From: <ral...@us...> - 2014-07-18 10:03:25
|
Author: ralfbecker Date: Fri Jul 18 12:03:18 2014 New Revision: 47779 URL: http://svn.stylite.de/viewvc/egroupware?rev=47779&view=rev Log: * Admin/API: remove no longer fully supported method to not "store session-id in cookie", it is the safer default anyway Modified: branches/14.1/admin/templates/default/config.tpl branches/14.1/etemplate/inc/class.url_widget.inc.php branches/14.1/phpgwapi/js/jsapi/egw_links.js Modified: branches/14.1/admin/templates/default/config.tpl URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/admin/templates/default/config.tpl?rev=47779&r1=47778&r2=47779&view=diff ============================================================================== --- branches/14.1/admin/templates/default/config.tpl (original) +++ branches/14.1/admin/templates/default/config.tpl Fri Jul 18 12:03:18 2014 @@ -125,16 +125,6 @@ <td colspan="2"> <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> Modified: branches/14.1/etemplate/inc/class.url_widget.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/etemplate/inc/class.url_widget.inc.php?rev=47779&r1=47778&r2=47779&view=diff ============================================================================== --- branches/14.1/etemplate/inc/class.url_widget.inc.php (original) +++ branches/14.1/etemplate/inc/class.url_widget.inc.php Fri Jul 18 12:03:18 2014 @@ -164,11 +164,6 @@ 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 @@ 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']); } Modified: branches/14.1/phpgwapi/js/jsapi/egw_links.js URL: http://svn.stylite.de/viewvc/egroupware/branches/14.1/phpgwapi/js/jsapi/egw_links.js?rev=47779&r1=47778&r2=47779&view=diff ============================================================================== --- branches/14.1/phpgwapi/js/jsapi/egw_links.js (original) +++ branches/14.1/phpgwapi/js/jsapi/egw_links.js Fri Jul 18 12:03:18 2014 @@ -258,14 +258,6 @@ } 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); |