← Back to branch summary

~ko-de-r-de/zabbix/precise

« back to all changes in this revision

Viewing changes to frontends/php/include/screens.inc.php

  • Committer: guntis
  • Date: 2013-08-01 06:46:25 UTC
  • Revision ID: svn-v4:f4e7fd02-d210-4e34-a1e0-d4093fb66cc2:trunk:37472
..F....... [ZBX-4986] absolute urls replaced with relative and fixed commit bugs

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/include/screens.inc.php
174
174
        }
175
175
 
176
176
        // validate slide name
177
 
        $db_slideshow = DBfetch(DBselect(
178
 
                'SELECT s.slideshowid FROM slideshows s WHERE s.name='.zbx_dbstr($name).' '.andDbNode('s.slideshowid')
179
 
        ));
 
177
        $sql = 'SELECT s.slideshowid FROM slideshows s WHERE s.name='.zbx_dbstr($name);
 
178
        $db_slideshow = DBfetch(DBselect($sql, 1));
180
179
        if (!empty($db_slideshow)) {
181
180
                error(_s('Slide show "%s" already exists.', $name));
182
181
                return false;
232
231
        }
233
232
 
234
233
        // validate slide name
235
 
        $db_slideshow = DBfetch(DBselect(
236
 
                'SELECT s.slideshowid'.
237
 
                ' FROM slideshows s'.
238
 
                ' WHERE s.name='.zbx_dbstr($name).
239
 
                        ' AND s.slideshowid<>'.$slideshowid.
240
 
                        ' '.andDbNode('s.slideshowid')
241
 
        ));
 
234
        $sql = 'SELECT s.slideshowid FROM slideshows s WHERE s.name='.zbx_dbstr($name).' AND s.slideshowid<>'.$slideshowid;
 
235
        $db_slideshow = DBfetch(DBselect($sql, 1));
242
236
        if (!empty($db_slideshow)) {
243
237
                error(_s('Slide show "%s" already exists.', $name));
244
238
                return false;
315
309
                $sql = 'SELECT si.screenitemid'.
316
310
                                ' FROM screens_items si'.
317
311
                                ' WHERE si.screenid='.$elid.
318
 
                                        ' AND si.dynamic='.SCREEN_DYNAMIC_ITEM.
319
 
                                        ' '.andDbNode('si.screenitemid');
 
312
                                        ' AND si.dynamic='.SCREEN_DYNAMIC_ITEM;
320
313
        }
321
314
        else {
322
315
                $sql = 'SELECT si.screenitemid'.
323
316
                                ' FROM slides s,screens_items si'.
324
317
                                ' WHERE s.slideshowid='.$elid.
325
318
                                        ' AND si.screenid=s.screenid'.
326
 
                                        ' AND si.dynamic='.SCREEN_DYNAMIC_ITEM.
327
 
                                        ' '.andDbNode('si.screenitemid');
 
319
                                        ' AND si.dynamic='.SCREEN_DYNAMIC_ITEM;
328
320
        }
329
321
        if (DBfetch(DBselect($sql, 1))) {
330
322
                return true;