From: <ral...@us...> - 2015-07-04 07:54:19
|
Author: ralfbecker Date: Sat Jul 4 09:54:11 2015 New Revision: 53048 URL: http://svn.stylite.de/viewvc/egroupware?rev=53048&view=rev Log: fix sometimes not working redirect to login page (session could not be verified), because inline script is not allowed by our content-security-policy, redirecting top window now in login.js Modified: branches/14.2/phpgwapi/ (props changed) branches/14.2/phpgwapi/inc/class.egw.inc.php branches/14.2/phpgwapi/js/login.js (contents, props changed) Propchange: branches/14.2/phpgwapi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jul 4 09:54:11 2015 @@ -1,1 +1,1 @@ -/trunk/phpgwapi:51366,51376,51397,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52252,52268,52274,52283,52288-52289,52296,52301,52310,52312,52314,52316,52322-52323,52327,52332,52334,52341,52368-52372,52375,52399,52428,52457,52494,52497,52501,52517-52518,52532,52534,52575,52579,52588,52596,52598,52604,52608,52619,52621,52653,52684,52686,52706,52732,52787,52820,52846,52900,52912,52961,53011,53021-53022,53024 +/trunk/phpgwapi:51366,51376,51397,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52252,52268,52274,52283,52288-52289,52296,52301,52310,52312,52314,52316,52322-52323,52327,52332,52334,52341,52368-52372,52375,52399,52428,52457,52494,52497,52501,52517-52518,52532,52534,52575,52579,52588,52596,52598,52604,52608,52619,52621,52653,52684,52686,52706,52732,52787,52820,52846,52900,52912,52961,53011,53021-53022,53024,53047 Modified: branches/14.2/phpgwapi/inc/class.egw.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/phpgwapi/inc/class.egw.inc.php?rev=53048&r1=53047&r2=53048&view=diff ============================================================================== --- branches/14.2/phpgwapi/inc/class.egw.inc.php (original) +++ branches/14.2/phpgwapi/inc/class.egw.inc.php Sat Jul 4 09:54:11 2015 @@ -331,12 +331,7 @@ if (egw_session::get_sessionid()) $redirect .= 'cd=10&'; } if ($relpath) $redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : '')); - //Header('Location: '.$GLOBALS['egw_info']['server']['webserver_url'].$redirect); - // do NOT redirect, but set top.location, as this works in framed template too - $redirect = $GLOBALS['egw_info']['server']['webserver_url'].$redirect; - - echo "<html>\n<head>\n<script type='text/javascript'>top.location='$redirect';</script>\n</head>\n"; - exit; + self::redirect_link($redirect); } } Modified: branches/14.2/phpgwapi/js/login.js URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/phpgwapi/js/login.js?rev=53048&r1=53047&r2=53048&view=diff ============================================================================== --- branches/14.2/phpgwapi/js/login.js (original) +++ branches/14.2/phpgwapi/js/login.js Sat Jul 4 09:54:11 2015 @@ -7,6 +7,9 @@ * @link http://www.egroupware.org * @version $Id$ */ + +/* if login page is not in top window, set top windows location to it */ +if (top !== window) top.location = window.location; egw_LAB.wait(function() { Propchange: branches/14.2/phpgwapi/js/login.js ------------------------------------------------------------------------------ svn:keywords = Id |