Changeset 852:969647a6c35e for inc/core

Timestamp:

07/31/12 15:15:32 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

sexy step 3 : no more media.

Location:

inc/core

Files:

• class.dc.auth.php (modified) (1 diff)
• class.dc.blog.php (modified) (1 diff)
• class.dc.core.php (modified) (2 diffs)
• class.dc.media.php (deleted)
• class.dc.postmedia.php (deleted)
• class.dc.rs.extensions.php (modified) (1 diff)
• class.dc.xmlrpc.php (modified) (4 diffs)

inc/core/class.dc.auth.php

@@ -75 +75 @@
                'publish' => __('publish entries and comments'),
                'delete' => __('delete entries and comments'),
-               'contentadmin' => __('manage all entries and comments'),
-               'media' => __('manage their own media items'),
-               'media_admin' => __('manage all media items')
+               'contentadmin' => __('manage all entries and comments')
           );
      }

inc/core/class.dc.blog.php

@@ -361 +361 @@
           $rs = $this->con->select($strReq);
           $rs->core = $this->core;
-          $rs->_nb_media = array();
           $rs->extend('rsExtPost');
           

inc/core/class.dc.core.php

@@ -35 +35 @@
      public $wiki2xhtml; ///< <b>wiki2xhtml</b>        wiki2xhtml object
      public $plugins;    ///< <b>dcModules</b>         dcModules object
-     public $media;      ///< <b>dcMedia</b>           dcMedia object
-     public $postmedia;  ///< <b>dcPostMedia</b>       dcPostMedia object
      public $rest;       ///< <b>dcRestServer</b> dcRestServer object
      public $log;        ///< <b>dcLog</b>             dcLog object
@@ -1202 +1200 @@
                     array('lang','string','en',
                     'Default blog language'),
-                    array('media_exclusion','string','/\.php$/i',
-                    'File name exclusion pattern in media manager. (PCRE value)'),
-                    array('media_img_m_size','integer',448,
-                    'Image medium size in media manager'),
-                    array('media_img_s_size','integer',240,
-                    'Image small size in media manager'),
-                    array('media_img_t_size','integer',100,
-                    'Image thumbnail size in media manager'),
-                    array('media_img_title_pattern','string','Title ;; Date(%b %Y) ;; separator(, )',
-                    'Pattern to set image title when you insert it in a post'),
                     array('nb_post_per_page','integer',20,
                     'Number of entries on home page and category pages'),

inc/core/class.dc.rs.extensions.php

@@ -335 +335 @@
      }
      
-     /**
-     Returns post media count using a subquery.
-     
-     @param    rs   Invisible parameter
-     @return   <b>integer</b>
-     */
-     public static function countMedia($rs)
-     {
-          if (isset($rs->_nb_media[$rs->index()]))
-          {
-               return $rs->_nb_media[$rs->index()];
-          }
-          else
-          {
-               $strReq =
-               'SELECT count(media_id) '.
-               'FROM '.$rs->core->prefix.'post_media '.
-               'WHERE post_id = '.(integer) $rs->post_id.' ';
-               
-               $res = (integer) $rs->core->con->select($strReq)->f(0);
-               $rs->_nb_media[$rs->index()] = $res;
-               return $res;
-          }
-     }
 }
 

inc/core/class.dc.xmlrpc.php

@@ -75 +75 @@
                'List of most recent posts in the system');
           
-          $this->addCallback('metaWeblog.newMediaObject',array($this,'mw_newMediaObject'),
-               array('struct','string','string','string','struct'),
-               'Upload a file on the web server');
-          
           # MovableType methods
           $this->addCallback('mt.getRecentPostTitles',array($this,'mt_getRecentPostTitles'),
@@ -573 +569 @@
           
           return true;
-     }
-     
-     private function newMediaObject($blog_id,$user,$pwd,$file)
-     {
-          if (empty($file['name'])) {
-               throw new Exception('No file name');
-          }
-          
-          if (empty($file['bits'])) {
-               throw new Exception('No file content');
-          }
-          
-          $file_name = $file['name'];
-          $file_bits = $file['bits'];
-          
-          $this->setUser($user,$pwd);
-          $this->setBlog();
-          
-          $media = new dcMedia($this->core);
-          
-          $dir_name = path::clean(dirname($file_name));
-          $file_name = basename($file_name);
-          
-          $dir_name = preg_replace('!^/!','',$dir_name);
-          if ($dir_name != '')
-          {
-               $dir = explode('/',$dir_name);
-               $cwd = './';
-               foreach ($dir as $v)
-               {
-                    $v = files::tidyFileName($v);
-                    $cwd .= $v.'/';
-                    $media->makeDir($v);
-                    $media->chdir($cwd);
-               }
-          }
-          
-          $media_id = $media->uploadBits($file_name,$file_bits);
-          
-          $f = $media->getFile($media_id);
-          return array(
-               'file' => $file_name,
-               'url' => $f->file_url,
-               'type' => files::getMimeType($file_name)
-          );
      }
      
@@ -940 +891 @@
      }
      
-     public function mw_newMediaObject($blogid,$username,$password,$file)
-     {
-          return $this->newMediaObject($blogid,$username,$password,$file);
-     }
-     
      /* MovableType methods
      --------------------------------------------------- */
@@ -1024 +970 @@
      {
           return $this->getTags($username,$password);
-     }
-     
-     public function wp_uploadFile($blogid,$username,$password,$file)
-     {
-          return $this->newMediaObject($blogid,$username,$password,$file);
      }