Skip to content

Commit

Permalink
[core,legacy] with out preg e modifier
Browse files Browse the repository at this point in the history 
`e` (PREG_REPLACE_EVAL) modifier has been DEPRECATED as of PHP 5.5.0.

preg 系関数の "e" 修飾子は PHP 5.5.0 から非奨励となるため、preg_replace で
"e" 修飾子を使っている部分を preg_replace_callback に変更しました。

TextFilter の  (Pre|Post)?XCodeConvertTable の replacements に callable 型を
指定することが可能になっています。

また、ついでに htmlspecialchars の第3引数に定数 _CHARSET を追加しました。
  • Loading branch information
@nao-pon
nao-pon committed Sep 21, 2013
1 parent 9f16f89 commit 6403aef
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 20 deletions.
127 changes: 108 additions & 19 deletions html/modules/legacy/kernel/Legacy_TextFilter.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,18 @@ class Legacy_TextFilter extends XCube_TextFilter
var $mXCodePatterns = array();
var $mXCodeReplacements = array();
var $mXCodeCheckImgPatterns = array();
var $mXCodeCallbacks = array();
var $mXCodeHasCallback = array();

var $mPreXCodePatterns = array();
var $mPreXCodeReplacements = array();
var $mPreXCodeCallbacks = array();
var $mPreXCodeHasCallback = false;

var $mPostXCodePatterns = array();
var $mPostXCodeReplacements = array();
var $mPostXCodeCallbacks = array();
var $mPostXCodeHasCallback = array();

var $mSmileys = array();
var $mSmileysConvTable = array();
Expand Down Expand Up @@ -122,9 +128,9 @@ function toShow($text, $x2comat=false) {
//ToDo:   patern is defined for XOOPS2.0 compatiblity. But what is it?
// This comatiblity option is used from method from MyTextSanitizer.
//
return preg_replace(array("/&(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", "/ /i"), array('&\\1;', ' '), htmlspecialchars($text, ENT_QUOTES));
return preg_replace(array("/&(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", "/ /i"), array('&\\1;', ' '), htmlspecialchars($text, ENT_QUOTES, _CHARSET));
} else {
return preg_replace("/&(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", '&\\1;', htmlspecialchars($text, ENT_QUOTES));
return preg_replace("/&(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", '&\\1;', htmlspecialchars($text, ENT_QUOTES, _CHARSET));
}
}

