Changeset 3874:ab8368569446 for plugins/simpleMenu/index.php

Timestamp:

09/14/18 12:16:17 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

short notation for array (array() → [])

File:

• plugins/simpleMenu/index.php (modified) (18 diffs)

plugins/simpleMenu/index.php

@@ -23 +23 @@
 
 # Liste des catégories
-$categories_label = array();
-$rs               = $core->blog->getCategories(array('post_type' => 'post'));
+$categories_label = [];
+$rs               = $core->blog->getCategories(['post_type' => 'post']);
 $categories_combo = dcAdminCombos::getCategoriesCombo($rs, false, true);
 $rs->moveStart();
@@ -33 +33 @@
 # Liste des langues utilisées
 $langs_combo = dcAdminCombos::getLangscombo(
-    $core->blog->getLangs(array('order' => 'asc'))
+    $core->blog->getLangs(['order' => 'asc'])
 );
 
 # Liste des mois d'archive
-$rs           = $core->blog->getDates(array('type' => 'month'));
+$rs           = $core->blog->getDates(['type' => 'month']);
 $months_combo = array_merge(
-    array(__('All months') => '-'),
+    [__('All months') => '-'],
     dcAdmincombos::getDatesCombo($rs)
 );
@@ -57 +57 @@
 
 # Liste des pages -- Doit être pris en charge plus tard par le plugin ?
