Changeset 3874:ab8368569446 for plugins/attachments

Timestamp:

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

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

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

Location:

plugins/attachments

Files:

• _admin.php (modified) (5 diffs)
• _define.php (modified) (1 diff)
• _public.php (modified) (3 diffs)

plugins/attachments/_admin.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) {return;}
 
-$core->addBehavior('adminPostFormItems', array('attachmentAdmin', 'adminPostFormItems'));
-$core->addBehavior('adminPostAfterForm', array('attachmentAdmin', 'adminPostAfterForm'));
-$core->addBehavior('adminPostHeaders', array('attachmentAdmin', 'postHeaders'));
-$core->addBehavior('adminPageFormItems', array('attachmentAdmin', 'adminPostFormItems'));
-$core->addBehavior('adminPageAfterForm', array('attachmentAdmin', 'adminPostAfterForm'));
-$core->addBehavior('adminPageHeaders', array('attachmentAdmin', 'postHeaders'));
-$core->addBehavior('adminPageHelpBlock', array('attachmentAdmin', 'adminPageHelpBlock'));
+$core->addBehavior('adminPostFormItems', ['attachmentAdmin', 'adminPostFormItems']);
+$core->addBehavior('adminPostAfterForm', ['attachmentAdmin', 'adminPostAfterForm']);
+$core->addBehavior('adminPostHeaders', ['attachmentAdmin', 'postHeaders']);
+$core->addBehavior('adminPageFormItems', ['attachmentAdmin', 'adminPostFormItems']);
+$core->addBehavior('adminPageAfterForm', ['attachmentAdmin', 'adminPostAfterForm']);
+$core->addBehavior('adminPageHeaders', ['attachmentAdmin', 'postHeaders']);
+$core->addBehavior('adminPageHelpBlock', ['attachmentAdmin', 'adminPageHelpBlock']);
 
 class attachmentAdmin
@@ -56 +56 @@
                 $item .=
                 '<div class="media-item s-attachments">' .
-                '<a class="media-icon" href="' . $core->adminurl->get('admin.media.item', array('id' => $f->media_id)) . '">' .
+                '<a class="media-icon" href="' . $core->adminurl->get('admin.media.item', ['id' => $f->media_id]) . '">' .
                 '<img src="' . $f->media_icon . '" alt="" title="' . $f->basename . '" /></a>' .
                 '<ul>' .
-                '<li><a class="media-link" href="' . $core->adminurl->get('admin.media.item', array('id' => $f->media_id)) . '" ' .
+                '<li><a class="media-link" href="' . $core->adminurl->get('admin.media.item', ['id' => $f->media_id]) . '" ' .
                 'title="' . $f->basename . '">' . $ftitle . '</a></li>' .
                 '<li>' . $f->media_dtstr . '</li>' .
@@ -66 +66 @@
 
                 '<li class="media-action"><a class="attachment-remove" id="attachment-' . $f->media_id . '" ' .
-                'href="' . $core->adminurl->get('admin.post.media', array(
+                'href="' . $core->adminurl->get('admin.post.media', [
                     'post_id'   => $post->post_id,
                     'media_id'  => $f->media_id,
                     'link_type' => 'attachment',
                     'remove'    => '1'
-                )) . '">' .
+                ]) . '">' .
                 '<img src="images/trash.png" alt="' . __('remove') . '" /></a>' .
                     '</li>' .
@@ -84 +84 @@
             }
             $item .=
-            '<p class="s-attachments"><a class="button" href="' . $core->adminurl->get('admin.media', array('post_id' => $post->post_id, 'link_type' => 'attachment')) . '">' .
+            '<p class="s-attachments"><a class="button" href="' . $core->adminurl->get('admin.media', ['post_id' => $post->post_id, 'link_type' => 'attachment']) . '">' .
             __('Add files to this entry') . '</a></p>';
             $sidebar['metas-box']['items']['attachments'] = $item;
@@ -96 +96 @@
             echo
             '<form action="' . $core->adminurl->get('admin.post.media') . '" id="attachment-remove-hide" method="post">' .
