[+] Classes : added new class Media => It contains all the method related to media like CSS, JS
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin() [~] Deprecated : All method related to CCC has been moved in class Media
This commit is contained in:
vAugagneur
+47
-256
@@ -1206,43 +1206,15 @@ class ToolsCore
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated as of 1.5 use Media::minifyHTML()
|
||||
*/
|
||||
|
||||
public static function minifyHTML($html_content)
|
||||
{
|
||||
if (strlen($html_content) > 0)
|
||||
{
|
||||
//set an alphabetical order for args
|
||||
$html_content = preg_replace_callback(
|
||||
'/(<[a-zA-Z0-9]+)((\s?[a-zA-Z0-9]+=[\"\\\'][^\"\\\']*[\"\\\']\s?)*)>/'
|
||||
,array('Tools', 'minifyHTMLpregCallback')
|
||||
,$html_content);
|
||||
|
||||
require_once(_PS_TOOL_DIR_.'minify_html/minify_html.class.php');
|
||||
$html_content = str_replace(chr(194) . chr(160), ' ', $html_content);
|
||||
$html_content = Minify_HTML::minify($html_content, array('xhtml', 'cssMinifier', 'jsMinifier'));
|
||||
|
||||
if (Configuration::get('PS_HIGH_HTML_THEME_COMPRESSION'))
|
||||
{
|
||||
//$html_content = preg_replace('/"([^\>\s"]*)"/i', '$1', $html_content);//FIXME create a js bug
|
||||
$html_content = preg_replace('/<!DOCTYPE \w[^\>]*dtd\">/is', '', $html_content);
|
||||
$html_content = preg_replace('/\s\>/is', '>', $html_content);
|
||||
$html_content = str_replace('</li>', '', $html_content);
|
||||
$html_content = str_replace('</dt>', '', $html_content);
|
||||
$html_content = str_replace('</dd>', '', $html_content);
|
||||
$html_content = str_replace('</head>', '', $html_content);
|
||||
$html_content = str_replace('<head>', '', $html_content);
|
||||
$html_content = str_replace('</html>', '', $html_content);
|
||||
$html_content = str_replace('</body>', '', $html_content);
|
||||
//$html_content = str_replace('</p>', '', $html_content);//FIXME doesnt work...
|
||||
$html_content = str_replace("</option>\n", '', $html_content);//TODO with bellow
|
||||
$html_content = str_replace('</option>', '', $html_content);
|
||||
$html_content = str_replace('<script type=text/javascript>', '<script>', $html_content);//Do a better expreg
|
||||
$html_content = str_replace("<script>\n", '<script>', $html_content);//Do a better expreg
|
||||
}
|
||||
|
||||
return $html_content;
|
||||
}
|
||||
return false;
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::minifyHTML($html_content);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1265,56 +1237,41 @@ class ToolsCore
|
||||
$b = hexdec(substr($hex, 4, 2));
|
||||
return (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated as of 1.5 use Media::minifyHTMLpregCallback()
|
||||
*/
|
||||
public static function minifyHTMLpregCallback($preg_matches)
|
||||
{
|
||||
$args = array();
|
||||
preg_match_all('/[a-zA-Z0-9]+=[\"\\\'][^\"\\\']*[\"\\\']/is', $preg_matches[2], $args);
|
||||
$args = $args[0];
|
||||
sort($args);
|
||||
$output = $preg_matches[1].' '.implode(' ', $args).'>';
|
||||
return $output;
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::minifyHTMLpregCallback($preg_matches);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated as of 1.5 use Media::packJSinHTML()
|
||||
*/
|
||||
public static function packJSinHTML($html_content)
|
||||
{
|
||||
if (strlen($html_content) > 0)
|
||||
{
|
||||
$htmlContentCopy = $html_content;
|
||||
$html_content = preg_replace_callback(
|
||||
'/\\s*(<script\\b[^>]*?>)([\\s\\S]*?)(<\\/script>)\\s*/i'
|
||||
,array('Tools', 'packJSinHTMLpregCallback')
|
||||
,$html_content);
|
||||
|
||||
// If the string is too big preg_replace return an error
|
||||
// In this case, we don't compress the content
|
||||
if( preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR ) {
|
||||
error_log('ERROR: PREG_BACKTRACK_LIMIT_ERROR in function packJSinHTML');
|
||||
return $htmlContentCopy;
|
||||
}
|
||||
return $html_content;
|
||||
}
|
||||
return false;
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::packJSinHTML($html_content);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated as of 1.5 use Media::packJSinHTMLpregCallback()
|
||||
*/
|
||||
public static function packJSinHTMLpregCallback($preg_matches)
|
||||
{
|
||||
$preg_matches[1] = $preg_matches[1].'/* <![CDATA[ */';
|
||||
$preg_matches[2] = self::packJS($preg_matches[2]);
|
||||
$preg_matches[count($preg_matches)-1] = '/* ]]> */'.$preg_matches[count($preg_matches)-1];
|
||||
unset($preg_matches[0]);
|
||||
$output = implode('', $preg_matches);
|
||||
return $output;
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::packJSinHTMLpregCallback($preg_matches);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated as of 1.5 use Media::packJS()
|
||||
*/
|
||||
public static function packJS($js_content)
|
||||
{
|
||||
if (strlen($js_content) > 0)
|
||||
{
|
||||
require_once(_PS_TOOL_DIR_.'js_minify/jsmin.php');
|
||||
return JSMin::minify($js_content);
|
||||
}
|
||||
return false;
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::packJS($js_content);
|
||||
}
|
||||
|
||||
|
||||
@@ -1328,42 +1285,14 @@ class ToolsCore
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated as of 1.5 use Media::minifyCSS()
|
||||
*/
|
||||
public static function minifyCSS($css_content, $fileuri = false)
|
||||
{
|
||||
global $current_css_file;
|
||||
|
||||
$current_css_file = $fileuri;
|
||||
if (strlen($css_content) > 0)
|
||||
{
|
||||
$css_content = preg_replace('#/\*.*?\*/#s', '', $css_content);
|
||||
$css_content = preg_replace_callback('#url\((?:\'|")?([^\)\'"]*)(?:\'|")?\)#s',array('Tools', 'replaceByAbsoluteURL'), $css_content);
|
||||
|
||||
$css_content = preg_replace('#\s+#',' ',$css_content);
|
||||
$css_content = str_replace("\t", '', $css_content);
|
||||
$css_content = str_replace("\n", '', $css_content);
|
||||
//$css_content = str_replace('}', "}\n", $css_content);
|
||||
|
||||
$css_content = str_replace('; ', ';', $css_content);
|
||||
$css_content = str_replace(': ', ':', $css_content);
|
||||
$css_content = str_replace(' {', '{', $css_content);
|
||||
$css_content = str_replace('{ ', '{', $css_content);
|
||||
$css_content = str_replace(', ', ',', $css_content);
|
||||
$css_content = str_replace('} ', '}', $css_content);
|
||||
$css_content = str_replace(' }', '}', $css_content);
|
||||
$css_content = str_replace(';}', '}', $css_content);
|
||||
$css_content = str_replace(':0px', ':0', $css_content);
|
||||
$css_content = str_replace(' 0px', ' 0', $css_content);
|
||||
$css_content = str_replace(':0em', ':0', $css_content);
|
||||
$css_content = str_replace(' 0em', ' 0', $css_content);
|
||||
$css_content = str_replace(':0pt', ':0', $css_content);
|
||||
$css_content = str_replace(' 0pt', ' 0', $css_content);
|
||||
$css_content = str_replace(':0%', ':0', $css_content);
|
||||
$css_content = str_replace(' 0%', ' 0', $css_content);
|
||||
|
||||
return trim($css_content);
|
||||
}
|
||||
return false;
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::minifyCSS($css_content, $fileuri);
|
||||
}
|
||||
|
||||
public static function replaceByAbsoluteURL($matches)
|
||||
@@ -1410,163 +1339,26 @@ class ToolsCore
|
||||
}
|
||||
|
||||
/**
|
||||
* Combine Compress and Cache CSS (ccc) calls
|
||||
*
|
||||
* @param array css_files
|
||||
* @return array processed css_files
|
||||
* @deprecated as of 1.5 use Media::cccCss()
|
||||
*/
|
||||
public static function cccCss($css_files) {
|
||||
//inits
|
||||
$css_files_by_media = array();
|
||||
$compressed_css_files = array();
|
||||
$compressed_css_files_not_found = array();
|
||||
$compressed_css_files_infos = array();
|
||||
$protocolLink = self::getCurrentUrlProtocolPrefix();
|
||||
|
||||
// group css files by media
|
||||
foreach ($css_files as $filename => $media)
|
||||
{
|
||||
if (!array_key_exists($media, $css_files_by_media))
|
||||
$css_files_by_media[$media] = array();
|
||||
|
||||
$infos = array();
|
||||
$infos['uri'] = $filename;
|
||||
$url_data = parse_url($filename);
|
||||
$infos['path'] = _PS_ROOT_DIR_.self::str_replace_once(__PS_BASE_URI__, '/', $url_data['path']);
|
||||
$css_files_by_media[$media]['files'][] = $infos;
|
||||
if (!array_key_exists('date', $css_files_by_media[$media]))
|
||||
$css_files_by_media[$media]['date'] = 0;
|
||||
$css_files_by_media[$media]['date'] = max(
|
||||
file_exists($infos['path']) ? filemtime($infos['path']) : 0,
|
||||
$css_files_by_media[$media]['date']
|
||||
);
|
||||
|
||||
if (!array_key_exists($media, $compressed_css_files_infos))
|
||||
$compressed_css_files_infos[$media] = array('key' => '');
|
||||
$compressed_css_files_infos[$media]['key'] .= $filename;
|
||||
}
|
||||
|
||||
// get compressed css file infos
|
||||
foreach ($compressed_css_files_infos as $media => &$info)
|
||||
{
|
||||
$key = md5($info['key'].$protocolLink);
|
||||
$filename = _PS_THEME_DIR_.'cache/'.$key.'_'.$media.'.css';
|
||||
$info = array(
|
||||
'key' => $key,
|
||||
'date' => file_exists($filename) ? filemtime($filename) : 0
|
||||
);
|
||||
}
|
||||
// aggregate and compress css files content, write new caches files
|
||||
foreach ($css_files_by_media as $media => $media_infos)
|
||||
{
|
||||
$cache_filename = _PS_THEME_DIR_.'cache/'.$compressed_css_files_infos[$media]['key'].'_'.$media.'.css';
|
||||
if ($media_infos['date'] > $compressed_css_files_infos[$media]['date'])
|
||||
{
|
||||
$compressed_css_files[$media] = '';
|
||||
foreach ($media_infos['files'] as $file_infos)
|
||||
{
|
||||
if (file_exists($file_infos['path']))
|
||||
$compressed_css_files[$media] .= self::minifyCSS(file_get_contents($file_infos['path']), $file_infos['uri']);
|
||||
else
|
||||
$compressed_css_files_not_found[] = $file_infos['path'];
|
||||
}
|
||||
if (!empty($compressed_css_files_not_found))
|
||||
$content = '/* WARNING ! file(s) not found : "'.
|
||||
implode(',', $compressed_css_files_not_found).
|
||||
'" */'."\n".$compressed_css_files[$media];
|
||||
else
|
||||
$content = $compressed_css_files[$media];
|
||||
file_put_contents($cache_filename, $content);
|
||||
chmod($cache_filename, 0777);
|
||||
}
|
||||
$compressed_css_files[$media] = $cache_filename;
|
||||
}
|
||||
|
||||
// rebuild the original css_files array
|
||||
$css_files = array();
|
||||
foreach ($compressed_css_files as $media => $filename)
|
||||
{
|
||||
$url = str_replace(_PS_THEME_DIR_, _THEMES_DIR_._THEME_NAME_.'/', $filename);
|
||||
$css_files[$protocolLink.self::getMediaServer($url).$url] = $media;
|
||||
}
|
||||
return $css_files;
|
||||
public static function cccCss($css_files)
|
||||
{
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::cccCss($css_files);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Combine Compress and Cache (ccc) JS calls
|
||||
*
|
||||
* @param array js_files
|
||||
* @return array processed js_files
|
||||
* @deprecated as of 1.5 use Media::cccJS()
|
||||
*/
|
||||
public static function cccJS($js_files) {
|
||||
//inits
|
||||
$compressed_js_files_not_found = array();
|
||||
$js_files_infos = array();
|
||||
$js_files_date = 0;
|
||||
$compressed_js_file_date = 0;
|
||||
$compressed_js_filename = '';
|
||||
$js_external_files = array();
|
||||
$protocolLink = self::getCurrentUrlProtocolPrefix();
|
||||
|
||||
// get js files infos
|
||||
foreach ($js_files as $filename)
|
||||
{
|
||||
$expr = explode(':', $filename);
|
||||
|
||||
if ($expr[0] == 'http')
|
||||
$js_external_files[] = $filename;
|
||||
else
|
||||
{
|
||||
$infos = array();
|
||||
$infos['uri'] = $filename;
|
||||
$url_data = parse_url($filename);
|
||||
$infos['path'] =_PS_ROOT_DIR_.self::str_replace_once(__PS_BASE_URI__, '/', $url_data['path']);
|
||||
$js_files_infos[] = $infos;
|
||||
|
||||
$js_files_date = max(
|
||||
file_exists($infos['path']) ? filemtime($infos['path']) : 0,
|
||||
$js_files_date
|
||||
);
|
||||
$compressed_js_filename .= $filename;
|
||||
}
|
||||
}
|
||||
|
||||
// get compressed js file infos
|
||||
$compressed_js_filename = md5($compressed_js_filename);
|
||||
|
||||
$compressed_js_path = _PS_THEME_DIR_.'cache/'.$compressed_js_filename.'.js';
|
||||
$compressed_js_file_date = file_exists($compressed_js_path) ? filemtime($compressed_js_path) : 0;
|
||||
|
||||
// aggregate and compress js files content, write new caches files
|
||||
if ($js_files_date > $compressed_js_file_date)
|
||||
{
|
||||
$content = '';
|
||||
foreach ($js_files_infos as $file_infos)
|
||||
{
|
||||
if (file_exists($file_infos['path']))
|
||||
$content .= file_get_contents($file_infos['path']).';';
|
||||
else
|
||||
$compressed_js_files_not_found[] = $file_infos['path'];
|
||||
}
|
||||
$content = self::packJS($content);
|
||||
|
||||
if (!empty($compressed_js_files_not_found))
|
||||
$content = '/* WARNING ! file(s) not found : "'.
|
||||
implode(',', $compressed_js_files_not_found).
|
||||
'" */'."\n".$content;
|
||||
|
||||
file_put_contents($compressed_js_path, $content);
|
||||
chmod($compressed_js_path, 0777);
|
||||
}
|
||||
|
||||
// rebuild the original js_files array
|
||||
$url = str_replace(_PS_ROOT_DIR_.'/', __PS_BASE_URI__, $compressed_js_path);
|
||||
|
||||
return array_merge(array($protocolLink.Tools::getMediaServer($url).$url), $js_external_files);
|
||||
public static function cccJS($js_files)
|
||||
{
|
||||
Tools::displayAsDeprecated();
|
||||
return Media::cccJS($css_files);
|
||||
}
|
||||
|
||||
private static $_cache_nb_media_servers = null;
|
||||
|
||||
public static function getMediaServer($filename)
|
||||
{
|
||||
if (self::$_cache_nb_media_servers === null)
|
||||
@@ -1770,7 +1562,6 @@ FileETag INode MTime Size
|
||||
{
|
||||
$backtrace = debug_backtrace();
|
||||
$callee = next($backtrace);
|
||||
|
||||
if ($message)
|
||||
trigger_error($message, E_USER_WARNING);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user