-$pages_combo = array();
+$pages_combo = [];
 try {
-    $rs = $core->blog->getPosts(array('post_type' => 'page'));
+    $rs = $core->blog->getPosts(['post_type' => 'page']);
     while ($rs->fetch()) {
         $pages_combo[$rs->post_title] = $rs->getURL();
@@ -67 +67 @@
 
 # Liste des tags -- Doit être pris en charge plus tard par le plugin ?
-$tags_combo = array();
+$tags_combo = [];
 try {
-    $rs                         = $core->meta->getMetadata(array('meta_type' => 'tag'));
+    $rs                         = $core->meta->getMetadata(['meta_type' => 'tag']);
     $tags_combo[__('All tags')] = '-';
     while ($rs->fetch()) {
@@ -79 +79 @@
 # Liste des types d'item de menu
 $items         = new ArrayObject();
-$items['home'] = new ArrayObject(array(__('Home'), false));
+$items['home'] = new ArrayObject([__('Home'), false]);
 
 if (count($langs_combo) > 1) {
-    $items['lang'] = new ArrayObject(array(__('Language'), true));
+    $items['lang'] = new ArrayObject([__('Language'), true]);
 }
 if (count($categories_combo)) {
-    $items['category'] = new ArrayObject(array(__('Category'), true));
+    $items['category'] = new ArrayObject([__('Category'), true]);
 }
 if (count($months_combo) > 1) {
-    $items['archive'] = new ArrayObject(array(__('Archive'), true));
+    $items['archive'] = new ArrayObject([__('Archive'), true]);
 }
 if ($core->plugins->moduleExists('pages')) {
     if (count($pages_combo)) {
-        $items['pages'] = new ArrayObject(array(__('Page'), true));
+        $items['pages'] = new ArrayObject([__('Page'), true]);
     }
 
@@ -98 +98 @@
 if ($core->plugins->moduleExists('tags')) {
     if (count($tags_combo) > 1) {
-        $items['tags'] = new ArrayObject(array(__('Tags'), true));
+        $items['tags'] = new ArrayObject([__('Tags'), true]);
     }
 
@@ -104 +104 @@
 
 # --BEHAVIOR-- adminSimpleMenuAddType
-# Should add an item to $items[<id>] as an array(<label>,<optional step (true or false)>)
+# Should add an item to $items[<id>] as an [<label>,<optional step (true or false)>]
 $core->callBehavior('adminSimpleMenuAddType', $items);
 
-$items['special'] = new ArrayObject(array(__('User defined'), false));
-
-$items_combo = array();
+$items['special'] = new ArrayObject([__('User defined'), false]);
+
+$items_combo = [];
 foreach ($items as $k => $v) {
     $items_combo[$v[0]] = $k;
@@ -117 +117 @@
 $menu = $core->blog->settings->system->get('simpleMenu');
 if (!is_array($menu)) {
-    $menu = array();
+    $menu = [];
 }
 
@@ -227 +227 @@
                         # Should set if necessary $item_select_label (displayed on further admin step only)
                         $core->callBehavior('adminSimpleMenuBeforeEdit', $item_type, $item_select,
-                            array(&$item_label, &$item_descr, &$item_url, &$item_select_label));
+                            [&$item_label, &$item_descr, &$item_url, &$item_select_label]);
                         break;
                 }
@@ -236 +236 @@
                     if (($item_label != '') && ($item_url != '')) {
                         // Add new item menu in menu array
-                        $menu[] = array(
+                        $menu[] = [
                             'label'       => $item_label,
                             'descr'       => $item_descr,
                             'url'         => $item_url,
                             'targetBlank' => $item_targetBlank
-                        );
+                        ];
 
                         // Save menu in blog settings
@@ -269 +269 @@
                         $menu[$v]['label'] = '';
                     }
-                    $newmenu = array();
+                    $newmenu = [];
                     foreach ($menu as $k => $v) {
                         if ($v['label']) {
-                            $newmenu[] = array(
+                            $newmenu[] = [
                                 'label'       => $v['label'],
                                 'descr'       => $v['descr'],
                                 'url'         => $v['url'],
                                 'targetBlank' => $v['targetBlank']
-                            );
+                            ];
                         }
                     }
@@ -311 +311 @@
 
                 }
-                $newmenu = array();
+                $newmenu = [];
                 for ($i = 0; $i < count($_POST['items_label']); $i++) {
-                    $newmenu[] = array(
+                    $newmenu[] = [
                         'label'       => $_POST['items_label'][$i],
                         'descr'       => $_POST['items_descr'][$i],
                         'url'         => $_POST['items_url'][$i],
                         'targetBlank' => (empty($_POST['items_targetBlank' . $i])) ? false : true
-                    );
+                    ];
                 }
                 $menu = $newmenu;
@@ -334 +334 @@
 
         # Order menu items
-        $order = array();
+        $order = [];
         if (empty($_POST['im_order']) && !empty($_POST['order'])) {
             $order = $_POST['order'];
@@ -349 +349 @@
         if (!empty($_POST['updateaction']) && !empty($order)) {
             try {
-                $newmenu = array();
+                $newmenu = [];
                 foreach ($order as $i => $k) {
-                    $newmenu[] = array(
+                    $newmenu[] = [
                         'label' => $menu[$k]['label'],
                         'descr' => $menu[$k]['descr'],
-                        'url'   => $menu[$k]['url']);
+                        'url'   => $menu[$k]['url']];
                 }
                 $menu = $newmenu;
@@ -413 +413 @@
     }
     echo dcPage::breadcrumb(
-        array(
+        [
             html::escapeHTML($core->blog->name) => '',
             $page_title                         => $p_url,
             __('Add item')                      => '',
             $step_label                         => ''
-        ),
-        array(
-            'hl_pos' => -2)
+        ],
+        [
+            'hl_pos' => -2]
     ) .
     dcPage::notices();
 } else {
     echo dcPage::breadcrumb(
-        array(
+        [
             html::escapeHTML($core->blog->name) => '',
             $page_title                         => ''
-        )) .
+        ]) .
     dcPage::notices();
 }
@@ -488 +488 @@
             echo '<p class="field"><label for="item_label" class="classic required"><abbr title="' . __('Required field') . '">*</abbr> ' .
             __('Label of item menu:') . '</label>' .
-            form::field('item_label', 20, 255, array(
+            form::field('item_label', 20, 255, [
                 'default'    => $item_label,
                 'extra_html' => 'required placeholder="' . __('Label') . '"'
-            )) .
+            ]) .
                 '</p>';
             echo '<p class="field"><label for="item_descr" class="classic">' .
@@ -497 +497 @@
             echo '<p class="field"><label for="item_url" class="classic required"><abbr title="' . __('Required field') . '">*</abbr> ' .
             __('URL of item menu:') . '</label>' .
-            form::field('item_url', 40, 255, array(
+            form::field('item_url', 40, 255, [
                 'default'    => $item_url,
                 'extra_html' => 'required placeholder="' . __('URL') . '"'
-            )) .
+            ]) .
                 '</p>';
             echo form::hidden('item_type', $item_type) . form::hidden('item_select', $item_select);
@@ -567 +567 @@
             $count++;
             echo '<td class="handle minimal">' .
-            form::number(array('order[' . $i . ']'), array(
+            form::number(['order[' . $i . ']'], [
                 'min'        => 1,
                 'default'    => $count,
                 'class'      => 'position',
                 'extra_html' => 'title="' . sprintf(__('position of %s'), html::escapeHTML(__($m['label']))) . '"'
-            )) .
-            form::hidden(array('dynorder[]', 'dynorder-' . $i), $i) . '</td>';
-            echo '<td class="minimal">' . form::checkbox(array('items_selected[]', 'ims-' . $i), $i) . '</td>';
-            echo '<td class="nowrap" scope="row">' . form::field(array('items_label[]', 'iml-' . $i), '', 255, html::escapeHTML(__($m['label']))) . '</td>';
-            echo '<td class="nowrap">' . form::field(array('items_descr[]', 'imd-' . $i), '30', 255, html::escapeHTML(__($m['descr']))) . '</td>';
-            echo '<td class="nowrap">' . form::field(array('items_url[]', 'imu-' . $i), '30', 255, html::escapeHTML($m['url'])) . '</td>';
+            ]) .
+            form::hidden(['dynorder[]', 'dynorder-' . $i], $i) . '</td>';
+            echo '<td class="minimal">' . form::checkbox(['items_selected[]', 'ims-' . $i], $i) . '</td>';
+            echo '<td class="nowrap" scope="row">' . form::field(['items_label[]', 'iml-' . $i], '', 255, html::escapeHTML(__($m['label']))) . '</td>';
+            echo '<td class="nowrap">' . form::field(['items_descr[]', 'imd-' . $i], '30', 255, html::escapeHTML(__($m['descr']))) . '</td>';
+            echo '<td class="nowrap">' . form::field(['items_url[]', 'imu-' . $i], '30', 255, html::escapeHTML($m['url'])) . '</td>';
             echo '<td class="nowrap">' . form::checkbox('items_targetBlank' . $i, 'blank', $targetBlank) . '</td>';
         } else {