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

contact id can be non-numeric, LDAP eg. uses UUID containing dashes and letters

Browse Source
This commit is contained in:
Ralf Becker 2013-06-01 17:03:32 +00:00
parent bd1d0f7c18
commit 5c63214e82
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1663,7 +1663,7 @@ class addressbook_ui extends addressbook_bo
{ {
egw_link::link('addressbook',$content['id'],$links); egw_link::link('addressbook',$content['id'],$links);
} }
$content['js'] = "opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','addressbook',{$content['id']}, '" . ($content['id'] ? 'update' : 'add') . "', opener.egw_getAppName());"; $content['js'] = "opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','addressbook','{$content['id']}', '" . ($content['id'] ? 'update' : 'add') . "', opener.egw_getAppName());";
if ($button == 'save') if ($button == 'save')
{ {
@ -1678,7 +1678,7 @@ class addressbook_ui extends addressbook_bo
case 'delete': case 'delete':
if($this->action('delete',array($content['id']),false,$success,$failed,$action_msg,'',$content['msg'])) if($this->action('delete',array($content['id']),false,$success,$failed,$action_msg,'',$content['msg']))
{ {
$js = "opener.egw_refresh('".str_replace("'","\\'",lang('Contact deleted'))."','addressbook',{$content['id']},'delete'); if(opener.egw_getAppName() != 'addressbook') { opener.egw_refresh('".str_replace("'","\\'",lang('Contact deleted'))."','addressbook',{$content['id']},null,'addressbook');} window.close();"; $js = "opener.egw_refresh('".str_replace("'","\\'",lang('Contact deleted'))."','addressbook','{$content['id']}','delete'); if(opener.egw_getAppName() != 'addressbook') { opener.egw_refresh('".str_replace("'","\\'",lang('Contact deleted'))."','addressbook','{$content['id']}',null,'addressbook');} window.close();";
echo '<html><body onload="'.$js.'"></body></html>'; echo '<html><body onload="'.$js.'"></body></html>';
common::egw_exit(); common::egw_exit();
} }