mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-10-17 06:21:00 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
d90b01111e
|
@ -58,9 +58,9 @@ class SeedDMS_Calendar {
|
||||||
} /* }}} */
|
} /* }}} */
|
||||||
|
|
||||||
public function getEventsInInterval($start, $stop) { /* {{{ */
|
public function getEventsInInterval($start, $stop) { /* {{{ */
|
||||||
$queryStr = "SELECT * FROM `tblEvents` WHERE ( `start` <= " . (int) $start . " AND `stop` >= " . (int) $start . " ) ".
|
$queryStr = "SELECT * FROM `tblEvents` WHERE (( `start` <= " . (int) $start . " AND `stop` >= " . (int) $start . " ) ".
|
||||||
"OR ( `start` <= " . (int) $stop . " AND `stop` >= " . (int) $stop . " ) ".
|
"OR ( `start` <= " . (int) $stop . " AND `stop` >= " . (int) $stop . " ) ".
|
||||||
"OR ( `start` >= " . (int) $start . " AND `stop` <= " . (int) $stop . " )";
|
"OR ( `start` >= " . (int) $start . " AND `stop` <= " . (int) $stop . " ))";
|
||||||
if(!$this->user->isAdmin()) {
|
if(!$this->user->isAdmin()) {
|
||||||
$queryStr .= " AND `userID`=".$this->user->getID();
|
$queryStr .= " AND `userID`=".$this->user->getID();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user