Changeset 2396

Timestamp:

06/25/10 17:17:08 (13 years ago)

Author:

JcDenis

Message:

periodical 0.3.1

• Fixed postgreSQL compatibility
• Fixed php 5.3 compatibility on post action combo
• Fixed admin crash on non DC 2.2
• Fixed users rights

Location:

plugins/periodical

Files:

• _admin.php (modified) (7 diffs)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _prepend.php (modified) (1 diff)
• inc/class.periodical.php (modified) (1 diff)
• inc/lib.dc.twitter.php (modified) (1 diff)
• js/main.js (added)
• release.txt (modified) (1 diff)

plugins/periodical/_admin.php

@@ -51 +51 @@
      }
      
-     public static function adminPostsActionsCombo(&$args)
+     public static function adminPostsActionsCombo($args)
      {
           global $core;
@@ -98 +98 @@
                     $posts = $core->blog->getPosts($params);
                     
+                    $posts_ids = array();
+                    while($posts->fetch())
+                    {
+                         # Check if user can edit this post
+                         if ($action == 'add_post_periodical' && $posts->isEditable())
+                         {
+                              $posts_ids[$posts->post_id] = $posts->post_title;
+                         }
+                         # Check if user can delete this post
+                         if ($action == 'remove_post_periodical' && $posts->isDeletable())
+                         {
+                              $posts_ids[$posts->post_id] = $posts->post_title;
+                         }
+                    }
+                    
                     if ($posts->isEmpty())
                     {
                          echo '<p>'.__('There is no pending post').'</p>';
+                    }
+                    elseif (empty($posts_ids))
+                    {
+                         echo '<p>'.__('There is no editable post').'</p>';
                     }
                     else
@@ -108 +127 @@
                          '<h3>'.__('Entries').'</h3><ul>';
                          
-                         while($posts->fetch())
+                         foreach($posts_ids as $k => $v)
                          {
                               echo
                               '<li><label class="classic">'.
-                              form::checkbox(array('periodical_entries[]'),$posts->post_id,1).' '.
-                              $posts->post_title.
+                              form::checkbox(array('periodical_entries[]'),$k,1).' '.
+                              html::escapeHTML($v).
                               '</label></li>';
                          }
@@ -148 +167 @@
      }
      
-     public static function adminPostsActions(&$core,$posts,$action,$redir)
+     public static function adminPostsActions($core,$posts,$action,$redir)
      {
           if (!in_array($action,array('remove_post_periodical','add_post_periodical')) 
@@ -161 +180 @@
                     if (in_array($posts->post_id,$_POST['periodical_entries']))
                     {
-                         if ($action == 'remove_post_periodical')
+                         if ($action == 'remove_post_periodical' && $posts->isDeletable())
                          {
                               $obj->delPost($posts->post_id);
                          }
-                         elseif ($action == 'add_post_periodical' 
+                         elseif ($action == 'add_post_periodical' && $posts->isEditable() 
                           && $posts->post_status == '-2')
                          {
@@ -183 +202 @@
           global $core;
           
-          if (!$core->auth->check('contentadmin',$core->blog->id)) return;
+          if ($post !== null && !$post->isEditable()) return;
+          if ($post === null && !$core->auth->check('contentadmin',$core->blog->id)) return;
           
           $obj = new periodical($core);
@@ -213 +233 @@
      {
           global $core;
-          # Not contentadmin
-          if (!$core->auth->check('contentadmin',$core->blog->id) || $post_id === null) return;
+          # Not saved
+          if ($post_id === null) return;
           # Period object
           $obj = new periodical($core);

plugins/periodical/_define.php

@@ -17 +17 @@
      /* Description*/         "Published periodically entries",
      /* Author */             "JC Denis",
-     /* Version */            '0.3',
+     /* Version */            '0.3.1',
      /* Permissions */        'usage,contentadmin'
 );
-     /* date */          #20100608
+     /* date */          #20100625
 ?>

plugins/periodical/_install.php

@@ -23 +23 @@
      if (version_compare(DC_VERSION,'2.2-beta','<'))
      {
-          throw new Exception('translater requires Dotclear 2.2');
+          throw new Exception('periodical requires Dotclear 2.2');
      }
      

plugins/periodical/_prepend.php

@@ -12 +12 @@
 
 if (!defined('DC_RC_PATH')){return;}
+if (version_compare(DC_VERSION,'2.2-alpha','<')){return;}
 
 global $__autoload, $core;

plugins/periodical/inc/class.periodical.php

@@ -209 +209 @@
           
           $params['from'] .= 'LEFT JOIN '.$this->core->prefix.'meta R ON P.post_id = R.post_id ';
-          $params['from'] .= 'LEFT JOIN '.$this->table.' T ON R.meta_id = T.periodical_id ';
+          $params['from'] .= 'LEFT JOIN '.$this->table.' T ON  CAST(T.periodical_id as char)=R.meta_id ';
           
           $params['sql'] .= "AND R.meta_type = 'periodical' ";

plugins/periodical/inc/lib.dc.twitter.php

@@ -375 +375 @@
           # Send request
           $client = netHttp::initClient($api,$path);
-          $client->setUserAgent('libDcTwitterSender - '.self::$version);
+          $client->setUserAgent('libDcTwitterSender');
           $client->setPersistReferers(false);
           $client->get($path,$data);

plugins/periodical/release.txt

@@ +1 @@
+0.3.1 20100625
+ * Fixed postgreSQL compatibility
+ * Fixed php 5.3 compatibility on post action combo
+ * Fixed admin crash on non DC 2.2
+ * Fixed users rights
+
 0.3 20100608
  * Switched to DC 2.2