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
|
* Class for building pages
|
||||||
*
|
*
|
||||||
* All methods are chainable, with the exception of the constructor,
|
* All methods are chainable, with the exception of the constructor,
|
||||||
* build_header(), build_footer(), build_page() and _headers() methods.
|
* build_header(), build_footer(), build_page() and _headers() methods.
|
||||||
*/
|
*/
|
||||||
class Page {
|
class Page
|
||||||
|
{
|
||||||
private static $meta, $head_js, $foot_js, $css, $title,
|
private static $meta, $head_js, $foot_js, $css, $title, $head_tags, $body_class, $body_id, $base;
|
||||||
$head_tags, $body_class, $body_id, $base;
|
|
||||||
private $CI;
|
private $CI;
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
@ -109,9 +109,9 @@ class Page {
|
|||||||
$doctype_string = '';
|
$doctype_string = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$doctype_string = "<?xml version='1.0' encoding='$charset' ?>\n" .
|
$doctype_string = "<?xml version='1.0' encoding='$charset' ?>\n"
|
||||||
$doctype_string . "\n<html xmlns='http://www.w3.org/1999/xhtml'" .
|
. $doctype_string
|
||||||
" xml:lang='en'>";
|
. "\n<html xmlns='http://www.w3.org/1999/xhtml'" . " xml:lang='en'>";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -189,7 +189,7 @@ class Page {
|
|||||||
$link = array(
|
$link = array(
|
||||||
'href' => $this->CI->config->item('group_style_path') . $group,
|
'href' => $this->CI->config->item('group_style_path') . $group,
|
||||||
'rel' => 'stylesheet',
|
'rel' => 'stylesheet',
|
||||||
'type' => 'text/css',
|
'type' => 'text/css'
|
||||||
);
|
);
|
||||||
$this->css .= T1 . link_tag($link) . NL;
|
$this->css .= T1 . link_tag($link) . NL;
|
||||||
|
|
||||||
@ -233,8 +233,7 @@ class Page {
|
|||||||
*/
|
*/
|
||||||
public function set_title($title = "")
|
public function set_title($title = "")
|
||||||
{
|
{
|
||||||
$title = ($title == "") ?
|
$title = ($title == "") ? $this->CI->config->item('default_title') : $title;
|
||||||
$this->CI->config->item('default_title') : $title;
|
|
||||||
|
|
||||||
$this->title = $title;
|
$this->title = $title;
|
||||||
|
|
||||||
@ -342,9 +341,7 @@ class Page {
|
|||||||
$data = array();
|
$data = array();
|
||||||
|
|
||||||
//Set Meta Tags
|
//Set Meta Tags
|
||||||
$this->meta = ($html5 == TRUE) ?
|
$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;
|
||||||
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;
|
$data['meta'] = $this->meta;
|
||||||
|
|
||||||
//Set CSS
|
//Set CSS
|
||||||
@ -406,8 +403,7 @@ class Page {
|
|||||||
{
|
{
|
||||||
$data = array();
|
$data = array();
|
||||||
|
|
||||||
$data['foot_js'] = ($this->foot_js != "") ?
|
$data['foot_js'] = ($this->foot_js != "") ? $this->foot_js : '';
|
||||||
$this->foot_js : '';
|
|
||||||
|
|
||||||
$this->CI->load->view('footer', $data);
|
$this->CI->load->view('footer', $data);
|
||||||
}
|
}
|
||||||
@ -431,9 +427,7 @@ class Page {
|
|||||||
if ($domain == FALSE)
|
if ($domain == FALSE)
|
||||||
$js_file = $js;
|
$js_file = $js;
|
||||||
|
|
||||||
$tag = T1.'<script src="' .
|
$tag = T1 . '<script src="' . $js_file . '"></script>' . NL;
|
||||||
$js_file .
|
|
||||||
'"></script>'.NL;
|
|
||||||
|
|
||||||
return $tag;
|
return $tag;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user