Changeset 771:d6311bb1cfaa for inc/core/class.dc.media.php

Timestamp:

11/19/11 14:44:40 (14 years ago)

Author:

xave

Branch:

default

Parents:

769:da721122beb5 (diff), 397:11252593aecf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Branch 2.3 is now closed.

File:

• inc/core/class.dc.media.php (modified) (7 diffs)

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;
           
@@ -175 +175 @@
      
      @param    href      <b>string</b>       URL pattern
+     @param    last      <b>string</b>       Last item pattern
      @return   <b>string</b> HTML code
      */
-     public function breadCrumb($href)
+     public function breadCrumb($href,$last='')
      {
           $res = '';
           if ($this->relpwd && $this->relpwd != '.') {
                $pwd = '';
-               foreach (explode('/',$this->relpwd) as $v) {
-                    $pwd .= rawurlencode($v).'/';
-                    $res .= '<a href="'.sprintf($href,$pwd).'">'.$v.'</a> / ';
+               $arr = explode('/',$this->relpwd);
+               $count = count($arr);
+               foreach ($arr as $v) {
+                    if (($last != '') && (0 === --$count)) {
+                         $res .= sprintf($last,$v);
+                    } else {
+                         $pwd .= rawurlencode($v).'/';
+                         $res .= '<a href="'.sprintf($href,$pwd).'">'.$v.'</a> / ';
+                    }
                }
           }
@@ -494 +501 @@
      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 +523 @@
      
      /**
-     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");
      }
      
@@ -856 +830 @@
      {
           $zip = new fileUnzip($f->file);
+          $zip->setExcludePattern($this->exclude_pattern);
           $zip->getList(false,'#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');