Assembla home | Assembla project page
 

Changeset 170

Show
Ignore:
Timestamp:
03/26/07 13:50:43 (2 years ago)
Author:
moensch
Message:

Fix Bug 1033: User cannot occupy a seat if he occupies a seat already, even for a different event

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/com_mls_seatmap/mls_seatmap.php

    r146 r170  
    188188                //check if I have another seat occupied or someone else reserved for me 
    189189                $database->setQuery( "SELECT s.id FROM `#__mls_seatmap_room_elements` AS `s`" 
     190                                                ."\n INNER JOIN `#__mls_seatmap_rooms` AS `r` ON r.id=s.roomid" 
    190191                                                ."\n WHERE" 
    191                                                 ."\n (s.userid = '".$my->id."' AND s.status='1')" 
    192                                                 ."\n OR (s.res_userid='".$my->id."' AND s.status='2' AND s.res_end_time > '".$now."')" 
     192                                                ."\n (s.userid = '".$my->id."' AND s.status='1' AND r.eventid='".$room->eventid."')" 
     193                                                ."\n OR (s.res_userid='".$my->id."' AND s.status='2' AND r.eventid='".$room->eventid."' AND s.res_end_time > '".$now."')" 
    193194                                                ."\n AND s.id!='".$id."'"); 
    194195                $seat_check = $database->loadObjectList();