From 70c3ab98af79e477a85cf583659bec21bbfafd43 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 29 Jan 2014 08:28:53 +0000
Subject: [PATCH] Set the "Allow ignore conflicts" default option to "Yes, only
 users with direct booking permission", therefore this would be the selected
 as first time installation, unless it set to another choice from Resources
 site configuration

---
 calendar/inc/class.calendar_uiforms.inc.php | 8 ++++----
 resources/templates/default/config.tpl      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 2f12de5278..5f0fdbb538 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1795,7 +1795,7 @@ class calendar_uiforms extends calendar_ui
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict');
 		$resources_config = config::read('resources');
 		$readonlys = array();
-		if($event['participant_types']['r'] && $resources_config)
+		if($event['participant_types']['r'] && $resources_config) // resources Allow ignore conflicts
 		{
 
 			switch ($resources_config['ignoreconflicts'])
@@ -1806,17 +1806,17 @@ class calendar_uiforms extends calendar_ui
 				case 'allusers':
 					$readonlys['button[ignore]'] = false;
 					break;
-				case 'directbooking':
+				default:
 					foreach ($event['participants'] as $pIds => $val)
 					{
 						if ($val != 'ACHAIR')
 						{
-							if ($this->bo->check_status_perms($pIds, $event))
+							if (!$this->bo->check_status_perms($pIds, $event))
 							{
 								$readonlys['button[ignore]'] = true;
 								break;
 							}
-						}
+ 						}
 					}
 					
 			}
diff --git a/resources/templates/default/config.tpl b/resources/templates/default/config.tpl
index f60ef6283c..9c097dee5b 100644
--- a/resources/templates/default/config.tpl
+++ b/resources/templates/default/config.tpl
@@ -29,9 +29,9 @@
 	</td>
 	<td>
 		<select name="newsettings[ignoreconflicts]">
+			<option value=""{selected_ignoreconflicts_directbooking}>{lang_Yes,_only_users_with_direct_booking_permission}</option>
+			<option value="allusers"{selected_ignoreconflicts_allusers}>{lang_Yes,_all_users_can_ignore_conflicts}</option>
 			<option value="no">{lang_No}</option>
-			<option value="allusers"{selected_ignoreconflicts_allusers}>{lang_Yes,_all_users_ignore_conflicts}</option>
-			<option value="directbooking"{selected_ignoreconflicts_directbooking}>{lang_Yes,_only_users_with_direct_booking_permission}</option>
 		</select>
 	</td>
 </tr>