From a11b6f76d139c2db893ff8887b0ae7a2e135b881 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 2 Sep 2015 10:00:43 +0200 Subject: [PATCH] code formatter --- .../application/controllers/Theme_assets.php | 52 ++++++++++++++----- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/htdocs/application/controllers/Theme_assets.php b/htdocs/application/controllers/Theme_assets.php index 7049648..f0b2294 100644 --- a/htdocs/application/controllers/Theme_assets.php +++ b/htdocs/application/controllers/Theme_assets.php @@ -4,6 +4,7 @@ * Function list: * - __construct() * - css() + * - fonts() * - images() * - js() * - _expires_header() @@ -23,8 +24,10 @@ class Theme_assets extends CI_Controller function css() { $css_file = $this->uri->segment(4); - $css_file = basename( $css_file ); // Fix LFI Vulnerability + $css_file = basename($css_file); // Fix LFI Vulnerability + //file path + $file_path = 'themes/' . $this->theme . '/css/' . $css_file; //fallback to default css if view in theme not found @@ -33,9 +36,11 @@ class Theme_assets extends CI_Controller { $file_path = 'themes/default/css/' . $css_file; } - + // Double checking file - if( !file_exists( $file_path ) ) { + + if (!file_exists($file_path)) + { return false; } @@ -44,38 +49,53 @@ class Theme_assets extends CI_Controller $this->_expires_header(1); readfile($file_path); } - + function fonts() { $font_file = $this->uri->segment(4); + //file path $file_path = 'themes/' . $this->theme . '/fonts/' . $font_file; //no fallback to default, since default has no such fonts //since no fallbcack, there is no doucle checking for file + + if (!file_exists($file_path)) { return false; } //send - $path_parts = pathinfo(dirname(dirname(dirname(__FILE__))) . '/' . $file_path ); - if ( $path_parts['extension'] == "woff" ) { + $path_parts = pathinfo(dirname(dirname(dirname(__FILE__))) . '/' . $file_path); + + if ($path_parts['extension'] == "woff") + { header('Content-type: application/font-woff'); } - if ( $path_parts['extension'] == "eot" ) { + + if ($path_parts['extension'] == "eot") + { header('Content-type: application/vnd.ms-fontobject'); } - if ( $path_parts['extension'] == "ttf" || $path_parts['extension'] == "ttc" ) { + + if ($path_parts['extension'] == "ttf" || $path_parts['extension'] == "ttc") + { header('Content-type: application/x-font-ttf'); } - if ( $path_parts['extension'] == "otf" ) { + + if ($path_parts['extension'] == "otf") + { header('Content-type: font/opentype'); } - if ( $path_parts['extension'] == "svg" ) { + + if ($path_parts['extension'] == "svg") + { header('Content-type: image/svg+xml'); } - if ( $path_parts['extension'] == "svgz" ) { + + if ($path_parts['extension'] == "svgz") + { header("Content-Encoding: gzip"); header('Content-type: image/svg+xml'); } @@ -86,7 +106,8 @@ class Theme_assets extends CI_Controller function images() { $image_file = $this->uri->segment(4); - $image_file = basename( $image_file ); + $image_file = basename($image_file); + //file path $file_path = 'themes/' . $this->theme . '/images/' . $image_file; @@ -96,11 +117,14 @@ class Theme_assets extends CI_Controller { $file_path = 'themes/default/images/' . $image_file; } - + // double checking file - if( !file_exists( $file_path ) ) { + + if (!file_exists($file_path)) + { return false; } + //send $size = getimagesize($file_path); header('Content-type: ' . $size['mime']);