[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: rbs add.php,1.4,1.4.4.1 admin.php,1.7.4.1,1.7.4.
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: rbs add.php,1.4,1.4.4.1 admin.php,1.7.4.1,1.7.4.2 config.inc,1.5,1.5.4.1 connect.inc,1.2,1.2.4.1 day.php,1.8,1.8.4.1 del.php,1.7,1.7.2.1 del_entry.php,1.7,1.7.2.1 edit_entry.php,1.6,1.6.4.1 edit_entry_handler.php,1.6,1.6.4.1 failed.php,1.3,1.3.4.1 functions.inc,1.2,1.2.4.1 mincals.inc,1.3,1.3.4.1 mrbs_sql.inc,1.4,1.4.4.1 trailer.inc,1.4,1.4.4.1view_entry.php,1.5,1.5.4.1 |
|
Date: |
Sat, 22 Mar 2003 18:15:24 -0500 |
Update of /cvsroot/phpgroupware/rbs
In directory subversions:/tmp/cvs-serv5311
Modified Files:
Tag: Version-0_9_14-branch
add.php admin.php config.inc connect.inc day.php del.php
del_entry.php edit_entry.php edit_entry_handler.php failed.php
functions.inc mincals.inc mrbs_sql.inc style.inc trailer.inc
view_entry.php
Log Message:
more bug fixes and make it use API lang()
Index: add.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/add.php,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** add.php 29 Mar 2001 20:10:47 -0000 1.4
--- add.php 22 Mar 2003 23:15:21 -0000 1.4.4.1
***************
*** 33,37 ****
# if anyone can make the header stuff work, pass me a clue!
header("Location: admin.php?area=$area");
! # echo "<a href=".$phpgw->link($HTTP_REFERER).">$lang[returnprev]</a>";
! # $phpgw->common->phpgw_footer();
?>
--- 33,37 ----
# if anyone can make the header stuff work, pass me a clue!
header("Location: admin.php?area=$area");
! # echo "<a
href=".$GLOBALS['phpgw']->link($HTTP_REFERER).">lang('returnprev')</a>";
! # $GLOBALS['phpgw']->common->phpgw_footer();
?>
Index: admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/admin.php,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -C2 -r1.7.4.1 -r1.7.4.2
*** admin.php 22 Mar 2003 21:03:30 -0000 1.7.4.1
--- admin.php 22 Mar 2003 23:15:21 -0000 1.7.4.2
***************
*** 1,4 ****
<?php
! $phpgw_info["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
--- 1,4 ----
<?php
! $GLOBALS['phpgw_info']["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
***************
*** 29,33 ****
while ($row = mysql_fetch_row($res)) {
$area_name_q = urlencode($row[1]);
! echo "<li><a href=".$phpgw->link( "/rbs/admin.php",
"area=$row[0]&area_name=$area_name_q").">$row[1]</a>";
echo " (<a href=".$GLOBALS['phpgw']->link("/rbs/del.php",
"type=area&area=$row[0]").">Delete</a>)</li>";
}
--- 29,33 ----
while ($row = mysql_fetch_row($res)) {
$area_name_q = urlencode($row[1]);
! echo "<li><a href=".$GLOBALS['phpgw']->link( "/rbs/admin.php",
"area=$row[0]&area_name=$area_name_q").">$row[1]</a>";
echo " (<a href=".$GLOBALS['phpgw']->link("/rbs/del.php",
"type=area&area=$row[0]").">Delete</a>)</li>";
}
Index: config.inc
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/config.inc,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -r1.5 -r1.5.4.1
*** config.inc 29 Mar 2001 20:10:47 -0000 1.5
--- config.inc 22 Mar 2003 23:15:21 -0000 1.5.4.1
***************
*** 14,21 ****
include( "../header.inc.php" );
# MySQL settings
! $mysql_host = $phpgw_info["server"]["db_host"];
! $mysql_database = $phpgw_info["server"]["db_name"];
! $mysql_login = $phpgw_info["server"]["db_user"];
! $mysql_password = $phpgw_info["server"]["db_pass"];
# Start and end of day (default is 7-19)
--- 14,22 ----
include( "../header.inc.php" );
# MySQL settings
! //IMHO This should go - it should use the api db calls
! $mysql_host = $GLOBALS['phpgw_info']["server"]["db_host"];
! $mysql_database = $GLOBALS['phpgw_info']["server"]["db_name"];
! $mysql_login = $GLOBALS['phpgw_info']["server"]["db_user"];
! $mysql_password = $GLOBALS['phpgw_info']["server"]["db_pass"];
# Start and end of day (default is 7-19)
***************
*** 51,63 ****
# Language
!
! # Change the en below to the code for your language - if
! # there is a language file for it.
! include 'lang.en';
!
! # These two lines import a language based on what the client
! # is using. Comment them out to disable this.
! $lang_file = "lang.$HTTP_ACCEPT_LANGUAGE";
! if (file_exists($lang_file)) {include $lang_file;}
--- 52,56 ----
# Language
! //No longer required ... now uses phpGW lang standard
Index: connect.inc
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/connect.inc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** connect.inc 29 Mar 2001 20:10:47 -0000 1.2
--- connect.inc 22 Mar 2003 23:15:21 -0000 1.2.4.1
***************
*** 1,4 ****
<?php
!
// db settings are in config.inc
--- 1,4 ----
<?php
! //imho this should not be needed
// db settings are in config.inc
Index: day.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/day.php,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -r1.8 -r1.8.4.1
*** day.php 29 Mar 2001 20:10:47 -0000 1.8
--- day.php 22 Mar 2003 23:15:21 -0000 1.8.4.1
***************
*** 10,14 ****
# header is included. No warranties, fitness for purpose, etc. etc.
! $phpgw_info["flags"]["currentapp"] = "rbs";
# bbaker - Goal is at some point to get rid of config.inc
--- 10,14 ----
# header is included. No warranties, fitness for purpose, etc. etc.
! $GLOBALS['phpgw_info']["flags"]["currentapp"] = "rbs";
# bbaker - Goal is at some point to get rid of config.inc
***************
*** 65,73 ****
echo "<table><tr><td width=\"100%\">";
! echo '<form action="' . $phpgw->link("/rbs/day.php") . '" method="POST">';
! echo "<H2>$lang[bookingsfor]: <FONT SIZE=NORMAL>";
genDateSelector("", $day, $month, $year);
echo "<INPUT TYPE=hidden NAME=area VALUE=$area>";
! echo "<INPUT TYPE=submit VALUE=\"" . $lang[goto] . "\">";
echo "</FONT></H2></form><P>";
--- 65,73 ----
echo "<table><tr><td width=\"100%\">";
! echo '<form action="' . $GLOBALS['phpgw']->link("/rbs/day.php") . '"
method="POST">';
! echo '<H2>' . lang('bookingsfor') . ': <FONT SIZE=NORMAL>';
genDateSelector("", $day, $month, $year);
echo "<INPUT TYPE=hidden NAME=area VALUE=$area>";
! echo "<INPUT TYPE=submit VALUE=\"" . lang('goto') . "\">";
echo "</FONT></H2></form><P>";
***************
*** 79,87 ****
#Show all avaliable areas
! echo "<B><U>$lang[areas]:</B></U><br>";
$sql = "select id, area_name from mrbs_area";
$res = mysql_query($sql);
while ($row = mysql_fetch_row($res)) {
! echo '<a href="' .
$phpgw->link("/rbs/day.php","year=$year&month=$month&day=$day&area=$row[0]") .
'">';
if ($row[0] == $area) { echo "<font color=red>";}
echo "$row[1]</a><br>";
--- 79,87 ----
#Show all avaliable areas
! echo '<B><U>' . lang('areas') . ':</B></U><br>';
$sql = "select id, area_name from mrbs_area";
$res = mysql_query($sql);
while ($row = mysql_fetch_row($res)) {
! echo '<a href="' .
$GLOBALS['phpgw']->link("/rbs/day.php","year=$year&month=$month&day=$day&area=$row[0]")
. '">';
if ($row[0] == $area) { echo "<font color=red>";}
echo "$row[1]</a><br>";
***************
*** 110,119 ****
#Show colour key
! echo "<table border=0><tr><td class=\"I\">$lang[internal]</td><td
class=\"E\">$lang[external]</td></tr></table>";
#Show Go to day before and after links
! echo '<table width=100%><tr><td><a href="' .
$phpgw->link("/rbs/day.php","year=$yy&month=$ym&day=$yd&area=$area") .
'"><< ' . $lang[daybefore] . '</a></td>
! <td align=center><a href="' . $phpgw->link("/rbs/day.php","area=$area")
. '">' . $lang[gototoday] . '</a></td>
! <td align=right><a href="' .
$phpgw->link("/rbs/day.php","year=$ty&month=$tm&day=$td&area=$area") . '">' .
$lang[dayafter] . ' >></a></td></tr></table>';
--- 110,119 ----
#Show colour key
! echo '<table border=0><tr><td class="I">' . lang('internal') . '</td><td
class="E">' . lang('external') . '</td></tr></table>';
#Show Go to day before and after links
! echo '<table width=100%><tr><td><a href="' .
$GLOBALS['phpgw']->link("/rbs/day.php","year=$yy&month=$ym&day=$yd&area=$area")
. '"><< ' . lang('daybefore') . '</a></td>
! <td align=center><a href="' .
$GLOBALS['phpgw']->link("/rbs/day.php","area=$area") . '">' . lang('gototoday')
. '</a></td>
! <td align=right><a href="' .
$GLOBALS['phpgw']->link("/rbs/day.php","year=$ty&month=$tm&day=$td&area=$area")
. '">' . lang('dayafter') . ' >></a></td></tr></table>';
***************
*** 184,188 ****
#This is where we start displaying stuff
echo "<table cellspacing=0 border=1 width=100%>";
! echo "<tr><th>$lang[time]</th>";
while ($row = mysql_fetch_row($res)) {
--- 184,188 ----
#This is where we start displaying stuff
echo "<table cellspacing=0 border=1 width=100%>";
! echo '<tr><th>' . lang('time') . '</th>';
while ($row = mysql_fetch_row($res)) {
***************
*** 202,206 ****
#Show the time linked to the URL for highlighting that time
! echo '<td width="1%" class="red"><a href="' .
$phpgw->link($REQUEST_URI,"timetohighlight=$t") . '">' . date("H:i",$t) .
'</a></td>';
#Loop through the list of rooms we have for this area
--- 202,206 ----
#Show the time linked to the URL for highlighting that time
! echo '<td width="1%" class="red"><a href="' .
$GLOBALS['phpgw']->link($REQUEST_URI,"timetohighlight=$t") . '">' .
date("H:i",$t) . '</a></td>';
#Loop through the list of rooms we have for this area
***************
*** 228,236 ****
$hour = date("H",$t); $minute = date("i",$t);
! echo '<center><a href="'
.$phpgw->link("/rbs/edit_entry.php","room=$room&hour=$hour&minute=$minute&year=$year&month=$month&day=$day")
. '"><img src="templates/default/images/new.gif" border="0"></a></center>';
}
else
{
#if it is booked then show
! echo '<a href="' .
$phpgw->link("/rbs/view_entry.php","id=$id") . '">' . $descr . ' </a>';
}
--- 228,236 ----
$hour = date("H",$t); $minute = date("i",$t);
! echo '<center><a href="'
.$GLOBALS['phpgw']->link("/rbs/edit_entry.php","room=$room&hour=$hour&minute=$minute&year=$year&month=$month&day=$day")
. '"><img src="templates/default/images/new.gif" border="0"></a></center>';
}
else
{
#if it is booked then show
! echo '<a href="' .
$GLOBALS['phpgw']->link("/rbs/view_entry.php","id=$id") . '">' . $descr .
' </a>';
}
***************
*** 248,252 ****
#phpinfo();
! $phpgw->common->phpgw_footer();
echo "</BODY>";
--- 248,252 ----
#phpinfo();
! $GLOBALS['phpgw']->common->phpgw_footer();
echo "</BODY>";
Index: del.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/del.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** del.php 11 Nov 2001 00:52:19 -0000 1.7
--- del.php 22 Mar 2003 23:15:21 -0000 1.7.2.1
***************
*** 1,8 ****
<?php
! $phpgw_info["flags"] = array("currentapp" => "rbs", "noheader" => True,
"nonavbar" => True);
include("../header.inc.php");
! # $phpgw_info["flags"]["currentapp"] = "rbs";
# include "config.inc";
# include "functions.inc";
--- 1,8 ----
<?php
! $GLOBALS['phpgw_info']["flags"] = array("currentapp" => "rbs", "noheader"
=> True, "nonavbar" => True);
include("../header.inc.php");
! # $GLOBALS['phpgw_info']["flags"]["currentapp"] = "rbs";
# include "config.inc";
# include "functions.inc";
***************
*** 31,36 ****
# Let them go back to the admin page
! # echo "<h1>It's Gone! </h1><a
href=".$phpgw->link("/rbs/admin.php" ).">Go Back to the Admin Page</a>";
! $phpgw->redirect($phpgw->link('/rbs/admin.php'));
} else {
--- 31,36 ----
# Let them go back to the admin page
! # echo "<h1>It's Gone! </h1><a
href=".$GLOBALS['phpgw']->link("/rbs/admin.php" ).">Go Back to the Admin
Page</a>";
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/rbs/admin.php'));
} else {
***************
*** 51,59 ****
echo "<center>";
echo "<H1>Are you sure?</h1>";
! echo "<H1><a href=".$phpgw->link( $PHP_SELF,
"type=room&room=$room&confirm=Y").">YES!</a> <a
href=".$phpgw->link("/rbs/admin.php").">NO!</a></h1>";
echo "</center>";
echo "</BODY></HTML>";
# include "trailer.inc";
! # $phpgw->common->phpgw_footer();
}
}
--- 51,59 ----
echo "<center>";
echo "<H1>Are you sure?</h1>";
! echo "<H1><a href=".$GLOBALS['phpgw']->link( $PHP_SELF,
"type=room&room=$room&confirm=Y").">YES!</a> <a
href=".$GLOBALS['phpgw']->link("/rbs/admin.php").">NO!</a></h1>";
echo "</center>";
echo "</BODY></HTML>";
# include "trailer.inc";
! # $GLOBALS['phpgw']->common->phpgw_footer();
}
}
***************
*** 68,78 ****
mysql_query("delete from mrbs_area where id=$area");
#redirect back to the admin page
! $phpgw->redirect($phpgw->link('/rbs/admin.php'));
} else {
# There are rooms left in the area
do_header();
echo "You must delete all rooms in this area before you can
delete it<p>";
! echo "<a href=".$phpgw->link("/rbs/admin.php").">Go back to
Admin page</a>";
}
}
! # $phpgw->common->phpgw_footer();
--- 68,78 ----
mysql_query("delete from mrbs_area where id=$area");
#redirect back to the admin page
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/rbs/admin.php'));
} else {
# There are rooms left in the area
do_header();
echo "You must delete all rooms in this area before you can
delete it<p>";
! echo "<a href=".$GLOBALS['phpgw']->link("/rbs/admin.php").">Go
back to Admin page</a>";
}
}
! # $GLOBALS['phpgw']->common->phpgw_footer();
Index: del_entry.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/del_entry.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** del_entry.php 11 Nov 2001 00:52:19 -0000 1.7
--- del_entry.php 22 Mar 2003 23:15:21 -0000 1.7.2.1
***************
*** 1,4 ****
<?php
! $phpgw_info["flags"] = array("currentapp" => "rbs", "noheader" => True,
"nonavbar" => True);
include("../header.inc.php");
# bad hack to get around bad nested includes
--- 1,4 ----
<?php
! $GLOBALS['phpgw_info']["flags"] = array("currentapp" => "rbs", "noheader"
=> True, "nonavbar" => True);
include("../header.inc.php");
# bad hack to get around bad nested includes
***************
*** 22,26 ****
if(mrbsDelEntry(getUserName(), $id, $series, 1))
{
!
$phpgw->redirect($phpgw->link('/rbs/day.php','day='.$day.'&month='.$month.'&year='.$year.'&area='.$area));
exit;
}
--- 22,26 ----
if(mrbsDelEntry(getUserName(), $id, $series, 1))
{
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/rbs/day.php','day='.$day.'&month='.$month.'&year='.$year.'&area='.$area));
exit;
}
***************
*** 28,32 ****
// If you got this far then we got an access denied.
! $phpgw->redirect($phpgw->link('/rbs/failed.php'));
?>
--- 28,32 ----
// If you got this far then we got an access denied.
! $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/rbs/failed.php'));
?>
Index: edit_entry.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/edit_entry.php,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -r1.6 -r1.6.4.1
*** edit_entry.php 29 Mar 2001 20:10:47 -0000 1.6
--- edit_entry.php 22 Mar 2003 23:15:21 -0000 1.6.4.1
***************
*** 1,4 ****
<?php
! $phpgw_info["flags"]["currentapp"] = "rbs";
# include("../header.inc.php");
--- 1,4 ----
<?php
! $GLOBALS['phpgw_info']["flags"]["currentapp"] = "rbs";
# include("../header.inc.php");
***************
*** 14,27 ****
<HEAD>
<META HTTP-EQUIV="REFRESH" CONTENT="5; URL=index.php">
! <TITLE><?php echo $lang[mrbs]?></TITLE>
<?php include "config.inc"?>
<BODY>
! <H1><?php echo $lang[accessdenied]?></H1>
<P>
! <?php echo $lang[unandpw]?>
</P>
<P>
<?php
! echo "<a href=".$phpgw->link($HTTP_REFERER).">$lang[returnprev]</a>";
?>
</P>
--- 14,27 ----
<HEAD>
<META HTTP-EQUIV="REFRESH" CONTENT="5; URL=index.php">
! <TITLE><?php echo lang('mrbs')?></TITLE>
<?php include "config.inc"?>
<BODY>
! <H1><?php echo lang('accessdenied')?></H1>
<P>
! <?php echo lang('unandpw')?>
</P>
<P>
<?php
! echo "<a
href=".$GLOBALS['phpgw']->link($HTTP_REFERER).">lang('returnprev')</a>";
?>
</P>
***************
*** 145,162 ****
<HTML>
<HEAD>
! <TITLE><?php echo $lang[mrbs]?></TITLE>
<?php if(!getWritable($create_by, getUserName())) { ?>
! <H1><?php echo $lang[accessdenied]?></H1>
<P>
! <?php echo $lang[norights]?>
</P>
<P>
<?php
! echo "<a href=".$phpgw->link($HTTP_REFERER).">$lang[returnprev]</a>";
?>
</P>
! <?php $phpgw->common->phpgw_footer();?>
</BODY>
</HTML>
--- 145,162 ----
<HTML>
<HEAD>
! <TITLE><?php echo lang('mrbs')?></TITLE>
<?php if(!getWritable($create_by, getUserName())) { ?>
! <H1><?php echo lang('accessdenied')?></H1>
<P>
! <?php echo lang('norights')?>
</P>
<P>
<?php
! echo "<a
href=".$GLOBALS['phpgw']->link($HTTP_REFERER).">lang('returnprev')</a>";
?>
</P>
! <?php $GLOBALS['phpgw']->common->phpgw_footer();?>
</BODY>
</HTML>
***************
*** 184,188 ****
<BODY>
! <h2><?php if ($id) echo $lang[editentry]; else echo $lang[addentry]; ?></H2>
<FORM ACTION="edit_entry_handler.php" METHOD="GET">
--- 184,188 ----
<BODY>
! <h2><?php if ($id) echo lang('editentry'); else echo lang('addentry'); ?></H2>
<FORM ACTION="edit_entry_handler.php" METHOD="GET">
***************
*** 190,200 ****
<TABLE BORDER=0>
! <TR><TD><B><?php echo $lang[namebooker]?></B></TD>
<TD><INPUT NAME="name" SIZE=40 VALUE="<?php echo $name ?>"></TD></TR>
! <TR><TD VALIGN="top"><B><?php echo $lang[fulldescription]?></B></TD>
<TD><TEXTAREA NAME="description" ROWS=8 COLS=40 WRAP="virtual"><?php echo
htmlentities ( $description ); ?></TEXTAREA></TD></TR>
! <TR><TD><B><?php echo $lang[date]?></B></TD>
<TD>
<?php genDateSelector("", $start_day, $start_month, $start_year) ?>
--- 190,200 ----
<TABLE BORDER=0>
! <TR><TD><B><?php echo lang('namebooker')?></B></TD>
<TD><INPUT NAME="name" SIZE=40 VALUE="<?php echo $name ?>"></TD></TR>
! <TR><TD VALIGN="top"><B><?php echo lang('fulldescription')?></B></TD>
<TD><TEXTAREA NAME="description" ROWS=8 COLS=40 WRAP="virtual"><?php echo
htmlentities ( $description ); ?></TEXTAREA></TD></TR>
! <TR><TD><B><?php echo lang('date')?></B></TD>
<TD>
<?php genDateSelector("", $start_day, $start_month, $start_year) ?>
***************
*** 202,206 ****
</TR>
! <TR><TD><B><?php echo $lang[time]?></B></TD>
<?php
$h12 = $hour;
--- 202,206 ----
</TR>
! <TR><TD><B><?php echo lang('time')?></B></TD>
<?php
$h12 = $hour;
***************
*** 226,246 ****
</TD></TR>
! <TR><TD><B><?php echo $lang[duration]?></B></TD>
<TD><INPUT NAME="duration" SIZE=7 VALUE="<?php echo $duration;?>">
<SELECT NAME="dur_units">
! <!-- <OPTION VALUE="seconds" <?php echo ($dur_units == "seconds") ?
"SELECTED" : ""; ?>><?php echo $lang[seconds]; ?> -->
! <OPTION VALUE="minutes" <?php echo ($dur_units == "minutes") ?
"SELECTED" : ""; ?>><?php echo $lang[minutes]; ?>
! <OPTION VALUE="hours" <?php echo ($dur_units == "hours" ) ?
"SELECTED" : ""; ?>><?php echo $lang[hours]; ?>
! <OPTION VALUE="days" <?php echo ($dur_units == "days" ) ?
"SELECTED" : ""; ?>><?php echo $lang[days]; ?>
! <OPTION VALUE="weeks" <?php echo ($dur_units == "weeks" ) ?
"SELECTED" : ""; ?>><?php echo $lang[weeks]; ?>
! <!-- <OPTION VALUE="years" <?php echo ($dur_units == "years" ) ?
"SELECTED" : ""; ?>><?php echo $lang[years]; ?> -->
</SELECT>
! <INPUT NAME="all_day" TYPE="checkbox" VALUE="yes"> <?php echo
$lang[all_day]; ?>
</TD></TR>
! <TR><TD><B><?php echo $lang[type]?></B></TD>
<TD><SELECT NAME="type">
! <OPTION VALUE="I"<?php if ( $type == "I" || ! strlen ( $type ) ) echo "
SELECTED";?>><?php echo $lang[internal]?>
! <OPTION VALUE="E"<?php if ( $type == "E" ) echo " SELECTED";?>><?php echo
$lang[external]?>
</SELECT></TD></TR>
--- 226,246 ----
</TD></TR>
! <TR><TD><B><?php echo lang('duration')?></B></TD>
<TD><INPUT NAME="duration" SIZE=7 VALUE="<?php echo $duration;?>">
<SELECT NAME="dur_units">
! <!-- <OPTION VALUE="seconds" <?php echo ($dur_units == "seconds") ?
"SELECTED" : ""; ?>><?php echo lang('seconds'); ?> -->
! <OPTION VALUE="minutes" <?php echo ($dur_units == "minutes") ?
"SELECTED" : ""; ?>><?php echo lang('minutes'); ?>
! <OPTION VALUE="hours" <?php echo ($dur_units == "hours" ) ?
"SELECTED" : ""; ?>><?php echo lang('hours'); ?>
! <OPTION VALUE="days" <?php echo ($dur_units == "days" ) ?
"SELECTED" : ""; ?>><?php echo lang('days'); ?>
! <OPTION VALUE="weeks" <?php echo ($dur_units == "weeks" ) ?
"SELECTED" : ""; ?>><?php echo lang('weeks'); ?>
! <!-- <OPTION VALUE="years" <?php echo ($dur_units == "years" ) ?
"SELECTED" : ""; ?>><?php echo lang('years'); ?> -->
</SELECT>
! <INPUT NAME="all_day" TYPE="checkbox" VALUE="yes"> <?php echo
('langall_day'); ?>
</TD></TR>
! <TR><TD><B><?php echo lang('type')?></B></TD>
<TD><SELECT NAME="type">
! <OPTION VALUE="I"<?php if ( $type == "I" || ! strlen ( $type ) ) echo "
SELECTED";?>><?php echo lang('internal')?>
! <OPTION VALUE="E"<?php if ( $type == "E" ) echo " SELECTED";?>><?php echo
lang('external')?>
</SELECT></TD></TR>
***************
*** 248,256 ****
<TR>
! <TD><B><?php echo $lang[rep_type]?></B></TD>
<TD>
<?php
! for($i = 0; $lang["rep_type_$i"]; $i++)
{
echo "<INPUT NAME=\"rep_type\" TYPE=\"RADIO\" VALUE=\"" . $i . "\"";
--- 248,256 ----
<TR>
! <TD><B><?php echo lang('rep_type')?></B></TD>
<TD>
<?php
! for($i = 0; $i <=4 ; $i++)
{
echo "<INPUT NAME=\"rep_type\" TYPE=\"RADIO\" VALUE=\"" . $i . "\"";
***************
*** 259,263 ****
echo " CHECKED";
! echo ">" . $lang["rep_type_$i"] . "\n";
}
--- 259,263 ----
echo " CHECKED";
! echo ">" . lang("rep_type_$i") . "\n";
}
***************
*** 267,276 ****
<TR>
! <TD><B><?php echo $lang[rep_end_date]?></B></TD>
<TD><?php genDateSelector("rep_end_", $rep_end_day, $rep_end_month,
$rep_end_year) ?></TD>
</TR>
<TR>
! <TD><B><?php echo $lang[rep_rep_day]?></B> <?php echo
$lang[rep_for_weekly]?></TD>
<TD>
<INPUT NAME="rep_day[0]" TYPE="CHECKBOX"<?php echo ($rep_day[0] ? "CHECKED"
: "")?>>Sunday
--- 267,276 ----
<TR>
! <TD><B><?php echo lang('rep_end_date')?></B></TD>
<TD><?php genDateSelector("rep_end_", $rep_end_day, $rep_end_month,
$rep_end_year) ?></TD>
</TR>
<TR>
! <TD><B><?php echo lang('rep_rep_day')?></B> <?php echo
lang('rep_for_weekly')?></TD>
<TD>
<INPUT NAME="rep_day[0]" TYPE="CHECKBOX"<?php echo ($rep_day[0] ? "CHECKED"
: "")?>>Sunday
***************
*** 290,295 ****
$key = "rep_type_" . ($rep_type ? $rep_type : "0");
! echo "<tr><td><b>$lang[rep_type]</b></td><td>$lang[$key]</td></tr>\n";
!
if($rep_type != 0)
{
--- 290,294 ----
$key = "rep_type_" . ($rep_type ? $rep_type : "0");
! echo '<tr><td><b>' . lang('rep_type') . '</b></td><td>' . lang($key) .
'</td></tr>\n';
if($rep_type != 0)
{
***************
*** 311,317 ****
if($opt)
! echo
"<tr><td><b>$lang[rep_rep_day]</b></td><td>$opt</td></tr>\n";
! echo
"<tr><td><b>$lang[rep_end_date]</b></td><td>$rep_end_date</td></tr>\n";
}
}
--- 310,316 ----
if($opt)
! echo '<tr><td><b>' . lang('rep_rep_day') .
"</b></td><td>$opt</td></tr>\n";
! echo '<tr><td><b>' . lang('rep_end_date') .
"</b></td><td>$rep_end_date</td></tr>\n";
}
}
***************
*** 322,326 ****
<TD><BR>
<SCRIPT LANGUAGE="JavaScript">
! document.writeln ( '<INPUT TYPE="button" VALUE="<?php echo $lang[save]?>"
ONCLICK="validate_and_submit()">' );
</SCRIPT>
<NOSCRIPT>
--- 321,325 ----
<TD><BR>
<SCRIPT LANGUAGE="JavaScript">
! document.writeln ( '<INPUT TYPE="button" VALUE="<?php echo lang('save')?>"
ONCLICK="validate_and_submit()">' );
</SCRIPT>
<NOSCRIPT>
***************
*** 341,345 ****
<?php
# include "trailer.inc";
! $phpgw->common->phpgw_footer();
?>
</BODY>
--- 340,344 ----
<?php
# include "trailer.inc";
! $GLOBALS['phpgw']->common->phpgw_footer();
?>
</BODY>
Index: edit_entry_handler.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/edit_entry_handler.php,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -r1.6 -r1.6.4.1
*** edit_entry_handler.php 29 Mar 2001 20:10:47 -0000 1.6
--- edit_entry_handler.php 22 Mar 2003 23:15:21 -0000 1.6.4.1
***************
*** 1,4 ****
<?php
! $phpgw_info["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
--- 1,4 ----
<?php
! $GLOBALS['phpgw_info']["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
***************
*** 13,26 ****
<HEAD>
<META HTTP-EQUIV="REFRESH" CONTENT="5; URL=index.php">
! <TITLE><?php echo $lang[mrbs]?></TITLE>
<?php include "config.inc"?>
<BODY>
! <H1><?php echo $lang[accessdenied]?></H1>
<P>
! <?php echo $lang[unandpw]?>
</P>
<P>
<?php
! echo "<a href=".$phpgw->link($HTTP_REFERER).">$lang[returnprev]</a>";
?>
</P>
--- 13,26 ----
<HEAD>
<META HTTP-EQUIV="REFRESH" CONTENT="5; URL=index.php">
! <TITLE><?php echo lang('mrbs')?></TITLE>
<?php include "config.inc"?>
<BODY>
! <H1><?php echo lang('accessdenied')?></H1>
<P>
! <?php echo lang('unandpw')?>
</P>
<P>
<?php
! echo '<a href="' . $GLOBALS['phpgw']->link($HTTP_REFERER) .'">' .
lang('returnprev') . '</a>';
?>
</P>
***************
*** 33,45 ****
<HTML>
<HEAD>
! <TITLE><?php echo $lang[mrbs]?></TITLE>
! <H1><?php echo $lang[accessdenied]?></H1>
<P>
! <?php echo $lang[norights]?>
</P>
<P>
<?php
! echo "<a href=".$phpgw->link($HTTP_REFERER).">$lang[returnprev]</a>";
?>
</P>
--- 33,45 ----
<HTML>
<HEAD>
! <TITLE><?php echo lang('mrbs')?></TITLE>
! <H1><?php echo lang('accessdenied')?></H1>
<P>
! <?php echo lang('norights')?>
</P>
<P>
<?php
! echo "<a
href=".$GLOBALS['phpgw']->link($HTTP_REFERER).">lang('returnprev')</a>";
?>
</P>
***************
*** 128,132 ****
else
{
! $err = $lang[too_may_entrys] . "<P>";
$hide_title = 1;
}
--- 128,132 ----
else
{
! $err = lang('too_may_entrys') . "<P>";
$hide_title = 1;
}
***************
*** 169,174 ****
# Now its all done go back to the day view
! echo "<a
href=".$phpgw->link("/rbs/day.php","year=$year&month=$month&day=$day&area=$area").">Back</a>";
! $phpgw->common->phpgw_footer();
exit;
}
--- 169,174 ----
# Now its all done go back to the day view
! echo "<a
href=".$GLOBALS['phpgw']->link("/rbs/day.php","year=$year&month=$month&day=$day&area=$area").">Back</a>";
! $GLOBALS['phpgw']->common->phpgw_footer();
exit;
}
***************
*** 176,180 ****
?>
<HTML>
! <HEAD><TITLE><?php echo $lang[mrbs]?></TITLE>
</HEAD>
<BODY>
--- 176,180 ----
?>
<HTML>
! <HEAD><TITLE><?php echo lang('mrbs')?></TITLE>
</HEAD>
<BODY>
***************
*** 184,191 ****
if(strlen($err))
{
! echo "<H2>" . $lang[sched_conflict] . "</H2>";
if(!$hide_title)
{
! echo $lang[conflict];
echo "<UL>";
}
--- 184,191 ----
if(strlen($err))
{
! echo "<H2>" . lang('sched_conflict') . "</H2>";
if(!$hide_title)
{
! echo lang('conflict');
echo "<UL>";
}
***************
*** 197,205 ****
}
! # What the FUCK is returl? (Stephan)
#echo "<a href=$returl>$lang[returncal]</a><p>";
# Well, I'm going to replace it with a standard Return Prev. Link
# (Bryan)
! echo "<a href=".$phpgw->link($HTTP_REFERER).">$lang[returnprev]</a>";
--- 197,205 ----
}
! # WTF is returl? (Stephan)
#echo "<a href=$returl>$lang[returncal]</a><p>";
# Well, I'm going to replace it with a standard Return Prev. Link
# (Bryan)
! echo '<a href="' .$GLOBALS['phpgw']->link($HTTP_REFERER). '">' .
lang('returnprev'). '</a>';
***************
*** 208,210 ****
</BODY>
</HTML>
! <?php $phpgw->common->phpgw_footer(); ?>
--- 208,211 ----
</BODY>
</HTML>
!
! <?php $GLOBALS['phpgw']->common->phpgw_footer(); ?>
Index: failed.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/failed.php,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** failed.php 29 Mar 2001 20:10:47 -0000 1.3
--- failed.php 22 Mar 2003 23:15:21 -0000 1.3.4.1
***************
*** 1,4 ****
<?php
! $phpgw_info["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
--- 1,4 ----
<?php
! $GLOBALS['phpgw_info']["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
***************
*** 8,18 ****
?>
! <H1><?php echo $lang[accessdenied]?></H1>
<P>
! <?php echo $lang[norights]?>
</P>
<P>
<?php
! echo "<a href=".$phpgw->link("index.php").">".$lang[returnprev]."</a>";
$phpgw->common->phpgw_footer();
?>
--- 8,18 ----
?>
! <H1><?php echo lang('accessdenied')?></H1>
<P>
! <?php echo lang('norights')?>
</P>
<P>
<?php
! echo '<a href="' . $GLOBALS['phpgw']->link("index.php") . '">' .
lang('returnprev') . '</a>';
$phpgw->common->phpgw_footer();
?>
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/functions.inc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** functions.inc 20 Mar 2001 01:04:16 -0000 1.2
--- functions.inc 22 Mar 2003 23:15:21 -0000 1.2.4.1
***************
*** 56,60 ****
$lnk = "<a href=";
$parms= "";
! # print "<A HREF=".$phpgw->link("/rbs/edit_entry.php");
if ( strcmp ( $user, $GLOBALS["login"] ) ) {
$parms .= "user=$user&";
--- 56,60 ----
$lnk = "<a href=";
$parms= "";
! # print "<A HREF=".$GLOBALS['phpgw']->link("/rbs/edit_entry.php");
if ( strcmp ( $user, $GLOBALS["login"] ) ) {
$parms .= "user=$user&";
***************
*** 62,66 ****
}
# I'm not 100% sure I ported this part correctly. It was made up of a bunch
of print()s (Stephan)
! print $lnk.$phpgw->link("/rbs/edit_entry.php", $parms).
"<IMG SRC=\"new.gif\" WIDTH=10 HEIGHT=10 ALT=\"New Entry\" BORDER=0
ALIGN=right>" .
"</A>";
--- 62,66 ----
}
# I'm not 100% sure I ported this part correctly. It was made up of a bunch
of print()s (Stephan)
! print $lnk.$GLOBALS['phpgw']->link("/rbs/edit_entry.php", $parms).
"<IMG SRC=\"new.gif\" WIDTH=10 HEIGHT=10 ALT=\"New Entry\" BORDER=0
ALIGN=right>" .
"</A>";
***************
*** 84,88 ****
while ( $row = mysql_fetch_array ( $res ) ) {
if ( ! $hide_icons ) {
! echo "<A HREF=".$phpgw->link("/rbs/view_entry.php", "?id=$row[0]\"
onMouseOver=\"window.status='View this entry'; return true;")."><IMG
SRC=\"circle.gif\" WIDTH=5 HEIGHT=7 ALT=\"view icon\" BORDER=0></A>";
}
if ( $row[4] == "W" ) echo "<FONT
COLOR=\"$GLOBALS[UNAPPROVED_COLOR]\">";
--- 84,88 ----
while ( $row = mysql_fetch_array ( $res ) ) {
if ( ! $hide_icons ) {
! echo "<A HREF=".$GLOBLAS['phpgw']->link("/rbs/view_entry.php",
"?id=$row[0]\" onMouseOver=\"window.status='View this entry'; return
true;")."><IMG SRC=\"circle.gif\" WIDTH=5 HEIGHT=7 ALT=\"view icon\"
BORDER=0></A>";
}
if ( $row[4] == "W" ) echo "<FONT
COLOR=\"$GLOBALS[UNAPPROVED_COLOR]\">";
***************
*** 108,116 ****
echo htmlentities ( $row[1] );
//if ( ! $hide_icons ) {
! // echo "<A HREF=".$phpgw->link("/rbs/view_entry.php?id=$row[0]\"
onMouseOver=\"window.status='View this entry'; return true;")."><IMG
SRC=\"view.gif\" WIDTH=10 HEIGHT=10 ALT=\"view icon\" BORDER=0></A>\n";
// if ( $row[5] == $GLOBALS["login"] || strlen ( $single_user_login )
> 0
// || $GLOBALS["is_admin"] = "Y" )
! // echo "<A HREF=".$phpgw->link("/rbs/edit_entry.php?id=$row[0]\"
onMouseOver=\"window.status='Edit this entry'; return true;")."><IMG
SRC=\"edit.gif\" WIDTH=10 HEIGHT=10 ALT=\"edit icon\" BORDER=0></A>\n";
! //echo "<A HREF=".$phpgw->link("/rbs/del_entry.php?id=$row[0]\"
onMouseOver=\"window.status='Delete this entry'; return true;\"
onClick=\"return confirm('Are you sure\\nyou want to\\ndelete this
entry?');")."><IMG SRC=\"delete.gif\" WIDTH=10 HEIGHT=10 ALT=\"delete icon\"
BORDER=0></A>\n";
//}
if ( $row[2] == 3 ) echo "</B>";
--- 108,116 ----
echo htmlentities ( $row[1] );
//if ( ! $hide_icons ) {
! // echo "<A
HREF=".$GLOBALS['phpgw']->link("/rbs/view_entry.php?id=$row[0]\"
onMouseOver=\"window.status='View this entry'; return true;")."><IMG
SRC=\"view.gif\" WIDTH=10 HEIGHT=10 ALT=\"view icon\" BORDER=0></A>\n";
// if ( $row[5] == $GLOBALS["login"] || strlen ( $single_user_login )
> 0
// || $GLOBALS["is_admin"] = "Y" )
! // echo "<A
HREF=".$GLOBALS['phpgw']->link("/rbs/edit_entry.php?id=$row[0]\"
onMouseOver=\"window.status='Edit this entry'; return true;")."><IMG
SRC=\"edit.gif\" WIDTH=10 HEIGHT=10 ALT=\"edit icon\" BORDER=0></A>\n";
! //echo "<A
HREF=".$GLOBALS['phpgw']->link("/rbs/del_entry.php?id=$row[0]\"
onMouseOver=\"window.status='Delete this entry'; return true;\"
onClick=\"return confirm('Are you sure\\nyou want to\\ndelete this
entry?');")."><IMG SRC=\"delete.gif\" WIDTH=10 HEIGHT=10 ALT=\"delete icon\"
BORDER=0></A>\n";
//}
if ( $row[2] == 3 ) echo "</B>";
***************
*** 133,137 ****
if ( $row = mysql_fetch_array ( $res ) ) {
if ( $row[0] > 0 )
! printf ( "You have <A HREF=".$phpgw->link("/rbs/list_unapproved.php"
).">%d unapproved %s</A><BR>\n", $row[0], ( $row[0] > 1 ? "events" : "event" )
);
}
mysql_free_result ( $res );
--- 133,137 ----
if ( $row = mysql_fetch_array ( $res ) ) {
if ( $row[0] > 0 )
! printf ( "You have <A
HREF=".$GLOBALS['phpgw']->link("/rbs/list_unapproved.php" ).">%d unapproved
%s</A><BR>\n", $row[0], ( $row[0] > 1 ? "events" : "event" ) );
}
mysql_free_result ( $res );
Index: mincals.inc
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/mincals.inc,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** mincals.inc 20 Mar 2001 01:04:16 -0000 1.3
--- mincals.inc 22 Mar 2003 23:15:21 -0000 1.3.4.1
***************
*** 45,50 ****
function phpgw_getDateLink($day, $month, $year) {
! global $phpgw;
! return $phpgw->link("/rbs/day.php",
"year=$year&month=$month&day=$day&area=".$this->area);
}
--- 45,49 ----
function phpgw_getDateLink($day, $month, $year) {
! return $GLOBALS['phpgw']->link("/rbs/day.php",
"year=$year&month=$month&day=$day&area=".$this->area);
}
***************
*** 98,102 ****
function getHTML()
{
- global $phpgw;
$s = "";
--- 97,100 ----
***************
*** 112,118 ****
$s .= "<table class=rbsCalendar>\n";
$s .= "<tr>\n";
! //$s .= "<td align=center valign=top>" . (($prevMonth == "") ? " "
: "<a href=".$phpgw->link("$prevmonthx")."><<</a>") . "</td>\n";
$s .= "<td align=center valign=top class=rbsCalendarHeader
colspan=7>$monthName $this->year</td>\n";
! //$s .= "<td align=center valign=top>" . (($nextMonth == "") ? " "
: "<a href=".$phpgw->link("$nextMonth").">>></a>") . "</td>\n";
$s .= "</tr>\n";
--- 110,116 ----
$s .= "<table class=rbsCalendar>\n";
$s .= "<tr>\n";
! //$s .= "<td align=center valign=top>" . (($prevMonth == "") ? " "
: "<a href=".$GLOBALS['phpgw']->link("$prevmonthx")."><<</a>") .
"</td>\n";
$s .= "<td align=center valign=top class=rbsCalendarHeader
colspan=7>$monthName $this->year</td>\n";
! //$s .= "<td align=center valign=top>" . (($nextMonth == "") ? " "
: "<a href=".$GLOBALS['phpgw']->link("$nextMonth").">>></a>") .
"</td>\n";
$s .= "</tr>\n";
***************
*** 137,141 ****
else { $s .= "<a href=".$link.">$col$d</a>"; }
# $s .= $link;
! # $s .= (($link == "") ? $d : "<a
href=".$phpgw->link("$link").">$col$d</a>");
# Need to check the validity of this port stuff (Stephan, 03 Aug 2000)
--- 135,139 ----
else { $s .= "<a href=".$link.">$col$d</a>"; }
# $s .= $link;
! # $s .= (($link == "") ? $d : "<a
href=".$GLOBALS['phpgw']->link("$link").">$col$d</a>");
# Need to check the validity of this port stuff (Stephan, 03 Aug 2000)
Index: mrbs_sql.inc
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/mrbs_sql.inc,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** mrbs_sql.inc 29 Mar 2001 20:10:47 -0000 1.4
--- mrbs_sql.inc 22 Mar 2003 23:15:21 -0000 1.4.4.1
***************
*** 53,57 ****
while($row = mysql_fetch_row($res))
! # $err .= "<LI><A HREF=".$phpgw->link( "view_entry.php",
"id=$row[0]" ).">$row[1]</A>";
$err .= "<LI><A
HREF=\"/rbs/view_entry.php?id=$row[0]\">$row[1]</A>";
return $err;
--- 53,57 ----
while($row = mysql_fetch_row($res))
! # $err .= "<LI><A HREF=".$GLOBALS['phpgw']->link( "view_entry.php",
"id=$row[0]" ).">$row[1]</A>";
$err .= "<LI><A
HREF=\"/rbs/view_entry.php?id=$row[0]\">$row[1]</A>";
return $err;
Index: style.inc
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/style.inc,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** style.inc 29 Mar 2001 20:10:47 -0000 1.3
--- style.inc 22 Mar 2003 23:15:21 -0000 1.3.4.1
***************
*** 1,3 ****
<LINK REL="stylesheet" href="mrbs.css" type="text/css">
! <META HTTP-EQUIV="Content-Type" content="text/html; charset=<?php echo
$lang[charset]?>">
<!-- <h1 class="sitename"><?php echo $lang[mrbs]?></h1> -->
--- 1,3 ----
<LINK REL="stylesheet" href="mrbs.css" type="text/css">
! <META HTTP-EQUIV="Content-Type" content="text/html; charset=<?php echo
lang('charset')?>">
<!-- <h1 class="sitename"><?php echo $lang[mrbs]?></h1> -->
Index: trailer.inc
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/trailer.inc,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** trailer.inc 29 Mar 2001 20:10:47 -0000 1.4
--- trailer.inc 22 Mar 2003 23:15:21 -0000 1.4.4.1
***************
*** 1,5 ****
<P>
<HR CLEAR="all">
! <B><?php echo $lang[viewday]?></B>
<?php
if(!isset($year))
--- 1,5 ----
<P>
<HR CLEAR="all">
! <B><?php echo lang('viewday')?></B>
<?php
if(!isset($year))
***************
*** 22,26 ****
$cday = date("d", $ctime);
! echo "<a href=".$phpgw->link("/rbs/day.php",
"year=$cyear&month=$cmonth&day=$cday" ).">$str</a>, \n";
}
--- 22,26 ----
$cday = date("d", $ctime);
! echo "<a href=".$GLOBALS['phpgw']->link("/rbs/day.php",
"year=$cyear&month=$cmonth&day=$cday" ).">$str</a>, \n";
}
Index: view_entry.php
===================================================================
RCS file: /cvsroot/phpgroupware/rbs/view_entry.php,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -r1.5 -r1.5.4.1
*** view_entry.php 23 Mar 2001 19:16:54 -0000 1.5
--- view_entry.php 22 Mar 2003 23:15:21 -0000 1.5.4.1
***************
*** 1,4 ****
<?php
! $phpgw_info["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
--- 1,4 ----
<?php
! $GLOBALS['phpgw_info']["flags"]["currentapp"] = "rbs";
include "config.inc";
include "functions.inc";
***************
*** 12,16 ****
# $res = mysql_query($sql);
! $res = $phpgw->db->query($sql);
if(mysql_num_rows($res) < 1)
{
--- 12,16 ----
# $res = mysql_query($sql);
! $res = $GLOBALS['phpgw']->db->query($sql);
if(mysql_num_rows($res) < 1)
{
***************
*** 75,89 ****
echo "<table border=0>\n";
! echo "<tr><td><b>$lang[description]</b></td><td>" . nl2br($description) .
"</td></tr>\n";
! echo "<tr><td><b>$lang[start_date]</b></td><td>$start_date</td></tr>\n";
! echo "<tr><td><b>$lang[duration]</b></td><td>$duration
$dur_units</td></tr>\n";
! echo "<tr><td><b>$lang[end_date]</b></td><td>$end_date</td></tr>\n";
!
! echo "<tr><td><b>$lang[type]</b></td><td>$typel[$type]</td></tr>\n";
! echo "<tr><td><b>$lang[createdby]</b></td><td>$create_by</td></tr>\n";
! echo "<tr><td><b>$lang[lastupdate]</b></td><td>$updated</td></tr>\n";
$key = "rep_type_".$rep_type;
! echo "<tr><td><b>$lang[rep_type]</b></td><td>$lang[$key]</td></tr>\n";
if($rep_type != 0)
--- 75,89 ----
echo "<table border=0>\n";
! echo '<tr><td><b>' . lang('description') . "</b></td><td>" .
nl2br($description) . "</td></tr>\n";
! echo '<tr><td><b>' . lang('start_date') .
"</b></td><td>$start_date</td></tr>\n";
! echo '<tr><td><b>' . lang('duration') . "</b></td><td>$duration
$dur_units</td></tr>\n";
! echo '<tr><td><b>' . lang('end_date') . "</b></td><td>$end_date</td></tr>\n";
!
! echo '<tr><td><b>' . lang('type') . "</b></td><td>$typel[$type]</td></tr>\n";
! echo '<tr><td><b>' . lang('createdby') .
"</b></td><td>$create_by</td></tr>\n";
! echo '<tr><td><b>' . lang('lastupdate') . "</b></td><td>$updated</td></tr>\n";
$key = "rep_type_".$rep_type;
! echo '<tr><td><b>' . lang('rep_type') . '</b></td><td>' . lang('$key') .
"</td></tr>\n";
if($rep_type != 0)
***************
*** 106,129 ****
if($opt)
! echo
"<tr><td><b>$lang[rep_rep_day]</b></td><td>$opt</td></tr>\n";
! echo
"<tr><td><b>$lang[rep_end_date]</b></td><td>$rep_end_date</td></tr>\n";
}
echo "</table><br><p>\n\n";
! echo "<a href=".$phpgw->link("/rbs/edit_entry.php",
"id=$id").">$lang[editentry]</a>";
if($repeat_id)
! echo " - <a
href=".$phpgw->link("/rbs/edit_entry.php","id=$id&edit_type=series").">$lang[editseries]</a>";
echo "<BR>\n";
! echo "<A HREF=".$phpgw->link("/rbs/del_entry.php", "id=$id&series=0\"
onClick=\"return confirm('$lang[confirmdel]')\"").">$lang[deleteentry]</A>";
if($repeat_id)
! echo " - <A HREF=".$phpgw->link("/rbs/del_entry.php",
"id=$id&series=1\" onClick=\"return
confirm('$lang[confirmdel]');").">$lang[deleteseries]</A>";
echo "<BR>\n";
! echo "<a href=".$phpgw->link( $HTTP_REFERER ).">$lang[returnprev]</a>";
echo "\n";
# include "trailer.inc";
! $phpgw->common->phpgw_footer();
?>
--- 106,129 ----
if($opt)
! echo '<tr><td><b>' . lang('rep_rep_day') .
"</b></td><td>$opt</td></tr>\n";
! echo '<tr><td><b>' . lang('rep_end_date') .
"</b></td><td>$rep_end_date</td></tr>\n";
}
echo "</table><br><p>\n\n";
! echo '<a href="' . $GLOBALS['phpgw']->link("/rbs/edit_entry.php", "id=$id").
'">' . lang('editentry') . "</a>";
if($repeat_id)
! echo ' - <a href="' .
$GLOBALS['phpgw']->link("/rbs/edit_entry.php","id=$id&edit_type=series") . '">'
. lang('editseries') . "</a>";
echo "<BR>\n";
! echo '<A HREF="' . $GLOBALS['phpgw']->link("/rbs/del_entry.php",
"id=$id&series=0\" onClick=\"return confirm('" . lang('confirmdel') . "')\"") .
'">' lang('deleteentry') . "</A>";
if($repeat_id)
! echo ' - <A HREF="' . $GLOBALS['phpgw']->link("/rbs/del_entry.php",
"id=$id&series=1\" onClick=\"return confirm('" . lang('confirmdel') . "');") .
'">' . lang('deleteseries') . "</A>";
echo "<BR>\n";
! echo '<a href="' . $GLOBALS['phpgw']->link( $HTTP_REFERER ) . '">' .
lang('returnprev') . "</a>";
echo "\n";
# include "trailer.inc";
! $GLOBALS['phpgw']->common->phpgw_footer();
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: rbs add.php,1.4,1.4.4.1 admin.php,1.7.4.1,1.7.4.2 config.inc,1.5,1.5.4.1 connect.inc,1.2,1.2.4.1 day.php,1.8,1.8.4.1 del.php,1.7,1.7.2.1 del_entry.php,1.7,1.7.2.1 edit_entry.php,1.6,1.6.4.1 edit_entry_handler.php,1.6,1.6.4.1 failed.php,1.3,1.3.4.1 functions.inc,1.2,1.2.4.1 mincals.inc,1.3,1.3.4.1 mrbs_sql.inc,1.4,1.4.4.1 trailer.inc,1.4,1.4.4.1view_entry.php,1.5,1.5.4.1,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: bookmarks/setup phpgw_de.lang,1.6.2.2,1.6.2.3 phpgw_en.lang,1.5.2.6,1.5.2.7
- Next by Date:
[Phpgroupware-cvs] CVS: rbs/setup phpgw_lang.de,1.1.2.1,1.1.2.2 phpgw_lang.en,1.1.2.1,1.1.2.2 phpgw_lang.es,1.1.2.1,1.1.2.2 phpgw_lang.fr,1.1.2.1,1.1.2.2 phpgw_lang.nl,1.1.2.1,1.1.2.2 phpgw_lang.zh-tw,1.1.2.1,1.1.2.2
- Previous by thread:
[Phpgroupware-cvs] CVS: bookmarks/setup phpgw_de.lang,1.6.2.2,1.6.2.3 phpgw_en.lang,1.5.2.6,1.5.2.7
- Next by thread:
[Phpgroupware-cvs] CVS: rbs/setup phpgw_lang.de,1.1.2.1,1.1.2.2 phpgw_lang.en,1.1.2.1,1.1.2.2 phpgw_lang.es,1.1.2.1,1.1.2.2 phpgw_lang.fr,1.1.2.1,1.1.2.2 phpgw_lang.nl,1.1.2.1,1.1.2.2 phpgw_lang.zh-tw,1.1.2.1,1.1.2.2
- Index(es):