diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl index 8eae450db2..d0a3101492 100644 --- a/admin/templates/default/config.tpl +++ b/admin/templates/default/config.tpl @@ -105,16 +105,6 @@  {lang_security} - - {lang_Use_cookies_to_pass_sessionid}: - - - - - {lang_Cookie_path_(allows_multiple_eGW_sessions_with_different_directories,_has_problemes_with_SiteMgr!)}: diff --git a/etemplate/inc/class.url_widget.inc.php b/etemplate/inc/class.url_widget.inc.php index 4ad3d35b3a..7407a95ec4 100644 --- a/etemplate/inc/class.url_widget.inc.php +++ b/etemplate/inc/class.url_widget.inc.php @@ -164,11 +164,6 @@ class url_widget if ($value) { $link = (strpos($value,'://') === false) ? 'http://'.$value : $value; - if (!$GLOBALS['egw_info']['server']['usecookies']) // if session-id is in url, use redirect.php to remove it from referrer - { - $link = $GLOBALS['egw_info']['server']['webserver_url'].'/redirect.php?go='.$link; - if ($link[0] == '/') $link = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$link; - } $cell['size'] = ','.$link.',,,_blank'; } if (substr($value,0,7) == 'http://') @@ -194,11 +189,6 @@ class url_widget if ($value) { $link = self::phone2link($value); - if (!$GLOBALS['egw_info']['server']['usecookies'] && substr($link,0,4) == 'http') // if session-id is in url, use redirect.php to remove it from referrer - { - $link = $GLOBALS['egw_info']['server']['webserver_url'].'/redirect.php?go='.$link; - if ($link[0] == '/') $link = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$link; - } $cell['size'] = ','.$link.($GLOBALS['egw_info']['server']['call_popup']=='none' ? '' : // 'none' = no target ',,,calling,'.$GLOBALS['egw_info']['server']['call_popup']); } diff --git a/phpgwapi/js/jsapi/egw_links.js b/phpgwapi/js/jsapi/egw_links.js index e217e7236c..f84f68849d 100644 --- a/phpgwapi/js/jsapi/egw_links.js +++ b/phpgwapi/js/jsapi/egw_links.js @@ -258,14 +258,6 @@ egw.extend('links', egw.MODULE_GLOBAL, function() { } var vars = {}; - /* not sure we still need to support that - // add session params if not using cookies - if (!$GLOBALS['egw_info']['server']['usecookies']) - { - $vars['sessionid'] = $GLOBALS['egw']->session->sessionid; - $vars['kp3'] = $GLOBALS['egw']->session->kp3; - $vars['domain'] = $GLOBALS['egw']->session->account_domain; - }*/ // check if the url already contains a query and ensure that vars is an array and all strings are in extravars var url_othervars = _url.split('?',2);