[Fmsystem-commits] [12819] sms manual daemon as cron

[Sigurd Nes]

Revision: 12819
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12819
Author:   sigurdne
Date:     2015-03-05 08:35:40 +0000 (Thu, 05 Mar 2015)
Log Message:
-----------
sms manual daemon as cron

Modified Paths:
--------------
    trunk/sms/inc/class.uisms.inc.php

Modified: trunk/sms/inc/class.uisms.inc.php
===================================================================
--- trunk/sms/inc/class.uisms.inc.php   2015-03-04 23:57:30 UTC (rev 12818)
+++ trunk/sms/inc/class.uisms.inc.php   2015-03-05 08:35:40 UTC (rev 12819)
@@ -855,7 +855,11 @@
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
                }
 
-               function daemon_manual()
+               /**
+                * @param mixed $data
+                * If $data is an array - then the process is run as cron
+                */
+               function daemon_manual($data=array())
                {
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
'admin::sms::refresh';
                        if(!$this->acl->check('run', PHPGW_ACL_READ,'admin'))
@@ -864,12 +868,16 @@
                                return;
                        }
 
-                       $GLOBALS['phpgw']->xslttpl->add_file(array('sms'));
-
                        $sms = CreateObject('sms.sms');
                        $sms->getsmsinbox(true);
                        $sms->getsmsstatus();
+                       if(isset($data['cron']))
+                       {
+                               return;
+                       }
 
+                       $GLOBALS['phpgw']->xslttpl->add_file(array('sms'));
+
                        $receipt['message'][]=array('msg'=>lang('Daemon 
refreshed'));
 
                        $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox_data($receipt);