Revision: 2338
http://mrbs.svn.sourceforge.net/mrbs/?rev=2338&view=rev
Author: cimorrison
Date: 2012-07-18 10:54:42 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fixed more problems to do with Search and Report introduced during the
JavaScript restructuring. (Disabled caching of some files which need to be
dynamically generated)
Modified Paths:
--------------
mrbs/trunk/web/add.php
mrbs/trunk/web/admin.php
mrbs/trunk/web/approve_entry_handler.php
mrbs/trunk/web/day.php
mrbs/trunk/web/del.php
mrbs/trunk/web/del_entry.php
mrbs/trunk/web/del_entry_ajax.php
mrbs/trunk/web/edit_area_room.php
mrbs/trunk/web/edit_entry.php
mrbs/trunk/web/edit_entry_handler.php
mrbs/trunk/web/edit_users.php
mrbs/trunk/web/help.php
mrbs/trunk/web/import.php
mrbs/trunk/web/index.php
mrbs/trunk/web/js/admin.js.php
mrbs/trunk/web/js/cell_click.js.php
mrbs/trunk/web/js/datatables.js.php
mrbs/trunk/web/js/datepicker.js.php
mrbs/trunk/web/js/edit_area_room.js.php
mrbs/trunk/web/js/edit_entry.js.php
mrbs/trunk/web/js/edit_users.js.php
mrbs/trunk/web/js/functions.js.php
mrbs/trunk/web/js/general.js.php
mrbs/trunk/web/js/multiple.js.php
mrbs/trunk/web/js/pending.js.php
mrbs/trunk/web/js/report.js.php
mrbs/trunk/web/js/resizable.js.php
mrbs/trunk/web/js/search.js.php
mrbs/trunk/web/month.php
mrbs/trunk/web/pending.php
mrbs/trunk/web/report.php
mrbs/trunk/web/search.php
mrbs/trunk/web/view_entry.php
mrbs/trunk/web/week.php
Modified: mrbs/trunk/web/add.php
===================================================================
--- mrbs/trunk/web/add.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/add.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
// Get non-standard form variables
Modified: mrbs/trunk/web/admin.php
===================================================================
--- mrbs/trunk/web/admin.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/admin.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
// Get non-standard form variables
$area_name = get_form_var('area_name', 'string');
Modified: mrbs/trunk/web/approve_entry_handler.php
===================================================================
--- mrbs/trunk/web/approve_entry_handler.php 2012-07-18 09:52:16 UTC (rev
2337)
+++ mrbs/trunk/web/approve_entry_handler.php 2012-07-18 10:54:42 UTC (rev
2338)
@@ -3,7 +3,7 @@
// Handles actions on bookings awaiting approval
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
require_once "functions_mail.inc";
Modified: mrbs/trunk/web/day.php
===================================================================
--- mrbs/trunk/web/day.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/day.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mincals.inc";
require_once "functions_table.inc";
Modified: mrbs/trunk/web/del.php
===================================================================
--- mrbs/trunk/web/del.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/del.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
// Get non-standard form variables
$type = get_form_var('type', 'string');
Modified: mrbs/trunk/web/del_entry.php
===================================================================
--- mrbs/trunk/web/del_entry.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/del_entry.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -8,7 +8,7 @@
// means that $id is the id of an entry in the repeat table. This
// should be fixed sometime.]
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
// Get non-standard form variables
Modified: mrbs/trunk/web/del_entry_ajax.php
===================================================================
--- mrbs/trunk/web/del_entry_ajax.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/del_entry_ajax.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -21,7 +21,7 @@
// seconds could overwhelm many mail servers, or break the usage policies
// on hosted systems.
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
// Check the user is authorised for this page
Modified: mrbs/trunk/web/edit_area_room.php
===================================================================
--- mrbs/trunk/web/edit_area_room.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/edit_area_room.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -44,7 +44,7 @@
// If MRBS can't find an entry for the field in the lang file or vocab
overrides, then
// it will use the fieldname, eg 'coffee_machine'.
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
Modified: mrbs/trunk/web/edit_entry.php
===================================================================
--- mrbs/trunk/web/edit_entry.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/edit_entry.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -48,7 +48,7 @@
// then it will use the fieldname, eg 'coffee_machine'.
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
// Regular expressions used to define mandatory text fields, eg the 'name'
field. The first
Modified: mrbs/trunk/web/edit_entry_handler.php
===================================================================
--- mrbs/trunk/web/edit_entry_handler.php 2012-07-18 09:52:16 UTC (rev
2337)
+++ mrbs/trunk/web/edit_entry_handler.php 2012-07-18 10:54:42 UTC (rev
2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
require_once "functions_ical.inc";
Modified: mrbs/trunk/web/edit_users.php
===================================================================
--- mrbs/trunk/web/edit_users.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/edit_users.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -38,7 +38,7 @@
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
// Get non-standard form variables
$Action = get_form_var('Action', 'string');
Modified: mrbs/trunk/web/help.php
===================================================================
--- mrbs/trunk/web/help.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/help.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "version.inc";
// Check the user is authorised for this page
Modified: mrbs/trunk/web/import.php
===================================================================
--- mrbs/trunk/web/import.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/import.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "functions_ical.inc";
require_once "mrbs_sql.inc";
Modified: mrbs/trunk/web/index.php
===================================================================
--- mrbs/trunk/web/index.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/index.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -7,7 +7,7 @@
// If $default_room is defined in config.inc.php then this will
// be used to redirect to a particular room.
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
switch ($default_view)
Modified: mrbs/trunk/web/js/admin.js.php
===================================================================
--- mrbs/trunk/web/js/admin.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/admin.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/cell_click.js.php
===================================================================
--- mrbs/trunk/web/js/cell_click.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/cell_click.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/datatables.js.php
===================================================================
--- mrbs/trunk/web/js/datatables.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/datatables.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/datepicker.js.php
===================================================================
--- mrbs/trunk/web/js/datepicker.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/datepicker.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/edit_area_room.js.php
===================================================================
--- mrbs/trunk/web/js/edit_area_room.js.php 2012-07-18 09:52:16 UTC (rev
2337)
+++ mrbs/trunk/web/js/edit_area_room.js.php 2012-07-18 10:54:42 UTC (rev
2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/edit_entry.js.php
===================================================================
--- mrbs/trunk/web/js/edit_entry.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/edit_entry.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/edit_users.js.php
===================================================================
--- mrbs/trunk/web/js/edit_users.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/edit_users.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/functions.js.php
===================================================================
--- mrbs/trunk/web/js/functions.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/functions.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/general.js.php
===================================================================
--- mrbs/trunk/web/js/general.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/general.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/multiple.js.php
===================================================================
--- mrbs/trunk/web/js/multiple.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/multiple.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/pending.js.php
===================================================================
--- mrbs/trunk/web/js/pending.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/pending.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/report.js.php
===================================================================
--- mrbs/trunk/web/js/report.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/report.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,10 +2,10 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
-expires_header(60*30); // 30 minute expiry
+expires_header(0); // Cannot cache file because it depends on $HTTP_REFERER
// Generates the JavaScript code to turn the input with id $id
// into an autocomplete box, with options contained in the
Modified: mrbs/trunk/web/js/resizable.js.php
===================================================================
--- mrbs/trunk/web/js/resizable.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/resizable.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,7 +2,7 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
expires_header(60*30); // 30 minute expiry
Modified: mrbs/trunk/web/js/search.js.php
===================================================================
--- mrbs/trunk/web/js/search.js.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/js/search.js.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -2,10 +2,10 @@
// $Id$
-require_once "../defaultincludes.inc";
+require "../defaultincludes.inc";
header("Content-type: application/x-javascript");
-expires_header(60*30); // 30 minute expiry
+expires_header(0); // Cannot cache file because it depends on $HTTP_REFERER
//
=================================================================================
Modified: mrbs/trunk/web/month.php
===================================================================
--- mrbs/trunk/web/month.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/month.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -3,7 +3,7 @@
// mrbs/month.php - Month-at-a-time view
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mincals.inc";
require_once "functions_table.inc";
Modified: mrbs/trunk/web/pending.php
===================================================================
--- mrbs/trunk/web/pending.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/pending.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
function display_buttons($row, $is_series)
{
Modified: mrbs/trunk/web/report.php
===================================================================
--- mrbs/trunk/web/report.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/report.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
// Converts a string from the standard MRBS character set to the character set
Modified: mrbs/trunk/web/search.php
===================================================================
--- mrbs/trunk/web/search.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/search.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
function generate_search_nav_html($search_pos, $total, $num_records,
$search_str)
Modified: mrbs/trunk/web/view_entry.php
===================================================================
--- mrbs/trunk/web/view_entry.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/view_entry.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -1,7 +1,7 @@
<?php
// $Id$
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mrbs_sql.inc";
require_once "functions_view.inc";
Modified: mrbs/trunk/web/week.php
===================================================================
--- mrbs/trunk/web/week.php 2012-07-18 09:52:16 UTC (rev 2337)
+++ mrbs/trunk/web/week.php 2012-07-18 10:54:42 UTC (rev 2338)
@@ -3,7 +3,7 @@
// mrbs/week.php - Week-at-a-time view
-require_once "defaultincludes.inc";
+require "defaultincludes.inc";
require_once "mincals.inc";
require_once "functions_table.inc";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
