adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-05 17:32:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 26972, 26998 from trunk:

Browse Source 
replace more preg_replace callback
........
remove *_version_compare methods in languages & plugins & themes classes, unused and outdated (preg_replace /e modifier)

git-svn-id: http://piwigo.org/svn/branches/2.6@26999 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-01-27 18:05:04 +00:00
parent 46c2cb6b5f
commit 6fcc5f10df
6 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/emogrifier.class.php
+14 -6
View File
@@ -35,6 +35,7 @@ UPDATES
Fixed some recent code introductions to make it cleaner to read.
2012-05-01 Made removal of invisible nodes operate in a case-insensitive manner... Thanks Juha P.!
2013-10-10 Add preserveStyleTag option
2014-01-26 PHP 5.5 compatibility (/e modifier is deprecated in preg_replace)
*/
define('CACHE_CSS', 0);
@@ -124,7 +125,7 @@ class Emogrifier {
$vistedNodes = $vistedNodeRef = array();
$nodes = @$xpath->query('//*[@style]');
foreach ($nodes as $node) {
$normalizedOrigStyle = preg_replace('/[A-z\-]+(?=\:)/Se',"strtolower('\\0')", $node->getAttribute('style'));
$normalizedOrigStyle = preg_replace_callback('/[A-z\-]+(?=\:)/S',create_function('$m', 'return strtolower($m[0]);'),$node->getAttribute('style'));
// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
$nodeKey = md5($node->getNodePath());
@@ -299,9 +300,6 @@ class Emogrifier {
'/([^\/]+):last-child/i', // last-child pseudo-selector
'/(\w)\[(\w+)\]/', // Matches element with attribute
'/(\w)\[(\w+)\=[\'"]?(\w+)[\'"]?\]/', // Matches element with EXACT attribute
'/(\w+)?\#([\w\-]+)/e', // Matches id attributes
'/(\w+|[\*\]])?((\.[\w\-]+)+)/e', // Matches class attributes
);
$replace = array(
'/',
@@ -311,12 +309,14 @@ class Emogrifier {
'*[last()]/self::\\1',
'\\1[@\\2]',
'\\1[@\\2="\\3"]',
"(strlen('\\1') ? '\\1' : '*').'[@id=\"\\2\"]'",
"(strlen('\\1') ? '\\1' : '*').'[contains(concat(\" \",@class,\" \"),concat(\" \",\"'.implode('\",\" \"))][contains(concat(\" \",@class,\" \"),concat(\" \",\"',explode('.',substr('\\2',1))).'\",\" \"))]'",
);
$css_selector = '//'.preg_replace($search, $replace, $css_selector);
// matches ids and classes
$css_selector = preg_replace_callback('/(\w+)?\#([\w\-]+)/', array($this, 'matchIdAttributes'), $css_selector);
$css_selector = preg_replace_callback('/(\w+|[\*\]])?((\.[\w\-]+)+)/', array($this, 'matchClassAttributes'), $css_selector);
// advanced selectors are going to require a bit more advanced emogrification
// if we required PHP 5.3 we could do this with closures
$css_selector = preg_replace_callback('/([^\/]+):nth-child\(\s*(odd|even|[+\-]?\d|[+\-]?\d?n(\s*[+\-]\s*\d)?)\s*\)/i', array($this, 'translateNthChild'), $css_selector);
@@ -327,6 +327,14 @@ class Emogrifier {
return $this->caches[CACHE_SELECTOR][$xpathkey];
}
private function matchIdAttributes($m) {
return (strlen($m[1]) ? $m[1] : '*').'[@id="'.$m[2].'"]';
}
private function matchClassAttributes($m) {
return (strlen($m[1]) ? $m[1] : '*').'[contains(concat(" ",@class," "),concat(" ","'.implode('"," "))][contains(concat(" ",@class," "),concat(" ","',explode('.',substr($m[2],1))).'"," "))]';
}
private function translateNthChild($match) {
$result = $this->parseNth($match);