-            '<div>' . form::hidden(array('post_id'), $post->post_id) .
-            form::hidden(array('media_id'), '') .
-            form::hidden(array('link_type'), 'attachment') .
-            form::hidden(array('remove'), 1) .
+            '<div>' . form::hidden(['post_id'], $post->post_id) .
+            form::hidden(['media_id'], '') .
+            form::hidden(['link_type'], 'attachment') .
+            form::hidden(['remove'], 1) .
             $core->formNonce() . '</div></form>';
         }

plugins/attachments/_define.php

@@ -17 +17 @@
     "Dotclear Team",           // Author
     '1.1',                     // Version
-    array(
+    [
         'permissions' => 'usage,contentadmin,pages',
         'priority'    => 999,
         'type'        => 'plugin'
-    )
+    ]
 );

plugins/attachments/_public.php

@@ -13 +13 @@
 
 # Attachments
-$core->tpl->addBlock('Attachments', array('attachmentTpl', 'Attachments'));
-$core->tpl->addBlock('AttachmentsHeader', array('attachmentTpl', 'AttachmentsHeader'));
-$core->tpl->addBlock('AttachmentsFooter', array('attachmentTpl', 'AttachmentsFooter'));
-$core->tpl->addValue('AttachmentMimeType', array('attachmentTpl', 'AttachmentMimeType'));
-$core->tpl->addValue('AttachmentType', array('attachmentTpl', 'AttachmentType'));
-$core->tpl->addValue('AttachmentFileName', array('attachmentTpl', 'AttachmentFileName'));
-$core->tpl->addValue('AttachmentSize', array('attachmentTpl', 'AttachmentSize'));
-$core->tpl->addValue('AttachmentTitle', array('attachmentTpl', 'AttachmentTitle'));
-$core->tpl->addValue('AttachmentThumbnailURL', array('attachmentTpl', 'AttachmentThumbnailURL'));
-$core->tpl->addValue('AttachmentURL', array('attachmentTpl', 'AttachmentURL'));
-$core->tpl->addValue('MediaURL', array('attachmentTpl', 'MediaURL'));
-$core->tpl->addBlock('AttachmentIf', array('attachmentTpl', 'AttachmentIf'));
-
-$core->tpl->addValue('EntryAttachmentCount', array('attachmentTpl', 'EntryAttachmentCount'));
-
-$core->addBehavior('tplIfConditions', array('attachmentBehavior', 'tplIfConditions'));
+$core->tpl->addBlock('Attachments', ['attachmentTpl', 'Attachments']);
+$core->tpl->addBlock('AttachmentsHeader', ['attachmentTpl', 'AttachmentsHeader']);
+$core->tpl->addBlock('AttachmentsFooter', ['attachmentTpl', 'AttachmentsFooter']);
+$core->tpl->addValue('AttachmentMimeType', ['attachmentTpl', 'AttachmentMimeType']);
+$core->tpl->addValue('AttachmentType', ['attachmentTpl', 'AttachmentType']);
+$core->tpl->addValue('AttachmentFileName', ['attachmentTpl', 'AttachmentFileName']);
+$core->tpl->addValue('AttachmentSize', ['attachmentTpl', 'AttachmentSize']);
+$core->tpl->addValue('AttachmentTitle', ['attachmentTpl', 'AttachmentTitle']);
+$core->tpl->addValue('AttachmentThumbnailURL', ['attachmentTpl', 'AttachmentThumbnailURL']);
+$core->tpl->addValue('AttachmentURL', ['attachmentTpl', 'AttachmentURL']);
+$core->tpl->addValue('MediaURL', ['attachmentTpl', 'MediaURL']);
+$core->tpl->addBlock('AttachmentIf', ['attachmentTpl', 'AttachmentIf']);
+
+$core->tpl->addValue('EntryAttachmentCount', ['attachmentTpl', 'EntryAttachmentCount']);
+
+$core->addBehavior('tplIfConditions', ['attachmentBehavior', 'tplIfConditions']);
 
 class attachmentTpl
@@ -90 +90 @@
     public static function AttachmentIf($attr, $content)
     {
-        $if = array();
+        $if = [];
 
         $operator = isset($attr['operator']) ? dcTemplate::getOperator($attr['operator']) : '&&';
@@ -224 +224 @@
         return $core->tpl->displayCounter(
             '$_ctx->posts->countMedia(\'attachment\')',
-            array(
+            [
                 'none' => 'no attachments',
                 'one'  => 'one attachment',
                 'more' => '%d attachments'
-            ),
+            ],
             $attr,
             false