Changeset 2566:9bf417837888 for inc/core/class.dc.xmlrpc.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• inc/core/class.dc.xmlrpc.php (modified) (71 diffs)

inc/core/class.dc.xmlrpc.php

@@ -21 +21 @@
      private $trace_args = true;
      private $trace_response = true;
-     
+
      public function __construct($core,$blog_id)
      {
           parent::__construct();
-          
+
           $this->core =& $core;
           $this->blog_id = $blog_id;
-          
+
           # Blogger methods
           $this->addCallback('blogger.newPost',array($this,'blogger_newPost'),
                array('string','string','string','string','string','string','integer'),
                'New post');
-          
+
           $this->addCallback('blogger.editPost',array($this,'blogger_editPost'),
                array('boolean','string','string','string','string','string','integer'),
                'Edit a post');
-          
+
           $this->addCallback('blogger.getPost',array($this,'blogger_getPost'),
                array('struct','string','integer','string','string'),
                'Return a posts by ID');
-          
+
           $this->addCallback('blogger.deletePost',array($this,'blogger_deletePost'),
                array('string','string','string','string','string','integer'),
                'Delete a post');
-          
+
           $this->addCallback('blogger.getRecentPosts',array($this,'blogger_getRecentPosts'),
                array('array','string','string','string','string','integer'),
                'Return a list of recent posts');
-          
+
           $this->addCallback('blogger.getUsersBlogs',array($this,'blogger_getUserBlogs'),
                array('struct','string','string','string'),
                "Return user's blog");
-          
+
           $this->addCallback('blogger.getUserInfo',array($this,'blogger_getUserInfo'),
                array('struct','string','string','string'),
                'Return User Info');
-          
+
           # Metaweblog methods
           $this->addCallback('metaWeblog.newPost',array($this,'mw_newPost'),
                array('string','string','string','string','struct','boolean'),
                'Creates a new post, and optionnaly publishes it.');
-          
+
           $this->addCallback('metaWeblog.editPost',array($this,'mw_editPost'),
                array('boolean','string','string','string','struct','boolean'),
                'Updates information about an existing entry');
-          
+
           $this->addCallback('metaWeblog.getPost',array($this,'mw_getPost'),
                array('struct','string','string','string'),
                'Returns information about a specific post');
-          
+
           $this->addCallback('metaWeblog.getRecentPosts',array($this,'mw_getRecentPosts'),
                array('array','string','string','string','integer'),
                'List of most recent posts in the system');
-          
+
           $this->addCallback('metaWeblog.getCategories',array($this,'mw_getCategories'),
                array('array','string','string','string'),
                'List of all categories defined in the weblog');
-          
+
           $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'),
                array('array','string','string','string','integer'),
                'List of most recent posts in the system');
-          
+
           $this->addCallback('mt.getCategoryList',array($this,'mt_getCategoryList'),
                array('array','string','string','string'),
                'List of all categories defined in the weblog');
-          
+
           $this->addCallback('mt.getPostCategories',array($this,'mt_getPostCategories'),
                array('array','string','string','string'),
                'List of all categories to which the post is assigned');
-          
+
           $this->addCallback('mt.setPostCategories',array($this,'mt_setPostCategories'),
                array('boolean','string','string','string','array'),
                'Sets the categories for a post');
-          
+
           $this->addCallback('mt.publishPost',array($this,'mt_publishPost'),
                array('boolean','string','string','string'),
                'Retrieve pings list for a post');
-          
+
           $this->addCallback('mt.supportedMethods',array($this,'listMethods'),
                array(),'Retrieve information about the XML-RPC methods supported by the server.');
-          
+
           $this->addCallback('mt.supportedTextFilters',array($this,'mt_supportedTextFilters'),
                array(),'Retrieve information about supported text filters.');
-          
+
           # WordPress methods
           $this->addCallback('wp.getUsersBlogs',array($this,'wp_getUsersBlogs'),
                array('array','string','string'),
                'Retrieve the blogs of the user.');
-          
+
           $this->addCallback('wp.getPage',array($this,'wp_getPage'),
                array('struct','integer','integer','string','string'),
                'Get the page identified by the page ID.');
-          
+
           $this->addCallback('wp.getPages',array($this,'wp_getPages'),
                array('array','integer','string','string','integer'),
                'Get an array of all the pages on a blog.');
-          
+
           $this->addCallback('wp.newPage',array($this,'wp_newPage'),
                array('integer','integer','string','string','struct','boolean'),
                'Create a new page.');
-          
+
           $this->addCallback('wp.deletePage',array($this,'wp_deletePage'),
                array('boolean','integer','string','string','integer'),
                'Removes a page from the blog.');
-          
+
           $this->addCallback('wp.editPage',array($this,'wp_editPage'),
                array('boolean','integer','integer','string','string','struct','boolean'),
                'Make changes to a blog page.');
-          
+
           $this->addCallback('wp.getPageList',array($this,'wp_getPageList'),
                array('array','integer','string','string'),
                'Get an array of all the pages on a blog. Just the minimum details, lighter than wp.getPages.');
-          
+
           $this->addCallback('wp.getAuthors',array($this,'wp_getAuthors'),
                array('array','integer','string','string'),
                'Get an array of users for the blog.');
