diff -Naurw moodle-clean/moodle/blocks/mrbs/lang/en_utf8/block_mrbs.php moodle-dev/blocks/mrbs/lang/en_utf8/block_mrbs.php
--- moodle-clean/moodle/blocks/mrbs/lang/en_utf8/block_mrbs.php	2009-04-22 12:31:36.000000000 +0100
+++ moodle-dev/blocks/mrbs/lang/en_utf8/block_mrbs.php	2009-05-08 11:17:09.000000000 +0100
@@ -22,6 +22,7 @@
 $string['charset']            = 'UTF-8';
 $string['class']            = 'class';
 $string['click_to_reserve']   = 'Click on the cell to make a reservation.';
+$string['computerroom'] = 'Computer rooms only';
 $string['config_admin_email'] = 'MRBS admin email';
 $string['config_admin_email2'] = 'Email address of the MRBS administrator. In order to receive MRBS email notifications, the email address must be associated with a Moodle user account.';
 $string['config_admin'] = 'MRBS Admin';
@@ -162,6 +163,7 @@
 $string['match_entry']        = 'Match brief description';
 $string['match_room']         = 'Match room';
 $string['match_type']         = 'Match type';
+$string['mincapacity'] = 'Minimum capacity';
 $string['minutes']            = 'minutes'; //duplicated in moodle.php but needed for view_entry.php foreach loop
 $string['monthafter']         = 'Go To Month After';
 $string['monthbefore']        = 'Go To Month Before';
@@ -186,7 +188,7 @@
 $string['of']                 = ' of ';
 $string['pagewindow'] = 'Same window';
 $string['password_twice']     = 'If you wish to change the password, please type the new password twice';
-$string['period']             = 'Period';
+$string['period']             = 'Start Period';
 $string['periods']            = 'periods';
 $string['please_contact']     = 'Please contact ';
 $string['postbrowserlang']    = 'language.';
@@ -222,6 +224,7 @@
 $string['room_admin_email']   = 'Room admin email';
 $string['room']               = 'Room';
 $string['rooms']              = 'Rooms';
+$string['roomsearch']              = 'Room Search';
 $string['sched_conflict']     = 'Scheduling Conflict';
 $string['search_for']         = 'Search For';
 $string['search_results']     = 'Search Results for';
@@ -231,6 +234,7 @@
 $string['slot']            = 'Slot';
 $string['sort_rep_time']      = 'Start Date/Time';
 $string['sort_rep']           = 'Sort Report by';
+$string['specialroom'] = 'Exclude special rooms';
 $string['start_date']         = 'Start Time';
 $string['submitquery']        = 'Run Report';
 $string['sum_by_creator']     = 'Creator';
@@ -241,6 +245,7 @@
 $string['summary_only']       = 'Summary only';
 $string['sure']               = 'Are you sure?';
 $string['system']             = 'System';
+$string['teachingroom'] = 'Teaching rooms only';
 $string['through']            = ' through ';
 $string['too_may_entrys']     = 'The selected options will create too many entries.<BR>Please use different options!';
 $string['type']               = 'Type';
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/edit_entry.php moodle-dev/blocks/mrbs/web/edit_entry.php
--- moodle-clean/moodle/blocks/mrbs/web/edit_entry.php	2009-05-08 11:11:13.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/edit_entry.php	2009-05-08 11:07:14.000000000 +0100
@@ -21,6 +21,8 @@
 // $rep_type could use a closer look but I believe this is not passed via URL -ab.
 $start_min = optional_param('start_min', 0, PARAM_INT);
 $rep_num_weeks = optional_param('rep_num_weeks', 0, PARAM_INT); 
+$duration = optional_param('duration', 60, PARAM_INT);
+$all_day = optional_param('all_day', FALSE, PARAM_BOOL);
 
 #If we dont know the right date then make it up
 if(($day==0) or ($month==0) or ($year==0))
@@ -72,14 +74,18 @@
 	$name        = $row[0];
 	$create_by   = $row[1];
 	$description = $row[2];
