Changeset 3614:1872eef9be30

Timestamp:

12/09/17 12:50:03 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Dotclear news are now displayed in async way by js (via services.php)

Files:

• admin/index.php (modified) (1 diff)
• admin/js/_index.js (modified) (1 diff)
• admin/services.php (modified) (3 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/index.php

@@ -116 +116 @@
 
 $dashboardItem = 0;
-
-if ($core->auth->user_prefs->dashboard->dcnews) {
-     try
-     {
-          if (empty($__resources['rss_news'])) {
-               throw new Exception();
-          }
-
-          $feed_reader = new feedReader;
-          $feed_reader->setCacheDir(DC_TPL_CACHE);
-          $feed_reader->setTimeout(2);
-          $feed_reader->setUserAgent('Dotclear - http://www.dotclear.org/');
-          $feed = $feed_reader->parse($__resources['rss_news']);
-          if ($feed)
-          {
-               $latest_news = '<div class="box medium dc-box"><h3>'.__('Dotclear news').'</h3><dl id="news">';
-               $i = 1;
-               foreach ($feed->items as $item)
-               {
-                    $dt = isset($item->link) ? '<a href="'.$item->link.'" class="outgoing" title="'.$item->title.'">'.
-                         $item->title.' <img src="images/outgoing-blue.png" alt="" /></a>' : $item->title;
-
-                    if ($i < 3) {
-                         $latest_news .=
-                         '<dt>'.$dt.'</dt>'.
-                         '<dd><p><strong>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</strong> '.
-                         '<em>'.text::cutString(html::clean($item->content),120).'...</em></p></dd>';
-                    } else {
-                         $latest_news .=
-                         '<dt>'.$dt.'</dt>'.
-                         '<dd>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</dd>';
-                    }
-                    $i++;
-                    if ($i > 2) { break; }
-               }
-               $latest_news .= '</dl></div>';
-               $__dashboard_items[$dashboardItem][] = $latest_news;
-               $dashboardItem++;
-          }
-     }
-     catch (Exception $e) {}
-}
 
 # Documentation links

admin/js/_index.js

@@ -98 +98 @@
      });
 
+     // check if some news are available
+     var params = {
+          f: 'checkNewsUpdate',
+          xd_check: dotclear.nonce
+     };
+     $.post('services.php',params,function(data) {
+          if ($('rsp[status=failed]',data).length > 0) {
+               // Silently fail
+          } else {
+               if ($('rsp>news',data).attr('check') == 1) {
+                    // Something has to be displayed
+                    xml = $('rsp>news',data).attr('ret');
+                    if ($('#dashboard-boxes').length == 0) {
+                         // Create the #dashboard-boxes container
+                         $('#dashboard-main').append('<div id="dashboard-boxes"></div>');
+                    }
+                    if ($('#dashboard-boxes div.db-items').length == 0) {
+                         // Create the #dashboard-boxes div.db-items container
+                         $('#dashboard-boxes').prepend('<div class="db-items"></div>');
+                    }
+                    $('#dashboard-boxes div.db-items').prepend(xml);
+               }
+          }
+     });
 });

admin/services.php

@@ -17 +17 @@
 require dirname(__FILE__).'/../inc/admin/prepend.php';
 
+$core->rest->addFunction('checkNewsUpdate',array('dcRestMethods','checkNewsUpdate'));
 $core->rest->addFunction('checkCoreUpdate',array('dcRestMethods','checkCoreUpdate'));
 $core->rest->addFunction('getPostById',array('dcRestMethods','getPostById'));
@@ -35 +36 @@
 class dcRestMethods
 {
+     public static function checkNewsUpdate($core,$get)
+     {
+          # Dotclear news
+
+          $rsp = new xmlTag('news');
+          $rsp->check = false;
+          $ret = __('Dotclear news not available');
+
+          if ($core->auth->user_prefs->dashboard->dcnews) {
+               try
+               {
+
+                    if (empty($GLOBALS['__resources']['rss_news'])) {
+                         throw new Exception();
+                    }
+                    $feed_reader = new feedReader;
+                    $feed_reader->setCacheDir(DC_TPL_CACHE);
+                    $feed_reader->setTimeout(2);
+                    $feed_reader->setUserAgent('Dotclear - http://www.dotclear.org/');
+                    $feed = $feed_reader->parse($GLOBALS['__resources']['rss_news']);
+                    if ($feed)
+                    {
+                         $ret = '<div class="box medium dc-box"><h3>'.__('Dotclear news').'</h3><dl id="news">';
+                         $i = 1;
+                         foreach ($feed->items as $item)
+                         {
+                              $dt = isset($item->link) ? '<a href="'.$item->link.'" class="outgoing" title="'.$item->title.'">'.
+                                   $item->title.' <img src="images/outgoing-blue.png" alt="" /></a>' : $item->title;
+
+                              if ($i < 3) {
+                                   $ret .=
+                                   '<dt>'.$dt.'</dt>'.
+                                   '<dd><p><strong>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</strong> '.
+                                   '<em>'.text::cutString(html::clean($item->content),120).'...</em></p></dd>';
+                              } else {
+                                   $ret .=
+                                   '<dt>'.$dt.'</dt>'.
+                                   '<dd>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</dd>';
+                              }
+                              $i++;
+                              if ($i > 2) { break; }
+                         }
+                         $ret .= '</dl></div>';
+                         $rsp->check = true;
+                    }
+               }
+               catch (Exception $e) {}
+          }
+          $rsp->ret = $ret;
+          return $rsp;
+     }
+
      public static function checkCoreUpdate($core,$get)
      {
@@ -41 +94 @@
           $rsp = new xmlTag('update');
           $rsp->check = false;
-          $ret = __('Dotclear update not avalaible');
+          $ret = __('Dotclear update not available');
 
           if ($core->auth->isSuperAdmin() && !DC_NOT_UPDATE && is_readable(DC_DIGESTS) &&

locales/fr/main.po

@@ -966 +966 @@
 msgstr "Informations sur cette version"
 
+msgid "Dotclear news not available"
+msgstr "Nouvelles de Dotclear non disponibles"
+
+msgid "Dotclear update not available"
+msgstr "Mise à jour de Dotclear non disponible"
+
 #, php-format
 msgid "A new version of Dotclear is available but needs PHP version ≥ %s, your's is currently %s"