-          
+
           $this->addCallback('wp.getCategories',array($this,'wp_getCategories'),
                array('array','integer','string','string'),
                'Get an array of available categories on a blog.');
-          
+
           $this->addCallback('wp.getTags',array($this,'wp_getTags'),
                array('array','integer','string','string'),
                'Get list of all tags for the blog.');
-          
+
           $this->addCallback('wp.newCategory',array($this,'wp_newCategory'),
                array('integer','integer','string','string','struct'),
                'Create a new category.');
-          
+
           $this->addCallback('wp.deleteCategory',array($this,'wp_deleteCategory'),
                array('boolean','integer','string','string','integer'),
                'Delete a category with a given ID.');
-          
+
           $this->addCallback('wp.suggestCategories',array($this,'wp_suggestCategories'),
                array('array','integer','string','string','string','integer'),
                'Get an array of categories that start with a given string.');
-          
+
           $this->addCallback('wp.uploadFile',array($this,'wp_uploadFile'),
                array('struct','integer','string','string','struct'),
                'Upload a file');
-          
+
           $this->addCallback('wp.getPostStatusList',array($this,'wp_getPostStatusList'),
                array('array','integer','string','string'),
                'Retrieve all of the post statuses.');
-          
+
           $this->addCallback('wp.getPageStatusList',array($this,'wp_getPageStatusList'),
                array('array','integer','string','string'),
                'Retrieve all of the pages statuses.');
-          
+
           $this->addCallback('wp.getPageTemplates',array($this,'wp_getPageTemplates'),
                array('struct','integer','string','string'),
                'Retrieve page templates.');
-          
+
           $this->addCallback('wp.getOptions',array($this,'wp_getOptions'),
                array('struct','integer','string','string','array'),
                'Retrieve blog options');
-          
+
           $this->addCallback('wp.setOptions',array($this,'wp_setOptions'),
                array('struct','integer','string','string','struct'),
                'Update blog options');
-          
+
           $this->addCallback('wp.getComment',array($this,'wp_getComment'),
                array('struct','integer','string','string','integer'),
                "Gets a comment, given it's comment ID.");
-          
+
           $this->addCallback('wp.getCommentCount',array($this,'wp_getCommentCount'),
                array('array','integer','string','string','integer'),
                'Retrieve comment count.');
-          
+
           $this->addCallback('wp.getComments',array($this,'wp_getComments'),
                array('array','integer','string','string','struct'),
                'Gets a set of comments for a given post.');
-          
+
           $this->addCallback('wp.deleteComment',array($this,'wp_deleteComment'),
                array('boolean','integer','string','string','integer'),
                'Delete a comment with given ID.');
-          
+
           $this->addCallback('wp.editComment',array($this,'wp_editComment'),
                array('boolean','integer','string','string','integer','struct'),
                'Edit a comment with given ID.');
-          
+
           $this->addCallback('wp.newComment',array($this,'wp_newComment'),
                array('integer','integer','string','string','integer','struct'),
                'Create a new comment for a given post ID.');
-          
+
           $this->addCallback('wp.getCommentStatusList',array($this,'wp_getCommentStatusList'),
                array('array','integer','string','string'),
                'Retrieve all of the comment statuses.');
-               
+
           # Pingback support
           $this->addCallback('pingback.ping',array($this,'pingback_ping'),
@@ -220 +220 @@
                'Notify a link to a post.');
      }
-     
+
      public function serve($data=false,$encoding='UTF-8')
      {
           parent::serve(false,$encoding);
      }
-     
+
      public function call($methodname,$args)
      {
@@ -237 +237 @@
           }
      }
-     
+
      private function debugTrace($methodname,$args,$rsp)
      {
@@ -243 +243 @@
                return;
           }
-          
+
           if (($fp = @fopen($this->debug_file,'a')) !== false)
           {
                fwrite($fp,'['.date('r').']'.' '.$methodname);
-               
+
                if ($this->trace_args) {
                     fwrite($fp,"\n- args ---\n".var_export($args,1));
                }
-               
+
                if ($this->trace_response) {
                     fwrite($fp,"\n- response ---\n".var_export($rsp,1));
@@ -259 +259 @@
           }
      }
-     
+
      /* Internal methods
      --------------------------------------------------- */
@@ -267 +267 @@
                return true;
           }
-          
+
           if ($this->core->auth->checkUser($user_id,$pwd) !== true) {
                throw new Exception('Login error');
           }
-          
+
           return true;
      }
-     
+
      private function setBlog($bypass = false)
      {
@@ -280 +280 @@
                throw new Exception('No blog ID given.');
           }
-          
+
           if ($this->blog_loaded) {
                return true;
           }
-          
+
           $this->core->setBlog($this->blog_id);
           $this->blog_loaded = true;
-          
+
           if (!$this->core->blog->id) {
                $this->core->blog = null;
                throw new Exception('Blog does not exist.');
           }
