extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

rebuild async patch to cope with changed line numbers, as openSUSE forbids patches succeeding with offsets

Browse Source
This commit is contained in:
Ralf Becker 2010-09-17 07:52:05 +00:00
parent 08a9e95de7
commit d8f86e1ea8
1 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
doc/rpm-build/class.uiasyncservice.inc.php.patch Normal file
View File

@ -0,0 +1,61 @@
Index: egroupware/phpgwapi/inc/class.egw.inc.php
===================================================================
--- egroupware/phpgwapi/inc/class.egw.inc.php (Revision 32148)
+++ egroupware/phpgwapi/inc/class.egw.inc.php (Arbeitskopie)
@@ -519,10 +519,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 32148)
+++ 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";