mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-23 19:37:23 +08:00
fix format_quote()
This commit is contained in:
@@ -98,7 +98,6 @@ function sqlerr($file = '', $line = '')
|
|||||||
|
|
||||||
function format_quotes($s)
|
function format_quotes($s)
|
||||||
{
|
{
|
||||||
global $lang_functions;
|
|
||||||
preg_match_all('/\\[quote.*?\\]/i', $s, $result, PREG_PATTERN_ORDER);
|
preg_match_all('/\\[quote.*?\\]/i', $s, $result, PREG_PATTERN_ORDER);
|
||||||
$openquotecount = count($openquote = $result[0]);
|
$openquotecount = count($openquote = $result[0]);
|
||||||
preg_match_all('/\\[\/quote\\]/i', $s, $result, PREG_PATTERN_ORDER);
|
preg_match_all('/\\[\/quote\\]/i', $s, $result, PREG_PATTERN_ORDER);
|
||||||
@@ -124,9 +123,9 @@ function format_quotes($s)
|
|||||||
for ($i=0; $i < count($openval); $i++)
|
for ($i=0; $i < count($openval); $i++)
|
||||||
if ($openval[$i] > $closeval[$i]) return $s; // Cannot close before opening. Return raw string...
|
if ($openval[$i] > $closeval[$i]) return $s; // Cannot close before opening. Return raw string...
|
||||||
|
|
||||||
|
$textQuote = nexus_trans("label.text_quote");
|
||||||
$s = preg_replace("/\\[quote\\]/i","<fieldset><legend> ".$lang_functions['text_quote']." </legend><br />",$s);
|
$s = preg_replace("/\\[quote\\]/i","<fieldset><legend> ".$textQuote." </legend><br />",$s);
|
||||||
$s = preg_replace("/\\[quote=(.+?)\\]/i", "<fieldset><legend> ".$lang_functions['text_quote'].": \\1 </legend><br />", $s);
|
$s = preg_replace("/\\[quote=(.+?)\\]/i", "<fieldset><legend> ".$textQuote.": \\1 </legend><br />", $s);
|
||||||
$s = preg_replace("/\\[\\/quote\\]/i","</fieldset><br />",$s);
|
$s = preg_replace("/\\[\\/quote\\]/i","</fieldset><br />",$s);
|
||||||
return $s;
|
return $s;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -272,8 +272,10 @@ function getLogFile($append = '')
|
|||||||
$scriptUserInfo = posix_getpwuid(posix_getuid());
|
$scriptUserInfo = posix_getpwuid(posix_getuid());
|
||||||
$name .= sprintf("-cli-%s", $scriptUserInfo['name']);
|
$name .= sprintf("-cli-%s", $scriptUserInfo['name']);
|
||||||
}
|
}
|
||||||
$logFile = sprintf('%s-%s%s', $name, date('Y-m-d'), $suffix);
|
if (IN_NEXUS) {
|
||||||
return $logFiles[$append] = $logFile;
|
$name .= "-" . date('Y-m-d');
|
||||||
|
}
|
||||||
|
return $logFiles[$append] = $name . $suffix;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ return [
|
|||||||
'create' => 'Create',
|
'create' => 'Create',
|
||||||
'created_at_begin' => 'Created at begin',
|
'created_at_begin' => 'Created at begin',
|
||||||
'created_at_end' => 'Created at end',
|
'created_at_end' => 'Created at end',
|
||||||
|
'text_quote' => 'Quote',
|
||||||
'setting' => [
|
'setting' => [
|
||||||
'nav_text' => 'Setting',
|
'nav_text' => 'Setting',
|
||||||
'backup' => [
|
'backup' => [
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ return [
|
|||||||
'create' => '创建',
|
'create' => '创建',
|
||||||
'created_at_begin' => '创建时间开始',
|
'created_at_begin' => '创建时间开始',
|
||||||
'created_at_end' => '创建时间结束',
|
'created_at_end' => '创建时间结束',
|
||||||
|
'text_quote' => '引用',
|
||||||
'setting' => [
|
'setting' => [
|
||||||
'nav_text' => '设置',
|
'nav_text' => '设置',
|
||||||
'backup' => [
|
'backup' => [
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ return [
|
|||||||
'create' => '創建',
|
'create' => '創建',
|
||||||
'created_at_begin' => '創建時間開始',
|
'created_at_begin' => '創建時間開始',
|
||||||
'created_at_end' => '創建時間結束',
|
'created_at_end' => '創建時間結束',
|
||||||
|
'text_quote' => '引用',
|
||||||
'setting' => [
|
'setting' => [
|
||||||
'nav_text' => '設置',
|
'nav_text' => '設置',
|
||||||
'backup' => [
|
'backup' => [
|
||||||
|
|||||||
Reference in New Issue
Block a user