-          
+
           if (!$bypass &&
                (!$this->core->blog->settings->system->enable_xmlrpc ||
@@ -299 +299 @@
                throw new Exception('Not enough permissions on this blog.');
           }
-          
+
           foreach ($this->core->plugins->getModules() as $id => $m) {
                $this->core->plugins->loadNsFile($id,'xmlrpc');
           }
-          
+
           return true;
      }
-     
+
      private function getPostRS($post_id,$user,$pwd,$post_type='post')
      {
@@ -315 +315 @@
                'post_type' => $post_type
           ));
-          
+
           if ($rs->isEmpty()) {
                throw new Exception('This entry does not exist');
           }
-          
+
           return $rs;
      }
-     
+
      private function getCatID($cat_url)
      {
           $rs = $this->core->blog->getCategories(array('cat_url' => $cat_url));
-          
+
           return $rs->isEmpty() ? null : $rs->cat_id;
      }
-     
+
      /* Generic methods
      --------------------------------------------------- */
@@ -336 +336 @@
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $title = !empty($struct['title']) ? $struct['title'] : '';
           $excerpt = !empty($struct['mt_excerpt']) ? $struct['mt_excerpt'] : '';
@@ -343 +343 @@
           $open_comment = isset($struct['mt_allow_comments']) ? $struct['mt_allow_comments'] : 1;
           $open_tb = isset($struct['mt_allow_pings']) ? $struct['mt_allow_pings'] : 1;
-          
+
           if ($description !== null) {
                $content = $description;
           }
-          
+
           if (!$title) {
                $title = text::cutString(html::clean($content),25).'...';
           }
-          
+
           $excerpt_xhtml = $this->core->callFormater('xhtml',$excerpt);
           $content_xhtml = $this->core->callFormater('xhtml',$content);
-          
+
           if (empty($content)) {
                throw new Exception('Cannot create an empty entry');
           }
-          
+
           $cur = $this->core->con->openCursor($this->core->prefix.'post');
-          
+
           $cur->user_id = $this->core->auth->userID();
           $cur->post_lang = $this->core->auth->getInfo('user_lang');
@@ -372 +372 @@
           $cur->post_status = (integer) $publish;
           $cur->post_format = 'xhtml';
-          
+
           if ($dateCreated) {
                if ($dateCreated instanceof xmlrpcDate) {
@@ -380 +380 @@
                }
           }
-          
+
           # Categories in an array
           if (isset($struct['categories']) && is_array($struct['categories']))
@@ -386 +386 @@
                $categories = $struct['categories'];
                $cat_id = !empty($categories[0]) ? $categories[0] : null;
-               
+
                $cur->cat_id = $this->getCatID($cat_id);
           }
-          
+
           if (isset($struct['wp_slug'])) {
                $cur->post_url = $struct['wp_slug'];
           }
-          
+
           if (isset($struct['wp_password'])) {
                $cur->post_password = $struct['wp_password'];
           }
-          
+
           $cur->post_type = 'post';
           if (!empty($struct['post_type'])) {
                $cur->post_type = $struct['post_type'];
           }
-          
+
           if ($cur->post_type == 'post')
           {
                # --BEHAVIOR-- xmlrpcBeforeNewPost
                $this->core->callBehavior('xmlrpcBeforeNewPost',$this,$cur,$content,$struct,$publish);
-               
+
                $post_id = $this->core->blog->addPost($cur);
-               
+
                # --BEHAVIOR-- xmlrpcAfterNewPost
                $this->core->callBehavior('xmlrpcAfterNewPost',$this,$post_id,$cur,$content,$struct,$publish);
@@ -418 +418 @@
                     $cur->post_position = (integer) $struct['wp_page_order'];
                }
-               
+
                $this->core->blog->settings->system->post_url_format = '{t}';
-               
+
                $post_id = $this->core->blog->addPost($cur);
           }
@@ -427 +427 @@
                throw new Exception('Invalid post type',401);
           }
-          
+
           return (string) $post_id;
      }
