Merge branch 'master' into grunt
This commit is contained in:
Ben Word
@@ -8,14 +8,9 @@ if (is_admin() && isset($_GET['activated']) && 'themes.php' == $GLOBALS['pagenow
|
||||
}
|
||||
|
||||
function roots_theme_activation_options_init() {
|
||||
if (roots_get_theme_activation_options() === false) {
|
||||
add_option('roots_theme_activation_options', roots_get_default_theme_activation_options());
|
||||
}
|
||||
|
||||
register_setting(
|
||||
'roots_activation_options',
|
||||
'roots_theme_activation_options',
|
||||
'roots_theme_activation_options_validate'
|
||||
'roots_theme_activation_options'
|
||||
);
|
||||
}
|
||||
add_action('admin_init', 'roots_theme_activation_options_init');
|
||||
@@ -28,7 +23,7 @@ add_filter('option_page_capability_roots_activation_options', 'roots_activation_
|
||||
function roots_theme_activation_options_add_page() {
|
||||
$roots_activation_options = roots_get_theme_activation_options();
|
||||
|
||||
if ($roots_activation_options['first_run']) {
|
||||
if (!$roots_activation_options) {
|
||||
$theme_page = add_theme_page(
|
||||
__('Theme Activation', 'roots'),
|
||||
__('Theme Activation', 'roots'),
|
||||
@@ -38,8 +33,7 @@ function roots_theme_activation_options_add_page() {
|
||||
);
|
||||
} else {
|
||||
if (is_admin() && isset($_GET['page']) && $_GET['page'] === 'theme_activation_options') {
|
||||
global $wp_rewrite;
|
||||
$wp_rewrite->flush_rules();
|
||||
flush_rewrite_rules();
|
||||
wp_redirect(admin_url('themes.php'));
|
||||
exit;
|
||||
}
|
||||
@@ -47,21 +41,8 @@ function roots_theme_activation_options_add_page() {
|
||||
}
|
||||
add_action('admin_menu', 'roots_theme_activation_options_add_page', 50);
|
||||
|
||||
function roots_get_default_theme_activation_options() {
|
||||
$default_theme_activation_options = array(
|
||||
'first_run' => true,
|
||||
'create_front_page' => false,
|
||||
'change_permalink_structure' => false,
|
||||
'change_uploads_folder' => false,
|
||||
'create_navigation_menus' => false,
|
||||
'add_pages_to_primary_navigation' => false,
|
||||
);
|
||||
|
||||
return apply_filters('roots_default_theme_activation_options', $default_theme_activation_options);
|
||||
}
|
||||
|
||||
function roots_get_theme_activation_options() {
|
||||
return get_option('roots_theme_activation_options', roots_get_default_theme_activation_options());
|
||||
return get_option('roots_theme_activation_options');
|
||||
}
|
||||
|
||||
function roots_theme_activation_options_render_page() { ?>
|
||||
@@ -74,12 +55,8 @@ function roots_theme_activation_options_render_page() { ?>
|
||||
|
||||
<?php
|
||||
settings_fields('roots_activation_options');
|
||||
$roots_activation_options = roots_get_theme_activation_options();
|
||||
$roots_default_activation_options = roots_get_default_theme_activation_options();
|
||||
?>
|
||||
|
||||
<input type="hidden" value="false" name="roots_theme_activation_options[first_run]">
|
||||
|
||||
<table class="form-table">
|
||||
|
||||
<tr valign="top"><th scope="row"><?php _e('Create static front page?', 'roots'); ?></th>
|
||||
@@ -155,32 +132,16 @@ function roots_theme_activation_options_render_page() { ?>
|
||||
|
||||
<?php }
|
||||
|
||||
function roots_theme_activation_options_validate($input) {
|
||||
$output = $defaults = roots_get_default_theme_activation_options();
|
||||
|
||||
$options = array(
|
||||
'first_run',
|
||||
'create_front_page',
|
||||
'change_permalink_structure',
|
||||
'change_uploads_folder',
|
||||
'create_navigation_menus',
|
||||
'add_pages_to_primary_navigation'
|
||||
);
|
||||
|
||||
foreach($options as $option_name) {
|
||||
if (isset($input[$option_name])) {
|
||||
$input[$option_name] = ($input[$option_name] === 'true') ? true : false;
|
||||
$output[$option_name] = $input[$option_name];
|
||||
}
|
||||
function roots_theme_activation_action() {
|
||||
if (!($roots_theme_activation_options = roots_get_theme_activation_options())) {
|
||||
return;
|
||||
}
|
||||
|
||||
return apply_filters('roots_theme_activation_options_validate', $output, $input, $defaults);
|
||||
}
|
||||
if (strpos(wp_get_referer(), 'page=theme_activation_options') === false) {
|
||||
return;
|
||||
}
|
||||
|
||||
function roots_theme_activation_action() {
|
||||
$roots_theme_activation_options = roots_get_theme_activation_options();
|
||||
|
||||
if ($roots_theme_activation_options['create_front_page']) {
|
||||
if ($roots_theme_activation_options['create_front_page'] === 'true') {
|
||||
$roots_theme_activation_options['create_front_page'] = false;
|
||||
|
||||
$default_pages = array('Home');
|
||||
@@ -215,26 +176,24 @@ function roots_theme_activation_action() {
|
||||
wp_update_post($home_menu_order);
|
||||
}
|
||||
|
||||
if ($roots_theme_activation_options['change_permalink_structure']) {
|
||||
if ($roots_theme_activation_options['change_permalink_structure'] === 'true') {
|
||||
$roots_theme_activation_options['change_permalink_structure'] = false;
|
||||
global $wp_rewrite;
|
||||
|
||||
if (get_option('permalink_structure') !== '/%postname%/') {
|
||||
global $wp_rewrite;
|
||||
$wp_rewrite->set_permalink_structure('/%postname%/');
|
||||
flush_rewrite_rules();
|
||||
}
|
||||
|
||||
$wp_rewrite->init();
|
||||
$wp_rewrite->flush_rules();
|
||||
}
|
||||
|
||||
if ($roots_theme_activation_options['change_uploads_folder']) {
|
||||
if ($roots_theme_activation_options['change_uploads_folder'] === 'true') {
|
||||
$roots_theme_activation_options['change_uploads_folder'] = false;
|
||||
|
||||
update_option('uploads_use_yearmonth_folders', 0);
|
||||
update_option('upload_path', 'assets');
|
||||
}
|
||||
|
||||
if ($roots_theme_activation_options['create_navigation_menus']) {
|
||||
if ($roots_theme_activation_options['create_navigation_menus'] === 'true') {
|
||||
$roots_theme_activation_options['create_navigation_menus'] = false;
|
||||
|
||||
$roots_nav_theme_mod = false;
|
||||
@@ -253,7 +212,7 @@ function roots_theme_activation_action() {
|
||||
}
|
||||
}
|
||||
|
||||
if ($roots_theme_activation_options['add_pages_to_primary_navigation']) {
|
||||
if ($roots_theme_activation_options['add_pages_to_primary_navigation'] === 'true') {
|
||||
$roots_theme_activation_options['add_pages_to_primary_navigation'] = false;
|
||||
|
||||
$primary_nav = wp_get_nav_menu_object('Primary Navigation');
|
||||
|
||||
@@ -138,32 +138,7 @@ add_filter('body_class', 'roots_body_class');
|
||||
* @author Scott Walkinshaw <scott.walkinshaw@gmail.com>
|
||||
*/
|
||||
function roots_root_relative_url($input) {
|
||||
// Fix for site_url() != home_url()
|
||||
if (!is_admin() && site_url() != home_url() && stristr($input, 'wp-includes') === false) {
|
||||
$input = str_replace(site_url(), '', $input);
|
||||
}
|
||||
|
||||
$output = preg_replace_callback(
|
||||
'!(https?://[^/|"]+)([^"]+)?!',
|
||||
create_function(
|
||||
'$matches',
|
||||
// If full URL is home_url("/") and this isn't a subdir install, return a slash for relative root
|
||||
'if (isset($matches[0]) && $matches[0] === home_url("/") && str_replace("http://", "", home_url("/", "http"))==$_SERVER["HTTP_HOST"]) { return "/";' .
|
||||
// If domain is equal to home_url("/"), then make URL relative
|
||||
'} elseif (isset($matches[0]) && strpos($matches[0], home_url("/")) !== false) { return $matches[2];' .
|
||||
// If domain is not equal to home_url("/"), do not make external link relative
|
||||
'} else { return $matches[0]; };'
|
||||
),
|
||||
$input
|
||||
);
|
||||
|
||||
// detect and correct for subdir installs
|
||||
if ($subdir = parse_url(home_url(), PHP_URL_PATH)) {
|
||||
if (substr($output, 0, strlen($subdir)) == (substr($output, strlen($subdir), strlen($subdir)))) {
|
||||
$output = substr($output, strlen($subdir));
|
||||
}
|
||||
}
|
||||
|
||||
$output = wp_make_link_relative($input);
|
||||
return $output;
|
||||
}
|
||||
|
||||
@@ -174,10 +149,6 @@ function roots_enable_root_relative_urls() {
|
||||
if (roots_enable_root_relative_urls()) {
|
||||
$root_rel_filters = array(
|
||||
'bloginfo_url',
|
||||
'theme_root_uri',
|
||||
'stylesheet_directory_uri',
|
||||
'template_directory_uri',
|
||||
'plugins_url',
|
||||
'the_permalink',
|
||||
'wp_list_pages',
|
||||
'wp_list_categories',
|
||||
|
||||
@@ -28,7 +28,7 @@ class Roots_Walker_Comment extends Walker_Comment {
|
||||
|
||||
extract($args, EXTR_SKIP); ?>
|
||||
|
||||
<li <?php comment_class('media comment-' . get_comment_ID()); ?>>
|
||||
<li id="comment-<?php comment_ID(); ?>" <?php comment_class('media comment-' . get_comment_ID()); ?>>
|
||||
<?php include(locate_template('templates/comment.php')); ?>
|
||||
<?php
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
*/
|
||||
add_theme_support('root-relative-urls'); // Enable relative URLs
|
||||
add_theme_support('rewrites'); // Enable URL rewrites
|
||||
add_theme_support('h5bp-htaccess'); // Enable HTML5 Boilerplate's .htaccess
|
||||
add_theme_support('bootstrap-top-navbar'); // Enable Bootstrap's top navbar
|
||||
add_theme_support('bootstrap-gallery'); // Enable Bootstrap's thumbnails component on [gallery]
|
||||
add_theme_support('nice-search'); // Enable /?s= to /search/ redirect
|
||||
@@ -64,7 +63,7 @@ function roots_display_sidebar() {
|
||||
* Any of these page templates that return true won't show the sidebar
|
||||
*/
|
||||
array(
|
||||
'page-custom.php'
|
||||
'template-custom.php'
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -1,420 +0,0 @@
|
||||
# BEGIN HTML5 Boilerplate
|
||||
|
||||
###
|
||||
### This contains the HTML5 Boilerplate .htaccess that can be found at:
|
||||
### https://github.com/h5bp/server-configs/blob/master/apache/.htaccess
|
||||
###
|
||||
### Added:
|
||||
### Block access to WordPress files that reveal version information.
|
||||
###
|
||||
### Removed:
|
||||
### Expires headers: Use W3 Total Cache
|
||||
### ETag removal: Use W3 Total Cache
|
||||
### Start rewrite engine: Handled by WordPress
|
||||
### Suppress/force www: Handled by WordPress
|
||||
### Custom 404 page: Handled by WordPress
|
||||
###
|
||||
### Commmented out by default:
|
||||
### Options -MultiViews: Causes a server 500 error on most shared hosts
|
||||
###
|
||||
### Anytime you update this file the .htaccess file in the root of your
|
||||
### WordPress install is automatically updated with the changes whenever
|
||||
### the permalinks are flushed or set (see lib/htaccess.php)
|
||||
###
|
||||
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Better website experience for IE users
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Force the latest IE version, in various cases when it may fall back to IE7 mode
|
||||
# github.com/rails/rails/commit/123eb25#commitcomment-118920
|
||||
# Use ChromeFrame if it's installed for a better experience for the poor IE folk
|
||||
|
||||
<IfModule mod_headers.c>
|
||||
Header set X-UA-Compatible "IE=edge,chrome=1"
|
||||
# mod_headers can't match by content-type, but we don't want to send this header on *everything*...
|
||||
<FilesMatch "\.(appcache|crx|css|eot|gif|htc|ico|jpe?g|js|m4a|m4v|manifest|mp4|oex|oga|ogg|ogv|otf|pdf|png|safariextz|svg|svgz|ttf|vcf|webm|webp|woff|xml|xpi)$">
|
||||
Header unset X-UA-Compatible
|
||||
</FilesMatch>
|
||||
</IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Cross-domain AJAX requests
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Serve cross-domain Ajax requests, disabled by default.
|
||||
# enable-cors.org
|
||||
# code.google.com/p/html5security/wiki/CrossOriginRequestSecurity
|
||||
|
||||
# <IfModule mod_headers.c>
|
||||
# Header set Access-Control-Allow-Origin "*"
|
||||
# </IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# CORS-enabled images (@crossorigin)
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Send CORS headers if browsers request them; enabled by default for images.
|
||||
# developer.mozilla.org/en/CORS_Enabled_Image
|
||||
# blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html
|
||||
# hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/
|
||||
# wiki.mozilla.org/Security/Reviews/crossoriginAttribute
|
||||
|
||||
<IfModule mod_setenvif.c>
|
||||
<IfModule mod_headers.c>
|
||||
# mod_headers, y u no match by Content-Type?!
|
||||
<FilesMatch "\.(gif|ico|jpe?g|png|svg|svgz|webp)$">
|
||||
SetEnvIf Origin ":" IS_CORS
|
||||
Header set Access-Control-Allow-Origin "*" env=IS_CORS
|
||||
</FilesMatch>
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Webfont access
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Allow access from all domains for webfonts.
|
||||
# Alternatively you could only whitelist your
|
||||
# subdomains like "subdomain.example.com".
|
||||
|
||||
<IfModule mod_headers.c>
|
||||
<FilesMatch "\.(eot|font.css|otf|ttc|ttf|woff)$">
|
||||
Header set Access-Control-Allow-Origin "*"
|
||||
</FilesMatch>
|
||||
</IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Proper MIME type for all files
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# JavaScript
|
||||
# Normalize to standard type (it's sniffed in IE anyways)
|
||||
# tools.ietf.org/html/rfc4329#section-7.2
|
||||
AddType application/javascript js jsonp
|
||||
AddType application/json json
|
||||
|
||||
# Audio
|
||||
AddType audio/mp4 m4a f4a f4b
|
||||
AddType audio/ogg oga ogg
|
||||
|
||||
# Video
|
||||
AddType video/mp4 mp4 m4v f4v f4p
|
||||
AddType video/ogg ogv
|
||||
AddType video/webm webm
|
||||
AddType video/x-flv flv
|
||||
|
||||
# SVG
|
||||
# Required for svg webfonts on iPad
|
||||
# twitter.com/FontSquirrel/status/14855840545
|
||||
AddType image/svg+xml svg svgz
|
||||
AddEncoding gzip svgz
|
||||
|
||||
# Webfonts
|
||||
AddType application/font-woff woff
|
||||
AddType application/vnd.ms-fontobject eot
|
||||
AddType application/x-font-ttf ttf ttc
|
||||
AddType font/opentype otf
|
||||
|
||||
# Assorted types
|
||||
AddType application/octet-stream safariextz
|
||||
AddType application/x-chrome-extension crx
|
||||
AddType application/x-opera-extension oex
|
||||
AddType application/x-shockwave-flash swf
|
||||
AddType application/x-web-app-manifest+json webapp
|
||||
AddType application/x-xpinstall xpi
|
||||
AddType application/xml rss atom xml rdf
|
||||
AddType image/webp webp
|
||||
AddType image/x-icon ico
|
||||
AddType text/cache-manifest appcache manifest
|
||||
AddType text/vtt vtt
|
||||
AddType text/x-component htc
|
||||
AddType text/x-vcard vcf
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Allow concatenation from within specific js and css files
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# e.g. Inside of script.combined.js you could have
|
||||
# <!--#include file="libs/jquery-1.5.0.min.js" -->
|
||||
# <!--#include file="plugins/jquery.idletimer.js" -->
|
||||
# and they would be included into this single file.
|
||||
|
||||
# This is not in use in the boilerplate as it stands. You may
|
||||
# choose to use this technique if you do not have a build process.
|
||||
|
||||
#<FilesMatch "\.combined\.js$">
|
||||
# Options +Includes
|
||||
# AddOutputFilterByType INCLUDES application/javascript application/json
|
||||
# SetOutputFilter INCLUDES
|
||||
#</FilesMatch>
|
||||
|
||||
#<FilesMatch "\.combined\.css$">
|
||||
# Options +Includes
|
||||
# AddOutputFilterByType INCLUDES text/css
|
||||
# SetOutputFilter INCLUDES
|
||||
#</FilesMatch>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Gzip compression
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
<IfModule mod_deflate.c>
|
||||
|
||||
# Force deflate for mangled headers developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping/
|
||||
<IfModule mod_setenvif.c>
|
||||
<IfModule mod_headers.c>
|
||||
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
|
||||
RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
|
||||
# Compress all output labeled with one of the following MIME-types
|
||||
# (for Apache versions below 2.3.7, you don't need to enable `mod_filter`
|
||||
# and can remove the `<IfModule mod_filter.c>` and `</IfModule>` lines as
|
||||
# `AddOutputFilterByType` is still in the core directives)
|
||||
<IfModule mod_filter.c>
|
||||
AddOutputFilterByType DEFLATE application/atom+xml \
|
||||
application/javascript \
|
||||
application/json \
|
||||
application/rss+xml \
|
||||
application/vnd.ms-fontobject \
|
||||
application/x-font-ttf \
|
||||
application/xhtml+xml \
|
||||
application/xml \
|
||||
font/opentype \
|
||||
image/svg+xml \
|
||||
image/x-icon \
|
||||
text/css \
|
||||
text/html \
|
||||
text/plain \
|
||||
text/x-component \
|
||||
text/xml
|
||||
</IfModule>
|
||||
|
||||
</IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Prevent mobile network providers from modifying your site
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# The following header prevents modification of your code over 3G on some
|
||||
# European providers.
|
||||
# This is the official 'bypass' suggested by O2 in the UK.
|
||||
|
||||
# <IfModule mod_headers.c>
|
||||
# Header set Cache-Control "no-transform"
|
||||
# </IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Stop screen flicker in IE on CSS rollovers
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# The following directives stop screen flicker in IE on CSS rollovers - in
|
||||
# combination with the "ExpiresByType" rules for images (see above).
|
||||
|
||||
# BrowserMatch "MSIE" brokenvary=1
|
||||
# BrowserMatch "Mozilla/4.[0-9]{2}" brokenvary=1
|
||||
# BrowserMatch "Opera" !brokenvary
|
||||
# SetEnvIf brokenvary 1 force-no-vary
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Set Keep-Alive Header
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Keep-Alive allows the server to send multiple requests through one
|
||||
# TCP-connection. Be aware of possible disadvantages of this setting. Turn on
|
||||
# if you serve a lot of static content.
|
||||
|
||||
# <IfModule mod_headers.c>
|
||||
# Header set Connection Keep-Alive
|
||||
# </IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Cookie setting from iframes
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Allow cookies to be set from iframes (for IE only)
|
||||
# If needed, specify a path or regex in the Location directive.
|
||||
|
||||
# <IfModule mod_headers.c>
|
||||
# Header set P3P "policyref=\"/w3c/p3p.xml\", CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\""
|
||||
# </IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Built-in filename-based cache busting
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# If you're not using the build script to manage your filename version revving,
|
||||
# you might want to consider enabling this, which will route requests for
|
||||
# `/css/style.20110203.css` to `/css/style.css`.
|
||||
|
||||
# To understand why this is important and a better idea than all.css?v1231,
|
||||
# please refer to the bundled documentation about `.htaccess`.
|
||||
|
||||
# <IfModule mod_rewrite.c>
|
||||
# RewriteCond %{REQUEST_FILENAME} !-f
|
||||
# RewriteCond %{REQUEST_FILENAME} !-d
|
||||
# RewriteRule ^(.+)\.(\d+)\.(js|css|png|jpg|gif)$ $1.$3 [L]
|
||||
# </IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Prevent SSL cert warnings
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Rewrite secure requests properly to prevent SSL cert warnings, e.g. prevent
|
||||
# https://www.example.com when your cert only allows https://secure.example.com
|
||||
|
||||
# <IfModule mod_rewrite.c>
|
||||
# RewriteCond %{SERVER_PORT} !^443
|
||||
# RewriteRule ^ https://example-domain-please-change-me.com%{REQUEST_URI} [R=301,L]
|
||||
# </IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Force client-side SSL redirection
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# If a user types "example.com" in her browser, the above rule will redirect her
|
||||
# to the secure version of the site. That still leaves a window of opportunity
|
||||
# (the initial HTTP connection) for an attacker to downgrade or redirect the
|
||||
# request. The following header ensures that browser will **only** connect to
|
||||
# your server via HTTPS, regardless of what users type in the address bar.
|
||||
|
||||
# <IfModule mod_headers.c>
|
||||
# Header set Strict-Transport-Security max-age=16070400;
|
||||
# </IfModule>
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Prevent 404 errors for non-existing redirected folders
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# without -MultiViews, Apache will give a 404 for a rewrite if a folder of the
|
||||
# same name does not exist.
|
||||
# webmasterworld.com/apache/3808792.htm
|
||||
|
||||
# Options -MultiViews
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# UTF-8 encoding
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# Use UTF-8 encoding for anything served text/plain or text/html
|
||||
AddDefaultCharset utf-8
|
||||
|
||||
# Force UTF-8 for a number of file formats
|
||||
AddCharset utf-8 .atom .css .js .json .rss .vtt .xml
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# A little more security
|
||||
# ----------------------------------------------------------------------
|
||||
|
||||
# To avoid displaying the exact version number of Apache being used, add the
|
||||
# following to httpd.conf (it will not work in .htaccess):
|
||||
# ServerTokens Prod
|
||||
|
||||
# "-Indexes" will have Apache block users from browsing folders without a
|
||||
# default document Usually you should leave this activated, because you
|
||||
# shouldn't allow everybody to surf through every folder on your server (which
|
||||
# includes rather private places like CMS system folders).
|
||||
<IfModule mod_autoindex.c>
|
||||
Options -Indexes
|
||||
</IfModule>
|
||||
|
||||
# Block access to "hidden" directories or files whose names begin with a
|
||||
# period. This includes directories used by version control systems such as
|
||||
# Subversion or Git.
|
||||
<IfModule mod_rewrite.c>
|
||||
RewriteCond %{SCRIPT_FILENAME} -d [OR]
|
||||
RewriteCond %{SCRIPT_FILENAME} -f
|
||||
RewriteRule "(^|/)\." - [F]
|
||||
</IfModule>
|
||||
|
||||
# Block access to backup and source files. These files may be left by some
|
||||
# text/html editors and pose a great security danger, when anyone can access
|
||||
# them.
|
||||
<FilesMatch "(\.(bak|config|dist|fla|inc|ini|log|psd|sh|sql|swp)|~)$">
|
||||
Order allow,deny
|
||||
Deny from all
|
||||
Satisfy All
|
||||
</FilesMatch>
|
||||
|
||||
# If your server is not already configured as such, the following directive
|
||||
# should be uncommented in order to set PHP's register_globals option to OFF.
|
||||
# This closes a major security hole that is abused by most XSS (cross-site
|
||||
# scripting) attacks. For more information: http://php.net/register_globals
|
||||
#
|
||||
# IF REGISTER_GLOBALS DIRECTIVE CAUSES 500 INTERNAL SERVER ERRORS:
|
||||
#
|
||||
# Your server does not allow PHP directives to be set via .htaccess. In that
|
||||
# case you must make this change in your php.ini file instead. If you are
|
||||
# using a commercial web host, contact the administrators for assistance in
|
||||
# doing this. Not all servers allow local php.ini files, and they should
|
||||
# include all PHP configurations (not just this one), or you will effectively
|
||||
# reset everything to PHP defaults. Consult www.php.net for more detailed
|
||||
# information about setting PHP directives.
|
||||
|
||||
# php_flag register_globals Off
|
||||
|
||||
# Rename session cookie to something else, than PHPSESSID
|
||||
# php_value session.name sid
|
||||
|
||||
# Disable magic quotes (This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.)
|
||||
# php_flag magic_quotes_gpc Off
|
||||
|
||||
# Do not show you are using PHP
|
||||
# Note: Move this line to php.ini since it won't work in .htaccess
|
||||
# php_flag expose_php Off
|
||||
|
||||
# Level of log detail - log all errors
|
||||
# php_value error_reporting -1
|
||||
|
||||
# Write errors to log file
|
||||
# php_flag log_errors On
|
||||
|
||||
# Do not display errors in browser (production - Off, development - On)
|
||||
# php_flag display_errors Off
|
||||
|
||||
# Do not display startup errors (production - Off, development - On)
|
||||
# php_flag display_startup_errors Off
|
||||
|
||||
# Format errors in plain text
|
||||
# Note: Leave this setting 'On' for xdebug's var_dump() output
|
||||
# php_flag html_errors Off
|
||||
|
||||
# Show multiple occurrence of error
|
||||
# php_flag ignore_repeated_errors Off
|
||||
|
||||
# Show same errors from different sources
|
||||
# php_flag ignore_repeated_source Off
|
||||
|
||||
# Size limit for error messages
|
||||
# php_value log_errors_max_len 1024
|
||||
|
||||
# Don't precede error with string (doesn't accept empty string, use whitespace if you need)
|
||||
# php_value error_prepend_string " "
|
||||
|
||||
# Don't prepend to error (doesn't accept empty string, use whitespace if you need)
|
||||
# php_value error_append_string " "
|
||||
|
||||
# Increase cookie security
|
||||
<IfModule mod_php5.c>
|
||||
php_value session.cookie_httponly true
|
||||
</IfModule>
|
||||
@@ -1,26 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Add HTML5 Boilerplate's .htaccess via WordPress
|
||||
*/
|
||||
function roots_add_h5bp_htaccess($content) {
|
||||
global $wp_rewrite;
|
||||
$home_path = function_exists('get_home_path') ? get_home_path() : ABSPATH;
|
||||
$htaccess_file = $home_path . '.htaccess';
|
||||
$mod_rewrite_enabled = function_exists('got_mod_rewrite') ? got_mod_rewrite() : false;
|
||||
|
||||
if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
|
||||
if ($mod_rewrite_enabled) {
|
||||
$h5bp_rules = extract_from_markers($htaccess_file, 'HTML5 Boilerplate');
|
||||
if ($h5bp_rules === array()) {
|
||||
$filename = dirname(__FILE__) . '/h5bp-htaccess';
|
||||
return insert_with_markers($htaccess_file, 'HTML5 Boilerplate', extract_from_markers($filename, 'HTML5 Boilerplate'));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
if (current_theme_supports('h5bp-htaccess')) {
|
||||
add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess');
|
||||
}
|
||||
@@ -30,9 +30,7 @@ if (!defined('__DIR__')) { define('__DIR__', dirname(__FILE__)); }
|
||||
// Define helper constants
|
||||
$get_theme_name = explode('/themes/', get_template_directory());
|
||||
|
||||
define('WP_BASE', wp_base_dir());
|
||||
define('THEME_NAME', next($get_theme_name));
|
||||
define('RELATIVE_PLUGIN_PATH', str_replace(site_url() . '/', '', plugins_url()));
|
||||
define('FULL_RELATIVE_PLUGIN_PATH', WP_BASE . '/' . RELATIVE_PLUGIN_PATH);
|
||||
define('RELATIVE_CONTENT_PATH', str_replace(site_url() . '/', '', content_url()));
|
||||
define('RELATIVE_PLUGIN_PATH', str_replace(home_url() . '/', '', plugins_url()));
|
||||
define('RELATIVE_CONTENT_PATH', str_replace(home_url() . '/', '', content_url()));
|
||||
define('THEME_PATH', RELATIVE_CONTENT_PATH . '/themes/' . THEME_NAME);
|
||||
|
||||
@@ -28,14 +28,14 @@ function roots_add_rewrites($content) {
|
||||
}
|
||||
|
||||
function roots_clean_urls($content) {
|
||||
if (strpos($content, FULL_RELATIVE_PLUGIN_PATH) === 0) {
|
||||
return str_replace(FULL_RELATIVE_PLUGIN_PATH, WP_BASE . '/plugins', $content);
|
||||
if (strpos($content, RELATIVE_PLUGIN_PATH) > 0) {
|
||||
return str_replace('/' . RELATIVE_PLUGIN_PATH, '/plugins', $content);
|
||||
} else {
|
||||
return str_replace('/' . THEME_PATH, '', $content);
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_multisite() && !is_child_theme() && get_option('permalink_structure')) {
|
||||
if (!is_multisite() && !is_child_theme()) {
|
||||
if (current_theme_supports('rewrites')) {
|
||||
add_action('generate_rewrite_rules', 'roots_add_rewrites');
|
||||
}
|
||||
|
||||
@@ -85,43 +85,6 @@ function roots_title() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Show an admin notice if .htaccess isn't writable
|
||||
*/
|
||||
function roots_htaccess_writable() {
|
||||
if (!is_writable(get_home_path() . '.htaccess')) {
|
||||
if (current_user_can('administrator')) {
|
||||
add_action('admin_notices', create_function('', "echo '<div class=\"error\"><p>" . sprintf(__('Please make sure your <a href="%s">.htaccess</a> file is writable ', 'roots'), admin_url('options-permalink.php')) . "</p></div>';"));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (current_theme_supports('h5bp-htaccess')) {
|
||||
add_action('admin_init', 'roots_htaccess_writable');
|
||||
}
|
||||
|
||||
/**
|
||||
* Return WordPress subdirectory if applicable
|
||||
*/
|
||||
function wp_base_dir() {
|
||||
preg_match('!(https?://[^/|"]+)([^"]+)?!', site_url(), $matches);
|
||||
if (count($matches) === 3) {
|
||||
return end($matches);
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Opposite of built in WP functions for trailing slashes
|
||||
*/
|
||||
function leadingslashit($string) {
|
||||
return '/' . unleadingslashit($string);
|
||||
}
|
||||
|
||||
function unleadingslashit($string) {
|
||||
return ltrim($string, '/');
|
||||
}
|
||||
|
||||
function add_filters($tags, $function) {
|
||||
foreach($tags as $tag) {
|
||||
add_filter($tag, $function);
|
||||
|
||||
Reference in New Issue
Block a user