Remove antiframe protection in portal javascript (#1696)

environments/ppa-mbqj77/deployments/720^2
Clément OUDOT 6 years ago
parent c4b4e95e9d
commit bac2eb564c
  1. 1
      lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
  2. 2
      lemonldap-ng-portal/site/coffee/portal.coffee
  3. 5
      lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
  4. 2
      lemonldap-ng-portal/site/htdocs/static/common/js/portal.min.js
  5. 1
      lemonldap-ng-portal/site/templates/common/script.tpl

@ -917,7 +917,6 @@ sub tplParams {
SKIN => $self->getSkin($req),
PORTAL_URL => $self->conf->{portal},
SKIN_PATH => $portalPath . "skins",
ANTIFRAME => $self->conf->{portalAntiFrame},
SKIN_BG => $self->conf->{portalSkinBackground},
( $self->customParameters ? ( %{ $self->customParameters } ) : () ),
%templateParams

@ -228,8 +228,6 @@ $(document).ready ->
datas = getValues()
# Export datas for other scripts
window.datas = datas
if datas['antiframe'] and top != self
top.location.href = location.href
$("#appslist").sortable
axis: "y"

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.8
// Generated by CoffeeScript 1.12.7
/*
LemonLDAP::NG Portal jQuery scripts
@ -226,9 +226,6 @@ LemonLDAP::NG Portal jQuery scripts
var action, al, authMenuTabs, back_url, i, l, lang, langdiv, langs, langs2, len, len1, len2, len3, link, m, menuIndex, menuTabs, method, n, nl, nlangs, re, ref, ref1, ref2;
datas = getValues();
window.datas = datas;
if (datas['antiframe'] && top !== self) {
top.location.href = location.href;
}
$("#appslist").sortable({
axis: "y",
cursor: "move",

File diff suppressed because one or more lines are too long

@ -22,7 +22,6 @@
"choicetab":"<TMPL_VAR NAME="CHOICE_VALUE">",
"login":"<TMPL_VAR NAME="LOGIN">",
"newwindow":<TMPL_VAR NAME="NEWWINDOW" DEFAULT="0">,
"antiframe":<TMPL_VAR NAME="ANTIFRAME" DEFAULT="1">,
"appslistorder":"<TMPL_VAR NAME="APPSLIST_ORDER">",
"scriptname":"<TMPL_VAR NAME="SCRIPT_NAME">",
"activeTimer":<TMPL_VAR NAME="ACTIVE_TIMER" DEFAULT="0">,

Loading…
Cancel
Save