Revision: 1787
          http://mrbs.svn.sourceforge.net/mrbs/?rev=1787&view=rev
Author:   jberanek
Date:     2011-02-09 21:11:38 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
* Updated web documentation for releasse of MRBS 1.4.6, added
 UPGRADE documentation file.

Modified Paths:
--------------
    mrbsweb/trunk/ChangeLog
    mrbsweb/trunk/INSTALL
    mrbsweb/trunk/NEWS
    mrbsweb/trunk/docs.php

Added Paths:
-----------
    mrbsweb/trunk/UPGRADE

Modified: mrbsweb/trunk/ChangeLog
===================================================================
--- mrbsweb/trunk/ChangeLog     2011-02-09 20:45:53 UTC (rev 1786)
+++ mrbsweb/trunk/ChangeLog     2011-02-09 21:11:38 UTC (rev 1787)
@@ -1,3 +1,591 @@
+2011-02-09 20:08  John Beranek <[email protected]>
+
+       * [r1784] web/version.inc:
+         
+         * Updated version number for 1.4.6 release.
+
+2011-02-03 12:42  John Beranek <[email protected]>
+
+       * [r1783] web/lang.es:
+         
+         * Updated Spanish translation received from Jose Luis Martin
+         Jimenez.
+
+2011-01-31 16:56  John Beranek <[email protected]>
+
+       * [r1782] web/Themes/default/header.inc:
+         
+         * Reverted one of the $PHP_SELF handling changes, which was
+         unnecessary.
+
+2011-01-31 11:02  Campbell Morrison <[email protected]>
+
+       * [r1781] web/Themes/default/footer.inc:
+         
+         Fixed an HTML validation error
+
+2011-01-31 10:04  Campbell Morrison <[email protected]>
+
+       * [r1780] web/Themes/default/header.inc:
+         
+         Fixed bug introduced in Rev 1775, causing styling errors and lack
+         of JavaScript functionality
+
+2011-01-30 10:06  Campbell Morrison <[email protected]>
+
+       * [r1779] web/add.php, web/admin.php, web/day.php, web/del.php,
+         web/edit_area_room.php, web/edit_entry.php,
+         web/edit_entry_handler.php, web/edit_users.php, web/lang.en,
+         web/month.php, web/mrbs_sql.inc, web/pending.php, web/report.php,
+         web/search.php, web/week.php:
+         
+         Improved handling of SQL errors
+
+2011-01-30 09:33  John Beranek <[email protected]>
+
+       * [r1778] web/edit_entry.php:
+         
+         * Fixed a few more HTML escaping issues, and rewrapped a few long
+         lines.
+
+2011-01-30 08:18  John Beranek <[email protected]>
+
+       * [r1777] web/functions.inc:
+         
+         * Fixed a few more cases where things weren't correctly escaped.
+
+2011-01-30 08:00  John Beranek <[email protected]>
+
+       * [r1776] web/admin.php, web/view_entry.php:
+         
+         * Fixed two more places where $PHP_SELF was used in HTML without
+         being properly escaped.
+
+2011-01-28 23:46  John Beranek <[email protected]>
+
+       * [r1775] web/Themes/default/header.inc, web/session_php.inc:
+         
+         * Fixed some XSS/escaping bugs reported by 'kevan_' in SF
+         #3167226.
+
+2011-01-28 22:02  John Beranek <[email protected]>
+
+       * [r1774] web/language.inc:
+         
+         * Possibly corrected the new locale selection logic from r1773.
+
+2011-01-28 21:54  John Beranek <[email protected]>
+
+       * [r1773] web/language.inc:
+         
+         * Now chooses a determined locale wven if MRBS doesn't have a
+         translation for that locale. It's better than nothing to get
+         dates/times right. Reported by 'corn_kid' as SF #2934313.
+
+2011-01-28 21:45  John Beranek <[email protected]>
+
+       * [r1772] web/edit_entry.php, web/systemdefaults.inc.php:
+         
+         * Implemented the ability to configure the default booking
+         description with $default_description, as requested in SF
+         #3001740.
+
+2011-01-28 21:33  John Beranek <[email protected]>
+
+       * [r1771] web/Themes/default/footer.inc[ADD], web/functions.inc:
+         
+         * Added the ability to specify a footer in the theme. Patch
+         submitted by rudd_j in SF #3166889.
+
+2011-01-28 21:15  John Beranek <[email protected]>
+
+       * [r1770] web/functions.inc:
+         
+         * Added error logging into fatal_error(). Patch submitted by
+         'shallot' in SF #2955546.
+
+2011-01-28 21:07  John Beranek <[email protected]>
+
+       * [r1769] web/mrbs-print.css.php:
+         
+         * Coloured borders for booking types in the printing style sheet.
+         Submitted by tuomas_ in SF #3003248.
+
+2011-01-28 20:44  John Beranek <[email protected]>
+
+       * [r1768] web/admin.php, web/del.php:
+         
+         * Made it so that you return to the right area after deleting a
+         room. Based on a patch in SF #3019525.
+
+2011-01-28 20:11  John Beranek <[email protected]>
+
+       * [r1767] web/internalconfig.inc.php:
+         
+         * Removed a possible deprecation warning, SF #3165269.
+
+2011-01-28 09:52  Campbell Morrison <[email protected]>
+
+       * [r1766] web/pending.php:
+         
+         Fixed pending so that it can cope with mixed periods and times
+
+2011-01-28 09:42  Campbell Morrison <[email protected]>
+
+       * [r1765] web/search.php:
+         
+         Fixed search so that it can handle mixed periods and times
+
+2011-01-28 09:40  Campbell Morrison <[email protected]>
+
+       * [r1764] web/functions.inc:
+         
+         Fixed bug introduced in Rev 1756
+
+2011-01-28 09:17  Campbell Morrison <[email protected]>
+
+       * [r1763] web/mrbs.css.php:
+         
+         Fixed CSS error
+
+2011-01-28 09:13  Campbell Morrison <[email protected]>
+
+       * [r1762] web/lang.en, web/mrbs.css.php, web/report.php:
+         
+         Fixed summary table so that it can cope with mixed periods and
+         times.
+
+2011-01-27 11:26  Campbell Morrison <[email protected]>
+
+       * [r1761] web/report.php:
+         
+         Fixed bug whereby summaries were not sorted properly by name
+
+2011-01-27 09:47  Campbell Morrison <[email protected]>
+
+       * [r1760] web/report.php:
+         
+         Fixed bug whereby start and end times were incorrectly presented
+         in reports when using mixed periods and times.
+
+2011-01-27 08:34  Campbell Morrison <[email protected]>
+
+       * [r1759] UPGRADE:
+         
+         Updated Upgrade documentation to reflect changes in Rev 1756
+
+2011-01-27 08:12  Campbell Morrison <[email protected]>
+
+       * [r1758] INSTALL:
+         
+         Clarified documentation on custom fields.
+
+2011-01-26 18:06  Campbell Morrison <[email protected]>
+
+       * [r1757] web/lang.fr:
+         
+         Minor tweak to capitalisation
+
+2011-01-26 17:17  Campbell Morrison <[email protected]>
+
+       * [r1756] web/day.php, web/edit_area_room.php, web/edit_entry.php,
+         web/functions.inc, web/functions_mail.inc,
+         web/functions_view.inc, web/help.php, web/internalconfig.inc.php,
+         web/language.inc, web/mincals.inc, web/month.php,
+         web/mrbs_sql.inc, web/report.php, web/systemdefaults.inc.php,
+         web/trailer.inc, web/week.php:
+         
+         Removed hard-coded formats for strftime() and put them in
+         systemdefaults in order to make it easier to tweak time and date
+         formats to meet local expectations.
+
+2011-01-26 16:12  John Beranek <[email protected]>
+
+       * [r1755] UPGRADE:
+         
+         * Removed some stray tabs.
+
+2011-01-26 16:08  John Beranek <[email protected]>
+
+       * [r1754] INSTALL:
+         
+         * Small documentation fix.
+
+2011-01-26 16:04  John Beranek <[email protected]>
+
+       * [r1753] INSTALL, UPGRADE, convert_db_to_utf8.php,
+         tables.my.pre41.sql[ADD], tables.my.sql, tables.pg.pre73.sql,
+         tables.pg.sql, web/dbsys.inc, web/upgrade/26[ADD],
+         web/upgrade/26/mysql.sql[ADD], web/upgrade/26/pgsql.sql[ADD],
+         web/upgrade/26/post.inc[ADD]:
+         
+         * Updated the MySQL table installation SQL files to utilise MySQL
+         4.1 features. A version for older versions of MySQL is retained
+         tables.my.pre41.sql.
+         
+         * Added a warning when upgrading the database, to inform
+         adninistrators that they may need to update their database to
+         UTF-8 encoding, using the convert_db_to_utf8.php script.
+         
+         * Updated the INSTALL and UPGRADE documentation to match the new
+         Unicode-only behaviour of MRBS, and to mention the new MySQL
+         installation SQL files.
+         
+         * Improved the convert_db_to_utf8.php quite a bit. Updated the
+         list of columns that need converting to UTF-8. Added support for
+         converting the database collation in a MySQL MRBS database.
+
+2011-01-26 12:37  Campbell Morrison <[email protected]>
+
+       * [r1752] web/Themes/default/header.inc, web/language.inc:
+         
+         Fixed problem where start and end times do not appear correctly
+         in the select boxes on the edit_entry form when using 12 hour
+         format and running on a Windows server.
+
+2011-01-26 11:30  John Beranek <[email protected]>
+
+       * [r1751] web/lang.cs:
+         
+         * Updated/fixed Czech translation from Marek Grác.
+
+2011-01-26 11:27  John Beranek <[email protected]>
+
+       * [r1750] ., INSTALL, UPGRADE, web/edit_users.php,
+         web/functions_mail.inc, web/lang.ca, web/lang.cs, web/lang.da,
+         web/lang.de, web/lang.el, web/lang.en, web/lang.es, web/lang.eu,
+         web/lang.fi, web/lang.fr, web/lang.it, web/lang.ja, web/lang.ko,
+         web/lang.nl, web/lang.no, web/lang.pl, web/lang.pt, web/lang.sl,
+         web/lang.sv, web/lang.tr, web/lang.zh-cn, web/lang.zh-tw,
+         web/language.inc, web/mysql.inc, web/mysqli.inc,
+         web/systemdefaults.inc.php, web/upgrade/5/pgsql.sql:
+         
+         * Merged the 'only_unicode' branch, which removes MRBS
+         non-Unicode mode. To come is an improved convert_db_to_utf8.php
+         script that I have been working on.
+
+2011-01-25 14:01  Campbell Morrison <[email protected]>
+
+       * [r1746] web/systemdefaults.inc.php:
+         
+         Added to comments for $override_locale
+
+2011-01-20 11:38  Campbell Morrison <[email protected]>
+
+       * [r1745] web/Themes/default/header.inc, web/edit_area_room.php,
+         web/lang.en, web/mrbs.css.php, web/mrbs_sql.inc,
+         web/systemdefaults.inc.php:
+         
+         - Fixed a bug whereby book ahead policies would not be applied
+         when using periods, depending on what settings were already in
+         the database. See SF Support Request #3161926 - At the same time
+         removed the restriction that book ahead policies cannot be set
+         per-area when using periods
+
+2011-01-13 11:12  Campbell Morrison <[email protected]>
+
+       * [r1744] web/functions_ical.inc:
+         
+         Added a comment.
+
+2011-01-11 09:47  Campbell Morrison <[email protected]>
+
+       * [r1743] web/Themes/default/header.inc,
+         web/jquery/ui/jquery-ui-datepicker-en-AU.js[ADD],
+         web/jquery/ui/jquery-ui-datepicker-en-NZ.js[ADD],
+         web/jquery/ui/jquery-ui-datepicker-no.js[ADD]:
+         
+         - added explicit en-AU and en-NZ initialisations for jQuery UI
+         datepicker. (Meanwhile a ticket, #6828, has been raised
+         requesting their inclusion in the standard package) - added a
+         correction for the Norwegian initialisation for datepicker
+         (pending discussions with the author of the original
+         initialisation with a view to incorporating the changes in the
+         standard package)
+
+2011-01-07 17:00  Campbell Morrison <[email protected]>
+
+       * [r1742] ., tables.my.sql, tables.pg.pre73.sql, tables.pg.sql,
+         web/Mail/mime.php[CPY], web/Mail/mimePart.php[CPY],
+         web/approve_entry_handler.php, web/dbsys.inc, web/del_entry.php,
+         web/edit_entry.php, web/edit_entry_handler.php,
+         web/functions.inc, web/functions_ical.inc[CPY],
+         web/functions_mail.inc, web/functions_view.inc[CPY],
+         web/internalconfig.inc.php, web/lang.en, web/language.inc,
+         web/mrbs-mail.css[CPY], web/mrbs.css.php, web/mrbs_sql.inc,
+         web/report.php, web/systemdefaults.inc.php, web/upgrade/23[CPY],
+         web/upgrade/23/mysql.sql[CPY], web/upgrade/23/pgsql.sql[CPY],
+         web/upgrade/24[CPY], web/upgrade/24/mysql.sql[CPY],
+         web/upgrade/24/pgsql.sql[CPY], web/upgrade/24/post.inc[CPY],
+         web/upgrade/25[CPY], web/upgrade/25/mysql.sql[CPY],
+         web/upgrade/25/pgsql.sql[CPY], web/upgrade/5/pgsql.sql,
+         web/view_entry.php:
+         
+         Merged the ics_attachments branch back into the trunk. MRBS now
+         supports: - HTML emails - emails containing iCalendar details
+         that can be imported automatically into calendar apps (eg
+         Outlook, iCal, Thunderbird/Lightning, Google Calendar) - export
+         of bookings as iCalendar files (.ics) from view_entry.php and
+         report.php
+
+2011-01-06 13:51  Campbell Morrison <[email protected]>
+
+       * [r1739] web/edit_area_room.php:
+         
+         Added missing HTML escaping
+
+2011-01-06 13:46  Campbell Morrison <[email protected]>
+
+       * [r1738] web/edit_entry.php, web/functions.inc:
+         
+         Added escaping of JavaScript strings (see SF Bug ID 3152394)
+
+2010-12-19 17:11  Campbell Morrison <[email protected]>
+
+       * [r1715] web/lang.fr:
+         
+         Updated French translation provided by Philippe Levi.
+
+2010-12-17 16:24  Campbell Morrison <[email protected]>
+
+       * [r1713] web/lang.pt:
+         
+         Updated Portuguese translation
+
+2010-12-17 12:38  Campbell Morrison <[email protected]>
+
+       * [r1711] web/edit_entry_handler.php:
+         
+         Simplified code
+
+2010-12-17 11:30  Campbell Morrison <[email protected]>
+
+       * [r1710] web/edit_entry_handler.php:
+         
+         Fixed bug which caused repeat, all-day bookings not to book the
+         last day of a series.
+
+2010-12-10 11:01  Campbell Morrison <[email protected]>
+
+       * [r1691] web/view_entry.php:
+         
+         Allowed entries for disabled rooms to be copied (but still not
+         deleted or edited).
+
+2010-12-10 08:53  Campbell Morrison <[email protected]>
+
+       * [r1688] web/functions.inc:
+         
+         Fixed bug that caused the room and area links in the day, week
+         and month views to operate incorrectly when using "list" format.
+         See SF Tracker ID: 3134046.
+
+2010-12-08 15:24  Campbell Morrison <[email protected]>
+
+       * [r1675] web/functions_mail.inc:
+         
+         Fixed bug whereby mail was not being sent to those on the cc and
+         bcc lists.
+
+2010-12-08 14:59  Campbell Morrison <[email protected]>
+
+       * [r1674] web/Mail.php, web/Mail/RFC822.php, web/Mail/mail.php,
+         web/Mail/null.php, web/Mail/sendmail.php, web/Mail/smtp.php,
+         web/Net/SMTP.php:
+         
+         Updated PEAR Mail package to Release 1.2.0 and Net_SMTP to
+         Release 1.4.4
+
+2010-11-26 12:24  John Beranek <[email protected]>
+
+       * [r1651] web/systemdefaults.inc.php:
+         
+         - Tidied example email address discussion.
+
+2010-11-26 11:52  Campbell Morrison <[email protected]>
+
+       * [r1650] web/systemdefaults.inc.php:
+         
+         Added a comment on email address formats
+
+2010-11-25 17:23  Campbell Morrison <[email protected]>
+
+       * [r1649] web/internalconfig.inc.php, web/upgrade/21/post.inc:
+         
+         - Removed the warning about the use of $provisional_enabled -
+         Added $provisional_enabled to the list of deprecated config
+         variables that are now replaced by something else, but still
+         supported for the moment in order to make upgrading easier -
+         Changed the way that the $mail_settings deprecated variables are
+         treated and stopped trying to do anything too smart
+
+2010-11-25 10:40  Campbell Morrison <[email protected]>
+
+       * [r1648] web/edit_entry.php, web/edit_entry_handler.php,
+         web/lang.en:
+         
+         Changed the privacy and confirmation status fields to be radio
+         buttons rather than checkboxes to make it slightly clearer what
+         they do.
+
+2010-11-25 09:18  Campbell Morrison <[email protected]>
+
+       * [r1647] web/mrbs_sql.inc:
+         
+         Better fix (again!) for Rev 1642 (bug causing approval of entries
+         not to work when using PostgreSQL)
+
+2010-11-25 07:39  Campbell Morrison <[email protected]>
+
+       * [r1646] web/dbsys.inc, web/mrbs_sql.inc, web/mysql.inc,
+         web/mysqli.inc, web/pgsql.inc:
+         
+         Better fix for Rev 1642 (bug causing approval of entries not to
+         work when using PostgreSQL)
+
+2010-11-25 04:49  Campbell Morrison <[email protected]>
+
+       * [r1645] web/lang.en:
+         
+         Fixed minor typo
+
+2010-11-25 04:47  Campbell Morrison <[email protected]>
+
+       * [r1644] web/lang.fr:
+         
+         Corrected French translation for rejected bookings.
+
+2010-11-25 04:35  Campbell Morrison <[email protected]>
+
+       * [r1643] web/approve_entry_handler.php:
+         
+         Fixed error handling if there's an SQL error when approving an
+         entry
+
+2010-11-25 04:17  Campbell Morrison <[email protected]>
+
+       * [r1642] web/mrbs_sql.inc:
+         
+         Fixed bug causing approval of entries not to work when using
+         PostgreSQL
+
+2010-11-24 19:07  Campbell Morrison <[email protected]>
+
+       * [r1641] UPGRADE, web/del_entry.php, web/edit_entry_handler.php,
+         web/internalconfig.inc.php, web/systemdefaults.inc.php:
+         
+         Following the suggestion of Céline Grousson, added a new config
+         variable to enable email notifications for new bookings to be
+         turned off. At the same time took the opportunity to rationalise
+         the naming of some of the mail settings, so the variables that
+         control when an email should be sent are now called
+         $mail_settings['on_new'], $mail_settings['on_change'] and
+         $mail_settings['on_delete']. The old variables,
+         $mail_settings['admin_all'] and
+         $mail_settings['admin_on_delete'], are still supported for
+         compatibility but their use is deprecated.
+
+2010-11-24 17:50  John Beranek <[email protected]>
+
+       * [r1640] auth_ldap.pl, auth_ldapsearch.pl, auth_pam.pl, badpw.pl,
+         checklang.php, convert_db_to_utf8.php, crypt_passwd.pl,
+         testdata.php, web/Mail.php, web/PEAR.php,
+         web/Themes/classic126/styling.inc, web/Themes/default/header.inc,
+         web/Themes/default/styling.inc, web/add.php, web/admin.php,
+         web/approve_entry_handler.php, web/auth_config.inc,
+         web/auth_db.inc, web/auth_db_ext.inc, web/auth_ext.inc,
+         web/auth_imap.inc, web/auth_imap_php.inc, web/auth_ldap.inc,
+         web/auth_nis.inc, web/auth_none.inc, web/auth_nw.inc,
+         web/auth_pop3.inc, web/auth_smtp.inc, web/config.inc.php,
+         web/dbsys.inc, web/defaultincludes.inc, web/del.php,
+         web/del_entry.php, web/edit_area_room.php, web/edit_entry.php,
+         web/edit_entry_handler.php, web/edit_users.php,
+         web/escapeshellarg.inc, web/functions.inc,
+         web/functions_mail.inc, web/grab_globals.inc.php, web/help.php,
+         web/index.php, web/lang.ca, web/lang.cs, web/lang.da,
+         web/lang.de, web/lang.el, web/lang.en, web/lang.es, web/lang.eu,
+         web/lang.fi, web/lang.fr, web/lang.it, web/lang.ja, web/lang.ko,
+         web/lang.nl, web/lang.no, web/lang.pl, web/lang.pt, web/lang.sl,
+         web/lang.sv, web/lang.tr, web/lang.zh-cn, web/lang.zh-tw,
+         web/language.inc, web/mincals.inc, web/month.php,
+         web/mrbs_auth.inc, web/mrbs_sql.inc, web/mysql.inc,
+         web/mysqli.inc, web/pending.php, web/pgsql.inc, web/report.php,
+         web/search.php, web/session_cookie.inc, web/session_host.inc,
+         web/session_http.inc, web/session_ip.inc, web/session_nt.inc,
+         web/session_omni.inc, web/session_php.inc,
+         web/session_remote_user.inc, web/style.inc, web/theme.inc,
+         web/trailer.inc, web/upgrade.inc, web/upgrade/13/post.inc,
+         web/upgrade/15/post.inc, web/upgrade/16/post.inc,
+         web/upgrade/17/post.inc, web/upgrade/2/post.inc,
+         web/upgrade/21/post.inc, web/upgrade/4/post.inc,
+         web/upgrade/5/post.inc, web/upgrade/6/post.inc,
+         web/upgrade/7/post.inc, web/upgrade/8/post.inc,
+         web/view_entry.php, web/week.php:
+         
+         - svn:mime-type tidying.
+
+2010-11-24 16:09  John Beranek <[email protected]>
+
+       * [r1639] web/version.inc:
+         
+         - One further test of svn:mime-type behaviour.
+
+2010-11-24 16:07  John Beranek <[email protected]>
+
+       * [r1638] web/day.php:
+         
+         - Testing the effects of svn:mime-type on ViewVC behaviour.
+
+2010-11-24 13:08  John Beranek <[email protected]>
+
+       * [r1637] web/jquery/ui/css/sunny/jquery-ui-1.8.6.custom.css,
+         web/jquery/ui/jquery-ui-1.8.6.custom.min.js:
+         
+         - Set svn:eol-style for new files.
+
+2010-11-24 10:22  Campbell Morrison <[email protected]>
+
+       * [r1636] web/Themes/default/header.inc,
+         web/jquery/ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png,
+         web/jquery/ui/css/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png,
+         web/jquery/ui/css/sunny/images/ui-icons_ed9f26_256x240.png,
+         web/jquery/ui/css/sunny/images/ui-icons_fadc7a_256x240.png,
+         web/jquery/ui/css/sunny/images/ui-icons_ffe180_256x240.png,
+         web/jquery/ui/css/sunny/jquery-ui-1.8.4.custom.css[DEL],
+         web/jquery/ui/css/sunny/jquery-ui-1.8.6.custom.css[ADD],
+         web/jquery/ui/jquery-ui-1.8.4.custom.min.js[DEL],
+         web/jquery/ui/jquery-ui-1.8.6.custom.min.js[ADD],
+         web/jquery/ui/jquery-ui-datepicker-pt.js[DEL],
+         web/jquery/ui/jquery-ui-i18n.js, web/style.inc:
+         
+         - Updated jQuery UI from 1.8.4 to 1.8.6 - Removed the separate
+         Portuguese regional setting for datepicker as it is now included
+         as standard in 1.8.6
+
+2010-11-24 09:50  Campbell Morrison <[email protected]>
+
+       * [r1635] ., tables.my.sql, tables.pg.pre73.sql, tables.pg.sql,
+         web/Themes/default/header.inc, web/admin.php, web/day.php,
+         web/dbsys.inc, web/edit_area_room.php, web/edit_entry.php,
+         web/functions.inc, web/internalconfig.inc.php, web/lang.en,
+         web/month.php, web/mrbs.css.php, web/mrbs_sql.inc,
+         web/pending.php, web/upgrade/22[CPY],
+         web/upgrade/22/mysql.sql[CPY], web/upgrade/22/pgsql.sql[CPY],
+         web/upgrade/5/pgsql.sql, web/view_entry.php, web/week.php:
+         
+         Merged the disabled_rooms branch back into the trunk. Rooms and
+         areas can now be disabled, meaning that they will not appear in
+         the day/week/month views and bookings cannot be made for them.
+         Any existing bookings will be preserved in the system, will be
+         returned in Search and Report results and can be viewed in
+         view_entry.php - but they will be read only.
+
+2010-11-22 21:21  John Beranek <[email protected]>
+
+       * [r1629] ChangeLog, NEWS:
+         
+         * Updated NEWS and ChangeLog for 1.4.5 release.
+
 2010-11-22 14:39  Campbell Morrison <[email protected]>
 
        * [r1628] web/Themes/default/header.inc:

