";
+ . utf8_strftime(hour_min_format(),$t) . "";
}
# Color to use for empty cells: white, unless highlighting this row:
@@ -450,7 +450,7 @@
tdcell("red");
echo ""
- . utf8_date(hour_min_format(),$t) . "";
+ . utf8_strftime(hour_min_format(),$t) . "";
}
}
Index: web/lang.en
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/lang.en,v
retrieving revision 1.26.2.1
diff -u -r1.26.2.1 lang.en
--- web/lang.en 17 May 2005 15:00:42 -0000 1.26.2.1
+++ web/lang.en 1 Aug 2008 19:15:36 -0000
@@ -1,5 +1,5 @@
Please use different options!";
$vocab["returncal"] = "Return to calendar view";
$vocab["failed_to_acquire"] = "Failed to acquire exclusive database access";
+$vocab["invalid_booking"] = "Invalid booking";
+$vocab["must_set_description"] = "You must set a brief description for the booking. Please go back and enter one.";
$vocab["mail_subject_entry"] = $mail["subject"];
$vocab["mail_body_new_entry"] = $mail["new_entry"];
$vocab["mail_body_del_entry"] = $mail["deleted_entry"];
Index: web/mrbs.css
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/mrbs.css,v
retrieving revision 1.11
diff -u -r1.11 mrbs.css
--- web/mrbs.css 24 Aug 2004 16:58:55 -0000 1.11
+++ web/mrbs.css 1 Aug 2008 19:15:36 -0000
@@ -19,7 +19,7 @@
TD.TR { vertical-align: top; text-align: right}
TD.TL { vertical-align: top; text-align: left}
-td form { margin:0; } // Prevent IE from displaying margins around forms in tables.
+td form { margin:0; } /* Prevent IE from displaying margins around forms in tables. */
TD.unallocated {color:gray}
TD.allocated {color:black}
Index: web/edit_entry_handler.php
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/edit_entry_handler.php,v
retrieving revision 1.22.2.3
diff -u -r1.22.2.3 edit_entry_handler.php
--- web/edit_entry_handler.php 28 Apr 2005 20:44:13 -0000 1.22.2.3
+++ web/edit_entry_handler.php 1 Aug 2008 19:15:35 -0000
@@ -1,5 +1,5 @@
+
+
+
+
+ 'zh_CN',
);
+# IBM AIX locale to code set table
+# See http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/libs/basetrf2/setlocale.htm
+$aixlocale_codepage_map = array
+(
+ 'Ar_AA' => 'IBM-1046',
+ 'ar_AA' => 'ISO8859-6',
+ 'bg_BG' => 'ISO8856-5',
+ 'cs_CZ' => 'ISO8859-2',
+ 'Da_DK' => 'IBM-850',
+ 'da_DK' => 'ISO8859-1',
+ 'De_CH' => 'IBM-850',
+ 'de_CH' => 'ISO8859-1',
+ 'De_DE' => 'IBM-850',
+ 'de_DE' => 'ISO8859-1',
+ 'el_GR' => 'ISO8859-7',
+ 'En_GB' => 'IBM-850',
+ 'en_GB' => 'ISO8859-1',
+ 'En_US' => 'IBM-850',
+ 'en_US' => 'ISO8859-1',
+ 'Es_ES' => 'IBM-850',
+ 'es_ES' => 'ISO8859-1',
+ 'Fi_FI' => 'IBM-850',
+ 'fi_FI' => 'ISO8859-1',
+ 'Fr_BE' => 'IBM-850',
+ 'fr_BE' => 'ISO8859-1',
+ 'Fr_CA' => 'IBM-850',
+ 'fr_CA' => 'ISO8859-1',
+ 'Fr_FR' => 'IBM-850',
+ 'fr_FR' => 'ISO8859-1 ',
+ 'Fr_CH' => 'IBM-850',
+ 'fr_CH' => 'ISO8859-1',
+ 'hr_HR' => 'ISO8859-2',
+ 'hu_HU' => 'ISO8859-2',
+ 'Is_IS' => 'IBM-850',
+ 'is_IS' => 'ISO8859-1',
+ 'It_IT' => 'IBM-850',
+ 'it_IT' => 'ISO8859-1',
+ 'Iw_IL' => 'IBM-856',
+ 'iw_IL' => 'ISO8859-8',
+ 'Ja_JP' => 'IBM-943',
+ 'ko_KR' => 'IBM-eucKR',
+ 'mk_MK' => 'ISO8859-5',
+ 'Nl_BE' => 'IBM-850',
+ 'nl_BE' => 'ISO8859-1',
+ 'Nl_NL' => 'IBM-850',
+ 'nl_NL' => 'ISO8859-1',
+ 'No_NO' => 'IBM-850',
+ 'no_NO' => 'ISO8859-1',
+ 'pl_PL' => 'ISO8859-2',
+ 'Pt_PT' => 'IBM-850',
+ 'pt_PT' => 'ISO8859-1',
+ 'ro_RO' => 'ISO8859-2',
+ 'ru_RU' => 'ISO8859-5',
+ 'sh_SP' => 'ISO8859-2',
+ 'sl_SI' => 'ISO8859-2',
+ 'sk_SK' => 'ISO8859-2',
+ 'sr_SP' => 'ISO8859-5',
+ 'Zh_CN' => 'GBK',
+ 'Sv_SE' => 'IBM-850',
+ 'sv_SE' => 'ISO8859-1',
+ 'tr_TR' => 'ISO8859-9',
+ 'zh_TW' => 'IBM-eucTW'
+);
+
+# GNU iconv code set to IBM AIX libiconv code set table
+# Keys of this table should be in lowercase, and searches should be performed using lowercase!
+$gnu_iconv_to_aix_iconv_codepage_map = array
+(
+ // "iso-8859-[1-9]" --> "ISO8859-[1-9]" according to http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/libs/basetrf2/setlocale.htm
+ 'iso-8859-1' => 'ISO8859-1',
+ 'iso-8859-2' => 'ISO8859-2',
+ 'iso-8859-3' => 'ISO8859-3',
+ 'iso-8859-4' => 'ISO8859-4',
+ 'iso-8859-5' => 'ISO8859-5',
+ 'iso-8859-6' => 'ISO8859-6',
+ 'iso-8859-7' => 'ISO8859-7',
+ 'iso-8859-8' => 'ISO8859-8',
+ 'iso-8859-9' => 'ISO8859-9',
+
+ // "big5" --> "IBM-eucTW" according to http://kadesh.cepba.upc.es/mancpp/classref/ref/ITranscoder_DSC.htm
+ 'big5' => 'IBM-eucTW',
+
+ // "big-5" --> "IBM-eucTW" (see above)
+ 'big-5' => 'IBM-eucTW'
+);
+
+# IBM AIX libiconv UTF-8 converters
+# See http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/genprogc/convert_prg.htm#HDRDNNRI49HOWA
+$aix_utf8_converters = array
+(
+ 'ISO8859-1',
+ 'ISO8859-2',
+ 'ISO8859-3',
+ 'ISO8859-4',
+ 'ISO8859-5',
+ 'ISO8859-6',
+ 'ISO8859-7',
+ 'ISO8859-8',
+ 'ISO8859-9',
+ 'JISX0201.1976-0',
+ 'JISX0208.1983-0',
+ 'CNS11643.1986-1',
+ 'CNS11643.1986-2',
+ 'KSC5601.1987-0',
+ 'IBM-eucCN',
+ 'IBM-eucJP',
+ 'IBM-eucKR',
+ 'IBM-eucTW',
+ 'IBM-udcJP',
+ 'IBM-udcTW',
+ 'IBM-sbdTW',
+ 'UCS-2',
+ 'IBM-437',
+ 'IBM-850',
+ 'IBM-852',
+ 'IBM-857',
+ 'IBM-860',
+ 'IBM-861',
+ 'IBM-863',
+ 'IBM-865',
+ 'IBM-869',
+ 'IBM-921',
+ 'IBM-922',
+ 'IBM-932',
+ 'IBM-943',
+ 'IBM-934',
+ 'IBM-935',
+ 'IBM-936',
+ 'IBM-938',
+ 'IBM-942',
+ 'IBM-944',
+ 'IBM-946',
+ 'IBM-948',
+ 'IBM-1124',
+ 'IBM-1129',
+ 'TIS-620',
+ 'IBM-037',
+ 'IBM-273',
+ 'IBM-277',
+ 'IBM-278',
+ 'IBM-280',
+ 'IBM-284',
+ 'IBM-285',
+ 'IBM-297',
+ 'IBM-500',
+ 'IBM-875',
+ 'IBM-930',
+ 'IBM-933',
+ 'IBM-937',
+ 'IBM-939',
+ 'IBM-1026',
+ 'IBM-1112',
+ 'IBM-1122',
+ 'IBM-1124',
+ 'IBM-1129',
+ 'IBM-1381',
+ 'GBK',
+ 'TIS-620'
+);
+
##############################################################################
# Language token handling
@@ -145,37 +305,67 @@
setlocale(LC_ALL,'C');
# We attempt to make up a sensible locale from the HTTP_ACCEPT_LANGUAGE
-# environment variable. If this doesn't work for you, comment it out
-# and assign locale directly.
-# If HTTP_ACCEPT_LANGUAGE is a comma-separated list, take the first one.
+# environment variable.
+
+# First we enumerate the user's language preferences...
if (isset($HTTP_ACCEPT_LANGUAGE)) // Attempt to use $HTTP_ACCEPT_LANGUAGE only when defined.
- $locale = ereg_replace(",.*", "", $HTTP_ACCEPT_LANGUAGE);
+{
+ $lang_specifiers = explode(',',$HTTP_ACCEPT_LANGUAGE);
+ foreach ($lang_specifiers as $specifier)
+ {
+ if (preg_match('/([a-zA-Z\-]+);q=([0-9\.]+)/', $specifier, $matches))
+ {
+ $langs[$matches[1]] = $matches[2];
+ }
+ else if (preg_match("/([a-zA-Z\-]+)/", $specifier, $matches))
+ {
+ $langs[$matches[1]] = 1.0;
+ }
+ }
+ arsort($langs,SORT_NUMERIC);
+}
else // Else use the value from config.inc.php.
- $locale = $default_language_tokens;
+{
+ $langs[$default_language_tokens] = 1.0;
+}
# The following attempts to import a language based on what the client
# is using.
if (!$disable_automatic_language_changing)
{
- $lang_file = "lang." . $locale;
- if (file_exists($lang_file))
- {
- include $lang_file;
- }
- else
+ $doneit = 0;
+
+ # First try for an exact match, so if the user specified en-gb, look
+ # for lang.en-gb
+
+ foreach ($langs as $lang => $qual)
{
- $lang_file = "lang." . preg_replace("/(\w+)_(\w+)/", "\\1-\\2", $locale);
+ $lang_file = "lang." . strtolower($lang);
+
if (file_exists($lang_file))
{
include $lang_file;
+ $doneit = 1;
+ $locale = $lang;
+ break;
}
- else
+ }
+ if ($doneit == 0)
+ {
+ # None of the user's preferred languages was available, so try to
+ # find a lang file for one of the base languages, e.g. look for
+ # lang.en if "en-ca" was specified.
+
+ foreach ($langs as $lang)
{
- $lang_file = "lang.". strtolower(substr($locale,0,2));
+ $lang_file = "lang." . strtolower(substr($lang,0,2));
+
if (file_exists($lang_file))
{
include $lang_file;
+ $locale = $lang;
+ break;
}
}
}
@@ -241,7 +431,12 @@
\"".$locale."\" to a Windows locale specifier";
}
}
- else if ($server_os == "unix")
+ /* All of these Unix OSes work in mostly the same way... */
+ else if (($server_os == "linux") ||
+ ($server_os == "sunos") ||
+ ($server_os == "bsd") ||
+ ($server_os == "aix") ||
+ ($server_os == "macosx"))
{
if (strlen($locale) == 2)
{
@@ -260,7 +455,19 @@
}
if ($unicode_encoding)
{
- $locale .= ".utf-8";
+ if ($server_os == "sunos")
+ {
+ $locale .= ".UTF-8";
+ }
+ else
+ {
+ // On IBM AIX, do not add ".utf-8" as this yields an invalid
+ // locale name
+ if ($server_os != "aix")
+ {
+ $locale .= ".utf-8";
+ }
+ }
}
if (setlocale(LC_ALL, $locale) == FALSE)
{
@@ -274,15 +481,27 @@
{
if (stristr(PHP_OS,"Darwin"))
{
- return "unix";
+ return "macosx";
}
else if (stristr(PHP_OS, "WIN"))
{
return "windows";
}
- else if (stristr(PHP_OS, "ux") || stristr(PHP_OS, "BSD"))
+ else if (stristr(PHP_OS, "Linux"))
+ {
+ return "linux";
+ }
+ else if (stristr(PHP_OS, "BSD"))
+ {
+ return "bsd";
+ }
+ else if (stristr(PHP_OS, "SunOS"))
+ {
+ return "sunos";
+ }
+ else if (stristr(PHP_OS, "AIX"))
{
- return "unix";
+ return "aix";
}
else
{
@@ -290,31 +509,147 @@
}
}
+// Translates a GNU libiconv character encoding name to its corresponding IBM AIX libiconv character
+// encoding name. Returns FALSE if character encoding name is unknown.
+function get_aix_character_encoding($character_encoding)
+{
+ global $gnu_iconv_to_aix_iconv_codepage_map;
+
+ // Check arguments
+ if ($character_encoding == NULL ||
+ !is_string($character_encoding) ||
+ empty($character_encoding))
+ {
+ return FALSE;
+ }
+
+ // Convert character encoding name to lowercase
+ $character_encoding = strtolower($character_encoding);
+
+ // Check that we know of an IBM AIX libiconv character encoding name equivalent for this character encoding name
+ if (!array_key_exists($character_encoding, $gnu_iconv_to_aix_iconv_codepage_map))
+ {
+ return FALSE;
+ }
+
+ return $gnu_iconv_to_aix_iconv_codepage_map[$character_encoding];
+}
+
+function get_vocab_utf8_aix($tag)
+{
+ global $aix_utf8_converters, $vocab;
+
+ // Attempt to translate character encoding name
+ $aix_character_set = get_aix_character_encoding($vocab['charset']);
+
+ // Check if character encoding name translation was successful
+ if ($aix_character_set === FALSE)
+ {
+ // Unsuccessful; just use the original character encoding name
+ $aix_character_set = $vocab['charset'];
+
+ }
+ else
+ {
+ // Successful; check that a corresponding UTF-8 converter exists
+ if (!in_array($aix_character_set, $aix_utf8_converters, TRUE))
+ {
+ // Corresponding UTF-8 converter does not exist; just use the original character encoding name
+ $aix_character_set = $vocab['charset'];
+
+ }
+ else
+ {
+ // Success; the translated character encoding name is ready to use
+ }
+ }
+
+ return iconv($aix_character_set, 'UTF-8', $vocab[$tag]);
+}
+
+
# Get a vocab item, in UTF-8 or a local encoding, depending on
# the setting of $unicode_encoding
function get_vocab($tag)
{
global $vocab, $unicode_encoding;
- if ($unicode_encoding)
+ if ($unicode_encoding && (strcasecmp($vocab["charset"], "utf-8") != 0))
{
- return iconv($vocab["charset"],"utf-8",$vocab[$tag]);
+ if ((get_server_os() == 'aix') &&
+ (strcasecmp(ICONV_IMPL, 'unknown') == 0) &&
+ (strcasecmp(ICONV_VERSION, 'unknown') == 0))
+ {
+ $translated = get_vocab_utf8_aix($tag);
+ }
+ else
+ {
+ $translated = iconv($vocab["charset"],"utf-8",$vocab[$tag]);
+ }
}
else
{
- return $vocab[$tag];
+ $translated = $vocab[$tag];
}
+ return $translated;
}
-function utf8_convert($string)
+// AIX version of utf8_convert(); needed as locales won't give us UTF-8
+// NOTE: Should ONLY be called with input encoded in the default code set of the current locale!
+// NOTE: Uses the LC_TIME category for determining the current locale setting, so should preferrably be used on date/time input only!
+function utf8_convert_aix($string)
+{
+ global $aixlocale_codepage_map, $aix_utf8_converters, $unicode_encoding;
+
+ // Retrieve current locale setting
+ $aix_locale = setlocale(LC_TIME, '0');
+
+ if ($aix_locale === FALSE)
+ {
+ // Locale setting could not be retrieved; return string unchanged
+ return $string;
+ }
+
+ if (!array_key_exists($aix_locale, $aixlocale_codepage_map))
+ {
+ // Default code page of locale could not be found; return string unchanged
+ return $string;
+ }
+
+ $aix_codepage = $aixlocale_codepage_map[$aix_locale];
+
+ if (!in_array($aix_codepage, $aix_utf8_converters, TRUE))
+ {
+ // No suitable UTF-8 converter was found for this code page; return string unchanged
+ return $string;
+ }
+
+ // Convert string to UTF-8
+ $aix_string = iconv($aix_codepage, 'UTF-8', $string);
+
+ // Default to original string if conversion failed
+ $string = ($aix_string === FALSE) ? $string : $aix_string;
+
+ return $string;
+}
+
+function utf8_convert_from_locale($string)
{
global $windows_locale, $unicode_encoding, $winlocale_codepage_map;
- if ($unicode_encoding && (get_server_os() == "windows"))
+ if ($unicode_encoding)
{
- if ($winlocale_codepage_map[$windows_locale])
+ if (get_server_os() == "windows")
{
- $string = iconv($winlocale_codepage_map[$windows_locale],"utf-8",$string);
+ if ($winlocale_codepage_map[$windows_locale])
+ {
+ $string = iconv($winlocale_codepage_map[$windows_locale],"utf-8",
+ $string);
+ }
+ }
+ else if (get_server_os() == "aix")
+ {
+ $string = utf8_convert_aix($string);
}
}
return $string;
@@ -322,14 +657,20 @@
function utf8_strftime($format, $time)
{
- $result = strftime($format,$time);
- return utf8_convert($result);
-}
+ # %p doesn't actually work in some locales, we have to patch it up ourselves
+ if (preg_match('/%p/', $format))
+ {
+ $ampm = strftime('%p', $time);
+ if ($ampm == '')
+ {
+ $ampm = date('a',$time);
+ }
-function utf8_date($format, $time)
-{
- $result = date($format,$time);
- return utf8_convert($result);
+ $format = preg_replace('/%p/', $ampm, $format);
+ }
+
+ $result = strftime($format,$time);
+ return utf8_convert_from_locale($result);
}
?>
Index: web/ChangeLog
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/Attic/ChangeLog,v
retrieving revision 1.34.2.3
diff -u -r1.34.2.3 ChangeLog
--- web/ChangeLog 20 Aug 2005 19:22:51 -0000 1.34.2.3
+++ web/ChangeLog 1 Aug 2008 19:15:35 -0000
@@ -1,23 +1,277 @@
+2007-02-23 John Beranek
+
+ * month.php, version.inc (mrbs-1_2-branch.[4,2]) (utags:
+ mrbs-1_2_5): * Fixed a few bugs in month view, including double
+ escaping of the < and > characters used in booking slot
+ descriptions (SF tracker #1663905) and also the times were being
+ shown incorrectly, as date() was being used instead of the now
+ standard (for anything displayed to the user) utf8_strftime().
+
+ * Upped version to 1.2.5 in preparation for release.
+
+2007-02-13 John Beranek
+
+ * lang.sv (tags: mrbs-1_2_5) (mrbs-1_2-branch.3): * Got rid of
+ nasty DOS line endings in lang.sv.
+
+2007-02-13 John Beranek
+
+ * auth_ldap.inc (tags: mrbs-1_2_5), config.inc.php (tags:
+ mrbs-1_2_5), day.php (tags: mrbs-1_2_5), edit_entry.php (tags:
+ mrbs-1_2_5), edit_entry_handler.php (tags: mrbs-1_2_5),
+ functions.inc (tags: mrbs-1_2_5), lang.es (tags: mrbs-1_2_5),
+ lang.sv, language.inc (tags: mrbs-1_2_5), month.php, mrbs.css
+ (tags: mrbs-1_2_5), report.php (tags: mrbs-1_2_5),
+ session_cookie.inc (tags: mrbs-1_2_5), session_php.inc (tags:
+ mrbs-1_2_5), week.php (tags: mrbs-1_2_5)
+ (mrbs-1_2-branch.[4,12,3,4,5,5,2,2,4,3,1,3,4,5,2]):
+ * LDAP auth scheme now has the ability to use LDAP v3 protocol,
+ and to use TLS, if configured to do so in config.inc.php.
+ Implements SF tracker #1644311.
+
+ * Fixed documentation of auth schemes in AUTHENTICATION to not
+ mention the getUserPassword() function that is no longer used.
+
+ * A few fixes to checklang.php.
+
+ * Added the ability to configure the cookie path that the 'php'
+ and 'cookie' session schemes use, to override the
+ auto-determination these schemes use. Also made the 'cookie'
+ session scheme actually use an expiring cookie. Fixes SF tracker
+ #1515118.
+
+ * Removed all use of the utf8_date() function, utf8_strftime()
+ is used instead. utf8_strftime() now works around a bug in
+ strftime() in the handling of %p, using date() if your locale
+ happens to return empty strings for the %p substitution.
+
+ * Replaced a short php start tag in edit_entry_handler.php with
+ the correct long form one. Fixes SF tracker #1652396. Also
+ corrected a short start tag in lang.es.
+
+ * Added code into edit_entry_handler.php to support locales that
+ use ',' as the decimal point. This will translate "1,5" hours
+ into "1.5" so it is understood. Fixes SF tracker #1647430.
+
+ * Added updated Swedish translation tokens, as provided by
+ bwiberg.
+
+ * Added AIX support into language.inc. You can now run MRBS on
+ an AIX server, in Unicode mode too. AIX support provided (and
+ tested) by bwiberg.
+
+ * Backported the improved language preference code from the
+ trunk MRBS development. The preference order of languages
+ specified by a user is now acted upon.
+
+ * Corrected some bracketing in month.php, as reported by a
+ number of people, including 't-matsuu' in SF tracker #1644042
+ who provided a fix.
+
+ * Corrected CSS commenting in mrbs.css, as reported in SF
+ tracker #1644042.
+
+2007-01-24 John Beranek
+
+ * config.inc.php, help.php (tags: mrbs-1_2_5), version.inc
+ (mrbs-1_2-branch.[11,1,1]) (utags: mrbs-1_2_4): * Moved version
+ number out of config.inc.php and into a version.inc, which
+ provides a function to retrieve the version number. Upped
+ version to 1.2.4.
+
+2006-10-09 John Beranek
+
+ * auth_imap.inc (tags: mrbs-1_2_5, mrbs-1_2_4), config.inc.php,
+ day.php (tags: mrbs-1_2_4), edit_entry_handler.php (tags:
+ mrbs-1_2_4), functions.inc (tags: mrbs-1_2_4), lang.en (tags:
+ mrbs-1_2_5, mrbs-1_2_4), lang.fi (tags: mrbs-1_2_5, mrbs-1_2_4),
+ month.php (tags: mrbs-1_2_4), mysqli.inc (tags: mrbs-1_2_5,
+ mrbs-1_2_4), robots.txt (tags: mrbs-1_2_5, mrbs-1_2_4),
+ session_php.inc (tags: mrbs-1_2_4), style.inc (tags: mrbs-1_2_5,
+ mrbs-1_2_4), trailer.inc (tags: mrbs-1_2_5, mrbs-1_2_4), week.php
+ (tags: mrbs-1_2_4)
+ (mrbs-1_2-branch.[3,10,2,4,4,2,2,2,2,1,4,2,1,1]):
+ * Added robots.txt and "Robots" META tag, to stop robots trawling
+ MRBS installations. Fixes SF bug tracker #1557192.
+
+ * Improved documentation in AUTHENTICATION on LDAP auth method
+ to make it clear that the 'ldap' PHP extension is required.
+ Fixes SF bug tracker #1554351.
+
+ * Fixes in auth_imap.inc to ensure that internet sockets to the
+ IMAP server are closed, in an attempt to fix a report in SF
+ tracker #1558451, though the reporter has since told me my fixes
+ didn't help his problem...
+
+ * Fixed example setting of $ldap_filter in config.inc.php, it
+ showed $ldap_user_filter instead of $ldap_filter. Fixes SF bug
+ tracker #1550827.
+
+ * Added a little code to turn $month, $week and $day into
+ integers explicitly, before calling checkdate(), this was
+ reported under SF tracker #1557192 as a place where MRBS will
+ output warnings (when being trawled by GoogleBot).
+
+ * Added a check in edit_entry_handler.php to ensure that the
+ "Brief Description" is not empty. This will only happen if the
+ user doesn't have JavaScript turned on, as usually there is
+ JavaScript validation that you enter a description. Translators
+ note that I had to add two more vocab tokens.
+
+ * Tidied HTML formatting - just the header section (for now).
+
+ * Added updated Finnish translation as provided by Tom Ingberg
+ in SF tracker #1450459. The translation encoding has changed to
+ UTF-8, so anyone with a Finnish installation that sets
+ $unicode_encoding to 1 will need to run convert_db_to_utf8.php
+ to convert the text in their database from iso-8859-1 to UTF-8.
+
+ * A few fixes to mysqli.inc that I'd not spotted in my earlier
+ testing.
+
+ * A fix in session_php.inc to ensure that the user's password
+ gets unslashed(). Fixed SF bug tracker #1563470.
+
+ * A few changes in trailer.inc so that the current day/week/month
+ in the trailer links are highlighted somewhat. Implements SF
+ feature request tracker # 875744.
+
+2006-07-07 John Beranek
+
+ * lang.es (tags: mrbs-1_2_4) (mrbs-1_2-branch.1): * Updated Spanish
+ translation, as provided by SoTMaR.
+
+2006-07-07 John Beranek
+
+ * config.inc.php, mysqli.inc (mrbs-1_2-branch.[9,1]): * Added
+ 'mysqli' database abstraction, to allow PHP 5 installations to
+ use the newer/better 'mysqli' extension instead of 'mysql'.
+ Reasonably tested on a Linux Apache 2.2.0/MySQL 5.0.18/PHP 5.1.2
+ installation. Updated the documentation to mention the new
+ database abstraction method, hopefully in all the necessary
+ places.
+
+2006-04-26 John Beranek
+
+ * config.inc.php (mrbs-1_2-branch.8): * Fixed typo in comment in
+ config.inc.php.
+
+2006-04-26 John Beranek
+
+ * config.inc.php, day.php, functions_mail.inc (tags: mrbs-1_2_5,
+ mrbs-1_2_4), lang.zh-tw (tags: mrbs-1_2_5, mrbs-1_2_4),
+ language.inc (tags: mrbs-1_2_4), month.php, report.php (tags:
+ mrbs-1_2_4), session_remote_user.inc (tags: mrbs-1_2_5,
+ mrbs-1_2_4) (mrbs-1_2-branch.[7,1,6,2,3,1,2,1]): * Upped version
+ number to 1.2.3+cvs (rather belatedly)
+
+ * Fixed some HTML escaping issues in the grids.
+
+ * Fixed a problem whereby non-repeating entries wouldn't be
+ emailed to area/room admins. Fixes SF tracker #1474386, fix
+ provided by 'karcher'.
+
+ * Added a little error logging into email functionality. You
+ should get an diagnostic error in your error log if an email
+ fails to be sent.
+
+ * Fixed zh-tw translation to correctly specify its encoding as
+ utf-8.
+
+ * Improved get_vocab() so that it doesn't do an iconv if the
+ language encoding is utf-8.
+
+ * Fixed bug in report.php that meant the meeting end date was
+ shown when the start date should have been. This fix was
+ provided to me somehow, but I can't find who provided it...
+
+ * Added "remote_user" session scheme, as provided by 'bwiberg' on
+ SF tracker #1432748. Allows MRBS to be configured to use a
+ server authentication scheme that sets the REMOTE_USER
+ environment variable.
+
+2006-01-26 John Beranek
+
+ * functions_mail.inc, mrbs_sql.inc (tags: mrbs-1_2_5, mrbs-1_2_4),
+ site_faq_de.html (tags: mrbs-1_2_5, mrbs-1_2_4)
+ (mrbs-1_2-branch.[5,3,2]): * Removed errant CRs from a few files.
+
+2006-01-26 John Beranek
+
+ * edit_entry.php (tags: mrbs-1_2_4), functions.inc,
+ functions_mail.inc, lang.sv (tags: mrbs-1_2_4), language.inc,
+ mrbs_sql.inc, report.php (mrbs-1_2-branch.[3,3,4,1,2,2,1]): *
+ Allow more entry types, now A-Z instead of A-J.
+
+ * Fix in notifyAdminOnBooking, to fix SF tracker #1315854, as
+ supplied by Neville Gilbert. The fix ensures that the area
+ administrator is sent an email when a booking is created.
+
+ * Improve server OS detection in language.inc. SunOS is now
+ handled, including utf-8 locale support.
+
+ * Improved n-weekly repeat code, you can now do an n-weekly
+ repeating meeting that happens on a sunday. Calculation of which
+ days to create bookings on is now done more carefully. SF
+ tracker #1300974
+
+ * Updated Swedish translation, as provided by Bjorn Wiberg in SF
+ tracker #1397719.
+
+ * Fixed problem in report.php that would create an error if MRBS
+ was configured to use HTTP session handling and you clicked the
+ "You are ..." link. Provided by Bjorn Wiberg in SF tracker
+ #1396685.
+
+2005-09-02 John Beranek
+
+ * auth_ldap.inc (tags: mrbs-1_2_4), config.inc.php, lang.fi
+ (mrbs-1_2-branch.[3,6,1]): * Added ability to change the port of
+ the LDAP server when the 'ldap' auth scheme is used. Set
+ $ldap_port in config.inc.php to change from the default port. *
+ Added documentation for ldap port configuration into
+ AUTHENTICATION, along with some brief details on the 'nis' auth
+ scheme. * Tidied up some of the text in INSTALL describing
+ MRBS's i18n and l10n support. * Made checklang.php work with
+ register_globals off, and made the output prettier. * Fixed a
+ typo in a comment in config.inc.php * Added a missing $ in a
+ Finnish vocab entry.
+
+2005-09-02 John Beranek
+
+ * edit_users.php (tags: mrbs-1_2_5, mrbs-1_2_4)
+ (mrbs-1_2-branch.3): * Bug fix for the SQL statement that
+ generates the mrbs_users table. Autoincrement columns don't
+ need a DEFAULT, and if specified with one on MySQL >= 4.1 the
+ SQL statement fails. The DEFAULT clause has been removed from
+ the SQL.
+
+2005-08-31 John Beranek
+
+ * site_faq_de.html (mrbs-1_2-branch.1): * Added German translation
+ of site FAQ, courtesy of Bertold Altaner.
+
2005-08-20 John Beranek
- * session_http.inc (tags: mrbs-1_2_3) (mrbs-1_2-branch.2): * Minor
- tidying.
+ * session_http.inc (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3)
+ (mrbs-1_2-branch.2): * Minor tidying.
2005-08-20 John Beranek
- * session_cookie.inc (tags: mrbs-1_2_3), session_http.inc,
- session_php.inc (tags: mrbs-1_2_3) (mrbs-1_2-branch.[3,1,3]): *
- Improved/fixed HTTP session scheme. It now also shows whether the
- login box in the to banner, and shows who you're logged in as.
- Tested it on my Linux box.
+ * session_cookie.inc (tags: mrbs-1_2_4, mrbs-1_2_3),
+ session_http.inc, session_php.inc (tags: mrbs-1_2_3)
+ (mrbs-1_2-branch.[3,1,3]): * Improved/fixed HTTP session scheme.
+ It now also shows whether the login box in the to banner, and
+ shows who you're logged in as. Tested it on my Linux box.
* Minor tidying in a few files.
2005-08-20 John Beranek
- * auth_db.inc (tags: mrbs-1_2_3), auth_db_ext.inc (tags:
- mrbs-1_2_3), config.inc.php (tags: mrbs-1_2_3),
- session_cookie.inc, session_php.inc, site_faq_es.html (tags:
+ * auth_db.inc (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3),
+ auth_db_ext.inc (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3),
+ config.inc.php (tags: mrbs-1_2_3), session_cookie.inc,
+ session_php.inc, site_faq_es.html (tags: mrbs-1_2_5, mrbs-1_2_4,
mrbs-1_2_3) (mrbs-1_2-branch.[3,2,5,2,2,1]):
* Improved db_ext auth scheme - moved the configuration into
config.inc.php, where it belongs. Additionally added support for
@@ -35,13 +289,15 @@
2005-07-13 John Beranek
- * lang.ko (tags: mrbs-1_2_3) (mrbs-1_2-branch.1): * Added Korean
- translation, as contributed by YoungJoon Kim.
+ * lang.ko (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3)
+ (mrbs-1_2-branch.1): * Added Korean translation, as contributed
+ by YoungJoon Kim.
2005-06-10 John Beranek
- * lang.no (tags: mrbs-1_2_3) (mrbs-1_2-branch.1): * Updated
- norwegian translation supplied by Emil Stoa.
+ * lang.no (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3)
+ (mrbs-1_2-branch.1): * Updated norwegian translation supplied by
+ Emil Stoa.
2005-05-17 John Beranek
@@ -88,26 +344,32 @@
2005-04-11 John Beranek
- * lang.ja (tags: mrbs-1_2_3, mrbs-1_2_2) (mrbs-1_2-branch.1): *
- Updated Japanese translation. Now stored in UTF-8 encoding.
- Japanese users who have set $unicode_encoding to 0 will need to
- convert their databases to UTF-8.
+ * lang.ja (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2)
+ (mrbs-1_2-branch.1): * Updated Japanese translation. Now stored
+ in UTF-8 encoding. Japanese users who have set $unicode_encoding
+ to 0 will need to convert their databases to UTF-8.
2005-03-29 John Beranek
- * add.php (tags: mrbs-1_2_3), admin.php (tags: mrbs-1_2_3),
- auth_config.inc (tags: mrbs-1_2_3), auth_db.inc, auth_ext.inc
- (tags: mrbs-1_2_3), auth_imap.inc (tags: mrbs-1_2_3),
- auth_ldap.inc (tags: mrbs-1_2_3), auth_nis.inc (tags:
- mrbs-1_2_3), auth_none.inc (tags: mrbs-1_2_3), auth_nw.inc (tags:
- mrbs-1_2_3), auth_pop3.inc (tags: mrbs-1_2_3), del.php (tags:
- mrbs-1_2_3), del_entry.php (tags: mrbs-1_2_3), edit_area_room.php
- (tags: mrbs-1_2_3), edit_entry.php (tags: mrbs-1_2_3),
- edit_entry_handler.php, edit_users.php, mrbs_auth.inc (tags:
+ * add.php (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3), admin.php
+ (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3), auth_config.inc
+ (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3), auth_db.inc,
+ auth_ext.inc (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3),
+ auth_imap.inc (tags: mrbs-1_2_3), auth_ldap.inc (tags:
+ mrbs-1_2_3), auth_nis.inc (tags: mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3), auth_none.inc (tags: mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3), auth_nw.inc (tags: mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3), auth_pop3.inc (tags: mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3), del.php (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3),
+ del_entry.php (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3),
+ edit_area_room.php (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3),
+ edit_entry.php (tags: mrbs-1_2_3), edit_entry_handler.php,
+ edit_users.php, mrbs_auth.inc (tags: mrbs-1_2_5, mrbs-1_2_4,
mrbs-1_2_3), session_cookie.inc, session_host.inc (tags:
- mrbs-1_2_3), session_ip.inc (tags: mrbs-1_2_3), session_nt.inc
- (tags: mrbs-1_2_3), session_omni.inc (tags: mrbs-1_2_3),
- session_php.inc
+ mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3), session_ip.inc (tags:
+ mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3), session_nt.inc (tags:
+ mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3), session_omni.inc (tags:
+ mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3), session_php.inc
(mrbs-1_2-branch.[1,1,2,2,2,2,2,2,2,2,2,1,1,1,2,2,1,1,1,1,1,1,1,1])
(utags: mrbs-1_2-branch_lastmerge, mrbs-1_2_2): * Made username
matching case insensitive throughout. Auth schemes may still
@@ -188,8 +450,9 @@
2004-09-21 John Beranek
- * lang.cs, language.inc (mrbs-1_2-branch.[1,1]) (utags:
- mrbs-1_2-branch_lastmerge, mrbs-1_2_1, mrbs-1_2_2, mrbs-1_2_3):
+ * lang.cs (tags: mrbs-1_2_5, mrbs-1_2_4), language.inc
+ (mrbs-1_2-branch.[1,1]) (utags: mrbs-1_2-branch_lastmerge,
+ mrbs-1_2_1, mrbs-1_2_2, mrbs-1_2_3):
* Fixed lang/locale selection for Czech language. Czech country
code is "cs", not "cz".
@@ -205,9 +468,9 @@
2004-09-14 John Beranek
- * lang.nl (tags: mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
- mrbs-1_2_1) (mrbs-1_2-branch.1): * Updated lang.nl from Marc ter
- Horst
+ * lang.nl (tags: mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
+ mrbs-1_2-branch_lastmerge, mrbs-1_2_1) (mrbs-1_2-branch.1): *
+ Updated lang.nl from Marc ter Horst
2004-09-13 John Beranek
@@ -224,11 +487,11 @@
2004-08-24 Jean-Francois LARVOIRE
* mrbs.css (1.11, mrbs-post-MDB-merge, mrbs-pre-MDB-merge),
- xbLib.js (1.4) (utags: mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1_2-branch_lastmerge, mrbs-1_2_1, mrbs-1_2_2, mrbs-1_2_3):
- Minor bug fix: The hidden active cell was sized differently from
- the main table cell. This generated extra mouse events, causing
- flicker on the status line.
+ xbLib.js (1.4, mrbs-1_2_5) (utags: mrbs-1_2, mrbs-1_2-branch_bp,
+ mrbs-1_2-branch_lastmerge, mrbs-1_2_1, mrbs-1_2_2, mrbs-1_2_3,
+ mrbs-1_2_4): Minor bug fix: The hidden active cell was sized
+ differently from the main table cell. This generated extra mouse
+ events, causing flicker on the status line.
2004-08-05 Gavin Walker
@@ -243,19 +506,21 @@
2004-07-28 John Beranek
- * lang.cz (1.10, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
- mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
- mrbs-1_2-branch_bp): * Updated lang.cz from David Krotil. Only
- required one token to be translated.
+ * lang.cz (1.10, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
+ mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
+ mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp): *
+ Updated lang.cz from David Krotil. Only required one token to be
+ translated.
2004-07-28 John Beranek
- * lang.cz (1.9), lang.da (1.5, mrbs-1_2_3, mrbs-1_2_2,
+ * lang.cz (1.9), lang.da (1.5, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
+ mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
+ lang.de (1.18, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
- lang.de (1.18, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
- mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
- mrbs-1_2-branch_bp), lang.el (1.4, mrbs-1_2_3, mrbs-1_2_2,
+ lang.el (1.4, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
lang.en (1.26, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
@@ -265,10 +530,11 @@
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
lang.fi (1.9, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
- mrbs-1_2-branch_bp), lang.fr (1.23, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
- mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
- lang.it (1.11, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-1_2-branch_bp), lang.fr (1.23, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp), lang.it (1.11, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
mrbs-1_2-branch_bp), lang.ja (1.15, mrbs-1_2-branch_lastmerge,
mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
@@ -276,18 +542,18 @@
mrbs-pre-MDB-merge, mrbs-1_2, mrbs-1_2-branch_bp), lang.no (1.13,
mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
- lang.pt (1.5, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
- mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
- mrbs-1_2-branch_bp), lang.sv (1.17, mrbs-1_2_3, mrbs-1_2_2,
+ lang.pt (1.5, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
- lang.zh-tw (1.15, mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
- mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp),
- language.inc (1.13, mrbs-post-MDB-merge, mrbs-pre-MDB-merge,
- mrbs-1_2, mrbs-1_2-branch_bp): * Language tokens synchronised.
- All files now have the same number of lines, and the same number
- of tokens. Some languages are now missing quite a few
- translations.
+ lang.sv (1.17, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp), lang.zh-tw (1.15, mrbs-1_2-branch_lastmerge,
+ mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp), language.inc (1.13, mrbs-post-MDB-merge,
+ mrbs-pre-MDB-merge, mrbs-1_2, mrbs-1_2-branch_bp): * Language
+ tokens synchronised. All files now have the same number of
+ lines, and the same number of tokens. Some languages are now
+ missing quite a few translations.
* Integrated fix for Windows locale selection contained in bug
#992390 (Huey). Browser language "en-ie" is now translated to
@@ -307,11 +573,11 @@
2004-06-23 Gavin Walker
* functions_mail.inc (1.12), lang.en (1.25), view_entry.php (1.16,
- mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
- mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp):
- Changed view_entry.php so that it could handle the situation
- where an id for a series is passed to it. A series is identified
- by series=1 in the url.
+ mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
+ mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge, mrbs-1_2_1,
+ mrbs-1_2, mrbs-1_2-branch_bp): Changed view_entry.php so that it
+ could handle the situation where an id for a series is passed to
+ it. A series is identified by series=1 in the url.
Changed functions_mail.inc to generate urls with series=1 in the
email messages where the message relates to a series.
@@ -553,27 +819,28 @@
mrbs-1-2-pre3), functions_mail.inc (1.1), lang.en (1.24,
mrbs-1-2-pre3), lang.fr (1.22, mrbs-1-2-pre3), language.inc
(1.9), mrbs_sql.inc (1.18, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3), Net/Socket.php (1.2, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
- mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3): + Added/changed features to email support: -
- Room and/or area administrators. An email field has been added to
- room and area administration page. Each room/area can have
- multiple emails. - Configurable options to send emails to these
- administrators. Emails can be send to MRBS admin and/or area
- admins and/or room admins. - Configurable options to set what
- is emailed (either a link to the view page as before or full
- details) - Configurable option to decide the lang used in
- emails and the text of subject and body. - Configurable
- options to decide which events cause an email to be sent
- (whether only new entries, new and edited entries, or deleted
- entries) - Full diffing informations between the new state of
- an edited entry and its previous settings (only if we choose
- to show details in emails) - Optionale recipients can receives
- mails in carbon copy - Configurable option to send mails using
- three mail backends: either the php mail function, an
- external smtp server (with or without authentication) or unix
- sendmail program. - upgraded Net::Socket from 1.0.1 to 1.0.2
+ mrbs-1-2-pre3), Net/Socket.php (1.2, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp, mrbs-1-2-pre3): + Added/changed features to
+ email support: - Room and/or area administrators. An email field
+ has been added to room and area administration page. Each
+ room/area can have multiple emails. - Configurable options to
+ send emails to these administrators. Emails can be send to
+ MRBS admin and/or area admins and/or room admins. -
+ Configurable options to set what is emailed (either a link to
+ the view page as before or full details) - Configurable option
+ to decide the lang used in emails and the text of subject and
+ body. - Configurable options to decide which events cause an
+ email to be sent (whether only new entries, new and edited
+ entries, or deleted entries) - Full diffing informations
+ between the new state of an edited entry and its previous
+ settings (only if we choose to show details in emails) -
+ Optionale recipients can receives mails in carbon copy -
+ Configurable option to send mails using three mail backends:
+ either the php mail function, an external smtp server (with or
+ without authentication) or unix sendmail program. -
+ upgraded Net::Socket from 1.0.1 to 1.0.2
2004-04-29 Thierry Bothorel
@@ -593,9 +860,10 @@
2004-04-25 Jean-Francois LARVOIRE
- * edit_users.php (1.8), mysql.inc (1.5, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge, mrbs-1_2_1,
- mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3), pgsql.inc (1.6,
+ * edit_users.php (1.8), mysql.inc (1.5, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
+ mrbs-1-2-pre3), pgsql.inc (1.6, mrbs-1_2_5, mrbs-1_2_4,
mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
mrbs-1-2-pre3): Modified the way edit_users.php gets the user
@@ -656,42 +924,45 @@
2004-04-16 Thierry Bothorel
- * Mail/mail.php (1.2, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
+ * Mail/mail.php (1.2, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
mrbs-1-2-pre3): - Removed PEAR_MAIL constants (never had).
2004-04-16 Thierry Bothorel
- * Mail.php (1.1, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
- mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
- mrbs-1_2-branch_bp, mrbs-1-2-pre3), PEAR.php (1.2, mrbs-1_2_3,
- mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
+ * Mail.php (1.1, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
+ mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3), config.inc.php (1.31), edit_entry_handler.php
- (1.18), functions.inc (1.30), lang.en (1.22), mrbs_sql.inc
- (1.17), view_entry.php (1.15, mrbs-1-2-pre3), Mail/RFC822.php
- (1.1, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-1-2-pre3), PEAR.php (1.2, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp, mrbs-1-2-pre3), config.inc.php (1.31),
+ edit_entry_handler.php (1.18), functions.inc (1.30), lang.en
+ (1.22), mrbs_sql.inc (1.17), view_entry.php (1.15,
+ mrbs-1-2-pre3), Mail/RFC822.php (1.1, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
mrbs-1_2-branch_bp, mrbs-1-2-pre3), Mail/mail.php (1.1),
- Mail/null.php (1.1, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
- mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3), Mail/sendmail.php (1.1, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
- mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3), Mail/smtp.php (1.1, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
+ Mail/null.php (1.1, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3), Net/SMTP.php (1.1, mrbs-1_2_3, mrbs-1_2_2,
+ mrbs-1-2-pre3), Mail/sendmail.php (1.1, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp, mrbs-1-2-pre3), Mail/smtp.php (1.1,
+ mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3), Net/Socket.php (1.1): + Added email support to
- MRBS (using PEAR::Mail class for that). MRBS developers, use
- function sendMail(), with at least the minimal parameters
- ($recipients, $subject and $body) to send mail from MRBS. +
- Added the option to notify the administrator (or someone else)
- with an email on each new entry or new and changed entries)
+ mrbs-1-2-pre3), Net/SMTP.php (1.1, mrbs-1_2_5, mrbs-1_2_4,
+ mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
+ mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp, mrbs-1-2-pre3), Net/Socket.php (1.1): + Added
+ email support to MRBS (using PEAR::Mail class for that). MRBS
+ developers, use function sendMail(), with at least the minimal
+ parameters ($recipients, $subject and $body) to send mail from
+ MRBS. + Added the option to notify the administrator (or someone
+ else) with an email on each new entry or new and changed entries)
2004-04-15 Thierry Bothorel
@@ -708,15 +979,15 @@
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
mrbs-1-2-pre3), edit_area_room.php (1.11), edit_entry.php (1.27),
edit_entry_handler.php (1.17), edit_users.php (1.7),
- functions.inc (1.29), index.php (1.8, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge, mrbs-1_2_1,
- mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3), month.php (1.26),
- mrbs_sql.inc (1.16), report.php (1.21), search.php (1.12,
+ functions.inc (1.29), index.php (1.8, mrbs-1_2_5, mrbs-1_2_4,
mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
- mrbs-1-2-pre3), view_entry.php (1.14), week.php (1.31): Changed
- the fixed table names to variables. The variables are defined in
- config.inc.php.
+ mrbs-1-2-pre3), month.php (1.26), mrbs_sql.inc (1.16), report.php
+ (1.21), search.php (1.12, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge,
+ mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3),
+ view_entry.php (1.14), week.php (1.31): Changed the fixed table
+ names to variables. The variables are defined in config.inc.php.
2004-04-14 Gavin Walker
@@ -796,8 +1067,8 @@
2004-04-12 Gavin Walker
- * mincals.inc (1.11, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
+ * mincals.inc (1.11, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
mrbs-1-2-pre3): mincal changes: - correct week highlight code to
correctly highlight where a week crosses into a new month. The
@@ -1396,10 +1667,10 @@
2003-11-14 Jean-Francois LARVOIRE
- * grab_globals.inc.php (1.2, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge, mrbs-1_2_1,
- mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3, mrbs-1-2-pre2):
- Added the setting of $HTTP_HOST.
+ * grab_globals.inc.php (1.2, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge,
+ mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3,
+ mrbs-1-2-pre2): Added the setting of $HTTP_HOST.
2003-11-14 Thierry Bothorel
@@ -1784,11 +2055,11 @@
2003-01-12 Thierry Bothorel
- * site_faq_fr.html (1.2, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge, mrbs-1_2_1,
- mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3, mrbs-1-2-pre2,
- mrbs-1-2-pre1, Root-of-mrbs_MDB, mrbs-1-1): Minor translation
- corrections
+ * site_faq_fr.html (1.2, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge,
+ mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3,
+ mrbs-1-2-pre2, mrbs-1-2-pre1, Root-of-mrbs_MDB, mrbs-1-1): Minor
+ translation corrections
2003-01-12 Thierry Bothorel
@@ -1900,16 +2171,16 @@
* admin.php (1.6), auth_ext.inc (1.4, Root-of-mrbs_MDB, mrbs-1-1),
edit_area_room.php (1.5), edit_entry.php (1.8),
- escapeshellarg.inc (1.1, mrbs-1_2_3, mrbs-1_2_2,
- mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge, mrbs-1_2_1,
- mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3, mrbs-1-2-pre2,
- mrbs-1-2-pre1, Root-of-mrbs_MDB, mrbs-1-1), functions.inc (1.13),
- help.php (1.5), index.php (1.3), lang.cz (1.2), lang.de (1.10),
- lang.en (1.9), lang.es (1.11), lang.fr (1.10), lang.it (1.4),
- lang.ja (1.9), lang.nl (1.10), lang.no (1.5), lang.sv (1.10),
- lang.zh-tw (1.9), mincals.inc (1.4), mrbs_auth.inc (1.4,
- mrbs-1-1), report.php (1.7), search.php (1.5), style.inc (1.6),
- view_entry.php (1.5):
+ escapeshellarg.inc (1.1, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3,
+ mrbs-1_2_2, mrbs-1_2-branch_lastmerge, mrbs-pre-MDB-merge,
+ mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3,
+ mrbs-1-2-pre2, mrbs-1-2-pre1, Root-of-mrbs_MDB, mrbs-1-1),
+ functions.inc (1.13), help.php (1.5), index.php (1.3), lang.cz
+ (1.2), lang.de (1.10), lang.en (1.9), lang.es (1.11), lang.fr
+ (1.10), lang.it (1.4), lang.ja (1.9), lang.nl (1.10), lang.no
+ (1.5), lang.sv (1.10), lang.zh-tw (1.9), mincals.inc (1.4),
+ mrbs_auth.inc (1.4, mrbs-1-1), report.php (1.7), search.php
+ (1.5), style.inc (1.6), view_entry.php (1.5):
- Changed all uses of
- * .htaccess (1.2, mrbs-1_2_3, mrbs-1_2_2,
+ * .htaccess (1.2, mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
mrbs-pre-MDB-merge, mrbs_MDB-latest, mrbs-1_2_1, mrbs-1_2,
mrbs-1_2-branch_bp, mrbs-1-2-pre3, mrbs-1-2-pre2, mrbs-1-2-pre1,
@@ -2249,13 +2520,14 @@
(1.2, mrbs-1-1, mrbs-1-0-final, mrbs-1-0-pre1), mrbs_auth.inc
(1.2, mrbs-1-0-final, mrbs-1-0-pre1), mrbs_sql.inc (1.2),
mysql.inc (1.2, mrbs-1-0-final, mrbs-1-0-pre1), new.gif (1.2,
+ mrbs-1_2_5, mrbs-1_2_4, mrbs-1_2_3, mrbs-1_2_2,
+ mrbs-1_2-branch_lastmerge, mrbs-post-MDB-merge,
+ mrbs-pre-MDB-merge, mrbs_MDB-latest, mrbs-1_2_1, mrbs-1_2,
+ mrbs-1_2-branch_bp, mrbs-1-2-pre3, mrbs-1-2-pre2, mrbs-1-2-pre1,
+ Root-of-mrbs_MDB, mrbs-1-1, mrbs-1-0-final, mrbs-1-0-pre1),
+ pgsql.inc (1.2, mrbs-1-0-final, mrbs-1-0-pre1), report.php (1.2),
+ search.php (1.2), site_faq.html (1.2, mrbs-1_2_5, mrbs-1_2_4,
mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
- mrbs-post-MDB-merge, mrbs-pre-MDB-merge, mrbs_MDB-latest,
- mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp, mrbs-1-2-pre3,
- mrbs-1-2-pre2, mrbs-1-2-pre1, Root-of-mrbs_MDB, mrbs-1-1,
- mrbs-1-0-final, mrbs-1-0-pre1), pgsql.inc (1.2, mrbs-1-0-final,
- mrbs-1-0-pre1), report.php (1.2), search.php (1.2), site_faq.html
- (1.2, mrbs-1_2_3, mrbs-1_2_2, mrbs-1_2-branch_lastmerge,
mrbs-pre-MDB-merge, mrbs-1_2_1, mrbs-1_2, mrbs-1_2-branch_bp,
mrbs-1-2-pre3, mrbs-1-2-pre2, mrbs-1-2-pre1, Root-of-mrbs_MDB,
mrbs-1-1, mrbs-1-0-final, mrbs-1-0-pre1), style.inc (1.2,
Index: web/edit_users.php
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/edit_users.php,v
retrieving revision 1.9.2.2
diff -u -r1.9.2.2 edit_users.php
--- web/edit_users.php 17 May 2005 15:00:41 -0000 1.9.2.2
+++ web/edit_users.php 1 Aug 2008 19:15:35 -0000
@@ -20,7 +20,7 @@
* *
\*****************************************************************************/
-// $Id: edit_users.php,v 1.9.2.2 2005/05/17 15:00:41 jberanek Exp $
+// $Id: edit_users.php,v 1.9.2.3 2005/09/02 10:42:34 jberanek Exp $
require_once "grab_globals.inc.php";
include "config.inc.php";
@@ -40,7 +40,7 @@
CREATE TABLE $tbl_users
(
/* The first four fields are required. Don't remove or reorder. */
- id int DEFAULT '0' NOT NULL auto_increment,
+ id int NOT NULL auto_increment,
name varchar(30),
password varchar(40),
email varchar(75),
Index: web/session_php.inc
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/session_php.inc,v
retrieving revision 1.8.2.3
diff -u -r1.8.2.3 session_php.inc
--- web/session_php.inc 20 Aug 2005 18:38:50 -0000 1.8.2.3
+++ web/session_php.inc 1 Aug 2008 19:15:37 -0000
@@ -16,12 +16,19 @@
* *
\*****************************************************************************/
-// $Id: session_php.inc,v 1.8.2.3 2005/08/20 18:38:50 jberanek Exp $
+// $Id: session_php.inc,v 1.8.2.5 2007/02/13 12:53:35 jberanek Exp $
global $PHP_SELF;
-$cookie_path = $PHP_SELF;
-$cookie_path = ereg_replace('[^/]*$', '', $cookie_path);
+if (isset($cookie_path_override))
+{
+ $cookie_path = $cookie_path_override;
+}
+else
+{
+ $cookie_path = $PHP_SELF;
+ $cookie_path = ereg_replace('[^/]*$', '', $cookie_path);
+}
session_set_cookie_params(0, $cookie_path);
session_start();
@@ -43,7 +50,7 @@
}
} else {
$NewUserName = unslashes($NewUserName);
- $NewPassword = unslashes($NewPassword);
+ $NewUserPassword = unslashes($NewUserPassword);
if (!authValidateUser($NewUserName, $NewUserPassword)) {
print_header(0, 0, 0, 0);
echo "
Error, REMOTE_USER was not set when it should have been
+
Index: web/robots.txt
===================================================================
RCS file: web/robots.txt
diff -N web/robots.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ web/robots.txt 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
Index: web/mysqli.inc
===================================================================
RCS file: web/mysqli.inc
diff -N web/mysqli.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ web/mysqli.inc 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,248 @@
+close();
+}
+
+// Execute a non-SELECT SQL command (insert/update/delete).
+// Returns the number of tuples affected if OK (a number >= 0).
+// Returns -1 on error; use sql_error to get the error message.
+function sql_command ($sql)
+{
+ global $mysqli;
+
+ $ret = -1;
+
+ if ($mysqli->query($sql)) {
+ $ret = $mysqli->affected_rows;
+ }
+ return $ret;
+}
+
+// Execute an SQL query which should return a single non-negative number value.
+// This is a lightweight alternative to sql_query, good for use with count(*)
+// and similar queries. It returns -1 on error or if the query did not return
+// exactly one value, so error checking is somewhat limited.
+// It also returns -1 if the query returns a single NULL value, such as from
+// a MIN or MAX aggregate function applied over no rows.
+function sql_query1 ($sql)
+{
+ global $mysqli;
+
+ $r = $mysqli->query($sql);
+ if (! $r) return -1;
+ if (($r->num_rows != 1) || ($r->field_count != 1) ||
+ (($row = $r->fetch_row()) == NULL)) {
+ $result = -1;
+ }
+ $r->close();
+ return $row[0];
+}
+
+// Execute an SQL query. Returns a database-dependent result handle,
+// which should be passed back to sql_row or sql_row_keyed to get the results.
+// Returns 0 on error; use sql_error to get the error message.
+function sql_query ($sql)
+{
+ global $mysqli;
+
+ $r = $mysqli->query($sql);
+ return $r;
+}
+
+// Return a row from a result. The first row is 0.
+// The row is returned as an array with index 0=first column, etc.
+// When called with i >= number of rows in the result, cleans up from
+// the query and returns 0.
+// Typical usage: $i = 0; while ((a = sql_row($r, $i++))) { ... }
+function sql_row ($r, $i)
+{
+ if ($i >= $r->num_rows) {
+ $r->close();
+ return 0;
+ }
+ $r->data_seek($i);
+ return $r->fetch_row();
+}
+
+// Return a row from a result as an associative array keyed by field name.
+// The first row is 0.
+// This is actually upward compatible with sql_row since the underlying
+// routing also stores the data under number indexes.
+// When called with i >= number of rows in the result, cleans up from
+// the query and returns 0.
+function sql_row_keyed ($r, $i)
+{
+ if ($i >= $r->num_rows) {
+ $r->close();
+ return 0;
+ }
+ $r->data_seek($i);
+ return $r->fetch_array();
+}
+
+// Return the number of rows returned by a result handle from sql_query.
+function sql_count ($r)
+{
+ return $r->num_rows;
+}
+
+// Return the value of an autoincrement field from the last insert.
+// Must be called right after an insert on that table!
+function sql_insert_id($table, $field)
+{
+ global $mysqli;
+
+ return $mysqli->insert_id;
+}
+
+// Return the text of the last error message.
+function sql_error()
+{
+ global $mysqli;
+
+ return $mysqli->error;
+}
+
+// Begin a transaction, if the database supports it. This is used to
+// improve PostgreSQL performance for multiple insert/delete/updates.
+// There is no rollback support, since MySQL doesn't support it.
+function sql_begin()
+{
+}
+
+// Commit (end) a transaction. See sql_begin().
+function sql_commit()
+{
+}
+
+// Acquire a mutual-exclusion lock on the named table. For portability:
+// This will not lock out SELECTs.
+// It may lock out DELETE/UPDATE/INSERT or not, depending on the implementation.
+// It will lock out other callers of this routine with the same name argument.
+// It may timeout in 20 seconds and return 0, or may wait forever.
+// It returns 1 when the lock has been acquired.
+// Caller must release the lock with sql_mutex_unlock().
+// Caller must not have more than one mutex at any time.
+// Do not mix this with sql_begin()/sql_end() calls.
+//
+// In MySQL, we avoid table locks, and use low-level locks instead.
+function sql_mutex_lock($name)
+{
+ global $sql_mutex_shutdown_registered, $sql_mutex_unlock_name;
+ if (!sql_query1("SELECT GET_LOCK('$name', 20)")) {
+ return 0;
+ }
+ $sql_mutex_unlock_name = $name;
+ if (empty($sql_mutex_shutdown_registered)) {
+ register_shutdown_function("sql_mutex_cleanup");
+ $sql_mutex_shutdown_registered = 1;
+ }
+ return 1;
+}
+
+// Release a mutual-exclusion lock on the named table. See sql_mutex_unlock.
+function sql_mutex_unlock($name)
+{
+ global $sql_mutex_unlock_name;
+ sql_query1("SELECT RELEASE_LOCK('$name')");
+ $sql_mutex_unlock_name = "";
+}
+
+// Shutdown function to clean up a forgotten lock. For internal use only.
+function sql_mutex_cleanup()
+{
+ global $sql_mutex_shutdown_registered, $sql_mutex_unlock_name;
+ if (!empty($sql_mutex_unlock_name)) {
+ sql_mutex_unlock($sql_mutex_unlock_name);
+ $sql_mutex_unlock_name = "";
+ }
+}
+
+
+// Return a string identifying the database version:
+function sql_version()
+{
+ $r = sql_query("select version()");
+ $v = sql_row($r, 0);
+ sql_free($r);
+ return "MySQL $v[0]";
+}
+
+
+// Generate non-standard SQL for LIMIT clauses:
+function sql_syntax_limit($count, $offset)
+{
+ return " LIMIT $offset,$count ";
+}
+
+// Generate non-standard SQL to output a TIMESTAMP as a Unix-time:
+function sql_syntax_timestamp_to_unix($fieldname)
+{
+ return " UNIX_TIMESTAMP($fieldname) ";
+}
+
+// Generate non-standard SQL to match a string anywhere in a field's value
+// in a case insensitive manner. $s is the un-escaped/un-slashed string.
+// In MySQL, REGEXP seems to be case sensitive, so use LIKE instead. But this
+// requires quoting of % and _ in addition to the usual.
+function sql_syntax_caseless_contains($fieldname, $s)
+{
+ $s = str_replace("\\", "\\\\", $s);
+ $s = str_replace("%", "\\%", $s);
+ $s = str_replace("_", "\\_", $s);
+ $s = str_replace("'", "''", $s);
+ return " $fieldname LIKE '%$s%' ";
+}
+
+// Returns the name of a field.
+function sql_field_name($result, $index)
+{
+ $finfo = $result->fetch_field_direct($index);
+ return $finfo->name;
+}
+
+// Returns the type of a field. (one of "int", "real", "string", "blob", etc...)
+function sql_field_type($result, $index)
+{
+ $finfo = $result->fetch_field_direct($index);
+ return $finfo->type;
+}
+
+// Returns the number of fields in a result.
+function sql_num_fields($result)
+{
+ return $result->field_count;
+}
+
+
+
+// Establish a database connection.
+// On connection error, the message will be output without a proper HTML
+// header. There is no way I can see around this; if track_errors isn't on
+// there seems to be no way to supress the automatic error message output and
+// still be able to access the error text.
+
+$mysqli = new mysqli($db_host, $db_login, $db_password, $db_database);
+
+/* check connection */
+if (mysqli_connect_errno()) {
+ echo "\n
+
+Mit dem Raumbuchungssystem MRBS können Sie sowohl
+Räume wie auch Geräte oder sonstige Dinge buchen bzw.
+reservieren.
+
+Hierzu wählen Sie zunächst unter Bereiche den
+gewünschten "Bereich" aus. Je nach gewählter
+Ansicht (Tag/Woche/Monat)
+
+sehen Sie entweder alle Räume/Geräte oder nur einen
+einzelnen, den Sie dann geeignet auswählen müssen.
+
+Der 3-Monats-Kalender dient zur schnellen Navigation - die jeweilige
+Ansicht (Tag/Woche/Monat) sowie der ausgewählte
+Raum/Gerät bleibt erhalten.
+
+Der Knopf "Start" neben der Datums-Eingabemaske führt immer
+zur Tagesansicht des eingestellten Bereichs.
+
+Raum/Geräte-Reservierungen führen Sie durch einen
+Klick auf das "Plus"-Zeichen (+) des gewünschten
+Raum/Geräts in der gewünschten Zeitspalte
+
+
Das System kann
+mit
+verschiedenen
+Authentifizierungsmethoden konfiguriert werden, dazu gehoeren LDAP,
+Netware und
+SMB. Wenden Sie sich bitte an ihren Systemadministrator, wenn Sie
+Schwierigkeiten bei der Anmeldung haben.
+
+
+
+
+
+
Einige
+Systemfunktionen koennen auf bestimmte
+Benutzer
+beschraenkt sein, und
+daher werden die uebrigen Benutzer die Meldung: „You do not
+have access
+right to
+modify this item!“ erhalten.Wenden Sie sich
+bitte an ihren
+Systemadministratoren, wenn ihre Benutzerberechtigungen nicht korrekt
+fuer sie
+eingestellt sind.Wenn das System auf der Grundlage der
+Authentifizierungsmethode LDAP
+eingerichtet ist, dann bedeutet dies, dass sie Zugang zu dem System mit
+dem
+gleichenBenutzernamen
+und Passwort z.B.
+"Mark Belanger" "MyPassword" wie zu ihrem E-Mail System
+haben.
Nur
+die
+Person, die die Besprechung im System angelegt hat, kann diese auch
+loeschen
+bzw. abaendern. Nehmen Sie Kontakt mit einem der Administratoren der
+Besprechungszimmer oder mit der Person, die die Besprechung
+urspruenglich
+angelegt hat, auf um diese loeschen bzw. aendern zu lassen.
+
+Wenn sie auf die
+gewuenschte Besprechungszeit klicken, kommen Sie auf den
+Bildschirm
+zum Anlegen einer Besprechung.
+
+Nach Eingabe einere Kurzbeschreibung
+und evtl. einer optionalen Vollständigen
+Beschreibung, sowie von Tag , Dauer, Bereiche, Räume
+(halten Sie die STRG-Taste beim Klicken gedrückt um mehrere zu
+selektieren), waehlen Sie die geeignete Art der
+Wiederholung aus. Der Raum wird fuer die gleiche Uhrzeit an den Tagen,
+die durch Ihren Wiederholungsschluessel (Art der Wiederholung)
+festgelegt sind, bis zum Endtermin (Ende der Wiederholung)
+eingeplant. Taeglich bedeutet eine Einplanung fuer jeden Tag.
+Woechentlich nimmt die Einplanungen an den Wochentagen vor, die
+sie unter Tag der Wiederholung ausgewaehlt
+haben.
+
Das
+ist
+nicht moeglich. Gegenwaertig kann das System nicht mehrere Raeume
+gleichzeitig
+einplanen. Sie muessen jeden Raum separat einplanen. Stellen Sie bitte
+sicher,
+dass die Raeume an den verschiedenen Orten zu der gewuenschten Zeit
+verfuegbar
+sind, bevor sie eine Belegung vornehmen.
+
+Die
+Obergrenze fuer die Anzahl der Wiederholungseinträge eines
+Besprechungseintrags liegt im System bei 365. Die Zahl kann aber bei
+Bedarf
+erhoeht werden. Bitte informieren Sie den Buchungsadministrator.
Die
+einfache Antwort ist: der erste, der den Button
+„Speichern“ drueckt,
+macht das
+Rennen. Hinter den Kulissen benutzt das System eine einwandfrei
+arbeitendefuer
+mehrere Benutzer und
+gleichzeitige
+Verarbeitung mehrerer Anforderungen ausgerichtete relationale
+Datenbank, die
+viele Tausende von gleichzeitigen Benutzern bedienen kann.
+
+Mit Hilfe des Such-Feldes wird in allen Buchungs-Einträgen
+gesucht. Gesucht wird in folgenden Kategorien:
+
+"Erstellt von", "Kurzbeschreibung", "Beschreibung".
+
+Zum Suchen den Such-Begriff in das Such-Feld eingeben und "Return"
+drücken. Als Ergebnis erscheint eine Liste mit gefundenen
+Buchungseinträgen die den Such-Begriff enthalten.
+
+Wenn Sie auf "Sie sind <Benutzername>"
+klicken, erhalten Sie eine Liste aller von Ihnen in der Zukunft
+reservierten Räumen/Geräten.
+
+
Standardmaessig
+gibt es im System MRBS zwei Besprechungsarten. "Intern"
+bedeutet, dass an der Besprechung nur Firmenangestellte
+teilnehmen."Extern"
+heisst,
+dass als Teilnehmer auch Kunden, Lieferanten, Geldanleger, usw.
+vorgesehen
+sind.Sie koennen
+fuer ihren Standort bis
+zu 10 Besprechungsarten nach ihren eigenen Beduerfnissen definieren.
+Jeder Besprechungsart ist eine Farbe zugeordnet und die Besprechung
+werden in
+der Kalenderuebersicht entsprechend farblich unterlegt. Eine Uebersicht
+ueber die
+Besprechungsarten und ihre farbliche Darstellung befindet sich am Fuss
+der
+Kalenderuebersicht.
+
+
Das Meeting
+Room
+Booking System ist eine Open source
+Software,
+die unter Gnu Public License (GPL) vertrieben wird. Das bedeutet, die
+Software kann unentgeltlich benutzt, vertrieben und geaendert werden.
+Der groesste Teil des Systems
+ist in PHP,
+geschrieben, dies ist eine
+Open Source
+Programmiersprache , die in Webseiten eingebettet werden kann,
+vergleichbar den
+Microsoft active server pages. PHP eignet sich besonders gut fuer den
+Zugriff auf Datenbanken. Das Datenbanksystem,
+das dem
+Anwendungssystem zugrunde liegt, ist entweder MySQL
+oder PostgreSQL.MySQL ist ein sehr schneller, fuer
+mehrere
+Benutzer
+und parallele Verarbeitung verschiedener Benutzeranforderungen
+ausgerichteter,
+leistungsfaehiger SQL (Structured Query Language) Datenbankserver ,
+dies
+trifft
+auch fuer GPL zu. PostgreSQL ist ein Multi User, Open Source und
+objektorientierter SQL
+Datenbankserver mit allen Leistungsmerkmalen. Das
+System laeuft auf vielen
+Plattformen, auch auf einer PC-Architektur mit einem Linux -Betriebsssystem.Linux ist eine kostenloses, Open
+Source und unix-aehnliches
+Betriebssystem. Auch der eingesetzte
+Webserver
+ist eine kostenlose Open Source Software.DerApache Webserver
+ist der weitverbreiteste Webserver.
+
+
+
+
Die
+Quintessenz lautet:
+
+Jeder
+Bestandteil des
+Systems vom Betriebssystem bis zur Anwendungssoftware
+ist vollkommen kostenloser Quellcode.