+    $start_time   = $row[3];
 	$start_day   = userdate($row[3], '%d');
 	$start_month = userdate($row[3], '%m');
 	$start_year  = userdate($row[3], '%Y');
 	$start_hour  = userdate($row[3], '%H');
 	$start_min   = userdate($row[3], '%M');
+       $end_time    = $row[4];
 	$duration    = $row[4] - $row[3] - cross_dst($row[3], $row[4]);
 	$type        = $row[5];
 	$room_id     = $row[6];
+    //put this here so that a move can be coded into the get data
+    if(!empty($room)){$room_id=$room;}
 	$entry_type  = $row[7];
 	$rep_id      = $row[8];
 	
@@ -151,11 +157,12 @@
     // Avoid notices for $hour and $minute if periods is enabled
     (isset($hour)) ? $start_hour = $hour : '';
 	(isset($minute)) ? $start_min = $minute : '';
-	$duration    = ($enable_periods ? 60 : 60 * 60);
+    //$duration    = ($enable_periods ? 60 : 60 * 60);
 	$type        = "I";
 	$room_id     = $room;
+        $start_time = mktime(12,$period,00,$start_month,$start_day,$start_year);
     unset($id);
-
+       $end_time=$start_time;
 	$rep_id        = 0;
 	$rep_type      = 0;
 	$rep_end_day   = $day;
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/functions.php moodle-dev/blocks/mrbs/web/functions.php
--- moodle-clean/moodle/blocks/mrbs/web/functions.php	2009-05-08 11:11:13.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/functions.php	2009-05-08 11:09:20.000000000 +0100
@@ -74,7 +74,7 @@
  <TITLE><?php echo get_string('mrbs','block_mrbs') ?></TITLE>
     <SCRIPT LANGUAGE="JavaScript">
 
-function ChangeOptionDays(formObj, prefix, updatefreerooms){
+function ChangeOptionDays(formObj, prefix, updatefreerooms, roomsearch){
 
     var week=new Array(7);
     week[1]="Mon";
@@ -115,6 +115,9 @@
     if(updatefreerooms){
         updateFreeRooms();
     }
+    if(roomsearch){
+        RoomSearch();
+    }
 }
 
 
@@ -161,6 +164,10 @@
                 </FORM>
               </TD>
               <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
+<a target="popup" title="<?php print_string('roomsearch','block_mrbs');?>" href="roomsearch.php" onclick="this.target='popup'; return openpopup('/blocks/mrbs/web/roomsearch.php', 'popup', 'toolbar=1,location=0,scrollbars,resizable,width=500,height=400', 0);"><?php print_string('roomsearch','block_mrbs');?></a>
+              </TD>
+
+              <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
           <A HREF="help.php?day=<?php echo $day ?>&month=<?php echo $month ?>&year=<?php echo $year ?>"><?php echo get_string('help') ?></A>
               </TD>
               <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
@@ -277,7 +284,7 @@
 
 
 
-function genDateSelector($prefix, $day, $month, $year, $updatefreerooms=false) {
+function genDateSelector($prefix, $day, $month, $year, $updatefreerooms=false, $roomsearch=false) {
 	if($day   == 0) $day = date("d");
 	if($month == 0) $month = date("m");
 	if($year  == 0) $year = date("Y");
@@ -292,7 +299,7 @@
 	echo "
                   </SELECT>
 
-                  <SELECT NAME=\"${prefix}month\" onchange=\"ChangeOptionDays(this.form,'$prefix'";if($updatefreerooms){echo",true";} echo")\">";
+                  <SELECT NAME=\"${prefix}month\" onchange=\"ChangeOptionDays(this.form,'$prefix'";if($updatefreerooms){echo",true";} if($roomsearch){echo",false,true";} echo")\">";
 
 	for($i = 1; $i <= 12; $i++)
 	{  
@@ -304,7 +311,7 @@
 
 	echo "
                   </SELECT>
-              <SELECT NAME=\"${prefix}year\" onchange=\"ChangeOptionDays(this.form,'$prefix'";if($updatefreerooms){echo",true";} echo")\">";
+              <SELECT NAME=\"${prefix}year\" onchange=\"ChangeOptionDays(this.form,'$prefix'";if($updatefreerooms){echo",true";} if($roomsearch){echo",false,true";} echo")\">";
 
 	$min = min($year, date("Y")) - 5;
 	$max = max($year, date("Y")) + 5;
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/roomsearch.js moodle-dev/blocks/mrbs/web/roomsearch.js
--- moodle-clean/moodle/blocks/mrbs/web/roomsearch.js	1970-01-01 01:00:00.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/roomsearch.js	2009-04-22 12:40:38.000000000 +0100
@@ -0,0 +1,141 @@
+function RoomSearch(){
+//check for force book- if ticked we should be able to select any room
+	
+	dayInput=document.getElementsByName('day');
+    day=dayInput[0].selectedIndex + 1;
+
+	monthInput=document.getElementsByName('month');
+    month=monthInput[0].selectedIndex + 1;
+
+	yearInput=document.getElementsByName('year');
+    year=yearInput[0].options[yearInput[0].selectedIndex].value;
+
+	periodInput=document.getElementsByName('period');
+	period=periodInput[0].selectedIndex;
+
+	durationInput=document.getElementsByName('duration');
+	duration=durationInput[0].value;
+
+	dur_unitsInput=document.getElementsByName('dur_units');
+	dur_units=dur_unitsInput[0].options[dur_unitsInput[0].selectedIndex].value;
+
+	mincapInput=document.getElementsByName('mincap');
+	mincap=mincapInput[0].value;
+
+	teachingInput=document.getElementsByName('teaching');
+	if(teachingInput[0].checked){teaching=1;}else{teaching=0;}
+
+	specialInput=document.getElementsByName('special');
+	if(specialInput[0].checked){special=1;}else{special=0;}
+
+	computerInput=document.getElementsByName('computer');
+	if(computerInput[0].checked){computer=1;}else{computer=0;}
+
+	
+     
+	searchstring="?day="+day+"&month="+month+"&year="+year+"&period="+period+"&duration="+duration+"&dur_units="+dur_units+"&mincap="+mincap+"&teaching="+teaching+"&special="+special+"&computer="+computer;
+	
+	//have to trial and error to get right browser code
+	var xmlHttp;
+	try{
+	    // Firefox, Opera 8.0+, Safari
+	    xmlHttp=new XMLHttpRequest();
+	}
+	catch (e){
+	    // Internet Explorer
+	    try{
+	        xmlHttp=new ActiveXObject("Msxml2.XMLHTTP");
+	    }
+	    catch (e){
+    	    try{
+	            xmlHttp=new ActiveXObject("Microsoft.XMLHTTP");
+	        }
+	        catch (e){
+    	        alert("Your browser does not support AJAX!");
+	            return false;
+	        }
+	    }
+	}
+	
+	xmlHttp.onreadystatechange=function(){
+	    if(xmlHttp.readyState==4){
+	      //We've got a list of rooms from the server 
+	      freeRooms=xmlHttp.responseText.split("\n");
+		  var rooms=document.getElementById('rooms');
+
+		  //wipe all the old options
+		  while ( rooms.childNodes.length >= 1 ){
+			  rooms.removeChild( rooms.firstChild );       
+		  } 
+		  if(xmlHttp.responseText!=''){
+		      document.getElementById('results').innerHTML='Rooms free...';
+	    	  for (i = 0; i<freeRooms.length;  i++) {
+                  room=freeRooms[i].split(",");
+	    		  var newroom = document.createElement('tr');
+	    		  for(j=0;j<room.length;j++){
+	    			  var cell=document.createElement('td');
+	    			  cell.innerHTML=room[j];
+	    			  newroom.appendChild(cell);
+	    		  }
+	    		  rooms.appendChild(newroom);
+              }
+	     
+		  }else{
+		      document.getElementById('results').innerHTML='Sorry, no rooms found';
+		  }
+
+	    }
+	}
+	xmlHttp.open("GET","roomsearch_ss.php"+searchstring,true);
+	xmlHttp.send(null);
+	  
+
+
+}
+
+
+function ChangeOptionDays(formObj, prefix, updatefreerooms, roomsearch){
+    
+    var week=new Array(7);
+    week[1]="Mon";
+    week[2]="Tue";
+    week[3]="Wed";
+    week[4]="Thu";
+    week[5]="Fri";
+    week[6]="Sat";
+    week[0]="Sun";
+    
+    
+    var DaysObject = eval("formObj." + prefix + "day");
+    var currentDay = DaysObject.selectedIndex;
+    var MonthObject = eval("formObj." + prefix + "month");
+    var YearObject = eval("formObj." + prefix + "year");
+ 
+    //wipe current list
+    for (j = DaysObject.options.length; j >= 0; j--) {
+        DaysObject.options[j] = null;
+    }
+    var day=DaysObject.selectedIndex+1;
+    var month=MonthObject.selectedIndex;
+    var year=YearObject.options[YearObject.selectedIndex].value;
+    
+ 
+    var i=new Date();
+    i.setDate(1);
+    i.setMonth(month);
+    i.setYear(year);
+    
+    while (i.getMonth()==month){
+        
+      DaysObject.options[i.getDate()-1] = new Option(week[i.getDay()]+" "+i.getDate(),i.getDate());
+      i.setTime(i.getTime() + 86400000);
+    }
+   DaysObject.selectedIndex = currentDay;
+   
+    if(updatefreerooms){
+        updateFreeRooms();
+    }
+    if(roomsearch){
+        RoomSearch();
+    }
+}
\ No newline at end of file
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/roomsearch.php moodle-dev/blocks/mrbs/web/roomsearch.php
--- moodle-clean/moodle/blocks/mrbs/web/roomsearch.php	1970-01-01 01:00:00.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/roomsearch.php	2009-03-18 12:36:00.000000000 +0000
@@ -0,0 +1,174 @@
+<?php
+# $Id: edit_entry.php,v 1.8 2008/08/17 23:07:29 arborrow Exp $
+require_once("../../../config.php"); //for Moodle integration
+require_once('grab_globals.inc.php');
+include "config.inc.php";
+include "functions.php";
+include "userfunctions.php";
+include "$dbsys.php";
+include "mrbs_auth.php";
+require_login();
+global $twentyfourhour_format;
+
+$day = optional_param('day', 0, PARAM_INT);
+$month = optional_param('month', 0, PARAM_INT);
+$year = optional_param('year', 0, PARAM_INT); 
+$area = optional_param('area', get_default_area(),  PARAM_INT);
+$edit_type = optional_param('edit_type', '', PARAM_ALPHA);
+$id = optional_param('id', 0, PARAM_INT);
+$room_id = optional_param('room_id', 0, PARAM_INT);
+$start_hour = optional_param('start_hour', 0, PARAM_INT);
+// $morningstarts = optional_param('morningstarts', 0, PARAM_INT); //I believe this is coming from somewhere else - not URL - ab.
+// $rep_type could use a closer look but I believe this is not passed via URL -ab.
+$start_min = optional_param('start_min', 0, PARAM_INT);
+$rep_num_weeks = optional_param('rep_num_weeks', 0, PARAM_INT); 
+$force = optional_param('force', FALSE, PARAM_BOOL); 
+$duration = optional_param('duration', 1, PARAM_INT);
+$all_day = optional_param('all_day', FALSE, PARAM_BOOL);
+
+#If we dont know the right date then make it up
+if(($day==0) or ($month==0) or ($year==0))
+{
+    $day   = date("d");
+    $month = date("m");
+    $year  = date("Y");
+}
+
+?>
+
+<html><head>
+<script type="text/JavaScript">
+    function openURL(sURL) {
+        opener.document.location = sURL;window.close();
+    }
+</script>
+
+
+
+<script type="text/javascript" src="roomsearch.js"></script> 
+<SCRIPT LANGUAGE="JavaScript">
+function OnAllDayClick() // Executed when the user clicks on the all_day checkbox.
+{
+  allday = document.getElementById('all_day');
+  form = document.forms["main"];
+  if (allday.checked) // If checking the box...
+  {
+    <?php if( ! $enable_periods ) { ?>
+      form.hour.value = "00";
+      form.minute.value = "00";
+    <?php } ?>
+    if (form.dur_units.value!="days") // Don't change it if the user already did.
+    {
+      form.duration.value = "1";
+      form.dur_units.value = "days";
+    }
+  }
+  RoomSearch()
+}
+</SCRIPT>
+</head><body>
+<h2><?php echo get_string('search');?></H2>
+
+<div id="searchform">
+<FORM NAME="main" >
+<TABLE BORDER=0>
+
+<!-- Date selectors -->
+    <TR><TD CLASS=CR><B><?php echo get_string('date')?></B></TD>
+     <TD CLASS=CL>
+      <?php genDateSelector("", $start_day, $start_month, $start_year,false,true) ?>
+      <SCRIPT LANGUAGE="JavaScript">ChangeOptionDays(document.main, '');</SCRIPT>
+     </TD>
+    </TR>
+
+<!-- Start time/period selectors -->
+    <?php if(! $enable_periods ) { ?>
+    <TR><TD CLASS=CR><B><?php echo get_string('time')?></B></TD>
+      <TD CLASS=CL><INPUT NAME="hour" SIZE=2 VALUE="<?php if (!$twentyfourhour_format && ($start_hour > 12)){ echo ($start_hour - 12);} else { echo $start_hour;} ?>" MAXLENGTH=2 onChange="RoomSearch()">:<INPUT NAME="minute" SIZE=2 VALUE="<?php echo $start_min;?>" MAXLENGTH=2 onChange="RoomSearch()">
+    <?php
+    if (!$twentyfourhour_format)
+    {
+      $checked = ($start_hour < 12) ? "checked" : "";
+      echo "<INPUT NAME=\"ampm\" type=\"radio\" value=\"am\" $checked>".userdate(mktime(1,0,0,1,1,2000), "%p");
+      $checked = ($start_hour >= 12) ? "checked" : "";
+      echo "<INPUT NAME=\"ampm\" type=\"radio\" value=\"pm\" $checked>".userdate(mktime(13,0,0,1,1,2000), "%p");
+    }
+    ?>
+    </TD></TR>
+    <?php } else { ?>
+    <TR><TD CLASS=CR><B><?php echo get_string('period','block_mrbs')?></B></TD>
+      <TD CLASS=CL>
+        <SELECT NAME="period" onChange="RoomSearch()">
+    <?php
+    foreach ($periods as $p_num => $p_val)
+    {
+        echo "<OPTION VALUE=$p_num";
+        if( ( isset( $period ) && $period == $p_num ) || $p_num == $start_min)
+                echo " SELECTED";
+        echo ">$p_val";
+    }
+    ?>
+        </SELECT>
+    
+    </TD></TR>
+
+<!-- Duration selectors -->
+    <?php } ?>
+    <TR><TD CLASS=CR><B><?php echo get_string('duration','block_mrbs');?></B></TD>
+      <TD CLASS=CL><INPUT NAME="duration" SIZE=7 VALUE="<?php echo $duration;?>" onChange="RoomSearch()" onKeyUp="RoomSearch()">
+        <SELECT NAME="dur_units" onChange="RoomSearch()">
+    <?php
+    if( $enable_periods )
+        $units = array("periods", "days");
+    else
+        $units = array("minutes", "hours", "days", "weeks");
+    
+    while (list(,$unit) = each($units))
+    {
+        echo "<OPTION VALUE=$unit";
+        if ($dur_units == get_string($unit,'block_mrbs')) echo " SELECTED";
+        echo " onChange=\"RoomSearch()\">".get_string($unit,'block_mrbs');
+    }
+    ?>
+        </SELECT>
+        <INPUT NAME="all_day" TYPE="checkbox" VALUE="yes" id="all_day" <?php if ($all_day) echo 'CHECKED ';?>onClick="OnAllDayClick()"> <?php echo get_string('all_day','block_mrbs');
+        if ($all_day) echo '<body onload = "OnAllDayClick()"></body>'; ?>
+    </TD></TR>
+
+<!-- Capacity input-->
+    <TR><TD CLASS=CR><B><?php echo get_string('mincapacity','block_mrbs')?></B></TD>
+     <TD CLASS=CL><INPUT NAME="mincap" SIZE="3" onChange="RoomSearch()" onKeyUp="RoomSearch()"></TD>
+    </TR>
+
+<!-- Teaching room input-->
+    <TR><TD CLASS=CR><B><?php echo get_string('teachingroom','block_mrbs')?></B></TD>
+     <TD CLASS=CL><INPUT TYPE="checkbox" NAME="teaching" onClick="RoomSearch()" CHECKED></TD>
+    </TR>
+
+<!-- Special room input-->
+    <TR><TD CLASS=CR><B><?php echo get_string('specialroom','block_mrbs')?></B></TD>
+     <TD CLASS=CL><INPUT TYPE="checkbox" NAME="special" onClick="RoomSearch()" CHECKED></TD>
+    </TR>
+
+<!-- Computer room input-->
+    <TR><TD CLASS=CR><B><?php echo get_string('computerroom','block_mrbs')?></B></TD>
+     <TD CLASS=CL><INPUT TYPE="checkbox" NAME="computer" onClick="RoomSearch()"></TD>
+    </TR>
+
+</TABLE>
+</FORM>
+
+</div>
+
+<!-- Area to display rooms found -->
+    <h2 id="results"></h2>
+    <table border=1 ><thead><tr><th>Department</th><th>Room</th><th>Description</th><th>Capacity</th></tr></thead><tbody id="rooms"></tbody></table>
+
+
+<SCRIPT LANGUAGE="JavaScript">
+window.onload=RoomSearch();
+</SCRIPT>
+
+
+</body>
+</html>
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/roomsearch_ss.php moodle-dev/blocks/mrbs/web/roomsearch_ss.php
--- moodle-clean/moodle/blocks/mrbs/web/roomsearch_ss.php	1970-01-01 01:00:00.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/roomsearch_ss.php	2009-03-26 16:38:11.000000000 +0000
@@ -0,0 +1,139 @@
+<?php
+require_once("../../../config.php"); //for Moodle integration
+require_once "grab_globals.inc.php";
+include "config.inc.php";
+include "functions.php";
+include "$dbsys.php";
+include "mrbs_auth.php";
+include "mrbs_sql.php";
+require_login();
+$day = optional_param('day', 0, PARAM_INT);
+$month = optional_param('month', 0, PARAM_INT);
+$year = optional_param('year', 0, PARAM_INT); 
+$period = optional_param('period', 0, PARAM_INT);
+$duration = optional_param('duration', 0, PARAM_INT);
+$dur_units = optional_param('dur_units', 0, PARAM_TEXT); 
+$currentroom = optional_param('currentroom', 0,  PARAM_INT);
+$mincap = optional_param('mincap', 0,  PARAM_INT);
+$teaching = optional_param('teaching', false,  PARAM_BOOL);
+$special = optional_param('special', false,  PARAM_BOOL);
+$computer = optional_param('computer', false,  PARAM_BOOL);
+
+
+
+        global $tbl_room;
+        global $tbl_entry;
+        global $tbl_area;
+    
+    # Support locales where ',' is used as the decimal point
+    $duration = preg_replace('/,/', '.', $duration);
+    
+    if( $enable_periods ) {
+        $resolution = 60;
+        $hour = 12;
+        $minute = $period;
+            $max_periods = count($periods);
+            if( $dur_units == "periods" && ($minute + $duration) > $max_periods )
+            {
+                $duration = (24*60*floor($duration/$max_periods)) + ($duration%$max_periods);
+            }
+            if( $dur_units == "days" && $minute == 0 )
+            {
+            $dur_units = "periods";
+                    $duration = $max_periods + ($duration-1)*60*24;
+            }
+        }
+    
+    // Units start in seconds
+    $units = 1.0;
+    
+    switch($dur_units)
+    {
+        case "years":
+            $units *= 52;
+        case "weeks":
+            $units *= 7;
+        case "days":
+            $units *= 24;
+        case "hours":
+            $units *= 60;
+        case "periods":
+        case "minutes":
+            $units *= 60;
+        case "seconds":
+            break;
+    }
+    
+    // Units are now in "$dur_units" numbers of seconds
+    
+    
+    if(isset($all_day) && ($all_day == "yes"))
+    {
+        if( $enable_periods )
+        {
+            $starttime = mktime(12, 0, 0, $month, $day, $year);
+            $endtime   = mktime(12, $max_periods, 0, $month, $day, $year);
+        }
+        else
+        {
+            $starttime = mktime($morningstarts, 0, 0, $month, $day  , $year, is_dst($month, $day  , $year));
+            $end_minutes = $eveningends_minutes + $morningstarts_minutes;
+            ($eveningends_minutes > 59) ? $end_minutes += 60 : '';
+            $endtime   = mktime($eveningends, $end_minutes, 0, $month, $day, $year, is_dst($month, $day, $year));
+        }
+    }
+    else
+    {
+        if (!$twentyfourhour_format)
+        {
+          if (isset($ampm) && ($ampm == "pm") && ($hour<12))
+          {
+            $hour += 12;
+          }
+          if (isset($ampm) && ($ampm == "am") && ($hour>11))
+          {
+            $hour -= 12;
+          }
+        }
+    
+        $starttime = mktime($hour, $minute, 0, $month, $day, $year, is_dst($month, $day, $year, $hour));
+        $endtime   = mktime($hour, $minute, 0, $month, $day, $year, is_dst($month, $day, $year, $hour)) + ($units * $duration);
+        # Round up the duration to the next whole resolution unit.
+        # If they asked for 0 minutes, push that up to 1 resolution unit.
+        $diff = $endtime - $starttime;
+        if (($tmp = $diff % $resolution) != 0 || $diff == 0)
+            $endtime += $resolution - $tmp;
+    
+        $endtime += cross_dst( $starttime, $endtime );
+    }
+
+    $sql = "SELECT $tbl_room.id, $tbl_room.room_name, $tbl_room.description, $tbl_room.capacity, $tbl_area.area_name, $tbl_room.area_id FROM $tbl_room JOIN $tbl_area on $tbl_room.area_id=$tbl_area.id WHERE ( SELECT COUNT(*) FROM $tbl_entry "; 
+
+//old booking fully inside new booking
+$sql .= "WHERE (($tbl_entry.start_time>=$starttime AND $tbl_entry.end_time<$endtime) ";
+//new start time within old booking
+$sql .= "OR ($tbl_entry.start_time<$starttime AND $tbl_entry.end_time>$starttime) ";
+//new end time within old booking
+$sql .= "OR ($tbl_entry.start_time<$endtime AND $tbl_entry.end_time>=$endtime)) ";
+
+$sql .= "AND mdl_mrbs_entry.room_id = mdl_mrbs_room.id ) < 1  AND $tbl_room.capacity >= $mincap ";
+
+if($computer){$sql.="AND description like 'Teaching IT%' ";}
+if($teaching){$sql.="AND description like 'Teaching%' ";}
+if($special){$sql.="AND description not like 'Teaching Specialist%' ";}
+
+$sql .= "ORDER BY area_name,room_name";
+    
+    //echo$sql;
+        $res = get_records_sql($sql);
+    if($res){
+        $list='';
+        foreach ($res as $room){
+            $list.=$room->area_name.',<a href="javascript:openURL(\'edit_entry.php?room='.$room->id.'&period='.$period.'&year='.$year.'&month='.$month.'&day='.$day.'&duration='.$diff.'\')">'.$room->room_name.'</a>,'.$room->description.','.$room->capacity."\n";
+        }
+        //remove last \n to prevent blank row in table
+        echo substr($list, 0, -1);
+    }
+
+
+?>
\ No newline at end of file