From 7358243aa11bd248371cfb714f2f789fa5d623d5 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 22 Nov 2010 16:19:28 +0000
Subject: [PATCH] *Users can now see and restore their 'deleted' but held
 events, if deletion prevention is turned on.  There is now a config setting
 to allow users to purge their own 'deleted' events.

---
 calendar/inc/class.calendar_ui.inc.php      | 2 +-
 calendar/inc/class.calendar_uiforms.inc.php | 6 +++++-
 calendar/inc/class.calendar_uilist.inc.php  | 9 +++++++--
 calendar/templates/default/config.tpl       | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 8e4f9cf616..a3745408e7 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -723,7 +723,7 @@ class calendar_ui
 
 		// Add in deleted for admins
 		$config = config::read('phpgwapi');
-		if($config['calendar_delete_history'] && $GLOBALS['egw_info']['user']['apps']['admin']) {
+		if($config['calendar_delete_history']) {
 			$options .= '<option value="deleted"'.($this->filter == 'deleted' ? ' selected="selected"' : '').' title="'.lang('Show events that have been deleted').'">'.lang('Deleted').'</options>'."\n";
 		}
 
diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 0d08d3301f..e17db07397 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1470,11 +1470,15 @@ function replace_eTemplate_onsubmit()
 
 		// Allow admins to restore deleted events
 		$config = config::read('phpgwapi');
-		if($config['calendar_delete_history'] && $event['deleted'] && $GLOBALS['egw_info']['user']['apps']['admin'])
+		if($config['calendar_delete_history'] && $event['deleted'] )
 		{
 			$content['deleted'] = $preserv['deleted'] = null;
 			$etpl->set_cell_attribute('button[save]', 'label', 'Recover');
 			$etpl->set_cell_attribute('button[apply]', 'disabled', true);
+			if($GLOBALS['egw_info']['user']['apps']['admin'] || $config['calendar_delete_history'] != 'user_purge')
+			{
+				$readonlys['button[delete]'] = true;
+			}
 		}
 
 		// Setup history tab
diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index 224f5954fe..2b201477b5 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -173,9 +173,14 @@ class calendar_uilist extends calendar_ui
 		}
 		// Add in deleted for admins
 		$config = config::read('phpgwapi');
-		if($config['calendar_delete_history'] && $GLOBALS['egw_info']['user']['apps']['admin'])
+		if($config['calendar_delete_history'])
 		{
 			$sel_options['action']['undelete'] = array('label' => 'Un-Delete', 'title' => 'Recover this event');
+			if(!$GLOBALS['egw_info']['user']['apps']['admin'] && $config['calendar_delete_history'] != 'user_purge')
+			{
+				unset($sel_options['action']['delete']);
+				$content['nm']['no_delete'] = true;
+			}
 		}
 		foreach($this->bo->verbose_status as $key => $value)
 		{
@@ -351,7 +356,7 @@ class calendar_uilist extends calendar_ui
 		{
 			$readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event));
 			// Delete disabled for other applications
-			$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id']);
+			$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id']) || $params['no_delete'];
 			// Filemanager disabled for other applications
 			$readonlys['filemanager['.$event['id'].']'] = !is_numeric($event['id']);
 
diff --git a/calendar/templates/default/config.tpl b/calendar/templates/default/config.tpl
index 5b4bda27f8..3add169e08 100644
--- a/calendar/templates/default/config.tpl
+++ b/calendar/templates/default/config.tpl
@@ -65,6 +65,7 @@
      <select name="newsettings[calendar_delete_history]">
       <option value="">{lang_No}</option>
       <option value="history"{selected_calendar_delete_history_history}>{lang_Yes,_only_admins_can_purge_deleted_items}</option>
+      <option value="user_purge"{selected_calendar_delete_history_user_purge}>{lang_Yes,_users_can_purge_their_deleted_items}</option>
      </select>
     </td>
    </tr>