extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

if async ID would be longer than 64 chars truncate it to 32 chars plus md5 hash of all data

Browse Source 
take care of being able to read old, just truncated IDs too
This commit is contained in:
ralf 2024-09-16 13:38:03 +02:00
parent 4040cb030f
commit 89c67cfc49
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
importexport/inc/class.importexport_schedule_ui.inc.php
View File

@ -267,9 +267,16 @@ class importexport_schedule_ui
} }
/** /**
* Generate a async key * Generate an unique async key
*/ *
public static function generate_id($data) * If the id is longer than 64 chars (supported in current DB schema), we use the first 32 chars
* plus a md5 hash of the whole data.
*
* @param array $data
* @param bool $old false: generate new id with md5 hash, if otherwise to long, true: generate old, to 64 chars truncated, id
* @return false|string
*/
public static function generate_id($data, $old=false)
{ {
$query = array( $query = array(
@ -280,7 +287,11 @@ class importexport_schedule_ui
$definition_list = ((array)$definitions->get_definitions()); $definition_list = ((array)$definitions->get_definitions());
$id = 'importexport.'.$definition_list[0].'.'.$data['target']; $id = 'importexport.'.$definition_list[0].'.'.$data['target'];
return substr($id, 0, 64); if (strlen($id) <= 64 || $old)
{
return substr($id, 0, 64);
}
return substr($id, 0, 32).md5($id);
} }
/** /**
@ -645,12 +656,12 @@ class importexport_schedule_ui
{ {
$id = self::generate_id($data); $id = self::generate_id($data);
$async = new Api\Asyncservice(); $async = new Api\Asyncservice();
$jobs = $async->read($id); $jobs = $async->read($id) ?: $async->read($old_id=self::generate_id($data, true)) ?: [];
$job = $jobs[$id]; $job = array_shift($jobs);
if(is_array($job)) if(is_array($job))
{ {
$async->cancel_timer($id); $async->cancel_timer($old_id ?? $id);
$result = $async->set_timer( $result = $async->set_timer(
$job['times'], $job['times'],
$id, $id,