Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move X-Frame-Options header to .htaccess #142

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<IfModule mod_headers.c>
Header append X-Frame-Options: DENY
</IfModule>
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteRule ^$ app/webroot/ [L]
Expand Down
1 change: 0 additions & 1 deletion app/View/Layouts/default_admin.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ header("Pragma: no-cache");
<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" class="no-js"> <!--<![endif]-->
<head>
<meta charset="UTF-8">
<meta http-equiv="X-Frame-Options" content="deny">
<?php echo $this->element('metadata'); ?>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<?php
Expand Down
3 changes: 1 addition & 2 deletions app/View/Layouts/default_inner.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-Frame-Options" content="deny">
<title>Orangescrum</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="robots" content="noindex,nofollow" />
Expand All @@ -23,7 +22,7 @@ if(PAGE_NAME == "profile") {
echo $this->Html->css('fcbkcomplete');

echo $this->Html->css('pace-theme-minimal');
echo $this->Html->css('prettyPhoto.css');
echo $this->Html->css('prettyPhoto.css');

//Moved from Create New project ajax request page
echo $this->Html->css('wick_new.css?v='.RELEASE);
Expand Down
1 change: 0 additions & 1 deletion app/View/Layouts/default_outer.ctp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="X-Frame-Options" content="deny">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<link rel="shortcut icon" href="<?php echo HTTP_ROOT; ?>favicon.ico"/>
<meta name="robots" content="noindex,nofollow" />
Expand Down