Changeset 3733:ee69b09370ec for plugins

Timestamp:

03/15/18 11:48:54 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add latest (associated entry date) and oldest (associated entry date) info when request list of metadata: it will provide a way to sort these metadata.

Plugin Tags updated in order to use this new feature (widget and templates)

Location:

plugins/tags

Files:

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

plugins/tags/_define.php

@@ -16 +16 @@
     "Tags for posts",  // Description
     "Olivier Meunier", // Author
-    '1.4',             // Version
+    '1.5',             // Version
     array(
         'permissions' => 'usage,contentadmin',

plugins/tags/_public.php

@@ -94 +94 @@
         $limit = isset($attr['limit']) ? (integer) $attr['limit'] : 'null';
 
+        $combo = array('meta_id_lower', 'count', 'latest', 'oldest');
+
         $sortby = 'meta_id_lower';
-        if (isset($attr['sortby']) && $attr['sortby'] == 'count') {
-            $sortby = 'count';
+        if (isset($attr['sortby']) && in_array($attr['sortby'], $combo)) {
+            $sortby = strtolower($attr['sortby']);
         }
 
@@ -107 +109 @@
             "<?php\n" .
             "\$_ctx->meta = \$core->meta->computeMetaStats(\$core->meta->getMetadata(array('meta_type'=>'"
-            . $type . "','limit'=>" . $limit . "))); " .
+            . $type . "','limit'=>" . $limit .
+            ($sortby != 'meta_id_lower' ? ",'order'=>'" . $sortby . ' ' . ($order == 'asc' ? 'ASC' : 'DESC' ) : '') . "'" .
+            "))); " .
             "\$_ctx->meta->sort('" . $sortby . "','" . $order . "'); " .
             '?>';
@@ -138 +142 @@
         $type = isset($attr['type']) ? addslashes($attr['type']) : 'tag';
 
+        $combo = array('meta_id_lower', 'count', 'latest', 'oldest');
+
         $sortby = 'meta_id_lower';
-        if (isset($attr['sortby']) && $attr['sortby'] == 'count') {
-            $sortby = 'count';
+        if (isset($attr['sortby']) && in_array($attr['sortby'], $combo)) {
+            $sortby = strtolower($attr['sortby']);
         }
 
@@ -239 +245 @@
         }
 
-        $params = array('meta_type' => 'tag');
-
-        if ($w->limit !== '') {
-            $params['limit'] = abs((integer) $w->limit);
-        }
-
-        $rs = $core->meta->computeMetaStats(
-            $core->meta->getMetadata($params));
-
-        if ($rs->isEmpty()) {
-            return;
-        }
+        $combo = array('meta_id_lower', 'count', 'latest', 'oldest');
 
         $sort = $w->sortby;
-        if (!in_array($sort, array('meta_id_lower', 'count'))) {
+        if (!in_array($sort, $combo)) {
             $sort = 'meta_id_lower';
         }
@@ -262 +257 @@
         }
 
-        $rs->sort($sort, $order);
+        $params = array('meta_type' => 'tag');
+
+        if ($sort != 'meta_id_lower') {
+            // As optional limit may restrict result, we should set order (if not computed after)
+            $params['order'] = $sort . ' ' . ($order == 'asc' ? 'ASC' : 'DESC');
+        }
+
+        if ($w->limit !== '') {
+            $params['limit'] = abs((integer) $w->limit);
+        }
+
+        $rs = $core->meta->computeMetaStats(
+            $core->meta->getMetadata($params));
+
+        if ($rs->isEmpty()) {
+            return;
+        }
+
+        if ($sort == 'meta_id_lower') {
+            // Sort resulting recordset on cleaned id
+            $rs->sort($sort, $order);
+        }
 
         $res =

plugins/tags/_widgets.php

@@ -19 +19 @@
     public static function initWidgets($w)
     {
+        $combo = array(
+            __('Tag name')       => 'meta_id_lower',
+            __('Entries count')  => 'count',
+            __('Newest entry')   => 'latest',
+            __('Oldest entry')   => 'oldest'
+        );
+
         $w->create('tags', __('Tags'), array('tplTags', 'tagsWidget'), null, 'Tags cloud');
         $w->tags->setting('title', __('Title (optional)') . ' :', __('Tags'));
         $w->tags->setting('limit', __('Limit (empty means no limit):'), '20');
-        $w->tags->setting('sortby', __('Order by:'), 'meta_id_lower', 'combo',
-            array(__('Tag name') => 'meta_id_lower', __('Entries count') => 'count')
-        );
+        $w->tags->setting('sortby', __('Order by:'), 'meta_id_lower', 'combo', $combo);
         $w->tags->setting('orderby', __('Sort:'), 'asc', 'combo',
             array(__('Ascending') => 'asc', __('Descending') => 'desc')