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

[cimorrison]

Revision: 1373
          http://mrbs.svn.sourceforge.net/mrbs/?rev=1373&view=rev
Author:   cimorrison
Date:     2010-07-14 12:23:33 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
Fixed bug whereby the reminder settings (reminders_enabled and 
reminder_interval) were being ignored in pending.php

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

Modified: mrbs/trunk/web/pending.php
===================================================================
--- mrbs/trunk/web/pending.php  2010-07-14 12:11:28 UTC (rev 1372)
+++ mrbs/trunk/web/pending.php  2010-07-14 12:23:33 UTC (rev 1373)
@@ -6,7 +6,7 @@
 function display_buttons($row, $is_series)
 {
   global $PHP_SELF;
-  global $user, $reminder_interval;
+  global $user, $reminders_enabled, $reminder_interval;
   
   $last_reminded = (empty($row['reminded'])) ? $row['last_updated'] : 
$row['reminded'];
   $returl = $PHP_SELF;
@@ -65,17 +65,13 @@
   }
   else
   {
-    // Work out whether enough time has elapsed since the last reminder
-    $not_yet_time = working_time_diff(time(), $last_reminded) < 
$reminder_interval;
-
+    // get the area settings for this room
+    get_area_settings(get_area($row['room_id']));
     // if enough time has passed since the last reminder
     // output a "Remind Admin" button, otherwise nothing
-    if ($not_yet_time)
+    if ($reminders_enabled  && 
+        (working_time_diff(time(), $last_reminded) >= $reminder_interval))
     {
-      echo "&nbsp";
-    }
-    else
-    {
       echo "<form action=\"confirm_entry_handler.php\" method=\"post\">\n";
       echo "<div>\n";
       echo "<input type=\"hidden\" name=\"action\" value=\"remind_admin\">\n";
@@ -85,6 +81,10 @@
       echo "</div>\n";
       echo "</form>\n";
     }
+    else
+    {
+      echo "&nbsp";
+    }
   }
 }
 


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

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits