diff -Naurw moodle-clean/moodle/blocks/mrbs/block_mrbs.php moodle-dev/blocks/mrbs/block_mrbs.php
--- moodle-clean/moodle/blocks/mrbs/block_mrbs.php	2009-04-22 12:24:24.000000000 +0100
+++ moodle-dev/blocks/mrbs/block_mrbs.php	2009-05-08 11:42:25.000000000 +0100
@@ -5,7 +5,7 @@
     function init() {
         $this->title = get_string('blockname','block_mrbs');
         $this->content_type = BLOCK_TYPE_TEXT;
-        $this->version = 2009042200;
+        $this->version = 2009050800;
         $this->cron=300;
     }
     function has_config() {return true;}
diff -Naurw moodle-clean/moodle/blocks/mrbs/db/access.php moodle-dev/blocks/mrbs/db/access.php
--- moodle-clean/moodle/blocks/mrbs/db/access.php	2009-04-22 12:24:34.000000000 +0100
+++ moodle-dev/blocks/mrbs/db/access.php	2009-05-08 11:29:17.000000000 +0100
@@ -77,6 +77,15 @@
             'coursecreator' => CAP_ALLOW,
             'admin' => CAP_ALLOW
         )
+    ),
+
+    'block/mrbs:forcebook' => array(
+
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
+            'admin' => CAP_ALLOW
+        )
     )
 
 
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-05-08 11:23:54.000000000 +0100
+++ moodle-dev/blocks/mrbs/lang/en_utf8/block_mrbs.php	2009-05-08 11:30:22.000000000 +0100
@@ -169,6 +169,7 @@
 $string['monthbefore']        = 'Go To Month Before';
 $string['mrbs:administermrbs'] = 'Access MRBS (Read / Write / Admin)';
 $string['mrbs:editmrbs'] = 'Access MRBS (Read / Write)';
+$string['mrbs:forcebook'] = 'Force Book Rooms (auto move existing bookings)';
 $string['mrbs:viewalltt'] = 'View All Users\' Timetables';
 $string['mrbs:viewmrbs'] = 'Access MRBS (Read only)';
 $string['mrbs']               = 'Meeting Room Booking System';
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/edit_entry_handler.php moodle-dev/blocks/mrbs/web/edit_entry_handler.php
--- moodle-clean/moodle/blocks/mrbs/web/edit_entry_handler.php	2008-11-26 11:58:23.000000000 +0000
+++ moodle-dev/blocks/mrbs/web/edit_entry_handler.php	2009-05-08 11:33:30.000000000 +0100
@@ -22,6 +22,7 @@
 $rep_day = optional_param('rep_day',NULL, PARAM_RAW);
 $rep_opt = optional_param('rep_opt','',PARAM_SEQUENCE);
 $rep_enddate = optional_param('rep_enddate',0,PARAM_INT);
+$forcebook = optional_param('forcebook',FALSE,PARAM_BOOL);
 
 # $all_day
 # echo $rep_type;
@@ -213,8 +214,14 @@
     }
   }
   else
+     if(has_capability("block/mrbs:forcebook",get_context_instance(CONTEXT_SYSTEM)) and $forcebook){
+         require_once "force_book.php";
+         mrbsForceMove($room_id,$starttime,$endtime);
+         //do this so that it thinks no clashes were found
+         $tmp='';
+    }else{
     $err .= mrbsCheckFree($room_id, $starttime, $endtime-1, $ignore_id, 0);
-
+    }
 } # end foreach rooms
 
 if(empty($err))
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:23:54.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/edit_entry.php	2009-05-08 11:47:56.000000000 +0100
@@ -21,6 +21,7 @@
 // $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', 60, PARAM_INT);
 $all_day = optional_param('all_day', FALSE, PARAM_BOOL);
 
@@ -218,6 +219,11 @@
 
 <?php
 echo'var currentroom='. $room_id.';';
+if(has_capability("block/mrbs:forcebook",get_context_instance(CONTEXT_SYSTEM))){
+    echo'var canforcebook=true;';
+}else{
+    echo'var canforcebook=false;';
+}
 ?>
 // do a little form verifying
 function validate_and_submit ()
@@ -468,7 +474,11 @@
 		echo "<OPTION VALUE=$c" . ($type == $c ? " SELECTED" : "") . ">$typel[$c]\n";
 }
 ?></SELECT></TD></TR>
-
+<?php if(has_capability("block/mrbs:forcebook",get_context_instance(CONTEXT_SYSTEM))){
+    echo'<b>Forceably book (automatically move other bookings):<input type="checkbox" name="forcebook" value="TRUE"';
+    if ($force)echo '"CHECKED"';
+    echo' onClick="updateFreeRooms()">';
+}?>
 <?php if($edit_type == "series") { ?>
 
 <TR>
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:23:54.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/functions.php	2009-05-08 11:34:53.000000000 +0100
@@ -163,6 +163,9 @@
                   </FONT>
                 </FORM>
               </TD>
+<?php if (has_capability("block/mrbs:forcebook",get_context_instance(CONTEXT_SYSTEM))) echo'<TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>';?>
+                  <a href="edit_entry.php?force=TRUE">Forcibly book a room</a>
+              </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>
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/updatefreerooms.js moodle-dev/blocks/mrbs/web/updatefreerooms.js
--- moodle-clean/moodle/blocks/mrbs/web/updatefreerooms.js	2009-05-08 11:11:13.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/updatefreerooms.js	2009-05-08 11:36:23.000000000 +0100
@@ -1,4 +1,5 @@
 function updateFreeRooms(){
+//check for force book- if ticked we should be able to select any room
 	
 	dayInput=document.getElementsByName('day');
     day=dayInput[2].selectedIndex + 1;
@@ -24,6 +25,17 @@
 	//currentroom is put onto edit_entry.php server-side
 	searchstring="?day="+day+"&month="+month+"&year="+year+"&period="+period+"&duration="+duration+"&dur_units="+dur_units+"&area="+area+"&currentroom="+currentroom;
 
+	if(canforcebook){
+		forcebookInput=document.getElementsByName('forcebook');
+		if(forcebookInput[0].checked){
+		    areasInput=document.getElementsByName('areas');
+		    area=areasInput[0].options[areasInput[0].selectedIndex].value;
+
+    		searchstring="?area="+area;
+		}
+	}
+	
+	
 	//have to trial and error to get right browser code
 	var xmlHttp;
 	try{
diff -Naurw moodle-clean/moodle/blocks/mrbs/db/access.php moodle-dev/blocks/mrbs/db/access.php
--- moodle-clean/moodle/blocks/mrbs/db/access.php	2009-05-08 11:53:36.000000000 +0100
+++ moodle-dev/blocks/mrbs/db/access.php	2009-05-08 14:21:17.000000000 +0100
@@ -88,7 +88,6 @@
         )
     )
 
-
 );
 
 ?>
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/edit_entry_handler.php moodle-dev/blocks/mrbs/web/edit_entry_handler.php
--- moodle-clean/moodle/blocks/mrbs/web/edit_entry_handler.php	2009-05-08 12:26:02.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/edit_entry_handler.php	2009-05-08 14:22:38.000000000 +0100
@@ -210,9 +210,7 @@
 	    # cross DST
             $diff = $endtime - $starttime;
             $diff += cross_dst($reps[$i], $reps[$i] + $diff);
-	    
 	    $tmp = mrbsCheckFree($room_id, $reps[$i], $reps[$i] + $diff, $ignore_id, $repeat_id);
-
             if(!empty($tmp))
                 $err = $err . $tmp;
         }
diff -Naurw moodle-clean/moodle/blocks/mrbs/web/force_book.php moodle-dev/blocks/mrbs/web/force_book.php
--- moodle-clean/moodle/blocks/mrbs/web/force_book.php	1970-01-01 01:00:00.000000000 +0100
+++ moodle-dev/blocks/mrbs/web/force_book.php	2009-03-20 13:14:30.000000000 +0000
@@ -0,0 +1,141 @@
+<?php
+
+function mrbsForceMove($room_id, $starttime, $endtime)
+{
+       global $tbl_room;
+    global $tbl_entry;
+    global $tbl_area;
+    global $enable_periods;
+       global $periods;
+
+       $output='';
+
+    # Select any meetings which overlap ($starttime,$endtime) for this room:
+    $sql = "SELECT $tbl_entry.id, $tbl_entry.name, $tbl_entry.description, $tbl_room.room_name, $tbl_entry.start_time, $tbl_entry.end_time, $tbl_room.description, $tbl_area.area_name, mdl_user.email
+              FROM $tbl_entry join $tbl_room on $tbl_entry.room_id = $tbl_room.id join $tbl_area on $tbl_room.area_id=$tbl_area.id left join mdl_user on $tbl_entry.create_by = mdl_user.username
+        WHERE start_time < $endtime AND end_time > $starttime
+        AND room_id = $room_id ORDER BY start_time";
+//echo $sql;
+    $res = sql_query($sql);
+    if(! $res)
+        return sql_error();
+    if (sql_count($res) == 0)
+    {
+        sql_free($res);
+              //echo 'No bookings found';
+    }else{
+
+    for ($i = 0; ($row = sql_row($res, $i)); $i++)
+    {
+
+           //Make it easier to remember what each value is
+           $class_entryid=$row[0];
+           $class_shortname=$row[1];
+           $class_fullname=$row[2];
+           $class_oldroom=$row[3];
+           $class_starttime=$row[4];
+           $class_endtime=$row[5];
+           $class_oldtype=$row[6];
+           $class_oldarea=$row[7];
+           $class_teacheremail=$row[8];
+
+           $today=mktime(0,0,0,date('n'),date('j'),date('Y'));
+           $class_hrstarttime=($row[4]-($today));
+           $class_hrstarttime=period_to_time($class_hrstarttime);
+
+           //Work out how many students so they don't get put in a tiny classroom
+           $sizequery="select count(*) as count from mdl_context join mdl_role_assignments on mdl_role_assignments.contextid = mdl_context.id and mdl_role_assignments.roleid=5 join mdl_course on mdl_context.contextlevel = 50 and mdl_context.instanceid = mdl_course.id where mdl_course.shortname  ='$class_shortname'";
+           if ($result=get_record_sql($sizequery)){
+               $class_size=$result->count;
+           }else{
+               $class_size=0;
+           }
+           if($class_oldroom=='077'){
+               $hallreplacement="IF(
+                                    room_name = 046 or 
+                                    room_name = 025 or  
+                                    room_name = 034 or  
+                                    room_name = 423 or  
+                                    room_name = 421 or  
+                                    room_name = 424 or  
+                                    room_name = 426 or  
+                                    room_name = 402 or  
+                                    room_name = 404 or  
+                                    room_name = 401 or  
+                                    room_name = 345
+                                 ,1,0),";
+           }else{
+               $hallreplacement='';
+           }
+           
+           $findroomquery = "SELECT DISTINCT $tbl_room.id, $tbl_room.room_name, $tbl_area.area_name,
+                                 CONCAT({$hallreplacement}IF($tbl_room.description = '$class_oldtype',1,0),IF($tbl_area.area_name= '$class_oldarea',1,0)) as sort
+                             FROM $tbl_room JOIN $tbl_area on $tbl_room.area_id=$tbl_area.id join $tbl_entry on $tbl_room.id=$tbl_entry.room_id 
+                             WHERE ( SELECT COUNT(*) FROM $tbl_entry 
+                                 WHERE (($tbl_entry.start_time>=$class_starttime AND $tbl_entry.end_time<$class_endtime)
+                                 OR ($tbl_entry.start_time<$class_starttime AND $tbl_entry.end_time>$class_starttime)
+                                 OR ($tbl_entry.start_time<$class_endtime AND $tbl_entry.end_time>=$class_endtime))
+                                 AND mdl_mrbs_entry.room_id = mdl_mrbs_room.id ) < 1  
+                             AND $tbl_room.description like '%teaching%' 
+                             AND $tbl_room.capacity >= $class_size 
+                             AND ($tbl_room.description not like '%special%' OR $tbl_area.area_name='$class_oldarea')
+                             ORDER BY sort DESC";//need to create these
+//echo $findroomquery;
+           //dump them in first room on the list
+           $findroomresult=get_record_sql($findroomquery,true);//var_dump($findroomresult);
+           $class_newroomid=$findroomresult->id;
+           $class_newroom=$findroomresult->room_name;
+           $class_newarea=$findroomresult->area_id;
+
+           $movequery="update $tbl_entry set room_id = $class_newroomid,type='B' where id=$class_entryid";//echo$movequery;
+           if(mysql_query($movequery) and !empty($class_teacheremail)){
+
+               $subject='One of your classes has been moved';
+               $message="Your $class_shortname class has been moved from Room $class_oldroom to Room $class_newroom in $class_newarea for the lesson on ".date('d/m/Y',$class_starttime)." at $class_hrstarttime. The room is required for either an exam or other event.\n\nIf you need to reply to this message contact Mike- replying to roombooking@moodle.tauntons.ac.uk will not get recieved or read\n\nWARNING: this move has been done by a computer making a calculated best guess, please check that the room is suitable before the lesson"; 
+               $output.= "<br>$class_shortname moved to $class_newroom";
+               mail($class_teacheremail,$subject,$message,'FROM:roombooking@moodle.tauntons.ac.uk');
+           }else{
+               $output.= "<br>There has been an error moving $class_shortname. Mike has been informed.";
+               mail('worthm@tauntons.ac.uk','ROOM BOOKING ERROR',"There has been an error moving $class_shortname (id: $class_entryid)");
+           }
+       }
+       }
+return $output;
+}
+
+
+//changes periods back to time(although that is done via minutes past midnight)
+function period_to_time($time){
+    switch(date(i,$time)){
+        case 00:
+            return  '0830';
+        break;
+        case 01:
+            return  '1000';
+        break;
+        case 02:
+            return  '1020';
+        break;
+        case 03:
+            return  '1150';
+        break;
+        case 04:
+            return  '1250';
+        break;
+        case 05:
+            return  '1420';
+        break;
+        case 06:
+            return  '1425';
+        break;
+        case 07:
+            return  '1555';
+        break;
+        case 08:
+            return  '1700';
+        break;
+    }
+}
+
+
+?>
\ No newline at end of file