Mibew/tray
1
0
Fork 0
mirror of https://github.com/Mibew/tray.git synced 2025-01-22 18:10:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug with flatten global $page array

Browse Source
This commit is contained in:
Dmitriy Simushev 2013-04-10 15:09:57 +00:00
parent 441316b9f5
commit 438824fa36
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/messenger/webim/libs/expand.php
View File

@ -18,14 +18,16 @@
$ifregexp = "/\\\${(if|ifnot):([\w\.]+)}(.*?)(\\\${else:\\2}.*?)?\\\${endif:\\2}/s"; $ifregexp = "/\\\${(if|ifnot):([\w\.]+)}(.*?)(\\\${else:\\2}.*?)?\\\${endif:\\2}/s";
$expand_include_path = ""; $expand_include_path = "";
$current_style = ""; $current_style = "";
$flatten_page = array();
function check_condition($condition) function check_condition($condition)
{ {
global $errors, $page; global $errors, $page, $flatten_page;
if ($condition == 'errors') { if ($condition == 'errors') {
return isset($errors) && count($errors) > 0; return isset($errors) && count($errors) > 0;
} }
return isset($page[$condition]) && $page[$condition]; return isset($flatten_page[$condition]) && $flatten_page[$condition];
} }
function expand_condition($matches) function expand_condition($matches)
@ -42,7 +44,8 @@ function expand_condition($matches)
function expand_var($matches) function expand_var($matches)
{ {
global $page, $webimroot, $errors, $current_style; global $page, $webimroot, $errors, $current_style, $flatten_page;
$prefix = $matches[1]; $prefix = $matches[1];
$var = $matches[2]; $var = $matches[2];
if (!$prefix) { if (!$prefix) {
@ -71,7 +74,7 @@ function expand_var($matches)
$pos = strpos($var, ","); $pos = strpos($var, ",");
$param = substr($var, $pos + 1); $param = substr($var, $pos + 1);
$var = substr($var, 0, $pos); $var = substr($var, 0, $pos);
$message = getlocal2($var, array($page[$param])); $message = getlocal2($var, array($flatten_page[$param]));
} else { } else {
$message = getlocal($var); $message = getlocal($var);
} }
@ -82,7 +85,7 @@ function expand_var($matches)
} else if ($prefix == 'form:') { } else if ($prefix == 'form:') {
return form_value($var); return form_value($var);
} else if ($prefix == 'page:' || $prefix == 'pagejs:') { } else if ($prefix == 'page:' || $prefix == 'pagejs:') {
$message = isset($page[$var]) ? $page[$var] : ""; $message = isset($flatten_page[$var]) ? $flatten_page[$var] : "";
return ($prefix == 'pagejs:') ? json_encode($message) : $message; return ($prefix == 'pagejs:') ? json_encode($message) : $message;
} else if ($prefix == 'if:' || $prefix == 'else:' || $prefix == 'endif:' || $prefix == 'ifnot:') { } else if ($prefix == 'if:' || $prefix == 'else:' || $prefix == 'endif:' || $prefix == 'ifnot:') {
return "<!-- wrong $prefix:$var -->"; return "<!-- wrong $prefix:$var -->";
@ -109,8 +112,10 @@ function expandtext($text)
function expand($basedir, $style, $filename) function expand($basedir, $style, $filename)
{ {
global $expand_include_path, $current_style, $page; global $page, $expand_include_path, $current_style, $flatten_page;
$page = array_flatten_recursive($page);
$flatten_page = array_flatten_recursive($page);
start_html_output(); start_html_output();
if (!is_dir("$basedir/$style")) { if (!is_dir("$basedir/$style")) {
$style = "default"; $style = "default";