Modified: mrbsweb/trunk/INSTALL
===================================================================
--- mrbsweb/trunk/INSTALL       2011-02-09 20:45:53 UTC (rev 1786)
+++ mrbsweb/trunk/INSTALL       2011-02-09 21:11:38 UTC (rev 1787)
@@ -94,14 +94,14 @@
 
 Create the MRBS tables using the supplied tables.*.sql file:
 
-[MySQL]         $ mysql mrbs < tables.my.sql
-[PostgreSQL]    $ psql -a -f tables.pg.sql mrbs
+[MySQL]             $ mysql mrbs < tables.my.sql
+[MySQL < 4.1]       $ mysql mrbs < tables.my.pre41.sql
+[PostgreSQL]        $ psql -a -f tables.pg.sql mrbs
+[PostgreSQL < 7.3]  $ psql -a -f tables.pg.pre73.sql mrbs
 
 where "mrbs" is the name of your database (mentioned above).
 This will create all the needed tables.
 You may need to set rights on the tables; for PostgreSQL see "grant.pg.sql".
-If you use a PHP version less than 4.2, you will also need to replace the pgsql
-driver file pgsql.inc with pgsql.before_php42.inc, and rename it to pgsql.inc.
 If you need to delete the tables, for PostgreSQL see "destroy.pg.sql".
 
 The tables are now empty and ready for use. If you want to add a few sample
