Revision: 1250
http://mrbs.svn.sourceforge.net/mrbs/?rev=1250&view=rev
Author: cimorrison
Date: 2009-11-10 17:28:29 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Accept button implemented for view_entry.php
Modified Paths:
--------------
mrbs/branches/provisional_bookings/web/lang.en
mrbs/branches/provisional_bookings/web/mrbs_sql.inc
mrbs/branches/provisional_bookings/web/view_entry.php
Added Paths:
-----------
mrbs/branches/provisional_bookings/web/confirm_entry_handler.php
Added: mrbs/branches/provisional_bookings/web/confirm_entry_handler.php
===================================================================
--- mrbs/branches/provisional_bookings/web/confirm_entry_handler.php
(rev 0)
+++ mrbs/branches/provisional_bookings/web/confirm_entry_handler.php
2009-11-10 17:28:29 UTC (rev 1250)
@@ -0,0 +1,59 @@
+<?php
+// $Id$
+
+// Handles actions on provisional bookings
+
+require_once "defaultincludes.inc";
+require_once "mrbs_sql.inc";
+require_once "functions_mail.inc";
+
+// Get form variables
+$day = get_form_var('day', 'int');
+$month = get_form_var('month', 'int');
+$year = get_form_var('year', 'int');
+$area = get_form_var('area', 'int');
+$action = get_form_var('action', 'string');
+$id = get_form_var('id', 'int');
+$series = get_form_var('series', 'int');
+$returl = get_form_var('returl', 'string');
+$room_id = get_form_var('room_id', 'int');
+
+// If we dont know the right date then make it up
+if (!isset($day) or !isset($month) or !isset($year))
+{
+ $day = date("d");
+ $month = date("m");
+ $year = date("Y");
+}
+
+if (empty($area))
+{
+ $area = get_default_area();
+}
+
+// Check that we're allowed to use this page
+// (1) We must be at least a logged in user
+if(!getAuthorised(1))
+{
+ showAccessDenied($day, $month, $year, $area, isset($room) ? $room : "");
+ exit;
+}
+$user = getUserName();
+// (2) We must also have confirm rights for this room
+if (!auth_can_confirm($user, $room_id))
+{
+ showAccessDenied($day, $month, $year, $area, isset($room) ? $room : "");
+ exit;
+}
+
+// ACTION = "ACCEPT"
+if ($action == "accept")
+{
+ mrbsConfirmEntry($id, $series);
+}
+
+// Now it's all done go back to the previous view
+header("Location: $returl");
+exit;
+
+?>
Property changes on:
mrbs/branches/provisional_bookings/web/confirm_entry_handler.php
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: mrbs/branches/provisional_bookings/web/lang.en
===================================================================
--- mrbs/branches/provisional_bookings/web/lang.en 2009-11-10 13:34:07 UTC
(rev 1249)
+++ mrbs/branches/provisional_bookings/web/lang.en 2009-11-10 17:28:29 UTC
(rev 1250)
@@ -107,6 +107,8 @@
$vocab["status"] = "Status";
$vocab["confirmed"] = "Confirmed booking";
$vocab["provisional"] = "Provisional booking";
+$vocab["accept"] = "Accept";
+$vocab["series"] = "Series";
// Used in edit_entry_handler.php
$vocab["error"] = "Error";
Modified: mrbs/branches/provisional_bookings/web/mrbs_sql.inc
===================================================================
--- mrbs/branches/provisional_bookings/web/mrbs_sql.inc 2009-11-10 13:34:07 UTC
(rev 1249)
+++ mrbs/branches/provisional_bookings/web/mrbs_sql.inc 2009-11-10 17:28:29 UTC
(rev 1250)
@@ -537,6 +537,31 @@
return $ent;
}
+// mrbsConfirmEntry($id, $series)
+//
+// Confirm an entry with id $id. If series is set to TRUE
+// then the id is the id in the repeat table and we must confirm
+// all the individual entries.
+// Returns FALSE on failure, TRUE on success
+function mrbsConfirmEntry($id, $series)
+{
+ global $tbl_entry;
+
+ $sql = "UPDATE $tbl_entry
+ SET status=". STATUS_CONFIRMED . "
+ WHERE status!=" . STATUS_CONFIRMED;
+ if ($series)
+ {
+ $sql .= " AND repeat_id=$id";
+ }
+ else
+ {
+ $sql .= " AND id=$id LIMIT 1";
+ }
+ return (sql_command($sql) >= 0);
+}
+
+
/* mrbsGetEntryInfo()
*
* Get the booking's entrys
Modified: mrbs/branches/provisional_bookings/web/view_entry.php
===================================================================
--- mrbs/branches/provisional_bookings/web/view_entry.php 2009-11-10
13:34:07 UTC (rev 1249)
+++ mrbs/branches/provisional_bookings/web/view_entry.php 2009-11-10
17:28:29 UTC (rev 1250)
@@ -3,6 +3,41 @@
require_once "defaultincludes.inc";
+function generateButton($form_action, $id, $series, $action_type, $returl,
$submit_value)
+{
+ global $room_id;
+
+ echo "<form action=\"$form_action\" method=\"post\">\n";
+ echo "<fieldset>\n";
+ echo "<legend></legend>\n";
+ echo "<input type=\"hidden\" name=\"id\" value=\"$id\">\n";
+ echo "<input type=\"hidden\" name=\"series\" value=\"$series\">\n";
+ echo "<input type=\"hidden\" name=\"action\" value=\"$action_type\">\n";
+ echo "<input type=\"hidden\" name=\"room_id\" value=\"$room_id\">\n";
+ echo "<input type=\"hidden\" name=\"returl\" value=\"" .
htmlspecialchars($returl) . "\">\n";
+ echo "<input type=\"submit\" value=\"" . get_vocab("accept") . "\">\n";
+ echo "</fieldset>\n";
+ echo "</form>\n";
+}
+
+function generateConfirmButtons($id, $series)
+{
+ global $returl;
+
+ echo "<tr>\n";
+ echo "<td>" . ($series ? get_vocab("series") : get_vocab("entry")) .
":</td>\n";
+ echo "<td>\n";
+ generateButton("confirm_entry_handler.php", $id, $series, "accept", $returl,
get_vocab("accept"));
+ // generateButton();
+ // generateButton();
+ echo "</td>\n";
+ echo "</tr>\n";
+}
+
+function generateOwnerButtons($id, $series)
+{
+}
+
$user = getUserName();
// Get form variables
@@ -28,6 +63,31 @@
print_header($day, $month, $year, $area, isset($room) ? $room : "");
+
+// Need to tell all the links where to go back to after an edit or delete
+if (isset($HTTP_REFERER))
+{
+ $returl = $HTTP_REFERER;
+}
+// If we haven't got a referer (eg we've come here from an email) then
construct
+// a sensible place to go to afterwards
+else
+{
+ switch ($default_view)
+ {
+ case "month":
+ $returl = "month.php";
+ break;
+ case "week":
+ $returl = "week.php";
+ break;
+ default:
+ $returl = "day.php";
+ }
+ $returl .= "?year=$year&month=$month&day=$day&area=$area";
+}
+$link_returl = urlencode($returl); // for use in links
+
if (empty($series))
{
$series = 0;
@@ -271,56 +331,92 @@
echo "</h3>\n";
?>
- <table id="entry">
- <tr>
+<table id="entry">
+
+<?php
+// If we're using provisional bookings, put the buttons to do with managing
+// the bookings in the footer
+if ($provisional_enabled && ($status == STATUS_PROVISIONAL))
+{
+ echo "<tfoot id=\"confirm_buttons\">\n";
+ // Buttons for those who are allowed to confirm this booking
+ if (auth_can_confirm($user, $room_id))
+ {
+ if (!$series)
+ {
+ generateConfirmButtons($id, FALSE);
+ }
+ if (!empty($repeat_id) || $series)
+ {
+ $target_id = (empty($repeat_id)) ? $id : $repeat_id;
+ generateConfirmButtons($target_id, TRUE);
+ }
+ }
+ // Buttons for the owner of this booking
+ elseif ($user == $create_by)
+ {
+ generateOwnerButtons($id, $series);
+ }
+ // Others don't get any buttons
+ else
+ {
+ // But valid HTML requires that there's something inside the
<tfoot></tfoot>
+ echo "<tr><td></td><td></td></tr>\n";
+ }
+ echo "</tfoot>\n";
+}
+?>
+
+<tbody>
+ <tr>
<td><?php echo get_vocab("description") ?>:</td>
<?php
echo "<td" . (($keep_private) ? " class=\"private\"" : "") . ">" .
mrbs_nl2br($description) . "</td>\n";
?>
- </tr>
- <?php
- if ($provisional_enabled)
- {
+ </tr>
+ <?php
+ if ($provisional_enabled)
+ {
echo "<tr>\n";
echo "<td>" . get_vocab("status") . ":</td>\n";
echo "<td>" . (($status == STATUS_PROVISIONAL) ? get_vocab("provisional")
: get_vocab("confirmed")) . "</td>\n";
echo "</tr>\n";
- }
- ?>
- <tr>
+ }
+ ?>
+ <tr>
<td><?php echo get_vocab("room") ?>:</td>
<td><?php echo mrbs_nl2br($area_name . " - " . $room_name) ?></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><?php echo get_vocab("start_date") ?>:</td>
<td><?php echo $start_date ?></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><?php echo get_vocab("duration") ?>:</td>
<td><?php echo $duration . " " . $dur_units ?></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><?php echo get_vocab("end_date") ?>:</td>
<td><?php echo $end_date ?></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><?php echo get_vocab("type") ?>:</td>
<td><?php echo empty($typel[$type]) ? "?$type?" : $typel[$type] ?></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><?php echo get_vocab("createdby") ?>:</td>
<?php
echo "<td" . (($keep_private) ? " class=\"private\"" : "") . ">" .
$create_by . "</td>\n";
?>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><?php echo get_vocab("lastupdate") ?>:</td>
<td><?php echo $updated ?></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><?php echo get_vocab("rep_type") ?>:</td>
<td><?php echo get_vocab($repeat_key) ?></td>
- </tr>
+ </tr>
<?php
if($rep_type != 0)
@@ -352,40 +448,15 @@
}
?>
+</tbody>
</table>
-<?php
-// Need to tell all the links where to go back to after an edit or delete
-if (isset($HTTP_REFERER))
-{
- $returl = $HTTP_REFERER;
-}
-// If we haven't got a referer (eg we've come here from an email) then
construct
-// a sensible place to go to afterwards
-else
-{
- switch ($default_view)
- {
- case "month":
- $returl = "month.php";
- break;
- case "week":
- $returl = "week.php";
- break;
- default:
- $returl = "day.php";
- }
- $returl .= "?year=$year&month=$month&day=$day&area=$area";
-}
-$returl = urlencode($returl);
-?>
-
<div id="view_entry_nav">
<div>
<?php
if (!$series)
{
- echo "<a href=\"edit_entry.php?id=$id&returl=$returl\">".
get_vocab("editentry") ."</a>";
+ echo "<a href=\"edit_entry.php?id=$id&returl=$link_returl\">".
get_vocab("editentry") ."</a>";
}
if (!empty($repeat_id))
@@ -395,7 +466,7 @@
if (!empty($repeat_id) || $series)
{
- echo "<a
href=\"edit_entry.php?id=$id&edit_type=series&day=$day&month=$month&year=$year&returl=$returl\">".get_vocab("editseries")."</a>";
+ echo "<a
href=\"edit_entry.php?id=$id&edit_type=series&day=$day&month=$month&year=$year&returl=$link_returl\">".get_vocab("editseries")."</a>";
}
?>
@@ -406,7 +477,7 @@
// Copy and Copy series
if (!$series)
{
- echo "<a href=\"edit_entry.php?id=$id&copy=1&returl=$returl\">".
get_vocab("copyentry") ."</a>";
+ echo "<a
href=\"edit_entry.php?id=$id&copy=1&returl=$link_returl\">".
get_vocab("copyentry") ."</a>";
}
if (!empty($repeat_id))
@@ -416,7 +487,7 @@
if (!empty($repeat_id) || $series)
{
- echo "<a
href=\"edit_entry.php?id=$id&edit_type=series&day=$day&month=$month&year=$year&copy=1&returl=$returl\">".get_vocab("copyseries")."</a>";
+ echo "<a
href=\"edit_entry.php?id=$id&edit_type=series&day=$day&month=$month&year=$year&copy=1&returl=$link_returl\">".get_vocab("copyseries")."</a>";
}
?>
@@ -425,7 +496,7 @@
<?php
if (!$series)
{
- echo "<a href=\"del_entry.php?id=$id&series=0&returl=$returl\"
onclick=\"return
confirm('".get_vocab("confirmdel")."');\">".get_vocab("deleteentry")."</a>";
+ echo "<a
href=\"del_entry.php?id=$id&series=0&returl=$link_returl\"
onclick=\"return
confirm('".get_vocab("confirmdel")."');\">".get_vocab("deleteentry")."</a>";
}
if (!empty($repeat_id))
@@ -435,7 +506,7 @@
if (!empty($repeat_id) || $series)
{
- echo "<a
href=\"del_entry.php?id=$id&series=1&day=$day&month=$month&year=$year&returl=$returl\"
onClick=\"return
confirm('".get_vocab("confirmdel")."');\">".get_vocab("deleteseries")."</a>";
+ echo "<a
href=\"del_entry.php?id=$id&series=1&day=$day&month=$month&year=$year&returl=$link_returl\"
onClick=\"return
confirm('".get_vocab("confirmdel")."');\">".get_vocab("deleteseries")."</a>";
}
?>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
