summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-12-14 07:37:32 +0000
committeralecpl <alec@alec.pl>2009-12-14 07:37:32 +0000
commit9898fe315a142451f4004d4eb4972fb19322be98 (patch)
tree4eef0528319ec69313dee5a1f64bef9ccdefa200
parent63ffe33c016e3f5a016d4ea961b12caa9c5b20c3 (diff)
- don't use preg_replace with /e modifier + code cleanup
-rw-r--r--program/include/rcmail.php24
1 files changed, 5 insertions, 19 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index a6ac75112..f3ce6e6e7 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -636,25 +636,14 @@ class rcmail
$attrib = array('name' => $attrib);
$nr = is_numeric($attrib['nr']) ? $attrib['nr'] : 1;
- $vars = isset($attrib['vars']) ? $attrib['vars'] : '';
+ $name = $attrib['name'] ? $attrib['name'] : '';
- $command_name = !empty($attrib['command']) ? $attrib['command'] : NULL;
- $alias = $attrib['name'] ? $attrib['name'] : ($command_name && $command_label_map[$command_name] ? $command_label_map[$command_name] : '');
-
// check for text with domain
- if ($domain && ($text_item = $this->texts[$domain.'.'.$alias]))
+ if ($domain && ($text_item = $this->texts[$domain.'.'.$name]))
;
// text does not exist
- else if (!($text_item = $this->texts[$alias])) {
- /*
- raise_error(array(
- 'code' => 500,
- 'type' => 'php',
- 'line' => __LINE__,
- 'file' => __FILE__,
- 'message' => "Missing localized text for '$alias' in '$sess_user_lang'"), TRUE, FALSE);
- */
- return "[$alias]";
+ else if (!($text_item = $this->texts[$name])) {
+ return "[$name]";
}
// make text item array
@@ -684,12 +673,9 @@ class rcmail
// replace vars in text
if (is_array($attrib['vars'])) {
foreach ($attrib['vars'] as $var_key => $var_value)
- $a_replace_vars[$var_key{0}=='$' ? substr($var_key, 1) : $var_key] = $var_value;
+ $text = str_replace($var_key[0]!='$' ? '$'.$var_key : $var_key, $var_value, $text);
}
- if ($a_replace_vars)
- $text = preg_replace('/\$\{?([_a-z]{1}[_a-z0-9]*)\}?/ei', '$a_replace_vars["\1"]', $text);
-
// format output
if (($attrib['uppercase'] && strtolower($attrib['uppercase']=='first')) || $attrib['ucfirst'])
return ucfirst($text);