extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-22 21:30:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reverted to old revision as having a 10.1 as a remote application is not needed

Browse Source
This commit is contained in:
Andreas Stöckel 2011-01-20 20:14:18 +00:00
parent 0df7e3b69e
commit 694dc8fc9f
4 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpgwapi/inc/class.egw.inc.php
View File

@ -338,21 +338,7 @@ class egw extends egw_minimal
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'>
if (typeof window.frameElement != 'undefined' &&
window.frameElement &&
typeof window.frameElement.egw_app != 'undefined' &&
typeof window.frameElement.egw_app.isRemote != 'undefined')
{
window.location='$redirect';
}
else
{
top.location='$redirect';
}
</script>\n</head>\n";
echo "<html>\n<head>\n<script type='text/javascript'>top.location='{$GLOBALS['egw_info']['server']['webserver_url']}$redirect';\n</script></head>\n";
exit;
}
}

3
phpgwapi/js/egw_json.js
View File

@ -312,7 +312,8 @@ egw_json_request.prototype.handleResponse = function(data, textStatus, XMLHttpRe
typeof res.data.global == 'boolean')
{
//Special handling for framework reload
res.data.global |= (res.data.url.indexOf("?cd=10") > 0);
if (res.data.url.indexOf("?cd=10") > 0)
res.data.global = true;
if (res.data.global)
{

21
phpgwapi/js/jsapi/jsapi.js
View File

@ -97,27 +97,6 @@ function egw_appWindow(_app)
return window;
}
/**
* Returns the current egw application
* @param string _name is only used for fallback, if an onlder version of jdots is used.
*/
function egw_getApp(_name)
{
var napp = null;
if (typeof window.frameElement != "undefined" &&
window.frameElement != null &&
typeof window.frameElement.egw_app != "undefined")
{
napp = window.frameElement.egw_app;
}
else
{
napp = window.parent.framework.getApplicationByName(_name);
}
return napp;
}
function egw_set_checkbox_multiselect_enabled(_id, _enabled)
{
//Retrieve the checkbox_multiselect base div

18
phpgwapi/templates/default/login.tpl
View File

@ -6,7 +6,7 @@
<div id="centerBox">
<div id="loginScreenMessage">{lang_message}</div>
<div id="loginCdMessage">{cd}</div>
<form name="login_form" id="login_form" method="post" action="{login_url}">
<form name="login_form" method="post" action="{login_url}">
<table class="divLoginbox divSideboxEntry" cellspacing="0" cellpadding="2" border="0" align="center">
<tr class="divLoginboxHeader">
<td colspan="3">{website_title}</td>
@ -63,21 +63,5 @@
<!-- END registration -->
</table>
</form>
<script type="text/javascript">
//Check whether the loginpage is displayed from within the jdots framework
//if yes, supress the "cd=yes" being appended to the page loaded
if (typeof window.frameElement != 'undefined' &&
window.frameElement &&
typeof window.frameElement.egw_app != 'undefined' &&
typeof window.frameElement.egw_app.isRemote != 'undefined' &&
window.frameElement.egw_app.isRemote())
{
loginForm = document.getElementById('login_form');
if (loginForm && loginForm.action.indexOf('phpgw_forward') > 0)
{
loginForm.action += '&suppress_cd=1';
}
}
</script>
</div>
</div>