From 8d3b47863d4e4c4ecbaeabf7378ec7b35b0810f9 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 22 Jan 2013 15:12:50 +0000
Subject: [PATCH] Move calendar stuff to general settings

---
 infolog/inc/class.infolog_hooks.inc.php | 62 ++++++++++++-------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php
index 6d9b841554..689e798931 100644
--- a/infolog/inc/class.infolog_hooks.inc.php
+++ b/infolog/inc/class.infolog_hooks.inc.php
@@ -290,13 +290,42 @@ class infolog_hooks
 				'xmlrpc' => True,
 				'admin'  => False,
 			),
-			array(
+		);
+		if ($GLOBALS['egw_info']['user']['apps']['calendar'])
+		{
+			$settings['cal_show'] = array(
+				'type'   => 'multiselect',
+				'label'  => 'Which types should the calendar show',
+				'name'   => 'cal_show',
+				'values' => $info->enums['type'],
+				'help'   => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.',
+				'xmlrpc' => True,
+				'admin'  => False,
+				'default'=> 'tasks,phone',
+			);
+			$settings['calendar_set'] = array(
+				'type'   => 'multiselect',
+				'label'  => 'Participants for scheduling an appointment',
+				'name'   => 'calendar_set',
+				'values' => array(
+					'responsible' => lang('Responsible'),
+					'contact' => lang('Contact'),
+					'owner' => lang('Owner'),
+					'user' => lang('Current user'),
+					'selected' => lang('Selected calendars'),
+				),
+				'help'   => 'Which participants should be preselected when scheduling an appointment.',
+				'xmlrpc' => True,
+				'admin'  => False,
+				'default'=> 'responsible,contact,user',
+			);
+		}
+		$settings[] = array(
 				'type'  => 'section',
 				'title' => lang('Notification settings'),
 				'no_lang'=> true,
 				'xmlrpc' => False,
 				'admin'  => False
-			),
 		);
 
 		// notification preferences
@@ -393,35 +422,6 @@ class infolog_hooks
 			'admin'  => False
 		);
 
-		if ($GLOBALS['egw_info']['user']['apps']['calendar'])
-		{
-			$settings['cal_show'] = array(
-				'type'   => 'multiselect',
-				'label'  => 'Which types should the calendar show',
-				'name'   => 'cal_show',
-				'values' => $info->enums['type'],
-				'help'   => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.',
-				'xmlrpc' => True,
-				'admin'  => False,
-				'default'=> 'tasks,phone',
-			);
-			$settings['calendar_set'] = array(
-				'type'   => 'multiselect',
-				'label'  => 'Participants for scheduling an appointment',
-				'name'   => 'calendar_set',
-				'values' => array(
-					'responsible' => lang('Responsible'),
-					'contact' => lang('Contact'),
-					'owner' => lang('Owner'),
-					'user' => lang('Current user'),
-					'selected' => lang('Selected calendars'),
-				),
-				'help'   => 'Which participants should be preselected when scheduling an appointment.',
-				'xmlrpc' => True,
-				'admin'  => False,
-				'default'=> 'responsible,contact,user',
-			);
-		}
 		// Merge print
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{