@@ -120,7 +120,7 @@
 If you are upgrading from MRBS 1.2-pre3 or later, your database will be
 upgraded automatically if necessary when you first run MRBS.   You will
 be prompted for a database (not MRBS) username and password with rights
-to create and alter tables.     Otherwise, please se the UPGRADE file.
+to create and alter tables.     Otherwise, please see the UPGRADE file.
 
 For a second installation or to use different table names:
 
@@ -180,19 +180,20 @@
 supported, displayed as textarea, text or checkbox fields as appropriate.
 Whether a varchar is displayed as a text or textarea input depends on its
 maximum length, with the breakpoint determined by a configuration variable.
-Smallints and tinyints are assumed to be booleans and are displayed as 
checkboxes.
+Ints are treated as integer types, as you would expect.   However smallints
+and tinyints are assumed to be booleans and are displayed as checkboxes.
 
+[Note:  smallints are assumed to be booleans because the boolean type in 
+PostgreSQL presents some problems in PHP when trying to process the results
+of a query in a database independent way, so it is more convenient to use a 
+smallint instead of a boolean in PostgreSQL.]
+
 Text descriptions are looked for in the lang files with the tag 
room.column_name,
 eg room.coffee_machine, or users.phone enabling translations to be provided.   
 If not present, the column name will be used for labels etc.  If you are adding
 columns to the entry and repeat tables then you only need to add the 
 entry.column_name tags:  you don't need to add a repeat.column_name tag.
 
