### Eclipse Workspace Patch 1.0
#P mrbs_head
Index: web/auth_nis.inc
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/auth_nis.inc,v
retrieving revision 1.8
diff -u -r1.8 auth_nis.inc
--- web/auth_nis.inc 29 Mar 2005 14:10:24 -0000 1.8
+++ web/auth_nis.inc 2 Aug 2008 12:36:05 -0000
@@ -1,6 +1,6 @@
+?>
\ No newline at end of file
Index: web/escapeshellarg.inc
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/escapeshellarg.inc,v
retrieving revision 1.2
diff -u -r1.2 escapeshellarg.inc
--- web/escapeshellarg.inc 17 Dec 2004 11:24:37 -0000 1.2
+++ web/escapeshellarg.inc 2 Aug 2008 12:36:05 -0000
@@ -1,6 +1,6 @@
queryRow($sql, $types);
-if (MDB::isError($row))
-{
- fatal_error(0, $row->getMessage() . "\n" . $row->getUserInfo() . "\n");
+ SELECT $tbl_entry.name,
+ $tbl_entry.description,
+ $tbl_entry.create_by,
+ $tbl_room.room_name,
+ $tbl_area.area_name,
+ $tbl_entry.type,
+ $tbl_entry.room_id,
+ " . sql_syntax_timestamp_to_unix("$tbl_entry.timestamp") . ",
+ ($tbl_entry.end_time - $tbl_entry.start_time),
+ $tbl_entry.start_time,
+ $tbl_entry.end_time,
+ $tbl_entry.repeat_id
+
+ FROM $tbl_entry, $tbl_room, $tbl_area
+ WHERE $tbl_entry.room_id = $tbl_room.id
+ AND $tbl_room.area_id = $tbl_area.id
+ AND $tbl_entry.id=$id
+ ";
+}
+
+$res = sql_query($sql);
+if (! $res) fatal_error(0, sql_error());
+
+if(sql_count($res) < 1) {
+ fatal_error(
+ 0,
+ ($series ? get_vocab("invalid_series_id") : get_vocab("invalid_entry_id"))
+ );
}
-if (NULL == $row)
-{
- fatal_error(0, ($series ? get_vocab('invalid_series_id') : get_vocab('invalid_entry_id')));
-}
+$row = sql_row($res, 0);
+sql_free($res);
# Note: Removed stripslashes() calls from name and description. Previous
# versions of MRBS mistakenly had the backslash-escapes in the actual database
@@ -103,8 +95,7 @@
$area_name = htmlspecialchars($row[4]);
$type = $row[5];
$room_id = $row[6];
-
-$updated = time_date_string(MDB_Date::mdbstamp2Unix($row[7]));
+$updated = time_date_string($row[7]);
# need to make DST correct in opposite direction to entry creation
# so that user see what he expects to see
$duration = $row[8] - cross_dst($row[9], $row[10]);
@@ -119,6 +110,7 @@
else
$end_date = time_date_string($row[10]);
+
$rep_type = 0;
if( $series == 1 ){
@@ -132,41 +124,30 @@
# edit_entry.php
# So I will look for the first entry in the series where the entry is
# as per the original series settings
-
- $types = array('integer');
- $sql = "
-SELECT id
-FROM $tbl_entry
-WHERE repeat_id=\"$id\"
- AND entry_type=\"1\"
-";
-# ORDER BY start_time";
-
- $row = $mdb->queryRow($sql, $types);
-
- if (MDB::isError($row))
- {
- fatal_error(0, $row->getMessage() . "\n" . $row->getUserInfo() . "\n");
- }
-
- if (NULL <> $row)
- {
+ $sql = "SELECT id
+ FROM $tbl_entry
+ WHERE repeat_id=\"$id\" AND entry_type=\"1\"
+ ORDER BY start_time
+ LIMIT 1";
+ $res = sql_query($sql);
+ if (! $res) fatal_error(0, sql_error());
+ if(sql_count($res) < 1) {
# if all entries in series have been modified then
# as a fallback position just select the first entry
# in the series
# hopefully this code will never be reached as
# this page will display the start time of the series
# but edit_entry.php will display the start time of the entry
- $types = array('integer');
- $row = $mdb->queryRow("SELECT id
-FROM $tbl_entry
-WHERE repeat_id=\"$id\"
-ORDER BY start_time",$types);
- if (MDB::isError($row))
- {
- fatal_error(0, $row->getMessage() . "\n" . $row->getUserInfo() . "\n");
- }
+ sql_free($res);
+ $sql = "SELECT id
+ FROM $tbl_entry
+ WHERE repeat_id=\"$id\"
+ ORDER BY start_time
+ LIMIT 1";
+ $res = sql_query($sql);
+ if (! $res) fatal_error(0, sql_error());
}
+ $row = sql_row($res, 0);
$id = $row[0];
sql_free($res);
}
@@ -176,20 +157,20 @@
if($repeat_id != 0)
{
- $types = array('integer', 'integer', 'text', 'integer');
- $row = $mdb->queryRow("SELECT rep_type, end_date, rep_opt, rep_num_weeks
-FROM $tbl_repeat WHERE id=$repeat_id", $types);
- if (MDB::isError($row))
- {
- fatal_error(0, $row->getMessage() . "\n" . $row->getUserInfo() . "\n");
- }
- if (NULL <> $row)
+ $res = sql_query("SELECT rep_type, end_date, rep_opt, rep_num_weeks
+ FROM $tbl_repeat WHERE id=$repeat_id");
+ if (! $res) fatal_error(0, sql_error());
+
+ if (sql_count($res) == 1)
{
+ $row = sql_row($res, 0);
+
$rep_type = $row[0];
$rep_end_date = utf8_strftime('%A %d %B %Y',$row[1]);
$rep_opt = $row[2];
$rep_num_weeks = $row[3];
}
+ sql_free($res);
}
}
Index: web/lang.ja
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/lang.ja,v
retrieving revision 1.16
diff -u -r1.16 lang.ja
--- web/lang.ja 11 Apr 2005 13:47:15 -0000 1.16
+++ web/lang.ja 2 Aug 2008 12:36:05 -0000
@@ -1,5 +1,5 @@
+
Authentification
Index: web/lang.es
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/lang.es,v
retrieving revision 1.19
diff -u -r1.19 lang.es
--- web/lang.es 24 Feb 2007 20:35:19 -0000 1.19
+++ web/lang.es 2 Aug 2008 12:36:05 -0000
@@ -1,5 +1,5 @@
-
-
+
" . get_vocab('you_are')." "
Index: web/session_remote_user.inc
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/session_remote_user.inc,v
retrieving revision 1.2
diff -u -r1.2 session_remote_user.inc
--- web/session_remote_user.inc 26 Apr 2006 10:34:35 -0000 1.2
+++ web/session_remote_user.inc 2 Aug 2008 12:36:07 -0000
@@ -19,7 +19,7 @@
* *
\*********************************************************************************************/
-// $Id: session_remote_user.inc,v 1.2 2006/04/26 10:34:35 jberanek Exp $
+// $Id: session_remote_user.inc,v 1.1.2.1 2006/04/26 10:01:43 jberanek Exp $
/* authGet()
*
Index: web/trailer.inc
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/trailer.inc,v
retrieving revision 1.10
diff -u -r1.10 trailer.inc
--- web/trailer.inc 15 Jan 2004 21:01:10 -0000 1.10
+++ web/trailer.inc 2 Aug 2008 12:36:07 -0000
@@ -1,5 +1,5 @@
[ ';
echo "$str\n";
+ if ($i == 0) echo '] ';
}
echo "
".get_vocab("viewweek").":\n";
@@ -49,8 +51,18 @@
$cmonth = date("m", $ctime);
$cyear = date("Y", $ctime);
if ($i != -4) echo " | ";
- ($view_week_number) ? $str = $cweek : $str = utf8_strftime(empty($dateformat)? "%b %d" : "%d %b", $ctime);
- echo "$str\n";
+
+ if ($view_week_number)
+ {
+ $str = $cweek;
+ }
+ else
+ {
+ $str = utf8_strftime(empty($dateformat)? "%b %d" : "%d %b", $ctime);
+ }
+ if ($i == 0) echo '[ ';
+ echo "$str\n";
+ if ($i == 0) echo '] ';
}
echo "
".get_vocab("viewmonth").":\n";
@@ -62,7 +74,9 @@
$cmonth = date("m", $ctime);
$cyear = date("Y", $ctime);
if ($i != -2) echo " | ";
+ if ($i == 0) echo '[ ';
echo "$str\n";
+ if ($i == 0) echo '] ';
}
echo "
";
Index: web/edit_entry_handler.php
===================================================================
RCS file: /cvsroot/mrbs/mrbs/web/edit_entry_handler.php,v
retrieving revision 1.26
diff -u -r1.26 edit_entry_handler.php
--- web/edit_entry_handler.php 28 Apr 2005 20:43:10 -0000 1.26
+++ web/edit_entry_handler.php 2 Aug 2008 12:36:05 -0000
@@ -1,11 +1,9 @@
+
+
+ |
+