-     
+
      private function editPost($post_id,$user,$pwd,$content,$struct=array(),$publish=true)
      {
           $post_id = (integer) $post_id;
-          
+
           $post_type = 'post';
           if (!empty($struct['post_type'])) {
                $post_type = $struct['post_type'];
           }
-          
+
           $post = $this->getPostRS($post_id,$user,$pwd,$post_type);
-          
+
           $title = (!empty($struct['title'])) ? $struct['title'] : '';
           $excerpt = (!empty($struct['mt_excerpt'])) ? $struct['mt_excerpt'] : '';
@@ -448 +448 @@
           $open_comment = (isset($struct['mt_allow_comments'])) ? $struct['mt_allow_comments'] : 1;
           $open_tb = (isset($struct['mt_allow_pings'])) ? $struct['mt_allow_pings'] : 1;
-          
+
           if ($description !== null) {
                $content = $description;
           }
-          
+
           if (!$title) {
                $title = text::cutString(html::clean($content),25).'...';
           }
-          
+
           $excerpt_xhtml = $this->core->callFormater('xhtml',$excerpt);
           $content_xhtml = $this->core->callFormater('xhtml',$content);
-          
+
           if (empty($content)) {
                throw new Exception('Cannot create an empty entry');
           }
-          
+
           $cur = $this->core->con->openCursor($this->core->prefix.'post');
-          
+
           $cur->post_type = $post_type;
           $cur->post_title = trim($title);
@@ -477 +477 @@
           $cur->post_format = 'xhtml';
           $cur->post_url = $post->post_url;
-          
-          
+
+
           if ($dateCreated) {
                if ($dateCreated instanceof xmlrpcDate) {
@@ -488 +488 @@
                $cur->post_dt = $post->post_dt;
           }
-          
+
           # Categories in an array
           if (isset($struct['categories']) && is_array($struct['categories']))
@@ -494 +494 @@
                $categories = $struct['categories'];
                $cat_id = !empty($categories[0]) ? $categories[0] : null;
-               
+
                $cur->cat_id = $this->getCatID($cat_id);
           }
-          
+
           if (isset($struct['wp_slug'])) {
                $cur->post_url = $struct['wp_slug'];
           }
-          
+
           if (isset($struct['wp_password'])) {
                $cur->post_password = $struct['wp_password'];
           }
-          
+
           if ($cur->post_type == 'post')
           {
                # --BEHAVIOR-- xmlrpcBeforeEditPost
                $this->core->callBehavior('xmlrpcBeforeEditPost',$this,$post_id,$cur,$content,$struct,$publish);
-               
+
                $this->core->blog->updPost($post_id,$cur);
-               
+
                # --BEHAVIOR-- xmlrpcAfterEditPost
                $this->core->callBehavior('xmlrpcAfterEditPost',$this,$post_id,$cur,$content,$struct,$publish);
@@ -521 +521 @@
                     $cur->post_position = (integer) $struct['wp_page_order'];
                }
-               
+
                $this->core->blog->settings->system->post_url_format = '{t}';
-               
+
                $this->core->blog->updPost($post_id,$cur);
           }
@@ -530 +530 @@
                throw new Exception('Invalid post type',401);
           }
-          
+
           return true;
      }
-     
+
      private function getPost($post_id,$user,$pwd,$type='mw')
      {
           $post_id = (integer) $post_id;
-          
+
           $post = $this->getPostRS($post_id,$user,$pwd);
-          
+
           $res = new ArrayObject();
-          
+
           $res['dateCreated'] = new xmlrpcDate($post->getTS());
           $res['userid'] = $post->user_id;
           $res['postid'] = $post->post_id;
-          
+
           if ($post->cat_id) {
                $res['categories'] = array($post->cat_url);
           }
-          
+
           if ($type == 'blogger') {
                $res['content'] = $post->post_content_xhtml;
           }
-          
+
           if ($type == 'mt' || $type == 'mw') {
                $res['title'] = $post->post_title;
           }
-          
+
           if ($type == 'mw') {
                $res['description'] = $post->post_content_xhtml;
@@ -568 +568 @@
                $res['mt_keywords'] = '';
           }
-          
+
           # --BEHAVIOR-- xmlrpcGetPostInfo
           $this->core->callBehavior('xmlrpcGetPostInfo',$this,$type,array(&$res));
-          
+
           return $res;
      }
-     
+
      private function deletePost($post_id,$user,$pwd)
      {
           $post_id = (integer) $post_id;
-          
+
           $this->getPostRS($post_id,$user,$pwd);
           $this->core->blog->delPost($post_id);
-          
+
           return true;
      }
-     
+
      private function getRecentPosts($blog_id,$user,$pwd,$nb_post,$type='mw')
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $nb_post = (integer) $nb_post;
-          
+
           if ($nb_post > 50) {
                throw new Exception('Cannot retrieve more than 50 entries');
           }
-          
+
           $params = array();
           $params['limit'] = $nb_post;
-          
+
           $posts = $this->core->blog->getPosts($params);
-          
+
           $res = array();
           while ($posts->fetch())
           {
                $tres = array();
-               
+
                $tres['dateCreated'] = new xmlrpcDate($posts->getTS());
                $tres['userid'] = $posts->user_id;
                $tres['postid'] = $posts->post_id;
-               
+
                if ($posts->cat_id) {
                     $tres['categories'] = array($posts->cat_url);
                }
-               
+
                if ($type == 'blogger') {
                     $tres['content'] = $posts->post_content_xhtml;
                }
-               
+
                if ($type == 'mt' || $type == 'mw') {
                     $tres['title'] = $posts->post_title;
                }
-               
+
                if ($type == 'mw') {
                     $tres['description'] = $posts->post_content_xhtml;
@@ -632 +632 @@
                     $tres['mt_keywords'] = '';
                }
-               
+
                # --BEHAVIOR-- xmlrpcGetPostInfo
                $this->core->callBehavior('xmlrpcGetPostInfo',$this,$type,array(&$tres));
-               
+
                $res[] = $tres;
           }
-          
+
           return $res;
      }
-     
+
      private function getUserBlogs($user,$pwd)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           return array(array(
                'url' => $this->core->blog->url,
@@ -653 +653 @@
           ));
      }
-     
+
      private function getUserInfo($user,$pwd)
      {
           $this->setUser($user,$pwd);
-          
+
           return array(
                'userid' => $this->core->auth->userID(),
@@ -667 +667 @@
           );
      }
