← Back to branch summary

~ubuntu-dev/ubuntu/lucid/zabbix/lucid-201002110857

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2008-06-04 09:22:37 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080604092237-zgwq7kmraj1oohoz
Tags: 1:1.4.5-1ubuntu1
https://launchpad.net/bugs/172775
* Merge from debian unstable, remaining changes: 
  + fixing missing pid directory in /var/run
* Added the same patch to debian/zabbix-server-{mysql,pgsql}.zabbix-server.init
  (LP: #172775)

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/include/screens.inc.php
164
164
 
165
165
        function        check_screen_recursion($mother_screenid, $child_screenid)
166
166
        {
167
 
                        if($mother_screenid == $child_screenid) return TRUE;
 
167
                        if((bccomp($mother_screenid , $child_screenid)==0))     return TRUE;
168
168
 
169
169
                        $db_scr_items = DBselect("select resourceid from screens_items where".
170
170
                                " screenid=$child_screenid and resourcetype=".SCREEN_RESOURCE_SCREEN);
211
211
                        $slide_data['delay'] = $slide_data['ss_delay'];
212
212
                }
213
213
 
214
 
                Redirect('screens.php?config=1&fullscreen=2&elementid='.$slideshowid.'&step='.($curr_step + 1).
 
214
                simple_js_redirect('screens.php?config=1&fullscreen=2&elementid='.$slideshowid.'&step='.($curr_step + 1).
215
215
                                '&period='.$effectiveperiod.url_param('stime').url_param('from'),
216
216
                                $slide_data['delay']);
217
217
 
319
319
                                        $item = get_screen_item_form();
320
320
                                }
321
321
                                elseif($editmode == 1 && isset($_REQUEST["form"]) &&
322
 
                                        isset($_REQUEST["screenitemid"]) && $_REQUEST["screenitemid"]==$screenitemid)
 
322
                                        isset($_REQUEST["screenitemid"]) && (bccomp($_REQUEST["screenitemid"], $screenitemid)==0))
323
323
                                { // click on element
324
324
                                        $item = get_screen_item_form();
325
325
                                }