Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/roundcube/roundcubemail.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2019-02-03 11:56:25 +0300
committerAleksander Machniak <alec@alec.pl>2019-02-03 11:56:25 +0300
commit9d51e40f9e3283805607d1cce1d4ce973f2844ef (patch)
treed91c13a5396301673faa5601f5c193814a235e08 /program/include
parent0492b1f6e5589bcde05aaaf5dd77d30cc8a42c59 (diff)
Code cleanup
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail_output_html.php32
1 files changed, 15 insertions, 17 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 62042806f..4d890255e 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -1377,30 +1377,28 @@ EOF;
$content = $this->frame($attrib, true);
}
- else if (in_array($object, array('meta', 'links'))) {
+ else if ($object == 'meta' || $object == 'links') {
if ($object == 'meta') {
$source = 'meta_tags';
- $tag = 'meta';
- $key = 'name';
- $param = 'content';
+ $tag = 'meta';
+ $key = 'name';
+ $param = 'content';
}
- elseif ($object == 'links') {
+ else if ($object == 'links') {
$source = 'link_tags';
- $tag = 'link';
- $key = 'rel';
- $param = 'href';
+ $tag = 'link';
+ $key = 'rel';
+ $param = 'href';
}
foreach ($this->$source as $name => $vars) {
- /*
- $vars can be in many forms:
- *) string
- *) array('key' => 'val')
- *) array(string, string)
- *) array(array(), string)
- *) array(array('key' => 'val'), array('key' => 'val'))
- normalise this for processing by checking for string array keys
- */
+ // $vars can be in many forms:
+ // - string
+ // - array('key' => 'val')
+ // - array(string, string)
+ // - array(array(), string)
+ // - array(array('key' => 'val'), array('key' => 'val'))
+ // normalise this for processing by checking for string array keys
$vars = is_array($vars) ? (count(array_filter(array_keys($vars), 'is_string')) > 0 ? array($vars) : $vars) : array($vars);
foreach ($vars as $args) {