\n";
+ echo "
+ ";
- echo "
+
+ ";
- echo "
+ ";
+ echo "
+ ";
}
# Error handler - this is used to display serious errors such as database
@@ -388,11 +398,11 @@
global $twentyfourhour_format;
if ($twentyfourhour_format)
{
- return "H:i";
+ return "%H:%M";
}
else
{
- return "h:ia";
+ return "%I:%M%p";
}
}
@@ -423,16 +433,14 @@
function time_date_string($t)
{
global $twentyfourhour_format;
- # This bit's necessary, because it seems %p in strftime format
- # strings doesn't work
- $ampm = utf8_date("a",$t);
+
if ($twentyfourhour_format)
{
return utf8_strftime("%H:%M:%S - %A %d %B %Y",$t);
}
else
{
- return utf8_strftime("%I:%M:%S$ampm - %A %d %B %Y",$t);
+ return utf8_strftime("%I:%M:%S%p - %A %d %B %Y",$t);
}
}
@@ -460,7 +468,7 @@
global $typel;
echo "
\n";
$nct = 0;
- for ($ct = "A"; $ct <= "J"; $ct++)
+ for ($ct = "A"; $ct <= "Z"; $ct++)
{
if (!empty($typel[$ct]))
{
@@ -595,4 +603,4 @@
return $modification;
}
-?>
\ No newline at end of file
+?>
Index: plugins/blocks/mrbs/web/lang.en.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/lang.en.php,v
retrieving revision 1.4
diff -u -r1.4 lang.en.php
--- plugins/blocks/mrbs/web/lang.en.php 1 Aug 2008 04:02:10 -0000 1.4
+++ plugins/blocks/mrbs/web/lang.en.php 2 Aug 2008 04:19:52 -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"];
@@ -250,4 +252,4 @@
# Used in mysql.php AND pgsql.php
$vocab["failed_connect_db"] = "Fatal Error: Failed to connect to database";
-?>
\ No newline at end of file
+?>
Index: plugins/blocks/mrbs/web/config.inc.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/config.inc.php,v
retrieving revision 1.6
diff -u -r1.6 config.inc.php
--- plugins/blocks/mrbs/web/config.inc.php 1 Aug 2008 04:02:11 -0000 1.6
+++ plugins/blocks/mrbs/web/config.inc.php 2 Aug 2008 04:19:52 -0000
@@ -1,6 +1,6 @@
dbtype;
-$dbsys = $CFG->dbtype;
+# Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL, "mysqli"=MySQL via the mysqli PHP extension
+$dbsys = $CFG->dbtype; //"mysql"
# Hostname of database server. For pgsql, can use "" instead of localhost
# to use Unix Domain Sockets instead of TCP/IP.
-$db_host = $CFG->dbhost;
-#"localhost";
+$db_host = $CFG->dbhost; //"localhost";
# Database name:
-$db_database = $CFG->dbname;
-#"moodle18patch";
+$db_database = $CFG->dbname; //"mrbs";
# Database login user name:
-$db_login = $CFG->dbuser;
-#"root";
+$db_login = $CFG->dbuser; // "mrbs";
# Database login password:
-$db_password = $CFG->dbpass;
-
+$db_password = $CFG->dbpass; //'mrbs-password';
# Prefix for table names. This will allow multiple installations where only
# one database is available
$db_tbl_prefix = $CFG->prefix.'mrbs_';
# Uncomment this to NOT use PHP persistent (pooled) database connections:
# $db_nopersist = 1;
-
################################
# Site identification information
#################################
@@ -72,29 +67,29 @@
$enable_periods = $cfg_mrbs->block_mrbs_enable_periods;
if ($enable_periods == 0) { //if we are not using periods then set the following values, prevents error of unset variables
- # Resolution - what blocks can be booked, in seconds.
- # Default is half an hour: 1800 seconds.
+# Resolution - what blocks can be booked, in seconds.
+# Default is half an hour: 1800 seconds.
$resolution = $cfg_mrbs->block_mrbs_resolution;
- # Start and end of day, NOTE: These are integer hours only, 0-23, and
- # morningstarts must be < eveningends. See also eveningends_minutes.
+# Start and end of day, NOTE: These are integer hours only, 0-23, and
+# morningstarts must be < eveningends. See also eveningends_minutes.
$morningstarts = $cfg_mrbs->block_mrbs_morningstarts;
$eveningends =$cfg_mrbs->block_mrbs_eveningends;
- # Minutes to add to $morningstarts to get to the real start of the day.
- # Be sure to consider the value of $eveningends_minutes if you change
- # this, so that you do not cause a day to finish before the start of
- # the last period. For example if resolution=3600 (1 hour)
- # morningstarts = 8 and morningstarts_minutes = 30 then for the last
- # period to start at say 4:30pm you would need to set eveningends = 16
- # and eveningends_minutes = 30
+# Minutes to add to $morningstarts to get to the real start of the day.
+# Be sure to consider the value of $eveningends_minutes if you change
+# this, so that you do not cause a day to finish before the start of
+# the last period. For example if resolution=3600 (1 hour)
+# morningstarts = 8 and morningstarts_minutes = 30 then for the last
+# period to start at say 4:30pm you would need to set eveningends = 16
+# and eveningends_minutes = 30
$morningstarts_minutes = $cfg_mrbs->block_mrbs_morningstarts_min;
- # Minutes to add to $eveningends hours to get the real end of the day.
- # Examples: To get the last slot on the calendar to be 16:30-17:00, set
- # eveningends=16 and eveningends_minutes=30. To get a full 24 hour display
- # with 15-minute steps, set morningstarts=0; eveningends=23;
- # eveningends_minutes=45; and resolution=900.
+# Minutes to add to $eveningends hours to get the real end of the day.
+# Examples: To get the last slot on the calendar to be 16:30-17:00, set
+# eveningends=16 and eveningends_minutes=30. To get a full 24 hour display
+# with 15-minute steps, set morningstarts=0; eveningends=23;
+# eveningends_minutes=45; and resolution=900.
$eveningends_minutes = $cfg_mrbs->block_mrbs_eveningends_min;
}
@@ -114,8 +109,8 @@
// Moodle HACK
if(!isset($cfg_mrbs->block_mrbs_periods) or empty($cfg_mrbs->block_mrbs_periods)) {
- $periods[] = "Period 1";
- $periods[] = "Period 2";
+$periods[] = "Period 1";
+$periods[] = "Period 2";
$periods[] = "Period 3";
$periods[] = "Period 4";
$periods[] = "Period 5";
@@ -200,17 +195,21 @@
###############################################
$auth["session"] = "php"; # How to get and keep the user ID. One of
# "http" "php" "cookie" "ip" "host" "nt" "omni".
-
+ # "remote_user"
$auth["type"] = "moodle";
#$auth["type"] = "db_ext"; # How to validate the user/password. One of "none"
# "config" "db" "db_ext" "pop3" "imap" "ldap" "nis"
# "nw" "ext".
+# Cookie path override. If this value is set it will be used by the
+# 'php' and 'cookie' session schemes to override the default behaviour
+# of automatically determining the cookie path to use
+$cookie_path_override = '';
+
# The list of administrators (can modify other peoples settings)
#$auth["admin"][] = "127.0.0.1"; # localhost IP address. Useful with IP sessions.
#$auth["admin"][] = "aborrow"; # A user name from the user list. Useful
#with most other session schemes.
-
#$auth["admin"][] = "10.0.0.1";
#$auth["admin"][] = "10.0.0.2";
#$auth["admin"][] = "10.0.0.3";
@@ -224,17 +223,20 @@
# 'session_http' configuration settings
$auth["realm"] = "mrbs";
+# 'session_remote_user' configuration settings
+#$auth['remote_user']['logout_link'] = '/logout/link.html';
+
# 'auth_ext' configuration settings
$auth["prog"] = "";
$auth["params"] = "";
-
# 'auth_db_ext' configuration settings
$auth['db_ext']['db_host'] = 'localhost';
-$auth['db_ext']['db_username'] = '';
-$auth['db_ext']['db_name'] = '';
-$auth['db_ext']['db_table'] = 'mdl_user';
-$auth['db_ext']['column_name_username'] = 'username';
+$auth['db_ext']['db_username'] = ''; // 'authuser';
+$auth['db_ext']['db_password'] = ''; //'authpass';
+$auth['db_ext']['db_name'] = ''; //'authdb';
+$auth['db_ext']['db_table'] = $CFG->prefix.'user'; // 'users';
+$auth['db_ext']['column_name_username'] = 'username'; //'name';
$auth['db_ext']['column_name_password'] = 'password';
# Either 'md5', 'sha1', 'crypt' or 'plaintext'
$auth['db_ext']['password_format'] = 'md5';
@@ -242,6 +244,12 @@
# 'auth_ldap' configuration settings
# Where is the LDAP server
#$ldap_host = "localhost";
+# If you have a non-standard LDAP port, you can define it here
+#$ldap_port = 389;
+# If you want to use LDAP v3, change the following to true
+$ldap_v3 = false;
+# If you want to use TLS, change following to true
+$ldap_tls = false;
# LDAP base distinguish name
# See AUTHENTICATION for details of how check against multiple base dn's
#$ldap_base_dn = "ou=organizationalunit,dc=my-domain,dc=com";
@@ -255,7 +263,7 @@
# (&($ldap_user_attrib=username)($ldap_filter))
# After binding to check the password, this check is used to see that
# they are a valid user of mrbs.
-#$ldap_user_filter = "mrbsuser=y";
+#$ldap_filter = "mrbsuser=y";
# 'auth_imap' configuration settings
# See AUTHENTICATION for details of how check against multiple servers
@@ -393,7 +401,7 @@
##########
# Set this to 1 to use UTF-8 in all pages and in the database, otherwise
-# text gets enterered in the database in different encodings, dependent
+# text gets entered in the database in different encodings, dependent
# on the users' language
$unicode_encoding = 1; //this should not be an option in Moodle
@@ -468,7 +476,4 @@
$tbl_room = $db_tbl_prefix . "room";
$tbl_users = $db_tbl_prefix . "users";
-# MRBS developers, make sure to update this string before each release:
-$mrbs_version = "MRBS 1.2.3";
-
?>
Index: plugins/blocks/mrbs/web/session_php.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/session_php.php,v
retrieving revision 1.3
diff -u -r1.3 session_php.php
--- plugins/blocks/mrbs/web/session_php.php 1 Aug 2008 04:02:10 -0000 1.3
+++ plugins/blocks/mrbs/web/session_php.php 2 Aug 2008 04:19:53 -0000
@@ -1,5 +1,4 @@
".get_string('usernamenotfound')."\n";
@@ -173,37 +179,39 @@
"roommatch=&namematch=&descrmatch=&summarize=1&sortby=r&display=d&".
"sumby=d&creatormatch=$user"; ?>
-
".get_string('mrbs','block_mrbs')." - ".get_mrbs_version()."\n";
echo " " . get_string('database','block_mrbs') . sql_version() . "\n";
echo " " . get_string('system','block_mrbs') . php_uname() . "\n";
echo " PHP: " . phpversion() . "\n";
@@ -38,4 +39,4 @@
include "site_faq" . $faqfilelang . ".html";
include "trailer.php";
-?>
\ No newline at end of file
+?>
Index: plugins/blocks/mrbs/web/functions_mail.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/functions_mail.php,v
retrieving revision 1.4
diff -u -r1.4 functions_mail.php
--- plugins/blocks/mrbs/web/functions_mail.php 1 Aug 2008 04:02:11 -0000 1.4
+++ plugins/blocks/mrbs/web/functions_mail.php 2 Aug 2008 04:19:52 -0000
@@ -11,10 +11,10 @@
// | are likely to be used. |
// +---------------------------------------------------------------------------+
// | @author thierry_bo. |
-// | @version $Revision: 1.4 $. |
+// | @version $Revision: 1.14.2.6 $. |
// +---------------------------------------------------------------------------+
//
-// $Id: functions_mail.php,v 1.4 2008/08/01 04:02:11 arborrow Exp $
+// $Id: functions_mail.inc,v 1.14.2.6 2006/04/26 10:01:42 jberanek Exp $
require_once("../../../config.php"); //for Moodle integration
// {{{ removeMailUnicode()
@@ -26,7 +26,6 @@
* @param string $string string to convert
* @return string $string string converted to $mail_vocab["charset"]
*/
-
function removeMailUnicode($string)
{
global $unicode_encoding, $mail_vocab;
@@ -72,7 +71,6 @@
*
* @param timestamp $t timestamp to format
* @param boolean $inc_time include time in return string
-
* @return string formated string
*/
function getMailTimeDateString($t, $inc_time=TRUE)
@@ -82,35 +80,20 @@
// strings doesn't work
$ampm = date("a",$t);
if ($inc_time)
-
{
-
if ($twentyfourhour_format)
-
{
-
return strftime("%H:%M:%S - %A %d %B %Y",$t);
-
}
-
else
-
{
-
return strftime("%I:%M:%S$ampm - %A %d %B %Y",$t);
-
}
-
}
-
else
-
{
-
return strftime("%A %d %B %Y",$t);
-
}
-
}
// }}}
@@ -134,7 +117,7 @@
//
$recipients = '';
- $id_table = ($rep_type > 0 ? "rep" : "e");
+ $id_table = ($rep_type > 0) ? "rep" : "e";
(MAIL_ADMIN_ON_BOOKINGS) ? $recipients = MAIL_RECIPIENTS : '';
if (MAIL_AREA_ADMIN_ON_BOOKINGS)
{
@@ -142,7 +125,13 @@
if ($new_entry)
{
$sql = "SELECT a.area_admin_email ";
- $sql .= "FROM $tbl_room r, $tbl_area a, $tbl_entry e, $tbl_repeat rep ";
+ $sql .= "FROM $tbl_room r, $tbl_area a, $tbl_entry e ";
+ // If this is a repeating entry...
+ if ($id_table == 'rep')
+ {
+ // ...use the repeat table
+ $sql .= ", $tbl_repeat rep ";
+ }
$sql .= "WHERE ${id_table}.id=$new_id AND r.id=${id_table}.room_id AND a.id=r.area_id";
$res = sql_query($sql);
(! $res) ? fatal_error(0, sql_error()) : '';
@@ -176,7 +165,13 @@
if ($new_entry)
{
$sql = "SELECT r.room_admin_email ";
- $sql .= "FROM $tbl_room r, $tbl_entry e, $tbl_repeat rep ";
+ $sql .= "FROM $tbl_room r, $tbl_entry e ";
+ // If this is a repeating entry...
+ if ($id_table == 'rep')
+ {
+ // ...use the repeat table
+ $sql .= ", $tbl_repeat rep ";
+ }
$sql .= "WHERE ${id_table}.id=$new_id AND r.id=${id_table}.room_id";
$res = sql_query($sql);
(! $res) ? fatal_error(0, sql_error()) : '';
@@ -380,81 +375,43 @@
}
// Details if a series
-
if ($rep_type > 0)
-
{
-
$opt = "";
-
if (($rep_type == 2) || ($rep_type == 6))
-
{
-
# Display day names according to language and preferred weekday start.
-
for ($i = 0; $i < 7; $i++)
-
{
-
$daynum = ($i + $weekstarts) % 7;
-
if ($rep_opt[$daynum]) $opt .= day_name($daynum) . " ";
-
}
-
}
-
if ($rep_type == 6)
-
{
-
$body .= "\n" . $mail_vocab["rep_num_weeks"];
-
$body .= ": " . compareEntries($rep_num_weeks, $mail_previous["rep_num_weeks"], $new_entry);
-
}
-
-
if($opt || $mail_previous["rep_opt"])
-
{
-
$body .= "\n" . $mail_vocab["rep_rep_day"];
-
$body .= " " . compareEntries($opt, $mail_previous["rep_opt"], $new_entry);
-
}
-
-
$body .= "\n" . $mail_vocab["rep_end_date"];
-
if ($new_entry)
-
{
-
$body .= " " . utf8_strftime('%A %d %B %Y',$rep_enddate);
-
}
-
else
-
{
-
$temp = utf8_strftime('%A %d %B %Y',$rep_enddate);
-
$body .= " " .
-
compareEntries($temp, $mail_previous['rep_end_date'], $new_entry) . "\n";
-
}
-
}
-
$body .= "\n";
-
}
$result = sendMail($recipients, $subject, $body, $mail_vocab['charset'] ,MAIL_CC);
return $result;
@@ -582,40 +539,23 @@
$temp = $mail_previous['rep_type'];
$body .= " " . $mail_vocab["rep_type_$temp"];
if ($mail_previous['rep_type'] > 0)
-
{
-
if ($mail_previous['rep_type'] == 6)
-
{
-
$body .= "\n" . $mail_vocab["rep_num_weeks"];
-
$body .= ": " . $mail_previous["rep_num_weeks"];
-
}
-
-
if($mail_previous["rep_opt"])
-
{
-
$body .= "\n" . $mail_vocab["rep_rep_day"];
-
$body .= " " . $mail_previous["rep_opt"];
-
}
-
-
$body .= "\n" . $mail_vocab["rep_end_date"];
-
$body .= " " . $mail_previous['rep_end_date'] . "\n";
-
}
$body .= "\n";
-
// End of mail details
$result = sendMail($recipients, $subject, $body, $mail_vocab['charset'], MAIL_CC);
return $result;
@@ -715,89 +655,49 @@
list( $mail_previous['end_period'] , $mail_previous['end_date']) =
getMailPeriodDateString($row['tbl_r_end_time'], 0);
// use getMailTimeDateString as all I want is the date
-
$mail_previous['rep_end_date'] =
-
getMailTimeDateString($row['tbl_r_end_date'], FALSE);
-
// need to make DST correct in opposite direction to entry creation
// so that user see what he expects to see
$mail_previous['duration'] = $row['tbl_r_duration'] -
cross_dst($row['tbl_r_start_time'], $row['tbl_r_end_time']);
-
$mail_previous['rep_opt'] = "";
-
switch($row['rep_type'])
-
{
-
case 2:
-
case 6:
-
$rep_day[0] = $row['rep_opt'][0] != "0";
-
$rep_day[1] = $row['rep_opt'][1] != "0";
-
$rep_day[2] = $row['rep_opt'][2] != "0";
-
$rep_day[3] = $row['rep_opt'][3] != "0";
-
$rep_day[4] = $row['rep_opt'][4] != "0";
-
$rep_day[5] = $row['rep_opt'][5] != "0";
-
$rep_day[6] = $row['rep_opt'][6] != "0";
-
-
if ($row['rep_type'] == 6)
-
{
-
$mail_previous['rep_num_weeks'] = $row['rep_num_weeks'];
-
}
-
else
-
{
-
$mail_previous['rep_num_weeks'] = "";
-
}
-
-
break;
-
-
default:
-
$rep_day = array(0, 0, 0, 0, 0, 0, 0);
-
}
-
for ($i = 0; $i < 7; $i++)
-
{
-
$wday = ($i + $weekstarts) % 7;
-
if ($rep_day[$wday])
-
$mail_previous['rep_opt'] .= day_name($wday) . " ";
-
}
-
-
$mail_previous['rep_num_weeks'] = $row['rep_num_weeks'];
-
}
-
toPeriodString($mail_previous['start_period'],
$mail_previous['duration'], $mail_previous['dur_units']);
}
@@ -824,87 +724,48 @@
$mail_previous['end_date'] =
getMailTimeDateString($row['tbl_r_end_time']);
// use getMailTimeDateString as all I want is the date
-
$mail_previous['rep_end_date'] =
-
getMailTimeDateString($row['tbl_r_end_date'], FALSE);
-
// need to make DST correct in opposite direction to entry creation
// so that user see what he expects to see
$mail_previous['duration'] = $row['tbl_r_duration'] -
cross_dst($row['tbl_r_start_time'], $row['tbl_r_end_time']);
-
$mail_previous['rep_opt'] = "";
-
switch($row['rep_type'])
-
{
-
case 2:
-
case 6:
-
$rep_day[0] = $row['rep_opt'][0] != "0";
-
$rep_day[1] = $row['rep_opt'][1] != "0";
-
$rep_day[2] = $row['rep_opt'][2] != "0";
-
$rep_day[3] = $row['rep_opt'][3] != "0";
-
$rep_day[4] = $row['rep_opt'][4] != "0";
-
$rep_day[5] = $row['rep_opt'][5] != "0";
-
$rep_day[6] = $row['rep_opt'][6] != "0";
-
-
if ($row['rep_type'] == 6)
-
{
-
$mail_previous['rep_num_weeks'] = $row['rep_num_weeks'];
-
}
-
else
-
{
-
$mail_previous['rep_num_weeks'] = "";
-
}
-
-
break;
-
-
default:
-
$rep_day = array(0, 0, 0, 0, 0, 0, 0);
-
}
-
for ($i = 0; $i < 7; $i++)
-
{
-
$wday = ($i + $weekstarts) % 7;
-
if ($rep_day[$wday])
-
$mail_previous['rep_opt'] .= day_name($wday) . " ";
-
}
-
-
$mail_previous['rep_num_weeks'] = $row['rep_num_weeks'];
-
}
toTimeString($mail_previous['duration'], $mail_previous['dur_units']);
}
@@ -974,13 +835,10 @@
{
require_once "Mail.php";
-
// Headers part
$headers['From'] = $from;
if( $backend != 'mail' ) {
-
$headers['To'] = $recipients;
-
}
(NULL != $cc) ? $headers['Cc'] = $cc : '';
(NULL != $bcc) ? $headers['Bcc'] = $bcc : '';
@@ -988,15 +846,11 @@
$headers['MIME-Version'] = '1.0';
$headers['Content-Type'] = 'text/plain; charset=' . $charset;
-
// Parameters part
if( $backend == 'sendmail' ) {
-
$params['sendmail_path'] = $sendmail_path;
$params['sendmail_args'] = $sendmail_args;
-
}
-
if( $backend == "smtp" ) {
$params['host'] = $host;
$params['port'] = $port;
@@ -1005,11 +859,14 @@
$params['password'] = $password;
}
-
-
// Call to the PEAR::Mail class
$mail_object =& Mail::factory($backend, $params);
$result = $mail_object->send($recipients, $headers, $body);
+
+ if (is_object($result))
+ {
+ error_log("Error sending email: ".$result->getMessage());
+ }
return $result;
}
@@ -1033,4 +890,4 @@
}
// }}}
-?>
\ No newline at end of file
+?>
Index: plugins/blocks/mrbs/web/lang.zh-tw.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/lang.zh-tw.php,v
retrieving revision 1.1
diff -u -r1.1 lang.zh-tw.php
--- plugins/blocks/mrbs/web/lang.zh-tw.php 5 Apr 2007 22:25:32 -0000 1.1
+++ plugins/blocks/mrbs/web/lang.zh-tw.php 2 Aug 2008 04:19:52 -0000
@@ -1,5 +1,5 @@
";
+$vocab["not_php3"] = "Varoitus: Järjestelmä ei välttämättä toimi PHP3:lla.";
# Used in day.php
$vocab["bookingsfor"] = "Varaukset";
$vocab["bookingsforpost"] = ""; # Goes after the date
$vocab["areas"] = "Tilat";
-$vocab["daybefore"] = "Edelliseen p�iv��n";
-$vocab["dayafter"] = "Seuraavaan p�iv��n";
-$vocab["gototoday"] = "T�h�n p�iv��n";
+$vocab["daybefore"] = "Edelliseen päivään";
+$vocab["dayafter"] = "Seuraavaan päivään";
+$vocab["gototoday"] = "Tähän päivään";
$vocab["goto"] = "mene";
-$vocab["highlight_line"] = "Highlight this line";
-$vocab["click_to_reserve"] = "Click on the cell to make a reservation.";
+$vocab["highlight_line"] = "Korosta tämä rivi";
+$vocab["click_to_reserve"] = "Napsauta solua tehdäksesi varauksen.";
-# Used in trailer.php
-$vocab["viewday"] = "N�yt� p�iv�";
-$vocab["viewweek"] = "N�yt� viikko";
-$vocab["viewmonth"] = "N�yt� kuukausi";
+# Used in trailer.inc
+$vocab["viewday"] = "Näytä päivä";
+$vocab["viewweek"] = "Näytä viikko";
+$vocab["viewmonth"] = "Näytä kuukausi";
$vocab["ppreview"] = "Tulostuksen esikatselu";
# Used in edit_entry.php
-$vocab["addentry"] = "Lis�� varaus";
+$vocab["addentry"] = "Lisää varaus";
$vocab["editentry"] = "Muokkaa varausta";
$vocab["editseries"] = "Muokkaa varaussarjaa";
$vocab["namebooker"] = "Lyhyt kuvaus:";
-$vocab["fulldescription"] = "T�ydellinen kuvaus: (Montako ihmist�, sis�inen/ulkoinen jne)";
-$vocab["date"] = "P�iv�m��r�:";
+$vocab["fulldescription"] = "Täydellinen kuvaus: (Montako ihmistä, sisäinen/ulkoinen jne)";
+$vocab["date"] = "Päivämäärä:";
$vocab["start_date"] = "Aloitusaika:";
$vocab["end_date"] = "Lopetusaika:";
$vocab["time"] = "Aika:";
-$vocab["period"] = "Period:";
+$vocab["period"] = "Jakso:";
$vocab["duration"] = "Kesto:";
$vocab["seconds"] = "sekuntia";
$vocab["minutes"] = "minuuttia";
$vocab["hours"] = "tuntia";
-$vocab["days"] = "p�iv��";
+$vocab["days"] = "päivää";
$vocab["weeks"] = "viikkoa";
$vocab["years"] = "vuotta";
-$vocab["periods"] = "periods";
-$vocab["all_day"] = "Koko p�iv�n";
+$vocab["periods"] = "jaksoa";
+$vocab["all_day"] = "Koko päivän";
$vocab["type"] = "Tyyppi:";
-$vocab["internal"] = "Sis�inen";
+$vocab["internal"] = "Sisäinen";
$vocab["external"] = "Ulkoinen";
$vocab["save"] = "Tallenna";
$vocab["rep_type"] = "Toiston tyyppi:";
$vocab["rep_type_0"] = "Ei toistoa";
-$vocab["rep_type_1"] = "P�ivitt�in";
+$vocab["rep_type_1"] = "Päivittäin";
$vocab["rep_type_2"] = "Viikoittain";
$vocab["rep_type_3"] = "Kuukausittain";
$vocab["rep_type_4"] = "Vuosittain";
-$vocab["rep_type_5"] = "Kuukausittain samana viikonp�iv�n�";
-$vocab["rep_type_6"] = "M��r�aikainen viikoittainen";
-$vocab["rep_end_date"] = "Toiston loppup�iv�m��r�:";
-$vocab["rep_rep_day"] = "Toiston viikonp�iv�:";
+$vocab["rep_type_5"] = "Kuukausittain samana viikonpäivänä";
+$vocab["rep_type_6"] = "Määräaikainen viikoittainen";
+$vocab["rep_end_date"] = "Toiston loppupäivämäärä:";
+$vocab["rep_rep_day"] = "Toiston viikonpäivä:";
$vocab["rep_for_weekly"] = "(viikottaiselle toistolle)";
$vocab["rep_freq"] = "Tiheys:";
$vocab["rep_num_weeks"] = "Montako viikkoa";
-$vocab["rep_for_nweekly"] = "(m��r�aikaiselle viikottaiselle)";
-$vocab["ctrl_click"] = "Pid� CTRL-nappi pohjassa valitaksesi useita huoneita.";
+$vocab["rep_for_nweekly"] = "(määräaikaiselle viikottaiselle)";
+$vocab["ctrl_click"] = "Pidä CTRL-nappi pohjassa valitaksesi useita huoneita.";
$vocab["entryid"] = "Varauksen ID ";
$vocab["repeat_id"] = "Toiston ID ";
$vocab["you_have_not_entered"] = "Et ole antanut seuraavaa pakollista tietoa:";
-$vocab["you_have_not_selected"] = "You have not selected a";
-$vocab["valid_room"] = "room.";
+$vocab["you_have_not_selected"] = "Et ole valinnut";
+$vocab["valid_room"] = "huonetta.";
$vocab["valid_time_of_day"] = "Ajankohta ei ole kelpaa.";
$vocab["brief_description"] = "Lyhyt kuvaus";
-$vocab["useful_n-weekly_value"] = "M��r�aikaisen viikottaisen varauksen viikkom��r�.";
+$vocab["useful_n-weekly_value"] = "Määräaikaisen viikottaisen varauksen viikkomäärä.";
# Used in view_entry.php
$vocab["description"] = "Kuvaus:";
$vocab["room"] = "Huone:";
-$vocab["createdby"] = "Varauksen tekij�:";
-$vocab["lastupdate"] = "P�ivitetty:";
+$vocab["createdby"] = "Varauksen tekijä:";
+$vocab["lastupdate"] = "Päivitetty:";
$vocab["deleteentry"] = "Poista varaus";
$vocab["deleteseries"] = "Poista varaussarja";
-$vocab["confirmdel"] = "Oletko varma ett� haluat poistaa\\nt�m�n varauksen?\\n\\n";
+$vocab["confirmdel"] = "Oletko varma että haluat poistaa\\ntämän varauksen?\\n\\n";
$vocab["returnprev"] = "Takaisin edelliselle sivulle";
$vocab["invalid_entry_id"] = "Virheellinen varauksen ID.";
-$vocab["invalid_series_id"] = "Invalid series id.";
+$vocab["invalid_series_id"] = "Virheellinen sarjan ID.";
# Used in edit_entry_handler.php
$vocab["error"] = "Virhe";
-$vocab["sched_conflict"] = "P��llekk�inen varaus";
-$vocab["conflict"] = "Uusi varaus menee p��llekk�in seuraavien varausten kanssa:";
+$vocab["sched_conflict"] = "Päällekkäinen varaus";
+$vocab["conflict"] = "Uusi varaus menee päällekkäin seuraavien varausten kanssa:";
$vocab["too_may_entrys"] = "Valituilla ehdoilla tulisi liian monta varausta. Valittuja ehtoja on muutettava.";
-$vocab["returncal"] = "Paluu kalenterin�kym��n";
-$vocab["failed_to_acquire"] = "Tietokantaan ei saatu (varauksetonta) yhteytt�.";
+$vocab["returncal"] = "Paluu kalenterinäkymään";
+$vocab["failed_to_acquire"] = "Tietokantaan ei saatu (varauksetonta) yhteyttä.";
$vocab["mail_subject_entry"] = $mail["subject"];
$vocab["mail_body_new_entry"] = $mail["new_entry"];
$vocab["mail_body_del_entry"] = $mail["deleted_entry"];
@@ -114,41 +114,41 @@
$vocab["mail_subject_delete"] = $mail["subject_delete"];
# Authentication stuff
-$vocab["accessdenied"] = "P��sy kielletty";
-$vocab["norights"] = "Sinulla ei ole riitt�v�sti oikeuksia yritt�m�si toiminnon suorittamiseen.";
-$vocab["please_login"] = "Ole hyv� ja kirjaudu sis��n";
-$vocab["user_name"] = "K�ytt�j�tunnus";
+$vocab["accessdenied"] = "Pääsy kielletty";
+$vocab["norights"] = "Sinulla ei ole riittävästi oikeuksia yrittämäsi toiminnon suorittamiseen.";
+$vocab["please_login"] = "Ole hyvä ja kirjaudu sisään";
+$vocab["user_name"] = "Käyttäjätunnus";
$vocab["user_password"] = "Salasana";
-$vocab["unknown_user"] = "Tuntematon k�ytt�j�";
+$vocab["unknown_user"] = "Tuntematon käyttäjä";
$vocab["you_are"] = "Olet";
-$vocab["login"] = "Kirjaudu sis��n";
+$vocab["login"] = "Kirjaudu sisään";
$vocab["logoff"] = "Kirjaudu ulos";
# Authentication database
-$vocab["user_list"] = "User list";
-$vocab["edit_user"] = "Edit user";
-$vocab["delete_user"] = "Delete this user";
+$vocab["user_list"] = "Käyttäjälista";
+$vocab["edit_user"] = "Muokkaa käyttäjää";
+$vocab["delete_user"] = "Poista tämä käyttäjä";
#$vocab["user_name"] = Use the same as above, for consistency.
#$vocab["user_password"] = Use the same as above, for consistency.
-$vocab["user_email"] = "Email address";
-$vocab["password_twice"] = "If you wish to change the password, please type the new password twice";
-$vocab["passwords_not_eq"] = "Error: The passwords do not match.";
-$vocab["add_new_user"] = "Add a new user";
-$vocab["rights"] = "Rights";
-$vocab["action"] = "Action";
-$vocab["user"] = "User";
-$vocab["administrator"] = "Administrator";
-$vocab["unknown"] = "Unknown";
+$vocab["user_email"] = "Sähköpostiosoite";
+$vocab["password_twice"] = "Jos haluat vaihtaa salasanan, ole hyvä ja anna uusi salasana kahdesti";
+$vocab["passwords_not_eq"] = "Virhe: Salasanat eivät täsmää.";
+$vocab["add_new_user"] = "Lisää uusi käyttäjä";
+$vocab["rights"] = "Oikeudet";
+$vocab["action"] = "Toiminto";
+$vocab["user"] = "Käyttäjä";
+$vocab["administrator"] = "Ylläpitäjä";
+$vocab["unknown"] = "Tuntematon";
$vocab["ok"] = "OK";
$vocab["show_my_entries"] = "Click to display all my upcoming entries";
# Used in search.php
-$vocab["invalid_search"] = "Tyhj� tai kelpaamaton haku.";
+$vocab["invalid_search"] = "Tyhjä tai kelpaamaton haku.";
$vocab["search_results"] = "Hakutulokset:";
-$vocab["nothing_found"] = "Yht��n varausta ei l�ytynyt antamillasi ehdoilla. ";
+$vocab["nothing_found"] = "Yhtään varausta ei löytynyt antamillasi ehdoilla. ";
$vocab["records"] = "Tulokset ";
$vocab["through"] = " - ";
-$vocab["of"] = " tuloksia yhteens�: ";
+$vocab["of"] = " tuloksia yhteensä: ";
$vocab["previous"] = "Edellinen";
$vocab["next"] = "Seuraava";
$vocab["entry"] = "Varaus";
@@ -160,45 +160,45 @@
# Used in report.php
$vocab["report_on"] = "Raportti varauksista:";
-$vocab["report_start"] = "Raportin alkup�iv�m��r�:";
-$vocab["report_end"] = "Raportin loppup�iv�m��r�:";
+$vocab["report_start"] = "Raportin alkupäivämäärä:";
+$vocab["report_end"] = "Raportin loppupäivämäärä:";
$vocab["match_area"] = "Alue:";
-$vocab["match_room"] = "Huone::";
-$vocab["match_type"] = "Match type:";
-$vocab["ctrl_click_type"] = "Use Control-Click to select more than one type";
+$vocab["match_room"] = "Huone:";
+$vocab["match_type"] = "Tyyppi:";
+$vocab["ctrl_click_type"] = "Pidä Ctrl-näppäin alaspainettuna valitaksesi useamman tyypin.";
$vocab["match_entry"] = "Lyhyt kuvaus:";
-$vocab["match_descr"] = "T�ydellinen kuvaus:";
-$vocab["include"] = "Sis�lt�en:";
+$vocab["match_descr"] = "Täydellinen kuvaus:";
+$vocab["include"] = "Sisältäen:";
$vocab["report_only"] = "Ainoastaan raportti";
$vocab["summary_only"] = "Ainoastaan yhteenveto";
$vocab["report_and_summary"] = "Molemmat";
$vocab["summarize_by"] = "Yhteenvedon peruste:";
$vocab["sum_by_descrip"] = "Lyhyt kuvaus";
$vocab["sum_by_creator"] = "Varaaja";
-$vocab["entry_found"] = "varaus l�ytyi";
-$vocab["entries_found"] = "varausta l�ytyi";
-$vocab["summary_header"] = "Varausten tunnit yhteens�";
+$vocab["entry_found"] = "varaus löytyi";
+$vocab["entries_found"] = "varausta löytyi";
+$vocab["summary_header"] = "Varausten tunnit yhteensä";
$vocab["summary_header_per"] = "Summary of (Entries) Periods";
$vocab["total"] = "Kaikkiaan";
$vocab["submitquery"] = "Tee raportti";
-$vocab["sort_rep"] = "Sort Report by:";
-$vocab["sort_rep_time"] = "Start Date/Time";
-$vocab["rep_dsp"] = "Display in report:";
-$vocab["rep_dsp_dur"] = "Duration";
-$vocab["rep_dsp_end"] = "End Time";
+$vocab["sort_rep"] = "Raporttien lajittelun peruste:";
+$vocab["sort_rep_time"] = "Aloitusaika";
+$vocab["rep_dsp"] = "Näytä raportissa:";
+$vocab["rep_dsp_dur"] = "Kesto";
+$vocab["rep_dsp_end"] = "Loppumisaika";
# Used in week.php
$vocab["weekbefore"] = "Edelliseen viikkoon";
$vocab["weekafter"] = "Seuraavaan viikkoon";
-$vocab["gotothisweek"] = "T�h�n viikkoon";
+$vocab["gotothisweek"] = "Tähän viikkoon";
# Used in month.php
$vocab["monthbefore"] = "Edelliseen kuukauteen";
$vocab["monthafter"] = "Seuraavaan kuukauteen";
-$vocab["gotothismonth"] = "T�h�n kuukauteen";
+$vocab["gotothismonth"] = "Tähän kuukauteen";
# Used in {day week month}.php
-$vocab["no_rooms_for_area"] = "T�ll� alueella ei ole yht��n huonetta.";
+$vocab["no_rooms_for_area"] = "Tällä alueella ei ole yhtään huonetta.";
# Used in admin.php
$vocab["edit"] = "Muokkaa";
@@ -206,46 +206,46 @@
$vocab["rooms"] = "Huoneet";
$vocab["in"] = "alueella";
$vocab["noareas"] = "Ei alueita";
-$vocab["addarea"] = "Lis�� alue";
+$vocab["addarea"] = "Lisää alue";
$vocab["name"] = "Nimi";
$vocab["noarea"] = "Ei valittua aluetta";
$vocab["browserlang"] = "Selaimesi kieliasetus on";
$vocab["postbrowserlang"] = ".";
-$vocab["addroom"] = "Lis�� huone";
-$vocab["capacity"] = "Maksimi henkil�m��r�";
+$vocab["addroom"] = "Lisää huone";
+$vocab["capacity"] = "Maksimi henkilömäärä";
$vocab["norooms"] = "Ei huoneita.";
-$vocab["administration"] = "Yll�pito";
+$vocab["administration"] = "Ylläpito";
# Used in edit_area_room.php
$vocab["editarea"] = "Muokkaa alueen tietoja";
-$vocab["change"] = "Talleta";
-$vocab["backadmin"] = "Takaisin yll�pitoon";
+$vocab["change"] = "Tallenna";
+$vocab["backadmin"] = "Takaisin ylläpitoon";
$vocab["editroomarea"] = "Muokkaa alueen tai huoneen kuvausta";
$vocab["editroom"] = "Muokkaa huoneen tietoja";
-$vocab["update_room_failed"] = "Huoneen tietojen p�ivitys ep�onnistui: ";
+$vocab["update_room_failed"] = "Huoneen tietojen päivitys epäonnistui: ";
$vocab["error_room"] = "Virhe: huonetta ";
-$vocab["not_found"] = " ei l�ytynyt";
-$vocab["update_area_failed"] = "Alueen tietojen p�ivitys ep�onnistui: ";
+$vocab["not_found"] = " ei löytynyt";
+$vocab["update_area_failed"] = "Alueen tietojen päivitys epäonnistui: ";
$vocab["error_area"] = "Virhe: aluetta ";
-$vocab["room_admin_email"] = "Room admin email:";
-$vocab["area_admin_email"] = "Area admin email:";
-$vocab["invalid_email"] = "Invalid email!";
+$vocab["room_admin_email"] = "Huonevastaavan sähköposti:";
+$vocab["area_admin_email"] = "Aluevastaavan sähköposti:";
+$vocab["invalid_email"] = "Virheellinen sähköpostiosoite!";
# Used in del.php
$vocab["deletefollowing"] = "Seuraavat varaukset poistetaan";
$vocab["sure"] = "Oletko varma?";
-$vocab["YES"] = "KYLL�";
+$vocab["YES"] = "KYLLÄ";
$vocab["NO"] = "EN";
-$vocab["delarea"] = "Sinun t�ytyy poistaa kaikki alueen huoneet ennnen kuin voit poistaa alueen.
";
+$vocab["delarea"] = "Sinun täytyy poistaa kaikki alueen huoneet ennnen kuin voit poistaa alueen.
";
# Used in help.php
-$vocab["about_mrbs"] = "Tietoja varausj�rjestelm�st�";
+$vocab["about_mrbs"] = "Tietoja varausjärjestelmästä";
$vocab["database"] = "Tietokanta: ";
-$vocab["system"] = "K�ytt�j�rjestelm�: ";
-$vocab["please_contact"] = "J�rjestelm�n yhteyshenkil� ";
-$vocab["for_any_questions"] = "antaa lis�tietoja mik�li et l�yd� vastausta kysymykseesi n�ist� ohjeista.";
+$vocab["system"] = "Käyttöjärjestelmä: ";
+$vocab["please_contact"] = "Järjestelmän yhteyshenkilö ";
+$vocab["for_any_questions"] = "antaa lisätietoja mikäli et löydä vastausta kysymykseesi näistä ohjeista.";
-# Used in mysql.php AND pgsql.php
-$vocab["failed_connect_db"] = "J�rjestelm�virhe: Tietokantayhteyden avaaminen ei onnistu.";
+# Used in mysql.inc AND pgsql.inc
+$vocab["failed_connect_db"] = "Järjestelmävirhe: Tietokantayhteyden avaaminen ei onnistu.";
?>
Index: plugins/blocks/mrbs/web/mysqli.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/mysqli.php,v
retrieving revision 1.3
diff -u -r1.3 mysqli.php
--- plugins/blocks/mrbs/web/mysqli.php 1 Aug 2008 04:02:10 -0000 1.3
+++ plugins/blocks/mrbs/web/mysqli.php 2 Aug 2008 04:19:53 -0000
@@ -1,7 +1,7 @@
close();
}
// Execute a non-SELECT SQL command (insert/update/delete).
@@ -23,8 +24,14 @@
// Returns -1 on error; use sql_error to get the error message.
function sql_command ($sql)
{
- if (mysql_query($sql)) return mysql_affected_rows();
- return -1;
+ 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.
@@ -35,12 +42,16 @@
// a MIN or MAX aggregate function applied over no rows.
function sql_query1 ($sql)
{
- $r = mysql_query($sql);
- if (! $r) return -1;
- if (mysql_num_rows($r) != 1 || mysql_num_fields($r) != 1
- || ($result = mysql_result($r, 0, 0)) == "") $result = -1;
- mysql_free_result($r);
- return $result;
+ 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,
@@ -48,8 +59,10 @@
// Returns 0 on error; use sql_error to get the error message.
function sql_query ($sql)
{
- $r = mysql_query($sql);
- return $r;
+ global $mysqli;
+
+ $r = $mysqli->query($sql);
+ return $r;
}
// Return a row from a result. The first row is 0.
@@ -59,13 +72,12 @@
// Typical usage: $i = 0; while ((a = sql_row($r, $i++))) { ... }
function sql_row ($r, $i)
{
- if ($i >= mysql_num_rows($r))
- {
- mysql_free_result($r);
- return 0;
- }
- mysql_data_seek($r, $i);
- return mysql_fetch_row($r);
+ 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.
@@ -76,32 +88,35 @@
// the query and returns 0.
function sql_row_keyed ($r, $i)
{
- if ($i >= mysql_num_rows($r))
- {
- mysql_free_result($r);
- return 0;
- }
- mysql_data_seek($r, $i);
- return mysql_fetch_array($r);
+ 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 mysql_num_rows($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)
{
- return mysql_insert_id();
+ global $mysqli;
+
+ return $mysqli->insert_id;
}
// Return the text of the last error message.
function sql_error()
{
- return mysql_error();
+ global $mysqli;
+
+ return $mysqli->error;
}
// Begin a transaction, if the database supports it. This is used to
@@ -129,57 +144,57 @@
// 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;
+ 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 = "";
+ 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 = "";
- }
+ 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]";
+ $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 ";
+ 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) ";
+ return " UNIX_TIMESTAMP($fieldname) ";
}
// Generate non-standard SQL to match a string anywhere in a field's value
@@ -188,29 +203,31 @@
// 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%' ";
+ $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)
{
- return mysql_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)
{
- return mysql_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 mysql_num_fields($result);
+ return $result->field_count;
}
@@ -220,15 +237,13 @@
// 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.
-if (empty($db_nopersist))
- $db_c = mysql_pconnect($db_host, $db_login, $db_password);
-else
- $db_c = mysql_connect($db_host, $db_login, $db_password);
-if (!$db_c || !mysql_select_db ($db_database))
-{
- echo "\n
\n";
}
@@ -479,8 +458,8 @@
$descrmatch = unslashes($descrmatch);
# Start and end times are also used to clip the times for summary info.
- $report_start = mktime(0, 0, 0, $From_month, $From_day, $From_year);
- $report_end = mktime(0, 0, 0, $To_month, $To_day+1, $To_year);
+ $report_start = mktime(0, 0, 0, $From_month+0, $From_day+0, $From_year+0);
+ $report_end = mktime(0, 0, 0, $To_month+0, $To_day+1, $To_year+0);
# SQL result will contain the following columns:
# Col Index Description:
@@ -496,9 +475,7 @@
# 10 [9] Room name, must be HTML escaped
$sql = "SELECT e.id, e.start_time, e.end_time, e.name, e.description, "
- . "e.type, e.create_by, "
- . sql_syntax_timestamp_to_unix("e.timestamp")
- . ", a.area_name, r.room_name"
+ . "e.type, e.create_by, e.timestamp, a.area_name, r.room_name"
. " FROM $tbl_entry e, $tbl_area a, $tbl_room r"
. " WHERE e.room_id = r.id AND r.area_id = a.id"
. " AND e.start_time < $report_end AND e.end_time > $report_start";
Index: plugins/blocks/mrbs/web/week.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/week.php,v
retrieving revision 1.5
diff -u -r1.5 week.php
--- plugins/blocks/mrbs/web/week.php 1 Aug 2008 04:02:11 -0000 1.5
+++ plugins/blocks/mrbs/web/week.php 2 Aug 2008 04:19:53 -0000
@@ -1,5 +1,5 @@
"
- . utf8_date(hour_min_format(),$t) . "
";
+ . utf8_strftime(hour_min_format(),$t) . "";
}
# Color to use for empty cells: white, unless highlighting this row:
@@ -460,7 +460,7 @@
tdcell("red");
echo ""
- . utf8_date(hour_min_format(),$t) . "";
+ . utf8_strftime(hour_min_format(),$t) . "";
}
}
@@ -471,4 +471,4 @@
show_colour_key();
include "trailer.php";
-?>
\ No newline at end of file
+?>
Index: plugins/blocks/mrbs/web/style.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/style.php,v
retrieving revision 1.4
diff -u -r1.4 style.php
--- plugins/blocks/mrbs/web/style.php 1 Aug 2008 04:02:11 -0000 1.4
+++ plugins/blocks/mrbs/web/style.php 2 Aug 2008 04:19:53 -0000
@@ -1,13 +1,12 @@
-
-
+ ">
+
\n";
+ echo " \n";
}
-?>
\ No newline at end of file
+?>
Index: plugins/blocks/mrbs/web/day.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/day.php,v
retrieving revision 1.6
diff -u -r1.6 day.php
--- plugins/blocks/mrbs/web/day.php 1 Aug 2008 04:02:11 -0000 1.6
+++ plugins/blocks/mrbs/web/day.php 2 Aug 2008 04:19:52 -0000
@@ -1,5 +1,5 @@
0))
@@ -294,7 +294,7 @@
} else {
echo ""
- . utf8_date(hour_min_format(),$t) . "\n";
+ . utf8_strftime(hour_min_format(),$t) . "\n";
}
# Loop through the list of rooms we have for this area
@@ -305,7 +305,7 @@
$id = $today[$room][$time_t]["id"];
$color = $today[$room][$time_t]["color"];
$descr = htmlspecialchars($today[$room][$time_t]["data"]);
- $long_descr = $today[$room][$time_t]["long_descr"];
+ $long_descr = htmlspecialchars($today[$room][$time_t]["long_descr"]);
}
else
unset($id);
@@ -376,7 +376,7 @@
tdcell("red");
echo ""
- . utf8_date(hour_min_format(),$t) . "\n";
+ . utf8_strftime(hour_min_format(),$t) . "\n";
}
}
Index: plugins/blocks/mrbs/web/session_cookie.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/session_cookie.php,v
retrieving revision 1.3
diff -u -r1.3 session_cookie.php
--- plugins/blocks/mrbs/web/session_cookie.php 1 Aug 2008 04:02:11 -0000 1.3
+++ plugins/blocks/mrbs/web/session_cookie.php 2 Aug 2008 04:19:53 -0000
@@ -18,8 +18,18 @@
* *
\*****************************************************************************/
-// $Id: session_cookie.php,v 1.3 2008/08/01 04:02:11 arborrow Exp $
+// $Id: session_cookie.inc,v 1.9.2.4 2007/02/13 12:53:34 jberanek Exp $
require_once("../../../config.php"); //for Moodle integration
+if (isset($cookie_path_override))
+{
+ $cookie_path = $cookie_path_override;
+}
+else
+{
+ $cookie_path = $PHP_SELF;
+ $cookie_path = ereg_replace('[^/]*$', '', $cookie_path);
+}
+
/*
Target of the form with sets the URL argument "Action=SetName".
Will eventually return to URL argument "TargetURL=whatever".
@@ -35,7 +45,7 @@
if ($NewUserName == "") {
// Delete cookie
- setcookie("UserName", '', time()-42000);
+ setcookie("UserName", '', time()-42000, $cookie_path);
} else {
$NewUserName = unslashes($NewUserName);
$NewPassword = unslashes($NewPassword);
@@ -53,7 +63,7 @@
$UserPassword = $NewUserPassword;
}
- setcookie("UserName", $UserName);
+ setcookie("UserName", $UserName, time()+(60*60*24*30), $cookie_path);
}
header ("Location: $TargetURL"); /* Redirect browser to initial page */
/* Note HTTP 1.1 mandates an absolute URL. Most modern browsers support relative URLs,
@@ -131,7 +141,7 @@
}
function getUserName()
-{ return 'cookie';
+{ return 'cookie'; //I forget why this was added, apparently to avoid the rest of the function from working -arb
if (!empty($_COOKIE) && isset($_COOKIE["UserName"]))
{
return $_COOKIE["UserName"];
Index: plugins/blocks/mrbs/web/ChangeLog
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/ChangeLog,v
retrieving revision 1.2
diff -u -r1.2 ChangeLog
--- plugins/blocks/mrbs/web/ChangeLog 13 Jan 2008 01:27:35 -0000 1.2
+++ plugins/blocks/mrbs/web/ChangeLog 2 Aug 2008 04:19:52 -0000
@@ -2,26 +2,280 @@
* added optional_param and required_param checks to incoming variable in response to
SQL injection attack vulnerability. More information available in CONTRIB-237.
+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
@@ -39,13 +293,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
@@ -92,26 +348,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
@@ -192,8 +454,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".
@@ -209,9 +472,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
@@ -228,11 +491,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
@@ -247,19 +510,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,
@@ -269,10 +534,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,
@@ -280,18 +546,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
@@ -311,11 +577,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.
@@ -557,27 +823,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
@@ -597,9 +864,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
@@ -660,42 +928,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
@@ -712,15 +983,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
@@ -800,8 +1071,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
@@ -1161,7 +1432,7 @@
2003-12-14 Thierry Bothorel
- * functions.inc (1.21): (print_header_mrbs): Added JavaScript to insure
+ * functions.inc (1.21): (print_header): Added JavaScript to insure
the integrity of the date entered in three field drop-down menus.
Tested with Windows IE 6.0
@@ -1400,10 +1671,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
@@ -1788,11 +2059,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
@@ -1904,16 +2175,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,
@@ -2253,13 +2524,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: plugins/blocks/mrbs/web/edit_entry.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/edit_entry.php,v
retrieving revision 1.5
diff -u -r1.5 edit_entry.php
--- plugins/blocks/mrbs/web/edit_entry.php 1 Aug 2008 04:02:10 -0000 1.5
+++ plugins/blocks/mrbs/web/edit_entry.php 2 Aug 2008 04:19:52 -0000
@@ -1,5 +1,5 @@
".utf8_date("a",mktime(1,0,0,1,1,2000));
+ echo "".utf8_strftime("%p",mktime(1,0,0,1,1,2000));
$checked = ($start_hour >= 12) ? "checked" : "";
- echo "".utf8_date("a",mktime(13,0,0,1,1,2000));
+ echo "".utf8_strftime("%p",mktime(13,0,0,1,1,2000));
}
?>
+
+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.