From 994d10fcdedd0eaf7032ae5aeb69319a84286914 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 18 Jul 2014 10:03:18 +0000
Subject: [PATCH] * Admin/API: remove no longer fully supported method to not
 "store session-id in cookie", it is the safer default anyway

---
 admin/templates/default/config.tpl     | 10 ----------
 etemplate/inc/class.url_widget.inc.php | 10 ----------
 phpgwapi/js/jsapi/egw_links.js         |  8 --------
 3 files changed, 28 deletions(-)

diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index bd4f1b1bd5..3e3595b1cb 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -125,16 +125,6 @@
     <td colspan="2">&nbsp;<b>{lang_security}</b></td>
    </tr>
 
-   <tr class="row_on">
-    <td>{lang_Use_cookies_to_pass_sessionid}:</td>
-    <td>
-     <select name="newsettings[usecookies]">
-      <option value="True"{selected_usecookies_True}>{lang_Yes} - {lang_more_secure}</option>
-      <option value=""{selected_usecookies_}>{lang_No}</option>
-     </select>
-    </td>
-   </tr>
-
    <tr class="row_off">
     <td>{lang_Cookie_path_(allows_multiple_eGW_sessions_with_different_directories,_has_problemes_with_SiteMgr!)}:</td>
     <td>
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);