diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index 131a07e780..1f2d7aa6a2 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -1393,17 +1393,15 @@ class calendar_uiviews extends calendar_ui if ($this->use_time_grid) { // drag and drop: check if the current user has EDIT permissions on the grid - if($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop']) + if($owner) { - if($owner) - { - $dropPermission = $this->bo->check_perms(EGW_ACL_EDIT,0,$owner); - } - else - { - $dropPermission = true; - } + $dropPermission = $this->bo->check_perms(EGW_ACL_EDIT,0,$owner); } + else + { + $dropPermission = true; + } + // adding divs to click on for each row / time-span for($t = $this->scroll_to_wdstart ? 0 : $this->wd_start,$i = 1 + $this->extraRows; $t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24*60; @@ -1843,8 +1841,7 @@ class calendar_uiviews extends calendar_ui // ATM we do not support whole day events or recurring events for dragdrop $dd_emulation = ""; - if ($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop'] && - $this->use_time_grid && + if ($this->use_time_grid && (int)$event['id'] && $this->bo->check_perms(EGW_ACL_EDIT,$event)) { if (!$event['whole_day_on_top'] && diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 36969c922e..5b503c05da 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -1111,12 +1111,6 @@ abstract class egw_framework { $java_script = ''; - // GLOBAL var to tell egroupware wether or not to enable the IE selectBox resize hack - if($GLOBALS['egw_info']['user']['preferences']['common']['enable_ie_dropdownmenuhack'] && html::$user_agent == 'msie' && html::$ua_version < 9) - { - $java_script .= "\n"; - } - /* this flag is for all javascript code that has to be put before other jscode. Think of conf vars etc... (pim@lingewoud.nl) */ if (isset($GLOBALS['egw_info']['flags']['java_script_thirst'])) diff --git a/phpgwapi/js/jsapi/jsapi.js b/phpgwapi/js/jsapi/jsapi.js index 3a0712a3b4..9d17e8d421 100644 --- a/phpgwapi/js/jsapi/jsapi.js +++ b/phpgwapi/js/jsapi/jsapi.js @@ -570,8 +570,13 @@ function dropdown_menu_hack(el) { if(el.runtimeStyle) { - if(typeof(enable_ie_dropdownmenuhack) !== 'undefined') { - if (enable_ie_dropdownmenuhack==1){} else return; + if(typeof(enable_ie_dropdownmenuhack) !== 'undefined') + { + if (enable_ie_dropdownmenuhack==1){ + + } + else + return; } else { return; } diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index c0a7366664..d2f2fe868e 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -228,25 +228,6 @@ class preferences_hooks 'admin' => True, 'forced' => true, ), - 'enable_dragdrop' => array( - 'type' => 'check', - 'label' => 'Enable drag and drop functionality (experimental)', - 'name' => 'enable_dragdrop', - 'help' => 'Enables or disables drag and drop functions in all applications. If the browser does not support '. - 'drag and drop, it will be disabled automatically. This feature is experimental at the moment.', - 'xmlrpc' => False, - 'admin' => False, - 'forced' => true, - ), - 'enable_ie_dropdownmenuhack' => array( - 'type' => 'check', - 'label' => 'Enable selectbox dropdown resizing for IE (experimental)', - 'name' => 'enable_ie_dropdownmenuhack', - 'help' => 'Enables or disables selectbox dropdown resizing for IE in all applications. If the browser is not an IE, the option will not apply. This feature is experimental at the moment.', - 'xmlrpc' => False, - 'admin' => False, - 'forced' => false, - ), array( 'type' => 'section', 'title' => 'Formatting & general settings'