-[Note:  smallints are assumed to be booleans because the boolean type in 
-PostgreSQL presents some problems in PHP when trying to process the results
-of a query in a database independent way, so it is more convenient to use a 
-smallint instead of a boolean in PostgreSQL.]
-
 As an example, to add a field to the room table recording whether or not
 there is a coffee machine you would, in MySQL, add the column 
 
@@ -412,19 +413,11 @@
 INTERNATIONALISATION
 ---------------------------------------------------------------------------
 
-From mrbs-1.2-pre2, MRBS is internationalised as long as the config
-variable $unicode_encoding is set to 1 (which is the default setting). 
-If this is set, then MRBS serves all of its pages in UTF-8 and stores
-everything in the database in UTF-8. This means that all languages work
-together.
+From MRBS 1.4.6, MRBS is internationalised and uses UTF-8 throughout.
+MRBS will serve all of its pages in UTF-8 and stores everything in the
+database in UTF-8. This means that all languages work together.
 
-IF THIS DOES NOT WORK for you (your server may not have unicode support),
-just set $unicode_encoding to 0. MRBS will run the old way, with pages
-being served in an encoding based on the language, and the encoding of data
-in the database being a mess of different encodings based on the users'
-preferred language.
-
-To use Unicode, php should be built with 'iconv' support ('--with-iconv'
+To use Unicode, PHP should be built with 'iconv' support ('--with-iconv'
 directive), or have the iconv extension installed and enabled. On Windows,
 if you are using PHP 5, iconv support is built-in.
 
@@ -439,14 +432,13 @@
   \%phpdir%\extensions\
 
 
-Note: Upgrading mysql database from previous charsets to Unicode :
+Note: Upgrading MySQL database from previous charsets to Unicode :
 
   You can use convert_db_to_utf8.php script to convert text in the
-  database to UTF8, to use MRBS with $unicode_encoding set to 1. The
-  administrator should copy it into the web directory, run it (choosing
-  the encoding to convert from) ONCE, and then move it back out of the
-  web directory. We recommend you backup your database before running
-  this script if you are at all worried.
+  database to UTF8. The administrator should copy this file into the web
+  directory, run it (choosing the encoding to convert from) ONCE, and then
+  move it back out of the web directory. We recommend you backup your
+  database before running this script if you are at all worried.
 
   
 PERIODS
@@ -493,4 +485,4 @@
 large number of test entries to your database, regardless of
 authentication, and book all your rooms to people you've never heard of.
 
-$Id: INSTALL 1586 2010-11-05 11:49:58Z cimorrison $
+$Id: INSTALL 1758 2011-01-27 08:12:02Z cimorrison $

Modified: mrbsweb/trunk/NEWS
===================================================================
--- mrbsweb/trunk/NEWS  2011-02-09 20:45:53 UTC (rev 1786)
+++ mrbsweb/trunk/NEWS  2011-02-09 21:11:38 UTC (rev 1787)
@@ -7,6 +7,83 @@
 [============================]
 
 -------------------------------------------------------------------------------
+Version 1.4.6 (Wed Feb 09 22:00:00 GMT 2011):
+
+[+] Areas and rooms can now be disabled.
+[*] Updated bundled version of jQuery UI to 1.8.6.
+[+] Added the ability to disable the new booking email notifications,
+ and tidying the configuration variables defining the email configuration.
+[-] Fixed bug causing approval of entries not to work when using
+ PostgreSQL.
+[*] Fixed error handling if there's an SQL error when approving an
+ entry.
+[*] Changed the privacy and confirmation status fields to be radio
+ buttons rather than checkboxes to make it slightly clearer what
+ they do.
+[*] Updated PEAR Mail package to Release 1.2.0 and Net_SMTP to
+ Release 1.4.4.
+[-] Fixed bug whereby mail was not being sent to those on the cc and
+ bcc lists.
+[-] Fixed bug that caused the room and area links in the day, week
+ and month views to operate incorrectly when using "list" format.
+ See SF Tracker ID: 3134046.
+[-] Fixed bug which caused repeat, all-day bookings not to book the
+ last day of a series.
+[*] Updated Portuguese translation
+[*] Updated French translation provided by Philippe Levi.
+[-] Added escaping of JavaScript strings.
+[-] Added missing HTML escaping in a number of places to solve possible
+ XSS attacks.
+[+] Added support for HTML emails, optionally with ICS attachments for
+ "invitation" support. You can also download bookings in ICS format from
+  the web interface.
+[*] Added datepicker localisations for English (New Zealand) and English
+ (Australia). Also corrected the localisation for Norwegian.
+[-] Fixed a bug whereby book ahead policies would not be applied
+ when using periods. [SF Support Request #3161926]
+[*] Removed MRBS's non-Unicode mode. All installations will now run
+ in Unicode, with all pages served as UTF-8 and all data in the database
+ as UTF-8. If you upgrade an installation running in non-Unicode mode
+ you must run the improved convert_db_to_utf8.php script, as detailed
+ in UPGRADE.
+[*] Updated/fixed Czech translation from Marek Grác.
+[-] Fixed problem where start and end times do not appear correctly
+ in the select boxes on the edit_entry form when using 12 hour
+ format and running on a Windows server.
+[*] Updated the MySQL table installation SQL files to utilise MySQL
+ 4.1 features. A version for older versions of MySQL is retained
+ as tables.my.pre41.sql.
+[*] Removed hard-coded formats for dates/times and made them configuration
+ variables.
+[*] Clarified documentation on custom fields.
+[-] Fixed bug whereby start and end times were incorrectly presented
+ in reports when using mixed periods and times.
+[-] Fixed bug whereby report summaries were not sorted properly by name.
+[-] Fixed report summary table so that it can cope with mixed periods and
+ times.
+[-] Fixed search so that it can handle mixed periods and times.
+[-] Fixed pending bookings functionality so that it can cope with
+ mixed periods and times.
+[*] Removed a possible PHP deprecation warning, SF #3165269.
+[*] Made it so that you return to the right area after deleting a
+ room. Based on a patch in SF #3019525.
+[*] Added coloured borders for booking types in the printing style sheet.
+ Submitted by tuomas_ in SF #3003248.
+[*] Added error logging into fatal_error(). Patch submitted by
+ 'shallot' in SF #2955546.
+[+] Added the ability to specify a footer in the theme. Patch
+ submitted by rudd_j in SF #3166889.
+[+] Implemented the ability to configure the default booking
+ description with $default_description, as requested in SF
+ #3001740.
+[*] Now chooses a determined locale wven if MRBS doesn't have a
+ translation for that locale. It's better than nothing to get
+ dates/times right. Reported by 'corn_kid' as SF #2934313.
+[*] Improved handling of SQL errors.
+[*] Updated Spanish translation received from Jose Luis Martin
+ Jimenez.
+
+-------------------------------------------------------------------------------
 Version 1.4.5 (Mon Nov 22 22:00:00 GMT 2010):
 
 [+] Added the ability to prevent ordinary users from selecting multiple

Added: mrbsweb/trunk/UPGRADE
===================================================================
--- mrbsweb/trunk/UPGRADE                               (rev 0)
+++ mrbsweb/trunk/UPGRADE       2011-02-09 21:11:38 UTC (rev 1787)
@@ -0,0 +1,130 @@
+Upgrade Information for previous releases of MRBS:
+--------------------------------------------------
+
+If you are upgrading from MRBS 1.2-pre3 or later, then MRBS will
+automatically execute any necessary database upgrades when it is first
+run.   It will prompt you for a database (not MRBS) username and password
+with rights to create and alter tables.
+
+It would be a sensible precaution to take a backup of your database before
+the upgrade.
+
+MRBS database upgrades are in general intended to be backwards compatible,
+so that you should still be able to run the old version of MRBS against the
+new database schema.   This will allow you to install the new version of MRBS
+in a separate directory while you configure and test it.   When you are happy
+with the new release you can switch the directory to be your production
+directory.
+
+There are however some exceptions to this backward compatiblity, namely at
+the following transitions:
+
+MRBS 1.4.4.1 -> 1.4.5
+
+In these cases you will not be able to run the old version of MRBS against
+the upgraded database.   You may therefore choose to make a copy of the
+database for test purposes and check that the upgrade process works before
+performing the upgrade on your production database.
+
+
+Upgrading from prior MRBS 1.4.6
+===============================
+
+If you were previously using MRBS with $unicode_encoding set to 0, when
+you upgrade to 1.4.6 you _MUST_ upgrade the MySQL database from the
+previously used character set to Unicode :
+
+          You need to use the convert_db_to_utf8.php script to convert text
+          in the database to UTF8. The administrator should copy the file
+          into the web directory, run it (choosing the encoding to convert
+          from) ONCE, and then move it back out of the web directory. We
+          recommend you backup your database before running this script if
+          you are at all worried.
+          Running it more than once will make a right mess of any non-ASCII 
+          text in the database. 
+
+          Additionally, this script can correct an MRBS database that used
+          to run on an old version of MySQL (earlier than 4.1), but that
+          now run on a newer version of MySQL. In this case, the database
+          contains UTF-8 text, but the tables are considered to be in some
+          other encoding by MySQL, generally Latin-1. The
+          convert_db_to_utf8.php detects this condition, and offers
+          the administrator the chance to correct the database 'collation'.
+
+===
+
+The following configuration variables are now deprecated.   Their use is
+supported for the moment but you should change your config file now to
+use the new variables as support for the old variables may be dropped in the
+future:
+
+$mail_settings['admin_all']        replaced by  $mail_settings['on_new'] and
+                                                $mail_settings['on_change']
+$mail_settings['admin_on_delete']  replaced by  $mail_settings['on_delete']
+$dateformat                        replaced by  $strftime_format['daymonth']
+
+
+Upgrading from prior MRBS 1.4.5
+===============================
+MRBS 1.4.5 introduces the concept of tentative bookings, or bookings that
+require confirmation.   To avoid confusion, what were previously known as
+"provisional bookings" have now been renamed "bookings requiring approval"
+and the config variable $provisional_enabled has been renamed
+$approval_enabled.   You should update your config file accordingly.
+
+Please also see the note about database compatibility above.
+
+
+Upgrading from prior MRBS 1.2-pre3
+==================================
+
+mrbs 1.2-pre3 introduced area and room administrator email fields.
+
+Please apply the upgrade3.my.sql to add these fields. This file should work 
+both with mysql and pgsql.
+
+
+Upgrading from prior MRBS 1.2-pre2
+==================================
+
+Upgrading mysql database from previous charsets to Unicode :
+
+          You can use convert_db_to_utf8.php script to convert text in the 
+          database to UTF8. The administrator should copy the file into
+          the web directory, run it (choosing the encoding to convert from)
+          ONCE, and then move it back out of the web directory. We recommend
+          you backup your database before running this script if you are at
+          all worried.
+          Running it more than once will make a right mess of any non-ASCII 
+          text in the database. 
+
+
+Upgrading from prior to MRBS 1.0 final
+======================================
+
+Please apply the upgrade2.my.sql (if using MySQL) or the
+the upgrade2.pg.sql (if using PostgreSQL) script, which
+adds a new column to the 'mrbs_repeat' table to support
+"n-weekly" repeats.
+
+
+Upgrading from prior to MRBS 1.0-pre1
+======================================
+
+A change in version 1.0-pre1 might affect the appearance of entries in your
+existing database. Prior versions of MRBS did an extra and unnecessary
+level of backslash-escaping on room, area, and entry names and
+descriptions. This applied to certain characters such as single quote
+mark(') and backslash(\). As of version 1.0-pre1, these characters are
+handled correctly. If you see extra backslashes when MRBS displays names or
+descriptions, it is because these are in actually your database.  You can
+edit the entries in MRBS or directly with your database SQL tool, or just
+ignore them.
+
+
+Upgrading from prior to MRBS 0.7
+================================
+There was a change to the database schema at version 0.7. See the
+information in INSTALL on using the upgrade.my.sql script.
+
+$Id: UPGRADE 1759 2011-01-27 08:34:14Z cimorrison $


Property changes on: mrbsweb/trunk/UPGRADE
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: mrbsweb/trunk/docs.php
===================================================================
--- mrbsweb/trunk/docs.php      2011-02-09 20:45:53 UTC (rev 1786)
+++ mrbsweb/trunk/docs.php      2011-02-09 21:11:38 UTC (rev 1787)
@@ -11,6 +11,7 @@
 <ul>
   <li><a 
href="view_text.php?section=Documentation&amp;file=README">README</a></li>
   <li><a 
href="view_text.php?section=Documentation&amp;file=INSTALL">INSTALL</a></li>
+  <li><a 
href="view_text.php?section=Documentation&amp;file=UPGRADE">UPGRADE</a></li>
   <li><a 
href="view_text.php?section=Documentation&amp;file=AUTHENTICATION">AUTHENTICATION</a></li>
   <li><a 
href="view_text.php?section=Documentation&amp;file=LANGUAGE">LANGUAGE</a></li>
 </ul>


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits

Reply via email to