holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix asyncservice patch for 16.1

Browse Source
This commit is contained in:
Ralf Becker 2016-05-25 19:04:49 +02:00
parent a46f418fb6
commit 3df5abe818
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
doc/rpm-build/class.uiasyncservice.inc.php.patch → doc/rpm-build/asyncservice.patch
View File

@ -1,10 +1,10 @@
Index: egroupware/admin/inc/class.uiasyncservice.inc.php diff --git egroupware/admin/inc/class.admin_asyncservice.inc.php egroupware/admin/inc/class.admin_asyncservice.inc.php
=================================================================== index 88d9388..52cf515 100644
--- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 54198) --- egroupware/admin/inc/class.admin_asyncservice.inc.php
+++ egroupware/admin/inc/class.uiasyncservice.inc.php (Arbeitskopie) +++ egroupware/admin/inc/class.admin_asyncservice.inc.php
@@ -95,16 +95,20 @@ @@ -97,16 +97,20 @@ class admin_asyncservice
{ {
config::save_value('asyncservice', $GLOBALS['egw_info']['server']['asyncservice']=$_POST['asyncservice'], 'phpgwapi'); Api\Config::save_value('asyncservice', $GLOBALS['egw_info']['server']['asyncservice']=$_POST['asyncservice'], 'phpgwapi');
} }
+/* +/*
if (!$async->only_fallback) if (!$async->only_fallback)
@ -23,18 +23,18 @@ Index: egroupware/admin/inc/class.uiasyncservice.inc.php
echo '<p><b>'.lang('Run Asynchronous services').'</b>'. echo '<p><b>'.lang('Run Asynchronous services').'</b>'.
' <select name="asyncservice" onChange="this.form.submit();">'; ' <select name="asyncservice" onChange="this.form.submit();">';
foreach ($async_use as $key => $label) foreach ($async_use as $key => $label)
@@ -126,8 +130,9 @@ @@ -128,8 +132,9 @@ class admin_asyncservice
} }
else else
{ {
- echo '<p>'.lang('Installed crontab').": \n"; - echo '<p>'.lang('Installed crontab').": \n";
+ echo '<p>'.lang('Installed crontab').": /etc/cron.d/egroupware\n"; + echo '<p>'.lang('Installed crontab').": /etc/cron.d/egroupware.cron\n";
+/* +/*
if (is_array($installed) && isset($installed['cronline'])) if (is_array($installed) && isset($installed['cronline']))
{ {
echo "$installed[cronline]</p>"; echo "$installed[cronline]</p>";
@@ -142,6 +147,7 @@ @@ -144,6 +149,7 @@ class admin_asyncservice
} }
echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n". echo '<p><input type="submit" name="install" value="'.lang('Install crontab')."\">\n".
lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n"; lang("for the times below (empty values count as '*', all empty = every minute)")."</p>\n";
@ -42,11 +42,11 @@ Index: egroupware/admin/inc/class.uiasyncservice.inc.php
} }
echo "<hr><table border=0><tr>\n"; echo "<hr><table border=0><tr>\n";
Index: egroupware/phpgwapi/inc/class.egw.inc.php diff --git egroupware/api/src/Egw.php egroupware/api/src/Egw.php
=================================================================== index f324f5e..1e52db0 100644
--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 54198) --- egroupware/api/src/Egw.php
+++ egroupware/phpgwapi/inc/class.egw.inc.php (Arbeitskopie) +++ egroupware/api/src/Egw.php
@@ -618,11 +618,13 @@ @@ -592,12 +592,14 @@ class Egw extends Egw\Base
_egw_log_exception($ex); _egw_log_exception($ex);
} }
} }
@ -54,9 +54,10 @@ Index: egroupware/phpgwapi/inc/class.egw.inc.php
// call the asyncservice check_run function if it is not explicitly set to cron-only // call the asyncservice check_run function if it is not explicitly set to cron-only
if (!$GLOBALS['egw_info']['server']['asyncservice']) // is default if (!$GLOBALS['egw_info']['server']['asyncservice']) // is default
{ {
ExecMethod('phpgwapi.asyncservice.check_run','fallback'); $async = new Asyncservice();
$async->check_run('fallback');
} }
+ */ +*/
$this->db->disconnect(); $this->db->disconnect();
} }
} }