diff --git a/addressbook/inc/class.uiaddressbook.inc.php b/addressbook/inc/class.uiaddressbook.inc.php index fbe8832e27..e5ad773e03 100644 --- a/addressbook/inc/class.uiaddressbook.inc.php +++ b/addressbook/inc/class.uiaddressbook.inc.php @@ -524,6 +524,7 @@ $GLOBALS['egw']->template->set_var('export_url',$GLOBALS['egw']->link('/index.php','menuaction=addressbook.uiXport.export')); $GLOBALS['egw']->template->set_var('lang_delete',lang('Delete')); $GLOBALS['egw']->template->set_var('column_count',count($columns_to_display)); + $GLOBALS['egw']->template->set_var('lang_sure',lang('Are you sure you want to delete these entries ?')); $GLOBALS['egw']->template->set_var('start',$this->start); $GLOBALS['egw']->template->set_var('sort',$this->sort); @@ -606,7 +607,7 @@ 'menuaction' => 'addressbook.uiaddressbook.delete', 'ab_id' => $entries[$i]['id'] )) - . '">'; } @@ -854,7 +855,6 @@ function delete() { $ab_id = $_POST['entry']['ab_id'] ? $_POST['entry']['ab_id'] : $_POST['ab_id']; - $confirm = $_GET['confirm'] ? $_GET['confirm'] :$_POST['confirm']; $select = $_POST['select']; if(@is_array($select)) { @@ -880,7 +880,7 @@ { $select[] = $ab_id; } - foreach($select as $null => $_id) + foreach($select as $_id) { if(!(int)$_id) { @@ -894,7 +894,7 @@ $GLOBALS['egw']->common->phpgw_exit(); } } - +/* done via javascript confirmation $GLOBALS['egw']->template->set_file(array('delete' => 'delete.tpl')); if(!$_POST['yes']) @@ -919,6 +919,7 @@ $GLOBALS['egw']->template->pparse('out','delete'); } else +*/ { if(!@is_array($select)) { diff --git a/addressbook/templates/default/index.tpl b/addressbook/templates/default/index.tpl index 5453bd4146..1f21a1d05e 100644 --- a/addressbook/templates/default/index.tpl +++ b/addressbook/templates/default/index.tpl @@ -66,7 +66,7 @@ function check_all(which)   - +