extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Update: fix not finishing update for more then 100 photos in addressbook

Browse Source 
caused by contact_jpegphoto was not set to NULL, as column no longer exists in tables_current
This commit is contained in:
Ralf Becker 2017-10-26 21:27:16 +02:00
parent 5b573abef7
commit 92584a61ad
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/setup/tables_update.inc.php
View File

@ -259,7 +259,7 @@ FROM egw_addressbook
WHERE contact_jpegphoto IS NOT NULL OR contact_pubkey IS NOT NULL AND contact_pubkey LIKE '%-----%'",
__LINE__, __FILE__, 0, $junk_size, false, Api\Db::FETCH_ASSOC) as $row)
{
$row['contact_files'] = 0;
$files = 0;
$contact_id = $row['contact_id'];
unset($row['contact_id']);
if ($row['contact_jpegphoto'] && ($fp = Api\Vfs::string_stream($row['contact_jpegphoto'])))
@ -270,7 +270,7 @@ WHERE contact_jpegphoto IS NOT NULL OR contact_pubkey IS NOT NULL AND contact_pu
'tmp_name' => $fp,
)))
{
$row['contact_files'] |= Api\Contacts::FILES_BIT_PHOTO;
$files |= Api\Contacts::FILES_BIT_PHOTO;
$row['contact_jpegphoto'] = null;
}
fclose($fp);
@ -291,7 +291,7 @@ WHERE contact_jpegphoto IS NOT NULL OR contact_pubkey IS NOT NULL AND contact_pu
'tmp_name' => $fp,
)))
{
$row['contact_files'] |= $bit;
$files |= $bit;
$row['contact_pubkey'] = str_replace($matches[0], '', $row['contact_pubkey']);
}
fclose($fp);
@ -299,9 +299,11 @@ WHERE contact_jpegphoto IS NOT NULL OR contact_pubkey IS NOT NULL AND contact_pu
}
if (!trim($row['contact_pubkey'])) $row['contact_pubkey'] = null;
if ($row['contact_files'])
if ($files)
{
$GLOBALS['egw_setup']->db->update('egw_addressbook', $row, array('contact_id' => $contact_id), __LINE__, __FILE__);
$GLOBALS['egw_setup']->db->query('UPDATE egw_addressbook SET '.
$GLOBALS['egw_setup']->db->column_data_implode(',', $row, true).
',contact_files='.$files.' WHERE contact_id='.$contact_id, __LINE__, __FILE__);
$total++;
}
$n++;