-     
+
      private function getCategories($blog_id,$user,$pwd)
      {
@@ -673 +673 @@
           $this->setBlog();
           $rs = $this->core->blog->getCategories();
-          
+
           $res = array();
-          
+
           $l = $rs->level;
           $stack = array('',$rs->cat_url);
-          
+
           while ($rs->fetch())
           {
@@ -694 +694 @@
                     $parent = end($stack);
                }
-               
+
                $res[] = array(
                     'categoryId' => $rs->cat_url,
@@ -705 +705 @@
                          $this->core->url->getURLFor('feed','category/'.$rs->cat_url.'/rss2')
                );
-               
+
                $stack[] = $rs->cat_url;
                $l = $rs->level;
           }
-          
+
           return $res;
      }
-     
+
      private function getPostCategories($post_id,$user,$pwd)
      {
           $post_id = (integer) $post_id;
-          
+
           $post = $this->getPostRS($post_id,$user,$pwd);
-          
+
           return array(
                array(
@@ -727 +727 @@
           );
      }
-     
+
      private function setPostCategories($post_id,$user,$pwd,$categories)
      {
           $post_id = (integer) $post_id;
-          
+
           $post = $this->getPostRS($post_id,$user,$pwd);
-          
+
           $cat_id = (!empty($categories[0]['categoryId'])) ? $categories[0]['categoryId'] : null;
-          
+
           foreach($categories as $v)
           {
@@ -743 +743 @@
                }
           }
-          
+
           # w.bloggar sends -1 for no category.
           if ($cat_id == -1) {
                $cat_id = null;
           }
-          
+
           if ($cat_id) {
                $cat_id = $this->getCatID($cat_id);
           }
-          
+
           $this->core->blog->updPostCategory($post_id,(integer) $cat_id);
-          
+
           return true;
      }
-     
+
      private function publishPost($post_id,$user,$pwd)
      {
           $post_id = (integer) $post_id;
-          
+
           $this->getPostRS($post_id,$user,$pwd);
-          
+
           # --BEHAVIOR-- xmlrpcBeforePublishPost
           $this->core->callBehavior('xmlrpcBeforePublishPost',$this,$post_id);
-          
+
           $this->core->blog->updPostStatus($post_id,1);
-          
+
           # --BEHAVIOR-- xmlrpcAfterPublishPost
           $this->core->callBehavior('xmlrpcAfterPublishPost',$this,$post_id);
-          
+
           return true;
      }
-     
+
      private function newMediaObject($blog_id,$user,$pwd,$file)
      {
@@ -780 +780 @@
                throw new Exception('No file name');
           }
-          
+
           if (empty($file['bits'])) {
                throw new Exception('No file content');
           }
-          
+
           $file_name = $file['name'];
           $file_bits = base64_decode($file['bits']);
-          
-          $this->setUser($user,$pwd);
-          $this->setBlog();
-          
+
+          $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 != '')
@@ -809 +809 @@
                }
           }
-          
+
           $media_id = $media->uploadBits($file_name,$file_bits);
-          
+
           $f = $media->getFile($media_id);
           return array(
@@ -819 +819 @@
           );
      }
-     
+
      private function translateWpStatus($s)
      {
@@ -829 +829 @@
                'scheduled' => -1
           );
-          
+
           if (is_int($s)) {
                $status = array_flip($status);
@@ -837 +837 @@
           }
      }
-     
+
      private function translateWpCommentstatus($s)
      {
@@ -845 +845 @@
                'spam' => -2
           );
-          
+
           if (is_int($s)) {
                $status = array_flip($status);
@@ -853 +853 @@
           }
      }
-     
+
      private function translateWpOptions($options=array())
      {
@@ -860 +860 @@
                $timezone = dt::getTimeOffset($this->core->blog->settings->system->blog_timezone)/3600;
           }
-          
+
           $res = array (
               'software_name' => array (
@@ -903 +903 @@
                )
           );
-          
+
           if (!empty($options))
           {
@@ -914 +914 @@
                return $r;
           }
-          
+
           return $res;
      }
-     
+
      private function getPostStatusList($blog_id,$user,$pwd)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           return array(
                'draft' => 'Draft',
@@ -931 +931 @@
           );
      }
-     
+
      private function getPageStatusList($blog_id,$user,$pwd)
      {
@@ -937 +937 @@
           $this->setBlog();
           $this->checkPagesPermission();
-          
+
           return array(
                'draft' => 'Draft',
@@ -945 +945 @@
           );
      }
-     
+
      private function checkPagesPermission()
      {
@@ -951 +951 @@
                throw new Exception('Pages management is not available on this blog.');
           }
-          
+
           if (!$this->core->auth->check('pages,contentadmin',$this->core->blog->id)) {
                throw new Exception('Not enough permissions to edit pages.',401);
           }
      }
-     
+
      private function getPages($blog_id,$user,$pwd,$limit=null,$id=null)
      {
@@ -962 +962 @@
           $this->setBlog();
           $this->checkPagesPermission();
-          
+
           $params = array(
                'post_type' => 'page',
                'order' => 'post_position ASC, post_title ASC'
           );
-          
+
           if ($id) {
                $params['post_id'] = (integer) $id;
@@ -974 +974 @@
                $params['limit'] = $limit;
           }
-          
+
           $posts = $this->core->blog->getPosts($params);
-          
+
           $res = array();
           while ($posts->fetch())
@@ -1006 +1006 @@
                     "wp_page_template"       => 'default'
                );
