[Mrbs-commits] SF.net SVN: mrbs:[1766] mrbs/trunk/web/pending.php

[cimorrison]

Revision: 1766
          http://mrbs.svn.sourceforge.net/mrbs/?rev=1766&view=rev
Author:   cimorrison
Date:     2011-01-28 09:52:37 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
Fixed pending so that it can cope with mixed periods and times

Modified Paths:
--------------
    mrbs/trunk/web/pending.php

Modified: mrbs/trunk/web/pending.php
===================================================================
--- mrbs/trunk/web/pending.php  2011-01-28 09:42:18 UTC (rev 1765)
+++ mrbs/trunk/web/pending.php  2011-01-28 09:52:37 UTC (rev 1766)
@@ -112,8 +112,6 @@
 // display an entry in a row
 function display_entry_row($row)
 {
-  global $enable_periods;
-  
   echo "<tr>\n";
   echo "<td class=\"control\">&nbsp;</td>\n";
     
@@ -130,7 +128,7 @@
   $link = getdate($row['start_time']);
   echo "<td>";
   echo "<a 
href=\"day.php?day=$link[mday]&amp;month=$link[mon]&amp;year=$link[year]&amp;area=".$row['area_id']."\">";
-  if(empty($enable_periods))
+  if(empty($row['enable_periods']))
   {
     $link_str = time_date_string($row['start_time']);
   }
@@ -167,7 +165,7 @@
 $sql = "SELECT E.id, E.name, E.room_id, E.start_time, E.create_by, " .
                sql_syntax_timestamp_to_unix("E.timestamp") . " AS last_updated,
                E.reminded, E.repeat_id,
-               M.room_name, M.area_id, A.area_name,
+               M.room_name, M.area_id, A.area_name, A.enable_periods,
                E.info_time AS entry_info_time, E.info_user AS entry_info_user,
                T.info_time AS repeat_info_time, T.info_user AS repeat_info_user
           FROM $tbl_room AS M, $tbl_area AS A, $tbl_entry AS E


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits