egroupware_official/doc/rpm-build/class.uiasyncservice.inc.php.patch

62 lines
2.0 KiB
Diff
Raw Normal View History

Index: egroupware/phpgwapi/inc/class.egw.inc.php
===================================================================
--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 38811)
+++ egroupware/phpgwapi/inc/class.egw.inc.php (Arbeitskopie)
@@ -512,10 +512,12 @@
}
// call the asyncservice check_run function if it is not explicitly set to cron-only
//
+/* not needed as rpm uses /etc/cron.d/egroupware
if (!$GLOBALS['egw_info']['server']['asyncservice']) // is default
{
ExecMethod('phpgwapi.asyncservice.check_run','fallback');
}
+*/
$this->db->disconnect();
}
}
Index: egroupware/admin/inc/class.uiasyncservice.inc.php
===================================================================
--- egroupware/admin/inc/class.uiasyncservice.inc.php (Revision 38732)
+++ egroupware/admin/inc/class.uiasyncservice.inc.php (Arbeitskopie)
@@ -100,16 +100,20 @@
$config->save_repository();
unset($config);
}
+/*
if (!$async->only_fallback)
{
$installed = $async->installed();
if (is_array($installed) && isset($installed['cronline']))
{
+*/
$async_use['cron'] = lang('crontab only (recomended)');
+/*
}
}
$async_use[''] = lang('fallback (after each pageview)');
$async_use['off'] = lang('disabled (not recomended)');
+*/
echo '<p><b>'.lang('Run Asynchronous services').'</b>'.
' <select name="asyncservice" onChange="this.form.submit();">';
foreach ($async_use as $key => $label)
@@ -131,8 +135,9 @@
}
else
{
- echo '<p>'.lang('Installed crontab').": \n";
+ echo '<p>'.lang('Installed crontab').": /etc/cron.d/egroupware\n";
+/*
if (is_array($installed) && isset($installed['cronline']))
{
echo "$installed[cronline]</p>";
@@ -147,6 +152,7 @@
}
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";
+*/
}
echo "<hr><table border=0><tr>\n";