-               
+
                # --BEHAVIOR-- xmlrpcGetPageInfo
                $this->core->callBehavior('xmlrpcGetPageInfo',$this,array(&$tres));
-               
+
                $res[] = $tres;
           }
-          
+
           return $res;
      }
-     
+
      private function newPage($blog_id,$user,$pwd,$struct,$publish)
      {
@@ -1021 +1021 @@
           $this->setBlog();
           $this->checkPagesPermission();
-          
+
           $struct['post_type'] = 'page';
-          
+
           return $this->newPost($blog_id,$user,$pwd,null,$struct,$publish);
      }
-     
+
      private function editPage($page_id,$user,$pwd,$struct,$publish)
      {
@@ -1032 +1032 @@
           $this->setBlog();
           $this->checkPagesPermission();
-          
+
           $struct['post_type'] = 'page';
-          
+
           return $this->editPost($page_id,$user,$pwd,null,$struct,$publish);
      }
-     
+
      private function deletePage($page_id,$user,$pwd)
      {
@@ -1043 +1043 @@
           $this->setBlog();
           $this->checkPagesPermission();
-          
+
           $page_id = (integer) $page_id;
-          
+
           $this->getPostRS($page_id,$user,$pwd,'page');
           $this->core->blog->delPost($page_id);
-          
+
           return true;
      }
-     
+
      private function getAuthors($user,$pwd)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $rs = $this->core->getBlogPermissions($this->core->blog->id);
           $res = array();
-          
+
           foreach($rs as $k => $v)
           {
@@ -1070 +1070 @@
           return $res;
      }
-     
+
      private function getTags($user,$pwd)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $tags = $this->core->meta->getMeta('tag');
           $tags->sort('meta_id_lower','asc');
-          
+
           $res = array();
           $url   = $this->core->blog->url.
@@ -1097 +1097 @@
           return $res;
      }
-     
+
      private function newCategory($user,$pwd,$struct)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           if (empty($struct['name'])) {
                throw new Exception('You mus give a category name.');
           }
-          
+
           $cur = $this->core->con->openCursor($this->core->prefix.'category');
           $cur->cat_title = $struct['name'];
-          
+
           if (!empty($struct['slug'])) {
                $cur->cat_url = $struct['slug'];
@@ -1119 +1119 @@
                }
           }
-          
+
           $parent = !empty($struct['category_parent']) ? (integer) $struct['category_parent'] : 0;
-          
+
           $id = $this->core->blog->addCategory($cur,$parent);
           $rs = $this->core->blog->getCategory($id);
           return $rs->cat_url;
      }
-     
+
      private function deleteCategory($user,$pwd,$cat_id)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $c = $this->core->blog->getCategories(array('cat_url' => $cat_id));
           if ($c->isEmpty()) {
@@ -1138 +1138 @@
           $cat_id = $c->cat_id;
           unset($c);
-          
+
           $this->core->blog->delCategory((integer) $cat_id);
           return true;
      }
-     
+
      private function searchCategories($user,$pwd,$category,$limit)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $strReq = 'SELECT cat_id, cat_title, cat_url '.
                     'FROM '.$this->core->prefix.'category '.
@@ -1153 +1153 @@
                     "AND LOWER(cat_title) LIKE LOWER('%".$this->core->con->escape($category)."%') ".
                     ($limit > 0 ? $this->core->con->limit($limit) : '');
-          
+
           $rs = $this->core->con->select($strReq);
-          
+
           $res = array();
           while ($rs->fetch())
@@ -1166 +1166 @@
           return $res;
      }
-     
+
      private function countComments($user,$pwd,$post_id)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $res = array(
                'approved' => 0,
@@ -1179 +1179 @@
           );
           $rs = $this->core->blog->getComments(array('post_id' => $post_id));
-          
+
           while ($rs->fetch()) {
                $res['total']++;
@@ -1192 +1192 @@
           return $res;
      }
-     
+
      private function getComments($user,$pwd,$struct,$id=null)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $params = array();
-          
+
           if (!empty($struct['status'])) {
                $params['comment_status'] = $this->translateWpCommentstatus($struct['status']);
           }
-          
+
           if (!empty($struct['post_id'])) {
                $params['post_id'] = (integer) $struct['post_id'];
           }
-          
+
           if (isset($id)) {
                $params['comment_id'] = $id;
           }
-          
+
           $offset = !empty($struct['offset']) ? (integer) $struct['offset'] : 0;
           $limit = !empty($struct['number']) ? (integer) $struct['number'] : 10;
           $params['limit'] = array($offset,$limit);
-          
+
           $rs = $this->core->blog->getComments($params);
           $res = array();
@@ -1238 +1238 @@
           return $res;
      }
-     
+
      private function addComment($user,$pwd,$post_id,$struct)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           if (empty($struct['content'])) {
                throw new Exception('Sorry, you cannot post an empty comment',401);
           }
