renamed src/admin/config.php to src/admin/index.php to prevent Apache directory listing

[iserv-mod-room-reservation.git] / includes / mod_roomReservationBookingTable.inc

diff --git a/includes/mod_roomReservationBookingTable.inc b/includes/mod_roomReservationBookingTable.inc
index 706d757..8d017f5 100644 (file)
--- a/includes/mod_roomReservationBookingTable.inc
+++ b/includes/mod_roomReservationBookingTable.inc
@@ -171,7 +171,12 @@ class mod_roomReservationBookingsTable /* extends mclWidget */ {
     } else {
       $this->setRoom($aoRooms[0]->getName());
     }
-    $this->setDate(time());
+    // if weekends are not shown, show the next week already on saturday
+    if(!$this->oCfg->isShowWeekend() and date("w") == 6) {
+      $this->setDate(strtotime("monday"));
+    } else {
+      $this->setDate(time());
+    }
     $this->setAction(MOD_ROOM_RESERVATION_BT_ACTION_SHOW);
     $this->nPostInterval = 0;
    
@@ -406,9 +411,10 @@ class mod_roomReservationBookingsTable /* extends mclWidget */ {
     $strCss = <<<CSS
 #mod_roomReservationBookingTable .msg { font-weight:800; }
 #mod_roomReservationBookingTable td {
-  vertical-align:middle;
-  height:7em;
-  border:1px solid white; padding:0.4em;
+  vertical-align: middle;
+  height: 5em;
+  border: 1px solid white;
+  padding:0.4em;
 }
 #mod_roomReservationBookingTable td.booking { background-color:#5276AB; }
 #mod_roomReservationBookingTable td.new { background-color:#008015; }
@@ -752,7 +758,8 @@ CSS;
    
     // print link to booking if the timeslice is later than now
     $oTs = $this->oCfg->getTimeslice($nTs);
-    $tsCur = strtotime(date("Y-m-d ", $ts) . date(" G:i",
+    // note: only the timeslices are in GMT!
+    $tsCur = strtotime(date("Y-m-d ", $ts) . gmdate(" G:i",
       $oTs->getEnd()));
     if($tsCur > time()) {
       $strURL = $_SERVER["PHP_SELF"] .