~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Factory/DisplayFactory.php

  • Committer: Dan Garner
  • Date: 2015-08-14 08:10:12 UTC
  • mfrom: (447.1.48)
  • Revision ID: git-v1:11ef90e0c8e85375d5f62b0f987a1e02b808f6ea
Merge pull request #97 from dasgarner/feature/playlists

First test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
158
158
 
159
159
        self::viewPermissionSql('Xibo\Entity\DisplayGroup', $body, $params, 'display.displayId', null, $filterBy);
160
160
 
161
 
        if (Sanitize::getInt('displayGroupId', $filterBy) != 0) {
 
161
        if (Sanitize::getInt('displayGroupId', $filterBy) !== null) {
162
162
            // Restrict to a specific display group
163
163
            $body .= ' AND displaygroup.displaygroupid = :displayGroupId ';
164
164
            $params['displayGroupId'] = Sanitize::getInt('displayGroupId', $filterBy);
168
168
        }
169
169
 
170
170
        // Filter by Display ID?
171
 
        if (Sanitize::getInt('displayId', $filterBy) != 0) {
 
171
        if (Sanitize::getInt('displayId', $filterBy) !== null) {
172
172
            $body .= ' AND display.displayid = :displayId ';
173
173
            $params['displayId'] = Sanitize::getInt('displayId', $filterBy);
174
174
        }
175
175
 
176
176
        // Filter by Wake On LAN
177
 
        if (Sanitize::getInt('wakeOnLan', $filterBy) != 0) {
 
177
        if (Sanitize::getInt('wakeOnLan', $filterBy) !== null) {
178
178
            $body .= ' AND display.wakeOnLan = :wakeOnLan ';
179
179
            $params['wakeOnLan'] = Sanitize::getInt('wakeOnLan', $filterBy);
180
180
        }
211
211
        }
212
212
 
213
213
        // Exclude a group?
214
 
        if (Sanitize::getInt('exclude_displaygroupid', $filterBy) != 0) {
 
214
        if (Sanitize::getInt('exclude_displaygroupid', $filterBy) !== null) {
215
215
            $body .= " AND display.DisplayID NOT IN ";
216
216
            $body .= "       (SELECT display.DisplayID ";
217
217
            $body .= "       FROM    display ";