-          
+
           if (is_numeric($post_id)) {
                $p['post_id'] = $post_id;
@@ -1257 +1257 @@
                throw new Exception('Sorry, no such post.',404);
           }
-          
+
           $cur = $this->core->con->openCursor($this->core->prefix.'comment');
-          
+
           $cur->comment_author = $this->core->auth->getInfo('user_cn');
           $cur->comment_email = $this->core->auth->getInfo('user_email');
           $cur->comment_site = $this->core->auth->getInfo('user_url');
-          
+
           $cur->comment_content = $struct['content'];
           $cur->post_id = (integer) $post_id;
-          
+
           $id = $this->core->blog->addComment($cur);
           return $id;
      }
-     
+
      private function updComment($user,$pwd,$comment_id,$struct)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $cur = $this->core->con->openCursor($this->core->prefix.'comment');
-          
+
           if (isset($struct['status'])) {
                $cur->comment_status = $this->translateWpCommentstatus($struct['status']);
           }
-          
+
           if (isset($struct['date_created_gmt'])) {
                if ($struct['date_created_gmt'] instanceof xmlrpcDate) {
@@ -1290 +1290 @@
                $cur->comment_dt = $struct['date_created_gmt'];
           }
-          
+
           if (isset($struct['content'])) {
                $cur->comment_content = $struct['content'];
           }
-          
+
           if (isset($struct['author'])) {
                $cur->comment_author = $struct['author'];
           }
-          
+
           if (isset($struct['author_url'])) {
                $cur->comment_site = $struct['author_url'];
           }
-          
+
           if (isset($struct['author_email'])) {
                $cur->comment_email = $struct['author_email'];
           }
-          
+
           $this->core->blog->updComment($comment_id,$cur);
           return true;
      }
-     
+
      private function delComment($user,$pwd,$comment_id)
      {
           $this->setUser($user,$pwd);
           $this->setBlog();
-          
+
           $this->core->blog->delComment($comment_id);
           return true;
      }
-     
+
      /* Blogger methods
      --------------------------------------------------- */
@@ -1326 +1326 @@
           return $this->newPost($blogid,$username,$password,$content,array(),$publish);
      }
-     
+
      public function blogger_editPost($appkey,$postid,$username,$password,$content,$publish)
      {
           return $this->editPost($postid,$username,$password,$content,array(),$publish);
      }
-     
+
      public function blogger_getPost($appkey,$postid,$username,$password)
      {
           return $this->getPost($postid,$username,$password,'blogger');
      }
-     
+
      public function blogger_deletePost($appkey,$postid,$username,$password,$publish)
      {
           return $this->deletePost($postid,$username,$password);
      }
-     
+
      public function blogger_getRecentPosts($appkey,$blogid,$username,$password,$numberOfPosts)
      {
           return $this->getRecentPosts($blogid,$username,$password,$numberOfPosts,'blogger');
      }
-     
+
      public function blogger_getUserBlogs($appkey,$username,$password)
      {
           return $this->getUserBlogs($username,$password);
      }
-     
+
      public function blogger_getUserInfo($appkey,$username,$password)
      {
           return $this->getUserInfo($username,$password);
      }
-     
-     
+
+
      /* Metaweblog methods
      ------------------------------------------------------- */
@@ -1364 +1364 @@
           return $this->newPost($blogid,$username,$password,'',$content,$publish);
      }
-     
+
      public function mw_editPost($postid,$username,$password,$content,$publish)
      {
           return $this->editPost($postid,$username,$password,'',$content,$publish);
      }
-     
+
      public function mw_getPost($postid,$username,$password)
      {
           return $this->getPost($postid,$username,$password,'mw');
      }
-     
+
      public function mw_getRecentPosts($blogid,$username,$password,$numberOfPosts)
      {
           return $this->getRecentPosts($blogid,$username,$password,$numberOfPosts,'mw');
      }
-     
+
      public function mw_getCategories($blogid,$username,$password)
      {
           return $this->getCategories($blogid,$username,$password);
      }
-     
+
      public function mw_newMediaObject($blogid,$username,$password,$file)
      {
           return $this->newMediaObject($blogid,$username,$password,$file);
      }
-     
+
      /* MovableType methods
      --------------------------------------------------- */
@@ -1396 +1396 @@
           return $this->getRecentPosts($blogid,$username,$password,$numberOfPosts,'mt');
      }
-     
+
      public function mt_getCategoryList($blogid,$username,$password)
      {
           return $this->getCategories($blogid,$username,$password);
      }
-     
+
      public function mt_getPostCategories($postid,$username,$password)
      {
           return $this->getPostCategories($postid,$username,$password);
      }
-     
+
      public function mt_setPostCategories($postid,$username,$password,$categories)
      {
           return $this->setPostCategories($postid,$username,$password,$categories);
      }
-     
+
      public function mt_publishPost($postid,$username,$password)
      {
           return $this->publishPost($postid,$username,$password);
      }
-     
+
      public function mt_supportedTextFilters()
      {
           return array();
      }
-     
+
      /* WordPress methods
      --------------------------------------------------- */
@@ -1428 +1428 @@
           return $this->getUserBlogs($username,$password);
      }
