[Fmsystem-commits] [15312] booking: tweak check for collisions

[sigurdne]

Revision: 15312
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15312
Author:   sigurdne
Date:     2016-06-21 12:19:24 +0000 (Tue, 21 Jun 2016)
Log Message:
-----------
booking: tweak check for collisions

Modified Paths:
--------------
    trunk/booking/inc/class.sobooking.inc.php

Modified: trunk/booking/inc/class.sobooking.inc.php
===================================================================
--- trunk/booking/inc/class.sobooking.inc.php   2016-06-21 11:23:50 UTC (rev 
15311)
+++ trunk/booking/inc/class.sobooking.inc.php   2016-06-21 12:19:24 UTC (rev 
15312)
@@ -165,8 +165,8 @@
                                $this->db->query("SELECT e.id FROM bb_event e 
                                                                        WHERE 
e.active = 1 AND 
                                                                        e.id IN 
(SELECT event_id FROM bb_event_resource WHERE resource_id IN ($rids)) AND
-                                                                       
((e.from_ >= '$start' AND e.from_ < '$end') OR 
-                                                                        (e.to_ 
> '$start' AND e.to_ <= '$end') OR 
+                                                                       
((e.from_ > '$start' AND e.from_ < '$end') OR 
+                                                                        (e.to_ 
> '$start' AND e.to_ < '$end') OR 
                                                                         
(e.from_ < '$start' AND e.to_ > '$end'))", __LINE__, __FILE__);
                                if ($this->db->next_record())
                                {
@@ -176,8 +176,8 @@
                                $this->db->query("SELECT a.id FROM 
bb_allocation a 
                                                                        WHERE 
a.active = 1 AND a.id<>$allocation_id AND 
                                                                        a.id IN 
(SELECT allocation_id FROM bb_allocation_resource WHERE resource_id IN ($rids)) 
AND
-                                                                       
((a.from_ >= '$start' AND a.from_ < '$end') OR 
-                                                                        (a.to_ 
> '$start' AND a.to_ <= '$end') OR 
+                                                                       
((a.from_ > '$start' AND a.from_ < '$end') OR 
+                                                                        (a.to_ 
> '$start' AND a.to_ < '$end') OR 
                                                                         
(a.from_ < '$start' AND a.to_ > '$end'))", __LINE__, __FILE__);
                                if ($this->db->next_record())
                                {
@@ -188,8 +188,8 @@
                                $this->db->query("SELECT b.id FROM bb_booking b 
                                                                        WHERE  
b.active = 1 AND b.id<>$booking_id AND 
                                                                        b.id IN 
(SELECT booking_id FROM bb_booking_resource WHERE resource_id IN ($rids)) AND
-                                                                       
((b.from_ >= '$start' AND b.from_ < '$end') OR 
-                                                                        (b.to_ 
> '$start' AND b.to_ <= '$end') OR 
+                                                                       
((b.from_ > '$start' AND b.from_ < '$end') OR 
+                                                                        (b.to_ 
> '$start' AND b.to_ < '$end') OR 
                                                                         
(b.from_ < '$start' AND b.to_ > '$end'))", __LINE__, __FILE__);
                                if ($this->db->next_record())
                                {