From d9c22c7f3e6a4bfff5814b59b266e2d72f0f71be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 27 Jan 2017 11:58:40 +0100 Subject: [PATCH] Continued a bit: - converted some else if to elseif (only PHP) - converted some space -> tab (intending) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/Core/PConfig.php | 2 +- include/template_processor.php | 14 ++++++--- mod/notifications.php | 8 ++--- mod/pubsubhubbub.php | 2 +- view/theme/duepuntozero/theme.php | 41 +++++++++++++++---------- view/theme/frio/php/PHPColors/Color.php | 5 +-- 6 files changed, 42 insertions(+), 30 deletions(-) diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index 6ced9fc755..421a1d5fac 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -44,7 +44,7 @@ class PConfig { $a->config[$uid][$family][$k] = $rr['v']; self::$in_db[$uid][$family][$k] = true; } - } else if ($family != 'config') { + } elseif ($family != 'config') { // Negative caching $a->config[$uid][$family] = "!!"; } diff --git a/include/template_processor.php b/include/template_processor.php index 252375a060..6c1b16592d 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -53,8 +53,9 @@ class Template implements ITemplateEngine { private function _get_var($name, $retNoKey = false) { $keys = array_map('trim', explode(".", $name)); - if ($retNoKey && !array_key_exists($keys[0], $this->r)) + if ($retNoKey && !array_key_exists($keys[0], $this->r)) { return KEY_NOT_EXISTS; + } $val = $this->r; foreach ($keys as $k) { $val = (isset($val[$k]) ? $val[$k] : null); @@ -73,14 +74,16 @@ class Template implements ITemplateEngine { if (strpos($args[2], "==") > 0) { list($a, $b) = array_map("trim", explode("==", $args[2])); $a = $this->_get_var($a); - if ($b[0] == "$") + if ($b[0] == "$") { $b = $this->_get_var($b); + } $val = ($a == $b); - } else if (strpos($args[2], "!=") > 0) { + } elseif (strpos($args[2], "!=") > 0) { list($a, $b) = array_map("trim", explode("!=", $args[2])); $a = $this->_get_var($a); - if ($b[0] == "$") + if ($b[0] == "$") { $b = $this->_get_var($b); + } $val = ($a != $b); } else { $val = $this->_get_var($args[2]); @@ -138,8 +141,9 @@ class Template implements ITemplateEngine { $newctx = null; } - if ($tplfile[0] == "$") + if ($tplfile[0] == "$") { $tplfile = $this->_get_var($tplfile); + } $this->_push_stack(); $r = $this->r; diff --git a/mod/notifications.php b/mod/notifications.php index d27228b8fe..e9e5081cbc 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -100,25 +100,25 @@ function notifications_content(App $a) { $notifs = $nm->introNotifs($all, $startrec, $perpage); // Get the network notifications - } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { + } elseif (($a->argc > 1) && ($a->argv[1] == 'network')) { $notif_header = t('Network Notifications'); $notifs = $nm->networkNotifs($show, $startrec, $perpage); // Get the system notifications - } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { + } elseif (($a->argc > 1) && ($a->argv[1] == 'system')) { $notif_header = t('System Notifications'); $notifs = $nm->systemNotifs($show, $startrec, $perpage); // Get the personal notifications - } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { + } elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) { $notif_header = t('Personal Notifications'); $notifs = $nm->personalNotifs($show, $startrec, $perpage); // Get the home notifications - } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { + } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) { $notif_header = t('Home Notifications'); $notifs = $nm->homeNotifs($show, $startrec, $perpage); diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php index 0f797d55b0..97f1c98209 100644 --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@ -32,7 +32,7 @@ function pubsubhubbub_init(App $a) { // check for valid hub_mode if ($hub_mode === 'subscribe') { $subscribe = 1; - } else if ($hub_mode === 'unsubscribe') { + } elseif ($hub_mode === 'unsubscribe') { $subscribe = 0; } else { logger("pubsubhubbub: invalid hub_mode=$hub_mode, ignoring."); diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php index c674a99d99..d3378e49b8 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -4,23 +4,30 @@ function duepuntozero_init(App $a) { set_template_engine($a, 'smarty3'); - $colorset = get_pconfig( local_user(), 'duepuntozero','colorset'); - if (!$colorset) - $colorset = get_config('duepuntozero', 'colorset'); // user setting have priority, then node settings - if ($colorset) { - if ($colorset == 'greenzero') - $a->page['htmlhead'] .= ''."\n"; - if ($colorset == 'purplezero') - $a->page['htmlhead'] .= ''."\n"; - if ($colorset == 'easterbunny') - $a->page['htmlhead'] .= ''."\n"; - if ($colorset == 'darkzero') - $a->page['htmlhead'] .= ''."\n"; - if ($colorset == 'comix') - $a->page['htmlhead'] .= ''."\n"; - if ($colorset == 'slackr') - $a->page['htmlhead'] .= ''."\n"; - } +$colorset = get_pconfig( local_user(), 'duepuntozero','colorset'); +if (!$colorset) { + $colorset = get_config('duepuntozero', 'colorset'); // user setting have priority, then node settings +} +if ($colorset) { + if ($colorset == 'greenzero') { + $a->page['htmlhead'] .= ''."\n"; + } + if ($colorset == 'purplezero') { + $a->page['htmlhead'] .= ''."\n"; + } + if ($colorset == 'easterbunny') { + $a->page['htmlhead'] .= ''."\n"; + } + if ($colorset == 'darkzero') { + $a->page['htmlhead'] .= ''."\n"; + } + if ($colorset == 'comix') { + $a->page['htmlhead'] .= ''."\n"; + } + if ($colorset == 'slackr') { + $a->page['htmlhead'] .= ''."\n"; + } +} $a->page['htmlhead'] .= <<< EOT