Changeset 407:eb5bd0f66932 for inc/core

Timestamp:

06/23/11 13:00:59 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Message:

• Re-enabled blank post_type required by media.php in class dcBlog
• Attachments are now handled by a plugins/attachments/_admin.php
• Added core dcPostMedia multi-purpose class, and 'link_type' in post_media table
• Added new behavior : tplIfConditions, to enable to add new attributes to tpl:XXXIf tags
• Moved tpl:SysIf has_tag attribute to Tags plugin

Location:

inc/core

Files:

• class.dc.blog.php (modified) (1 diff)
• class.dc.core.php (modified) (2 diffs)
• class.dc.media.php (modified) (5 diffs)
• class.dc.postmedia.php (added)

inc/core/class.dc.blog.php

@@ -727 +727 @@
           if (isset($params['post_type']))
           {
-               $strReq .= 'AND post_type '.$this->con->in($params['post_type']);
+               if (is_array($params['post_type']) || $params['post_type'] != '') {
+                    $strReq .= 'AND post_type '.$this->con->in($params['post_type']);
+               }
           }
           else

inc/core/class.dc.core.php

@@ -27 +27 @@
 {
      public $con;        ///< <b>connection</b>        Database connection object
-     public $prefix;     ///< <b>string</b>            Database tables prefix
+     public $prefix;          ///< <b>string</b>            Database tables prefix
      public $blog;       ///< <b>dcBlog</b>            dcBlog object
      public $error;      ///< <b>dcError</b>           dcError object
@@ -36 +36 @@
      public $plugins;    ///< <b>dcModules</b>         dcModules object
      public $media;      ///< <b>dcMedia</b>           dcMedia object
-     public $rest;       ///< <b>dcRestServer</b>      dcRestServer object
+     public $postmedia;  ///< <b>dcPostMedia</b>       dcPostMedia object
+     public $rest;       ///< <b>dcRestServer</b> dcRestServer object
      public $log;        ///< <b>dcLog</b>             dcLog object
      

inc/core/class.dc.media.php

@@ -23 +23 @@
      protected $con;          ///< <b>connection</b> Database connection
      protected $table;        ///< <b>string</b> Media table name
-     protected $table_ref;    ///< <b>string</b> Post-media relation table name
      protected $type;         ///< <b>string</b> Media type filter
+     protected $postmedia;
      protected $file_sort = 'name-asc';
      
@@ -57 +57 @@
           $this->core =& $core;
           $this->con =& $core->con;
+          $this->postmedia = new dcPostMedia($core);
           
           if ($this->core->blog == null) {
@@ -63 +64 @@
           
           $this->table = $this->core->prefix.'media';
-          $this->table_ref = $this->core->prefix.'post_media';
           $root = $this->core->blog->public_path;
           
@@ -494 +494 @@
      public function getPostMedia($post_id,$media_id=null)
      {
-          $post_id = (integer) $post_id;
-          
-          $strReq =
-          'SELECT media_file, M.media_id, media_path, media_title, media_meta, media_dt, '.
-          'media_creadt, media_upddt, media_private, user_id '.
-          'FROM '.$this->table.' M '.
-          'INNER JOIN '.$this->table_ref.' PM ON (M.media_id = PM.media_id) '.
-          "WHERE media_path = '".$this->path."' ".
-          'AND post_id = '.$post_id.' ';
-          
+          $params = array(
+               'post_id' => $post_id,
+               'media_path' => $this->path
+          );
           if ($media_id) {
-               $strReq .= 'AND M.media_id = '.(integer) $media_id.' ';
-          }
-          
-          $rs = $this->con->select($strReq);
+               $params['media_id'] = (integer) $media_id;
+          }
+          $rs = $this->postmedia->getPostMedia($params);
           
           $res = array();
@@ -523 +516 @@
      
      /**
-     Attaches a media to a post.
-     
-     @param    post_id   <b>integer</b>      Post ID
-     @param    media_id  <b>integer</b>      Optionnal media ID
+     @deprecated since version 2.4
+     @see dcPostMedia::addPostMedia
      */
      public function addPostMedia($post_id,$media_id)
      {
-          $post_id = (integer) $post_id;
-          $media_id = (integer) $media_id;
-          
-          $f = $this->getPostMedia($post_id,$media_id);
-          
-          if (!empty($f)) {
-               return;
-          }
-          
-          $cur = $this->con->openCursor($this->table_ref);
-          $cur->post_id = $post_id;
-          $cur->media_id = $media_id;
-          
-          $cur->insert();
-          $this->core->blog->triggerBlog();
-     }
-     
-     /**
-     Detaches a media from a post.
-     
-     @param    post_id   <b>integer</b>      Post ID
-     @param    media_id  <b>integer</b>      Optionnal media ID
+          $this->postmedia->addPostMedia($post_id,$media_id);
+     }
+     
+     /**
+     @deprecated since version 2.4
+     @see dcPostMedia::removePostMedia
      */
      public function removePostMedia($post_id,$media_id)
      {
-          $post_id = (integer) $post_id;
-          $media_id = (integer) $media_id;
-          
-          $strReq = 'DELETE FROM '.$this->table_ref.' '.
-                    'WHERE post_id = '.$post_id.' '.
-                    'AND media_id = '.$media_id.' ';
-          
-          $this->con->execute($strReq);
-          $this->core->blog->triggerBlog();
+          $this->postmedia->removePostMedia($post_id,$media_id,"attachment");
      }