Added Output class, fixed some formatting issues
This commit is contained in:
parent
c52724e325
commit
d043477bc3
@ -0,0 +1,2 @@
|
||||
Codeigniter Page Builder is a simple system for putting together content into web pages, using Codeigniter's views, and making it simpler to set expiration headers for javascript and CSS.
|
||||
|
||||
222
application/core/MY_Output.php
Normal file
222
application/core/MY_Output.php
Normal file
@ -0,0 +1,222 @@
|
||||
<?php
|
||||
if (!defined('BASEPATH'))
|
||||
exit('No direct script access allowed');
|
||||
|
||||
define('MIN_SAFE', 1);
|
||||
define('MIN_EXTREME', 2);
|
||||
define('MIN_EXTREME_COMMENTS', 4);
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Output Class
|
||||
*
|
||||
* Responsible for sending final output to browser
|
||||
*
|
||||
* @package CodeIgniter
|
||||
* @subpackage Libraries
|
||||
* @category Output
|
||||
* @author ExpressionEngine Dev Team
|
||||
* @link http://codeigniter.com/user_guide/libraries/output.html
|
||||
*/
|
||||
class MY_Output extends CI_Output
|
||||
{
|
||||
var $final_output;
|
||||
var $cache_expiration = 0;
|
||||
var $headers = array();
|
||||
var $enable_profiler = FALSE;
|
||||
var $min = 0;
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Display Output
|
||||
*
|
||||
* All "view" data is automatically put into this variable by the controller class:
|
||||
*
|
||||
* $this->final_output
|
||||
*
|
||||
* This function sends the finalized output data to the browser along
|
||||
* with any server headers and profile data. It also stops the
|
||||
* benchmark timer so the page rendering speed and memory usage can be shown.
|
||||
*
|
||||
* @access public
|
||||
* @return mixed
|
||||
*/
|
||||
function _display($output = '')
|
||||
{
|
||||
// Note: We use globals because we can't use $CI =& get_instance()
|
||||
// since this function is sometimes called by the caching mechanism,
|
||||
// which happens before the CI super object is available.
|
||||
global $BM, $CFG;
|
||||
//$this->min = 0;
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Set the output data
|
||||
if ($output == '')
|
||||
{
|
||||
$output =& $this->final_output;
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Do we need to write a cache file?
|
||||
if ($this->cache_expiration > 0)
|
||||
{
|
||||
$this->_write_cache($output);
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Parse out the elapsed time and memory usage,
|
||||
// then swap the pseudo-variables with the data
|
||||
|
||||
$elapsed = $BM->elapsed_time('total_execution_time_start', 'total_execution_time_end');
|
||||
$output = str_replace('{elapsed_time}', $elapsed, $output);
|
||||
|
||||
$memory = (!function_exists('memory_get_usage')) ? '0' : round(memory_get_usage() / 1024 / 1024, 2) . 'MB';
|
||||
$output = str_replace('{memory_usage}', $memory, $output);
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Is compression requested?
|
||||
if ($CFG->item('compress_output') === TRUE)
|
||||
{
|
||||
if (extension_loaded('zlib'))
|
||||
{
|
||||
if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) AND strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE)
|
||||
{
|
||||
ob_start('ob_gzhandler');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Are there any server headers to send?
|
||||
if (count($this->headers) > 0)
|
||||
{
|
||||
foreach ($this->headers as $header)
|
||||
{
|
||||
header($header[0], $header[1]);
|
||||
}
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Does the get_instance() function exist?
|
||||
// If not we know we are dealing with a cache file so we'll
|
||||
// simply echo out the data and exit.
|
||||
if (!function_exists('get_instance'))
|
||||
{
|
||||
echo $output;
|
||||
log_message('debug', "Final output sent to browser");
|
||||
log_message('debug', "Total execution time: " . $elapsed);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Grab the super object. We'll need it in a moment…
|
||||
$CI =& get_instance();
|
||||
|
||||
// Do we need to generate profile data?
|
||||
// If so, load the Profile class and run it.
|
||||
if ($this->enable_profiler == TRUE)
|
||||
{
|
||||
$CI->load->library('profiler');
|
||||
|
||||
// If the output data contains closing </body> and </html> tags
|
||||
// we will remove them and add them back after we insert the profile data
|
||||
if (preg_match("|</body>.*?</html>|is", $output))
|
||||
{
|
||||
$output = preg_replace("|</body>.*?</html>|is", '', $output);
|
||||
$output .= $CI->profiler->run();
|
||||
$output .= '</body></html>';
|
||||
}
|
||||
else
|
||||
{
|
||||
$output .= $CI->profiler->run();
|
||||
}
|
||||
}
|
||||
|
||||
//Let's minify!
|
||||
switch ((int) $this->min)
|
||||
{
|
||||
case 0:
|
||||
//Don't minify
|
||||
break;
|
||||
|
||||
case 1: //Safe Minify
|
||||
$output = preg_replace("`>\s+<`", "> <", $output);
|
||||
break;
|
||||
|
||||
case 2: //Extreme Minify
|
||||
$output = preg_replace('/<!--[^\[](.*)-->/Uis', '', $output);
|
||||
$output = preg_replace("`\s+`", " ", $output);
|
||||
$output = preg_replace("`> <`", "><", $output);
|
||||
$output = str_replace("</a><a", "</a> <a", $output);
|
||||
$output = preg_replace("`(<img(.*?)/>)`", " <img$2/> ", $output);
|
||||
break;
|
||||
|
||||
case 4: //Extreme minify, save comments
|
||||
$output = preg_replace("`\s+`", " ", $output);
|
||||
$output = preg_replace("`> <`", "><", $output);
|
||||
$output = str_replace("</a><a", "</a> <a", $output);
|
||||
$output = preg_replace("`(<img(.*?)/>)`", " <img$2/> ", $output);
|
||||
break;
|
||||
|
||||
default:
|
||||
//Don't minify
|
||||
break;
|
||||
}
|
||||
|
||||
//Replace common entities with more compatible versions
|
||||
$replace = array(
|
||||
'"&"' => '"&"',
|
||||
'{NL}' => " ",
|
||||
' ' => ' ',
|
||||
'©' => '©',
|
||||
'â' => 'â',
|
||||
'¢' => '¢',
|
||||
'»' => '»',
|
||||
'«' => '«'
|
||||
);
|
||||
|
||||
$output = strtr($output, $replace);
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
// Does the controller contain a function named _output()?
|
||||
// If so send the output there. Otherwise, echo it.
|
||||
if (method_exists($CI, '_output'))
|
||||
{
|
||||
$CI->_output($output);
|
||||
}
|
||||
else
|
||||
{
|
||||
echo $output; // Send it to the browser!
|
||||
}
|
||||
|
||||
log_message('debug', "Final output sent to browser");
|
||||
log_message('debug', "Total execution time: " . $elapsed);
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable/disable Minified HTML
|
||||
*
|
||||
* @access public
|
||||
* @param int
|
||||
* @return void
|
||||
*/
|
||||
function enable_min($val = 0)
|
||||
{
|
||||
$this->min = $val;
|
||||
}
|
||||
|
||||
}
|
||||
// END Output Class
|
||||
|
||||
/* End of file Output.php */
|
||||
/* Location: ./system/libraries/Output.php */
|
||||
@ -1,14 +1,14 @@
|
||||
<?php (defined('BASEPATH')) OR exit('No direct script access allowed');
|
||||
<?php
|
||||
(defined('BASEPATH')) OR exit('No direct script access allowed');
|
||||
/**
|
||||
* Class for building pages
|
||||
*
|
||||
* All methods are chainable, with the exception of the constructor,
|
||||
* build_header(), build_footer(), build_page() and _headers() methods.
|
||||
*/
|
||||
class Page {
|
||||
|
||||
private static $meta, $head_js, $foot_js, $css, $title,
|
||||
$head_tags, $body_class, $body_id, $base;
|
||||
class Page
|
||||
{
|
||||
private static $meta, $head_js, $foot_js, $css, $title, $head_tags, $body_class, $body_id, $base;
|
||||
private $CI;
|
||||
|
||||
public function __construct()
|
||||
@ -27,11 +27,11 @@ class Page {
|
||||
//Define some constants for formatting
|
||||
define('NL', "\n");
|
||||
define('T1', "\t");
|
||||
define('T2', T1.T1);
|
||||
define('T3', T2.T1);
|
||||
define('T4', T2.T2);
|
||||
define('T5', T3.T2);
|
||||
define('T6', T3.T3);
|
||||
define('T2', T1 . T1);
|
||||
define('T3', T2 . T1);
|
||||
define('T4', T2 . T2);
|
||||
define('T5', T3 . T2);
|
||||
define('T6', T3 . T3);
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
@ -64,20 +64,20 @@ class Page {
|
||||
$charset = "UTF-8";
|
||||
|
||||
//If xhtml flag is false, set html4 header
|
||||
if($xhtml == TRUE)
|
||||
if ($xhtml == TRUE)
|
||||
{
|
||||
//Check that the user agent accepts application/xhtml+xml, or if it's the W3C Validator
|
||||
if(stristr($accept,"application/xhtml+xml") || stristr($_SERVER["HTTP_USER_AGENT"],"W3C_Validator"))
|
||||
if (stristr($accept, "application/xhtml+xml") || stristr($_SERVER["HTTP_USER_AGENT"], "W3C_Validator"))
|
||||
{
|
||||
$mime = "application/xhtml+xml";
|
||||
}
|
||||
//Or if it supports application/xml
|
||||
else if(stristr($accept,"application/xml"))
|
||||
else if (stristr($accept, "application/xml"))
|
||||
{
|
||||
$mime = "application/xml";
|
||||
}
|
||||
//Or if it supports text/xml
|
||||
else if(stristr($accept,"text/xml"))
|
||||
else if (stristr($accept, "text/xml"))
|
||||
{
|
||||
$mime = "text/xml";
|
||||
}
|
||||
@ -85,7 +85,7 @@ class Page {
|
||||
{
|
||||
$mime = "text/html";
|
||||
|
||||
if($html5 == FALSE) //If it's not HTML5, it's HTML4
|
||||
if ($html5 == FALSE) //If it's not HTML5, it's HTML4
|
||||
{
|
||||
$doctype_string = doctype('html4-strict');
|
||||
}
|
||||
@ -95,23 +95,23 @@ class Page {
|
||||
{
|
||||
$mime = "text/html";
|
||||
|
||||
if($html5 == FALSE)
|
||||
if ($html5 == FALSE)
|
||||
{
|
||||
$doctype_string = doctype('html4-strict');
|
||||
}
|
||||
}
|
||||
|
||||
// set the doctype according to the mime type which was determined
|
||||
if($mime == "application/xhtml+xml" || $mime == "text/xml" || $mime == "application/xml")
|
||||
if ($mime == "application/xhtml+xml" || $mime == "text/xml" || $mime == "application/xml")
|
||||
{
|
||||
if($html5 == TRUE)
|
||||
if ($html5 == TRUE)
|
||||
{
|
||||
$doctype_string = '';
|
||||
}
|
||||
|
||||
$doctype_string = "<?xml version='1.0' encoding='$charset' ?>\n" .
|
||||
$doctype_string . "\n<html xmlns='http://www.w3.org/1999/xhtml'" .
|
||||
" xml:lang='en'>";
|
||||
$doctype_string = "<?xml version='1.0' encoding='$charset' ?>\n"
|
||||
. $doctype_string
|
||||
. "\n<html xmlns='http://www.w3.org/1999/xhtml'" . " xml:lang='en'>";
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -138,7 +138,7 @@ class Page {
|
||||
*/
|
||||
public function set_meta($meta)
|
||||
{
|
||||
$this->meta .= T1.meta($meta).NL;
|
||||
$this->meta .= T1 . meta($meta) . NL;
|
||||
return $this;
|
||||
}
|
||||
|
||||
@ -150,9 +150,9 @@ class Page {
|
||||
* @param bool $debug
|
||||
* @return Page
|
||||
*/
|
||||
public function set_head_js_group($group, $debug=FALSE)
|
||||
public function set_head_js_group($group, $debug = FALSE)
|
||||
{
|
||||
if($group === FALSE)
|
||||
if ($group === FALSE)
|
||||
{
|
||||
return $this;
|
||||
}
|
||||
@ -171,7 +171,7 @@ class Page {
|
||||
* @param bool $domain
|
||||
* @return Page
|
||||
*/
|
||||
public function set_head_js($js, $domain=TRUE)
|
||||
public function set_head_js($js, $domain = TRUE)
|
||||
{
|
||||
$this->head_js .= $this->script_tag($js, $domain);
|
||||
return $this;
|
||||
@ -189,9 +189,9 @@ class Page {
|
||||
$link = array(
|
||||
'href' => $this->CI->config->item('group_style_path') . $group,
|
||||
'rel' => 'stylesheet',
|
||||
'type' => 'text/css',
|
||||
'type' => 'text/css'
|
||||
);
|
||||
$this->css .= T1.link_tag($link).NL;
|
||||
$this->css .= T1 . link_tag($link) . NL;
|
||||
|
||||
return $this;
|
||||
}
|
||||
@ -203,7 +203,7 @@ class Page {
|
||||
* @param string $group
|
||||
* @return Page
|
||||
*/
|
||||
public function set_foot_js_group($group, $debug=FALSE)
|
||||
public function set_foot_js_group($group, $debug = FALSE)
|
||||
{
|
||||
$file = $this->CI->config->item('group_js_path') . $group;
|
||||
$file .= ($debug == TRUE) ? "?debug=1" : "";
|
||||
@ -231,10 +231,9 @@ class Page {
|
||||
* @param string $title
|
||||
* @return Page
|
||||
*/
|
||||
public function set_title($title="")
|
||||
public function set_title($title = "")
|
||||
{
|
||||
$title = ($title == "") ?
|
||||
$this->CI->config->item('default_title') : $title;
|
||||
$title = ($title == "") ? $this->CI->config->item('default_title') : $title;
|
||||
|
||||
$this->title = $title;
|
||||
|
||||
@ -248,7 +247,7 @@ class Page {
|
||||
* @param string $class
|
||||
* @return Page
|
||||
*/
|
||||
public function set_body_class($class="")
|
||||
public function set_body_class($class = "")
|
||||
{
|
||||
$this->body_class = $class;
|
||||
return $this;
|
||||
@ -261,7 +260,7 @@ class Page {
|
||||
* @param string $id
|
||||
* @return Page
|
||||
*/
|
||||
public function set_body_id($id="")
|
||||
public function set_body_id($id = "")
|
||||
{
|
||||
$this->body_id = $id;
|
||||
return $this;
|
||||
@ -288,7 +287,7 @@ class Page {
|
||||
* @param string $media
|
||||
* @return Page
|
||||
*/
|
||||
public function set_css_tag($name, $domain=TRUE, $media="all")
|
||||
public function set_css_tag($name, $domain = TRUE, $media = "all")
|
||||
{
|
||||
$path = $this->CI->config->item('content_domain');
|
||||
$css_file = $path . "/css/" . $name . ".css";
|
||||
@ -296,7 +295,7 @@ class Page {
|
||||
if ($domain == FALSE)
|
||||
$css_file = $name;
|
||||
|
||||
$this->css_tags .= T1.link_tag($name, "stylesheet", "text/css", "", $media).NL;
|
||||
$this->css_tags .= T1 . link_tag($name, "stylesheet", "text/css", "", $media) . NL;
|
||||
|
||||
return $this;
|
||||
}
|
||||
@ -309,7 +308,7 @@ class Page {
|
||||
* @param bool $domain
|
||||
* @return Page
|
||||
*/
|
||||
public function set_foot_js_tag($name, $domain=TRUE)
|
||||
public function set_foot_js_tag($name, $domain = TRUE)
|
||||
{
|
||||
$this->foot_js .= $this->script_tag($name, $domain);
|
||||
return $this;
|
||||
@ -342,9 +341,7 @@ class Page {
|
||||
$data = array();
|
||||
|
||||
//Set Meta Tags
|
||||
$this->meta = ($html5 == TRUE) ?
|
||||
T1.'<meta charset="utf-8" />'.NL. $this->meta :
|
||||
T1.meta('content-type', 'text/html; charset=utf-8', 'equiv').NL.$this->meta;
|
||||
$this->meta = ($html5 == TRUE) ? T1 . '<meta charset="utf-8" />' . NL . $this->meta : T1 . meta('content-type', 'text/html; charset=utf-8', 'equiv') . NL . $this->meta;
|
||||
$data['meta'] = $this->meta;
|
||||
|
||||
//Set CSS
|
||||
@ -360,7 +357,7 @@ class Page {
|
||||
}
|
||||
|
||||
//Set head javascript
|
||||
if($this->head_js != "")
|
||||
if ($this->head_js != "")
|
||||
{
|
||||
$data['head_js'] = $this->head_js;
|
||||
}
|
||||
@ -406,8 +403,7 @@ class Page {
|
||||
{
|
||||
$data = array();
|
||||
|
||||
$data['foot_js'] = ($this->foot_js != "") ?
|
||||
$this->foot_js : '';
|
||||
$data['foot_js'] = ($this->foot_js != "") ? $this->foot_js : '';
|
||||
|
||||
$this->CI->load->view('footer', $data);
|
||||
}
|
||||
@ -423,7 +419,7 @@ class Page {
|
||||
* @param bool $domain
|
||||
* @return string
|
||||
*/
|
||||
private function script_tag($js, $domain=TRUE)
|
||||
private function script_tag($js, $domain = TRUE)
|
||||
{
|
||||
$path = $this->CI->config->item('content_domain');
|
||||
$js_file = $path . "/js/" . $js . ".js";
|
||||
@ -431,9 +427,7 @@ class Page {
|
||||
if ($domain == FALSE)
|
||||
$js_file = $js;
|
||||
|
||||
$tag = T1.'<script src="' .
|
||||
$js_file .
|
||||
'"></script>'.NL;
|
||||
$tag = T1 . '<script src="' . $js_file . '"></script>' . NL;
|
||||
|
||||
return $tag;
|
||||
}
|
||||
@ -449,7 +443,7 @@ class Page {
|
||||
* @param bool $xhtml
|
||||
* @param bool $html5
|
||||
*/
|
||||
public function quick_build($view, $data, $xhtml=TRUE, $html5=TRUE)
|
||||
public function quick_build($view, $data, $xhtml = TRUE, $html5 = TRUE)
|
||||
{
|
||||
//Set up header
|
||||
if ($title != '')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user