-     
+
      public function wp_getPage($blogid,$pageid,$username,$password)
      {
           $res = $this->getPages($blogid,$username,$password,null,$pageid);
-          
+
           if (empty($res)) {
                throw new Exception('Sorry, no such page',404);
           }
-          
+
           return $res[0];
      }
-     
+
      public function wp_getPages($blogid,$username,$password,$num=10)
      {
           return $this->getPages($blogid,$username,$password,$num);
      }
-     
+
      public function wp_newPage($blogid,$username,$password,$content,$publish)
      {
           return $this->newPage($blogid,$username,$password,$content,$publish);
      }
-     
+
      public function wp_deletePage($blogid,$username,$password,$pageid)
      {
           return $this->deletePage($pageid,$username,$password);
      }
-     
+
      public function wp_editPage($blogid,$pageid,$username,$password,$content,$publish)
      {
           return $this->editPage($pageid,$username,$password,$content,$publish);
      }
-     
+
      public function wp_getPageList($blogid,$username,$password)
      {
@@ -1475 +1475 @@
           return $res;
      }
-     
+
      public function wp_getAuthors($blogid,$username,$password)
      {
           return $this->getAuthors($username,$password);
      }
-     
+
      public function wp_getCategories($blogid,$username,$password)
      {
           return $this->getCategories($blogid,$username,$password);
      }
-     
+
      public function wp_getTags($blogid,$username,$password)
      {
           return $this->getTags($username,$password);
      }
-     
+
      public function wp_newCategory($blogid,$username,$password,$content)
      {
           return $this->newCategory($username,$password,$content);
      }
-     
+
      public function wp_deleteCategory($blogid,$username,$password,$categoryid)
      {
           return $this->deleteCategory($username,$password,$categoryid);
      }
-     
+
      public function wp_suggestCategories($blogid,$username,$password,$category,$max_results=0)
      {
           return $this->searchCategories($username,$password,$category,$max_results);
      }
-     
+
      public function wp_uploadFile($blogid,$username,$password,$file)
      {
           return $this->newMediaObject($blogid,$username,$password,$file);
      }
-     
+
      public function wp_getPostStatusList($blogid,$username,$password)
      {
           return $this->getPostStatusList($blogid,$username,$password);
      }
-     
+
      public function wp_getPageStatusList($blogid,$username,$password)
      {
           return $this->getPostStatusList($blogid,$username,$password);
      }
-     
+
      public function wp_getPageTemplates($blogid,$username,$password)
      {
           return array('Default' => 'default');
      }
-     
+
      public function wp_getOptions($blogid,$username,$password,$options=array())
      {
           $this->setUser($username,$password);
           $this->setBlog();
-          
+
           return $this->translateWpOptions($options);
      }
-     
+
      public function wp_setOptions($blogid,$username,$password,$options)
      {
           $this->setUser($username,$password);
           $this->setBlog();
-          
+
           if (!$this->core->auth->check('admin',$this->core->blog->id)) {
                throw new Exception('Not enough permissions to edit options.',401);
           }
-          
+
           $opt = $this->translateWpOptions();
-          
+
           $done = array();
           $blog_changes = false;
           $cur = $this->core->con->openCursor($this->core->prefix.'blog');
-          
+
           $this->core->blog->settings->addNamespace('system');
-          
+
           foreach ($options as $name => $value)
           {
@@ -1556 +1556 @@
                     continue;
                }
-               
+
                switch ($name)
                {
@@ -1579 +1579 @@
                }
           }
-          
+
           if ($blog_changes) {
                $this->core->updBlog($this->core->blog->id,$cur);
                $this->core->setBlog($this->core->blog->id);
           }
-          
+
           return $this->translateWpOptions($done);
      }
-     
+
      public function wp_getComment($blogid,$username,$password,$commentid)
      {
           $res = $this->getComments($username,$password,array(),$commentid);
-          
+
           if (empty($res)) {
                throw new Exception('Sorry, no such comment',404);
           }
-          
+
           return $res[0];
      }
-     
+
      public function wp_getCommentCount($blogid,$username,$password,$postid)
      {
           return $this->countComments($username,$password,$postid);
      }
-     
+
      public function wp_getComments($blogid,$username,$password,$struct)
      {
           return $this->getComments($username,$password,$struct);
      }
-     
+
      public function wp_deleteComment($blogid,$username,$password,$commentid)
      {
           return $this->delComment($username,$password,$commentid);
      }
-     
+
      public function wp_editComment($blogid,$username,$password,$commentid,$content)
      {
           return $this->updComment($username,$password,$commentid,$content);
      }
-     
+
      public function wp_newComment($blogid,$username,$password,$postid,$content)
      {
           return $this->addComment($username,$password,$postid,$content);
      }
-     
+
      public function wp_getCommentStatusList($blogid,$username,$password)
      {
           $this->setUser($username,$password);
           $this->setBlog();
-          
+
           return array(
                'hold' => 'Unapproved',
@@ -1652 +1652 @@
                throw new Exception(__('LOL!'), 0);
           }
-          
+
           # Time to get things done...
           $this->setBlog(true);
@@ -1659 +1659 @@
      }
 }
-?>