' .
- '
_params['hideBlocks'] ? '' : ' style="display:none"') . '>' . htmlspecialchars(sprintf(Horde_Core_Translation::t("[Show Quoted Text - %d lines]"), $qcount)) . '' .
- '
_params['hideBlocks'] ? ' style="display:none"' : '') . '>' . htmlspecialchars(Horde_Core_Translation::t("[Hide Quoted Text]")) . '';
+ '
_params['hideBlocks'] ? '' : ' style="display:none"') . '>' . htmlspecialchars(sprintf(Horde_Core_Translation::t('[Show Quoted Text - %d lines]'), $qcount)) . '' .
+ '
_params['hideBlocks'] ? ' style="display:none"' : '') . '>' . htmlspecialchars(Horde_Core_Translation::t('[Hide Quoted Text]')) . '';
}
/**
diff --git a/lib/Horde/Core/Topbar.php b/lib/Horde/Core/Topbar.php
index d1d138c97..3b76a5e9f 100644
--- a/lib/Horde/Core/Topbar.php
+++ b/lib/Horde/Core/Topbar.php
@@ -1,4 +1,5 @@
getApp();
$isAdmin = $registry->isAdmin();
- $menu = array();
+ $menu = [];
- foreach ($registry->listApps(array('active', 'admin', 'noadmin', 'heading', 'link', 'notoolbar', 'topbar'), true, null) as $app => $params) {
+ foreach ($registry->listApps(['active', 'admin', 'noadmin', 'heading', 'link', 'notoolbar', 'topbar'], true, null) as $app => $params) {
/* Check if the current user has permisson to see this application,
* and if the application is active. Headings are visible to
* everyone (but get filtered out later if they have no
* children). Administrators always see all applications except
* those marked 'inactive'. */
if (($app != 'horde') &&
- (in_array($params['status'], array('heading', 'link')) ||
- (in_array($params['status'], array('active', 'admin', 'noadmin', 'topbar')) &&
+ (in_array($params['status'], ['heading', 'link']) ||
+ (in_array($params['status'], ['active', 'admin', 'noadmin', 'topbar']) &&
!($isAdmin && ($params['status'] == 'noadmin')) &&
!(!$isAdmin && ($params['status'] == 'admin')) &&
$registry->hasPermission((!empty($params['app']) ? $params['app'] : $app), Horde_Perms::SHOW)))) {
@@ -82,7 +83,7 @@ public function getTree()
}
do {
- $children = array();
+ $children = [];
foreach ($menu as $params) {
if (isset($params['menu_parent'])) {
$children[$params['menu_parent']] = true;
@@ -108,172 +109,170 @@ public function getTree()
if ($isAdmin ||
$perms->hasPermission('horde:administration:' . $method, $registry->getAuth(), Horde_Perms::SHOW)) {
++$admin_item_count;
- $menu['administration_' . $method] = array(
+ $menu['administration_' . $method] = [
'icon' => $val['icon'],
'menu_parent' => 'administration',
'name' => Horde::stripAccessKey($val['name']),
'status' => 'active',
'url' => Horde::url($registry->applicationWebPath($val['link'], 'horde')),
- );
+ ];
}
}
- } catch (Horde_Exception $e) {}
+ } catch (Horde_Exception $e) {
+ }
if ($admin_item_count) {
- $menu['administration'] = array(
- 'name' => Horde_Core_Translation::t("Administration"),
+ $menu['administration'] = [
+ 'name' => Horde_Core_Translation::t('Administration'),
'status' => 'heading',
'menu_parent' => 'settings',
- );
+ ];
}
- $menu['settings'] = array(
+ $menu['settings'] = [
'class' => 'horde-settings horde-icon-settings',
'name' => '',
'noarrow' => true,
- 'status' => 'active'
- );
+ 'status' => 'active',
+ ];
/* Add preferences. */
if ($registry->showService('prefs') &&
!($prefs instanceof Horde_Prefs_Session)) {
- $menu['prefs'] = array(
+ $menu['prefs'] = [
'icon' => Horde_Themes::img('prefs.png'),
'menu_parent' => 'settings',
- 'name' => Horde_Core_Translation::t("Preferences"),
+ 'name' => Horde_Core_Translation::t('Preferences'),
'status' => 'active',
- 'url' => $registry->getServiceLink('prefs', $current)
- );
+ 'url' => $registry->getServiceLink('prefs', $current),
+ ];
/* Get a list of configurable applications. */
$prefs_apps = $registry->listApps(
- array('active', $isAdmin ? 'admin' : 'noadmin'),
+ ['active', $isAdmin ? 'admin' : 'noadmin'],
true,
Horde_Perms::READ
);
if (!empty($prefs_apps['horde'])) {
- $menu['prefs_' . 'horde'] = array(
+ $menu['prefs_' . 'horde'] = [
'icon' => $registry->get('icon', 'horde'),
'menu_parent' => 'prefs',
- 'name' => Horde_Core_Translation::t("Global Preferences"),
+ 'name' => Horde_Core_Translation::t('Global Preferences'),
'status' => 'active',
- 'url' => $registry->getServiceLink('prefs', 'horde')
- );
+ 'url' => $registry->getServiceLink('prefs', 'horde'),
+ ];
unset($prefs_apps['horde']);
}
- uasort($prefs_apps, array($this, '_sortByName'));
+ uasort($prefs_apps, [$this, '_sortByName']);
foreach ($prefs_apps as $app => $params) {
- $menu['prefs_' . $app] = array(
+ $menu['prefs_' . $app] = [
'icon' => $registry->get('icon', $app),
'menu_parent' => 'prefs',
'name' => $params['name'],
'status' => 'active',
- 'url' => $registry->getServiceLink('prefs', $app)
- );
+ 'url' => $registry->getServiceLink('prefs', $app),
+ ];
}
}
/* Add notification log. */
- $menu['growlerlog'] = array(
+ $menu['growlerlog'] = [
'icon' => 'info.png',
'menu_parent' => 'settings',
- 'name' => Horde_Core_Translation::t("Toggle Alerts Log"),
+ 'name' => Horde_Core_Translation::t('Toggle Alerts Log'),
'status' => 'active',
- 'url' => 'javascript:void(HordeCore.Growler.toggleLog());'
- );
+ 'url' => 'javascript:void(HordeCore.Growler.toggleLog());',
+ ];
/* Add problem link. */
if ($registry->showService('problem') &&
($problem_link = $registry->getServiceLink('problem', $current))) {
- $menu['problem_' . $current] = array(
+ $menu['problem_' . $current] = [
'icon' => 'problem.png',
'menu_parent' => 'settings',
- 'name' => Horde_Core_Translation::t("Problem"),
+ 'name' => Horde_Core_Translation::t('Problem'),
'status' => 'active',
- 'url' => $problem_link
- );
+ 'url' => $problem_link,
+ ];
}
/* Add help link. */
if ($registry->showService('help') &&
($help_link = $registry->getServiceLink('help', $current))) {
- $menu['help_' . $current] = array(
+ $menu['help_' . $current] = [
'icon' => 'help_index.png',
'menu_parent' => 'settings',
- 'name' => Horde_Core_Translation::t("Help"),
- 'onclick' => Horde::popupJs($help_link, array('urlencode' => true)) . 'return false;',
+ 'name' => Horde_Core_Translation::t('Help'),
+ 'onclick' => Horde::popupJs($help_link, ['urlencode' => true]) . 'return false;',
'status' => 'active',
'target' => 'help',
- 'url' => $help_link
- );
+ 'url' => $help_link,
+ ];
}
foreach ($menu as $app => $params) {
switch ($params['status']) {
- case 'topbar':
- try {
- $registry->callAppMethod(
- $params['app'],
- 'topbarCreate', array(
- 'args' => array(
- $this->_tree,
- empty($params['menu_parent']) ? null : $params['menu_parent'],
- isset($params['topbar_params']) ? $params['topbar_params'] : array()
- )
- )
- );
- } catch (Horde_Exception_PushApp $e) {
- // Ignore
- } catch (Horde_Exception $e) {
- Horde::log($e, 'ERR');
- }
- break;
+ case 'topbar':
+ try {
+ $registry->callAppMethod(
+ $params['app'],
+ 'topbarCreate',
+ [
+ 'args' => [
+ $this->_tree,
+ empty($params['menu_parent']) ? null : $params['menu_parent'],
+ $params['topbar_params'] ?? [],
+ ],
+ ]
+ );
+ } catch (Horde_Exception_PushApp $e) {
+ // Ignore
+ } catch (Horde_Exception $e) {
+ Horde::log($e, 'ERR');
+ }
+ break;
- default:
- /* Need to run the name through Horde's gettext since the
- * user's locale may not have been loaded when registry.php was
- * parsed, and the translations of the application names are
- * not in the Core package. */
- $name = strlen($params['name']) ? _($params['name']) : '';
+ default:
+ /* Need to run the name through Horde's gettext since the
+ * user's locale may not have been loaded when registry.php was
+ * parsed, and the translations of the application names are
+ * not in the Core package. */
+ $name = strlen($params['name']) ? _($params['name']) : '';
- /* Headings have no webroot; they're just containers for other
- * menu items. */
- if (isset($params['url'])) {
- $url = $params['url'];
- } elseif (($params['status'] == 'heading') ||
- !isset($params['webroot'])) {
- $url = '';
- } else {
- $url = Horde::url($registry->getInitialPage($app), false, array('app' => $app));
- }
+ /* Headings have no webroot; they're just containers for other
+ * menu items. */
+ if (isset($params['url'])) {
+ $url = $params['url'];
+ } elseif (($params['status'] == 'heading') ||
+ !isset($params['webroot'])) {
+ $url = '';
+ } else {
+ $url = Horde::url($registry->getInitialPage($app), false, ['app' => $app]);
+ }
- $this->_tree->addNode(array(
- 'id' => $app,
- 'parent' => empty($params['menu_parent']) ? null : $params['menu_parent'],
- 'label' => $name,
- 'expanded' => false,
- 'params' => array(
- 'icon' => strval((isset($params['icon'])
- ? $params['icon']
- : $registry->get('icon', $app))),
- 'class' => isset($params['class'])
- ? $params['class']
- : ($app == $current
- ? 'horde-point-center-active'
- : 'horde-point-center'),
- 'noarrow' => !empty($params['noarrow']),
- 'onclick' => isset($params['onclick'])
- ? $params['onclick']
- : null,
- 'target' => isset($params['target'])
- ? $params['target']
- : null,
- 'url' => $url,
- 'active' => ($app == $current),
- )
- ));
+ $this->_tree->addNode([
+ 'id' => $app,
+ 'parent' => empty($params['menu_parent']) ? null : $params['menu_parent'],
+ 'label' => $name,
+ 'expanded' => false,
+ 'params' => [
+ 'icon' => strval(($params['icon']
+ ?? $registry->get('icon', $app))),
+ 'class' => $params['class']
+ ?? ($app == $current
+ ? 'horde-point-center-active'
+ : 'horde-point-center'),
+ 'noarrow' => !empty($params['noarrow']),
+ 'onclick' => $params['onclick']
+ ?? null,
+ 'target' => $params['target']
+ ?? null,
+ 'url' => $url,
+ 'active' => ($app == $current),
+ ],
+ ]);
}
}
diff --git a/lib/Horde/Core/Translation.php b/lib/Horde/Core/Translation.php
index 5066e3044..d12b47c1b 100644
--- a/lib/Horde/Core/Translation.php
+++ b/lib/Horde/Core/Translation.php
@@ -1,4 +1,5 @@
1,
'blank' => '',
'join' => 2,
@@ -37,8 +38,8 @@ class Horde_Core_Tree_Renderer_Html extends Horde_Tree_Renderer_Html
'null_only' => 13,
'folder' => 14,
'folderopen' => 15,
- 'leaf' => 16
- );
+ 'leaf' => 16,
+ ];
/**
* Generate a link URL tag.
@@ -66,22 +67,22 @@ protected function _generateUrlTag($node_id)
protected function _generateImage($src, $class = '', $alt = null)
{
switch ($class) {
- case 'horde-tree-icon':
- return parent::_generateImage($src, $class, $alt);
+ case 'horde-tree-icon':
+ return parent::_generateImage($src, $class, $alt);
- case 'horde-tree-toggle':
- $class .= ' horde-tree-image';
- break;
+ case 'horde-tree-toggle':
+ $class .= ' horde-tree-image';
+ break;
- default:
- $class = 'horde-tree-image';
- break;
+ default:
+ $class = 'horde-tree-image';
+ break;
}
$img = '
';
diff --git a/lib/Horde/Core/Tree/Renderer/Javascript.php b/lib/Horde/Core/Tree/Renderer/Javascript.php
index fe38521a5..df6bc6454 100644
--- a/lib/Horde/Core/Tree/Renderer/Javascript.php
+++ b/lib/Horde/Core/Tree/Renderer/Javascript.php
@@ -1,4 +1,5 @@
_static = $static;
- $opts = array(
+ $opts = [
'extraColsLeft' => $this->_colsLeft,
'extraColsRight' => $this->_colsRight,
'header' => $this->_header,
@@ -102,16 +103,16 @@ public function getTree($static = false)
'imgNullOnly' => $this->_images['null_only'],
'imgLeaf' => $this->_images['leaf'],
- 'initTree' => $this->renderNodeDefinitions()
- );
+ 'initTree' => $this->renderNodeDefinitions(),
+ ];
if (!($js_var = $this->getOption('jsvar'))) {
$js_var = $this->_tree->instance;
}
- $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineScript(array(
- 'window.' . $js_var . ' = new Horde_Tree(' . Horde_Serialize::serialize($opts, Horde_Serialize::JSON) . ')'
- ), true);
+ $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineScript([
+ 'window.' . $js_var . ' = new Horde_Tree(' . Horde_Serialize::serialize($opts, Horde_Serialize::JSON) . ')',
+ ], true);
return '
';
}
@@ -135,20 +136,20 @@ public function isSupported()
*/
public function renderNodeDefinitions()
{
- $result = new stdClass;
+ $result = new stdClass();
$result->is_static = intval($this->_static);
$result->nodes = $this->_tree->getNodes();
foreach ($this->_extra as $id => $extra_node) {
$result->nodes[$id]['extra'] = $extra_node;
}
$result->root_nodes = $this->_tree->getRootNodes();
- $result->files = array();
+ $result->files = [];
foreach ($GLOBALS['page_output']->hsl as $val) {
/* Ignore files that are already loaded before building the
* tree. */
if (($val->app != 'horde') ||
- !in_array($val->file, array('prototype.js', 'hordetree.js', 'accesskeys.js'))) {
+ !in_array($val->file, ['prototype.js', 'hordetree.js', 'accesskeys.js'])) {
$result->files[] = strval($val->url);
}
}
diff --git a/lib/Horde/Core/Tree/Renderer/Simplehtml.php b/lib/Horde/Core/Tree/Renderer/Simplehtml.php
index 5e301e789..66be3a9bf 100644
--- a/lib/Horde/Core/Tree/Renderer/Simplehtml.php
+++ b/lib/Horde/Core/Tree/Renderer/Simplehtml.php
@@ -1,4 +1,5 @@
$data['name'],
- 'attr' => array('title' => $data['name'])
- ));
+ 'attr' => ['title' => $data['name']],
+ ]);
return $img
? $img
@@ -79,10 +80,10 @@ public static function getFlagImageObByHost($host)
return false;
}
- return array(
+ return [
'name' => $data['name'],
- 'ob' => Horde_Themes::img('flags/' . $data['code'] . '.png')
- );
+ 'ob' => Horde_Themes::img('flags/' . $data['code'] . '.png'),
+ ];
}
}
diff --git a/lib/Horde/Core/Ui/JsCalendar.php b/lib/Horde/Core/Ui/JsCalendar.php
index 0f8833ae0..8862497f7 100644
--- a/lib/Horde/Core/Ui/JsCalendar.php
+++ b/lib/Horde/Core/Ui/JsCalendar.php
@@ -1,4 +1,5 @@
*/
- public static function init(array $params = array())
+ public static function init(array $params = [])
{
if (self::$_initRun) {
return;
}
self::$_initRun = true;
- $params = array_merge(array(
+ $params = array_merge([
'click_month' => false,
'click_week' => false,
'click_year' => false,
'full_weekdays' => false,
- 'short_weekdays' => false
- ), $params);
+ 'short_weekdays' => false,
+ ], $params);
$weekdays = self::weekdays();
if ($params['short_weekdays']) {
@@ -64,14 +65,14 @@ public static function init(array $params = array())
}
}
- $js = array(
+ $js = [
'-Horde_Calendar.click_month' => intval($params['click_month']),
'-Horde_Calendar.click_week' => intval($params['click_week']),
'-Horde_Calendar.click_year' => intval($params['click_year']),
'-Horde_Calendar.firstDayOfWeek' => intval($GLOBALS['prefs']->getValue('first_week_day')),
'Horde_Calendar.months' => self::months(),
- 'Horde_Calendar.weekdays' => $weekdays
- );
+ 'Horde_Calendar.weekdays' => $weekdays,
+ ];
if ($params['full_weekdays']) {
$js['Horde_Calendar.fullweekdays'] = self::fullWeekdays();
}
@@ -88,15 +89,15 @@ public static function init(array $params = array())
*/
public static function weekdays()
{
- return array(
- Horde_Core_Translation::t("Su"),
- Horde_Core_Translation::t("Mo"),
- Horde_Core_Translation::t("Tu"),
- Horde_Core_Translation::t("We"),
- Horde_Core_Translation::t("Th"),
- Horde_Core_Translation::t("Fr"),
- Horde_Core_Translation::t("Sa")
- );
+ return [
+ Horde_Core_Translation::t('Su'),
+ Horde_Core_Translation::t('Mo'),
+ Horde_Core_Translation::t('Tu'),
+ Horde_Core_Translation::t('We'),
+ Horde_Core_Translation::t('Th'),
+ Horde_Core_Translation::t('Fr'),
+ Horde_Core_Translation::t('Sa'),
+ ];
}
/**
@@ -106,15 +107,15 @@ public static function weekdays()
*/
public static function fullWeekdays()
{
- return array(
- Horde_Core_Translation::t("Sunday"),
- Horde_Core_Translation::t("Monday"),
- Horde_Core_Translation::t("Tuesday"),
- Horde_Core_Translation::t("Wednesday"),
- Horde_Core_Translation::t("Thursday"),
- Horde_Core_Translation::t("Friday"),
- Horde_Core_Translation::t("Saturday"),
- );
+ return [
+ Horde_Core_Translation::t('Sunday'),
+ Horde_Core_Translation::t('Monday'),
+ Horde_Core_Translation::t('Tuesday'),
+ Horde_Core_Translation::t('Wednesday'),
+ Horde_Core_Translation::t('Thursday'),
+ Horde_Core_Translation::t('Friday'),
+ Horde_Core_Translation::t('Saturday'),
+ ];
}
/**
@@ -124,20 +125,20 @@ public static function fullWeekdays()
*/
public static function months()
{
- return array(
- Horde_Core_Translation::t("January"),
- Horde_Core_Translation::t("February"),
- Horde_Core_Translation::t("March"),
- Horde_Core_Translation::t("April"),
- Horde_Core_Translation::t("May"),
- Horde_Core_Translation::t("June"),
- Horde_Core_Translation::t("July"),
- Horde_Core_Translation::t("August"),
- Horde_Core_Translation::t("September"),
- Horde_Core_Translation::t("October"),
- Horde_Core_Translation::t("November"),
- Horde_Core_Translation::t("December")
- );
+ return [
+ Horde_Core_Translation::t('January'),
+ Horde_Core_Translation::t('February'),
+ Horde_Core_Translation::t('March'),
+ Horde_Core_Translation::t('April'),
+ Horde_Core_Translation::t('May'),
+ Horde_Core_Translation::t('June'),
+ Horde_Core_Translation::t('July'),
+ Horde_Core_Translation::t('August'),
+ Horde_Core_Translation::t('September'),
+ Horde_Core_Translation::t('October'),
+ Horde_Core_Translation::t('November'),
+ Horde_Core_Translation::t('December'),
+ ];
}
}
diff --git a/lib/Horde/Core/Ui/Language.php b/lib/Horde/Core/Ui/Language.php
index 87ac57ce6..18de7074e 100644
--- a/lib/Horde/Core/Ui/Language.php
+++ b/lib/Horde/Core/Ui/Language.php
@@ -1,4 +1,5 @@
isLocked('language')) {
$session->set('horde', 'language', $registry->preferredLang());
- $html = sprintf('