Expand All @@ -136,7 +142,7 @@ function toShow($text, $x2comat=false) {
*
**/
function toEdit($text) {
return preg_replace("/&(#0?[0-9]{4,6};)/i", '&$1', htmlspecialchars($text, ENT_QUOTES));
return preg_replace("/&(#0?[0-9]{4,6};)/i", '&$1', htmlspecialchars($text, ENT_QUOTES, _CHARSET));
}

/**
Expand Down Expand Up @@ -218,7 +224,7 @@ function getSmileys() {
while ($smile = $db->fetchArray($getsmiles)) {
$this->mSmileys[] = $smile;
$this->mSmileysConvTable[0][] = $smile['code'];
$this->mSmileysConvTable[1][] = '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />';
$this->mSmileysConvTable[1][] = '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url'], ENT_COMPAT, _CHARSET).'" alt="" />';
}
}
}
Expand Down Expand Up @@ -252,15 +258,15 @@ public function makeClickable($text) {
// Delegate may replace makeClickable conversion table
// Args :
// 'patterns' [I/O] : &Array of pattern RegExp
// 'replacements' [I/O] : &Array of replacing string
// 'replacements' [I/O] : &Array of replacing string or callable
//
$this->mMakeClickableConvertTable->call(new XCube_Ref($this->mClickablePatterns), new XCube_Ref($this->mClickableReplacements));

// Delegate Call 'MyTextSanitizer.MakeClickablePre'
// Delegate may replace makeClickable conversion table
// Args :
// 'patterns' [I/O] : &Array of pattern RegExp
// 'replacements' [I/O] : &Array of replacing string
// 'replacements' [I/O] : &Array of replacing string or callable
//
// Todo: For Compatiblitiy to XC2.1 Beta3
//
Expand Down Expand Up @@ -297,7 +303,7 @@ function convertXCode($text, $allowimage = 1) {
// Delegate may replace makeClickable conversion table
// Args :
// 'patterns' [I/O] : &Array of pattern RegExp
// 'replacements' [I/O] : &Array[0..1] of Array of replacing string
// 'replacements' [I/O] : &Array[0..1] of Array of replacing string or callable
// replacements[0] for $allowimage = 0;
// replacements[1] for $allowimage = 1;
//
Expand All @@ -307,13 +313,25 @@ function convertXCode($text, $allowimage = 1) {
// Delegate may replace conversion table
// Args :
// 'patterns' [I/O] : &Array of pattern RegExp
// 'replacements' [I/O] : &Array of replacing string
// 'replacements' [I/O] : &Array of replacing string or callable
// 'allowimage' [I] : xoopsCodeDecode $allowimage parameter
//
//Todo: For Compatiblitiy to XC2.1 Beta3
$this->mXCodePre->call(new XCube_Ref($this->mXCodePatterns), new XCube_Ref($this->mXCodeReplacements[0]), 0);
$dummy = array();
$this->mXCodePre->call(new XCube_Ref($dummy), new XCube_Ref($this->mXCodeReplacements[1]), 1);
for($idx = 0; $idx < 2; ++$idx) {
$this->mXCodeHasCallback[$idx] = false;
foreach($this->mXCodeReplacements[$idx] as $i => $replacements) {
if (is_callable($replacements)) {
!$this->mXCodeHasCallback[$idx] && $this->mXCodeHasCallback[$idx] = true;
$this->mXCodeCallbacks[$idx][$i] = $replacements;
$this->mXCodeReplacements[$idx][$i] = null;
} else {
$this->mXCodeCallbacks[$idx][$i] = null;
}
}
}
}
if (empty($this->mXCodeCheckImgPatterns)) {
// RaiseEvent 'Legacy_TextFilter.MakeXCodeCheckImgPatterns'
Expand All @@ -326,7 +344,17 @@ function convertXCode($text, $allowimage = 1) {
}
$text = preg_replace_callback($this->mXCodeCheckImgPatterns, array($this, '_filterImgUrl'), $text);
$replacementsIdx = ($allowimage == 0) ? 0 : 1;
$text = preg_replace($this->mXCodePatterns, $this->mXCodeReplacements[$replacementsIdx], $text);
if ($this->mXCodeHasCallback[$replacementsIdx] === true) {
foreach($this->mXCodePatterns as $i => $patterns) {
if (is_null($this->mXCodeCallbacks[$replacementsIdx][$i])) {
$text = preg_replace($patterns, $this->mXCodeReplacements[$replacementsIdx][$i], $text);
} else {
$text = preg_replace_callback($patterns, $this->mXCodeCallbacks[$replacementsIdx][$i], $text);
}
}
} else {
$text = preg_replace($this->mXCodePatterns, $this->mXCodeReplacements[$replacementsIdx], $text);
}
return $text;
}

Expand Down Expand Up @@ -440,18 +468,37 @@ function preConvertXCode($text, $xcode = 1) {
// Delegate may replace conversion table
// Args :
// 'patterns' [I/O] : &Array of pattern RegExp
// 'replacements' [I/O] : &Array of replacing string
// 'replacements' [I/O] : &Array of replacing string or callable
//
$this->mMakePreXCodeConvertTable->call(new XCube_Ref($this->mPreXCodePatterns), new XCube_Ref($this->mPreXCodeReplacements));
foreach($this->mPreXCodeReplacements as $i => $replacements) {
if (is_callable($replacements)) {
!$this->mPreXCodeHasCallback && $this->mPreXCodeHasCallback = true;
$this->mPreXCodeCallbacks[$i] = $replacements;
$this->mPreXCodeReplacements[$i] = null;
} else {
$this->mPreXCodeCallbacks[$i] = null;
}
}
}
if ($this->mPreXCodeHasCallback === true) {
foreach($this->mPreXCodePatterns as $i => $patterns) {
if (is_null($this->mPreXCodeCallbacks[$i])) {
$text = preg_replace($patterns, $this->mPreXCodeReplacements[$i], $text);
} else {
$text = preg_replace_callback($patterns, $this->mPreXCodeCallbacks[$i], $text);
}
}
} else {
$text = preg_replace($this->mPreXCodePatterns, $this->mPreXCodeReplacements, $text);
}
$text = preg_replace($this->mPreXCodePatterns, $this->mPreXCodeReplacements, $text);
}
return $text;
}

public function makePreXCodeConvertTable(&$patterns, &$replacements) {
$patterns[] = "/\[code\](.*)\[\/code\]/esU";
$replacements[] = "'[code]'.base64_encode('$1').'[/code]'";
$patterns[] = "/\[code\](.*)\[\/code\]/sU";
$replacements[] = create_function('$m', 'return \'[code]\'.base64_encode($m[1]).\'[/code]\';');
}

/**
Expand All @@ -471,7 +518,7 @@ function postConvertXCode($text, $xcode=1, $image=1){
// Delegate may replace conversion table
// Args :
// 'patterns' [I/O] : &Array of pattern RegExp
// 'replacements' [I/O] : &Array[0..1] of Array of replacing string
// 'replacements' [I/O] : &Array[0..1] of Array of replacing string or callable
// replacements[0] for $allowimage = 0;
// replacements[1] for $allowimage = 1;
// Caution :
Expand All @@ -480,21 +527,63 @@ function postConvertXCode($text, $xcode=1, $image=1){
// - Conversion rule should treat input string as raw text with single quote escape.(not sanitized).
//
$this->mMakePostXCodeConvertTable->call(new XCube_Ref($this->mPostXCodePatterns), new XCube_Ref($this->mPostXCodeReplacements));
for($idx = 0; $idx < 2; ++$idx) {
$this->mPostXCodeHasCallback[$idx] = false;
foreach($this->mPostXCodeReplacements[$idx] as $i => $replacements) {
if (is_callable($replacements)) {
!$this->mPostXCodeHasCallback[$idx] && $this->mPostXCodeHasCallback[$idx] = true;
$this->mPostXCodeCallbacks[$idx][$i] = $replacements;
$this->mPostXCodeReplacements[$idx][$i] = null;
} else {
$this->mPostXCodeCallbacks[$idx][$i] = null;
}
}
}
}
$replacementsIdx = ($image == 0) ? 0 : 1;
$text = preg_replace($this->mPostXCodePatterns, $this->mPostXCodeReplacements[$replacementsIdx], $text);
if ($this->mPostXCodeHasCallback[$replacementsIdx] === true) {
foreach($this->mPostXCodePatterns as $i => $patterns) {
if (is_null($this->mPostXCodeCallbacks[$replacementsIdx][$i])) {
$text = preg_replace($patterns, $this->mPostXCodeReplacements[$replacementsIdx][$i], $text);
} else {
$text = preg_replace_callback($patterns, $this->mPostXCodeCallbacks[$replacementsIdx][$i], $text);
}
}
} else {
$text = preg_replace($this->mPostXCodePatterns, $this->mPostXCodeReplacements[$replacementsIdx], $text);
}
}
return $text;
}

public function makePostXCodeConvertTable(&$patterns, &$replacements) {
$patterns[] = "/\[code\](.*)\[\/code\]/esU";
$replacements[0][] = "'<div class=\"xoopsCode\"><pre><code>'.Legacy_TextFilter::codeSanitizer('$1', 0).'</code></pre></div>'";
$replacements[1][] = "'<div class=\"xoopsCode\"><pre><code>'.Legacy_TextFilter::codeSanitizer('$1', 1).'</code></pre></div>'";
$patterns[] = "/\[code\](.*)\[\/code\]/sU";
if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
$replacements[0][] = 'Legacy_TextFilter::codeSanitizerCallback0';
$replacements[1][] = 'Legacy_TextFilter::codeSanitizerCallback1';
} else {
$root =& XCube_Root::getSingleton();
$me =& $root->getTextFilter();
$replacements[0][] = array(&$me, 'Legacy_TextFilter::codeSanitizerCallback0');
$replacements[1][] = array(&$me, 'Legacy_TextFilter::codeSanitizerCallback1');
}
}

private function codeSanitizerCallback($m, $image) {
$text = $this->convertXCode(htmlspecialchars(base64_decode($m[1]), ENT_QUOTES, _CHARSET), $image);
return '<div class="xoopsCode"><pre><code>'.$text.'</code></pre></div>';
}

private function codeSanitizerCallback0($m) {
return $this->codeSanitizerCallback($m, 0);
}

private function codeSanitizerCallback1($m) {
return $this->codeSanitizerCallback($m, 1);
}

function codeSanitizer($text, $image = 1){
return $this->convertXCode(htmlspecialchars(str_replace('\"', '"', base64_decode($text)),ENT_QUOTES), $image);
return $this->convertXCode(htmlspecialchars(str_replace('\"', '"', base64_decode($text)),ENT_QUOTES,_CHARSET), $image);
}
}
?>
2 changes: 1 addition & 1 deletion xoops_trust_path/libs/smarty/plugins/resource.db.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function smarty_resource_db_systemTpl($tpl_name)
$root=&XCube_Root::getSingleton();
$systemTemplates = explode(',',$root->getSiteConfig('Legacy_RenderSystem','SystemTemplate',''));
$prefix = $root->getSiteConfig('Legacy_RenderSystem','SystemTemplatePrefix','legacy');
$patterns = preg_replace('/^\s*([^\s]*)\s*$/e', '"/".preg_quote("\1","/")."/"', $systemTemplates);
$patterns = preg_replace_callback('/^\s*([^\s]*)\s*$/', function($m){return '/'.preg_quote($m[1],'/').'/';}, $systemTemplates);
$replacements = preg_replace('/^\s*system_([^\s]*)\s*/', $prefix.'_\1', $systemTemplates);
}
if ($patterns) {
Expand Down

0 comments on commit 6403aef

Please sign in to comment.