Changeset 4916

Timestamp:

02/22/07 19:44:16 (1 year ago)

Author:

ryan

Message:

APP updates from dougal and eliast. fixes #3741

Files:

• trunk/app.php (modified) (28 diffs)

trunk/app.php

@@ -5 +5 @@
- * Modified by: Dougal Campbell, http://dougal.gunters.org/
- *
-0
+5
- */
-
+
-define('APP_REQUEST', true);
-
-require_once('wp-config.php');
-
-
+
+
+
+
+
-
-// If using querystring, we need to put the path together manually:
-if ($use_querystring) {
-_
+
-    $action = $_GET['action'];
-    $eid = (int) $_GET['eid'];
@@ -29 +32 @@
-}
-
-1
+0
-
-function log_app($label,$msg) {
@@ -258 +261 @@
-
-    var $ATOM_CONTENT_TYPE = 'application/atom+xml';
-
+
-    var $INTROSPECTION_CONTENT_TYPE = 'application/atomserv+xml';
-
-    var $ENTRIES_PATH = "posts";
+    var $CATEGORIES_PATH = "categories";
-    var $MEDIA_PATH = "attachments";
-    var $ENTRY_PATH = "post";
@@ -283 +287 @@
-            '@/service@' => 
-                array('GET' => 'get_service'),
+            '@/categories@' =>
+                array('GET' => 'get_categories_xml'),
-            '@/post/(\d+)@' => 
-                array('GET' => 'get_post', 
@@ -349 +355 @@
-        log_app('function','get_service()');
-        $entries_url = $this->get_entries_url();
+        $categories_url = $this->get_categories_url(); 
-        $media_url = $this->get_attachments_url();
-        $accepted_content_types = join(',',$this->media_content_types);
-        $introspection = <<<EOD
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-</service>
-
-EOD;
+
-        $this->output($introspection, $this->INTROSPECTION_CONTENT_TYPE); 
-    }
+
+function get_categories_xml() {
+    log_app('function','get_categories_xml()');
+    $home = get_bloginfo_rss('home');
+
+    $categories = "";
+    $cats = get_categories("hierarchical=0&hide_empty=0");
+    foreach ((array) $cats as $cat) {
+        $categories .= "    <category term=\"" . attribute_escape($cat->cat_name) .  "\" />\n";
+    }
+        $output = <<<EOD
+<app:categories xmlns:app="http://purl.org/atom/app#"
+    xmlns="http://www.w3.org/2005/Atom"
+    fixed="yes" scheme="$home">
+    $categories
+</app:categories>
+EOD;
+    $this->output($output, $this->CATEGORIES_CONTENT_TYPE); 
+}
-
-    /*
@@ -373 +401 @@
-     */
-    function create_post() {
-
+
-        $this->get_accepted_content_type($this->atom_content_types);
-
@@ -390 +418 @@
-            $this->auth_required('Sorry, you do not have the right to edit/publish new posts.');
-
-1
+$current_blog->blog_id
-        $post_status = ($publish) ? 'publish' : 'draft';
-        $post_author = $user->ID;
@@ -401 +429 @@
-        $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
-
+        log_app('Inserting Post. Data:', print_r($post_data,true));
+
-        $postID = wp_insert_post($post_data);
-
@@ -438 +468 @@
-        // check for not found
-        global $entry;
+        $entry = $GLOBALS['entry'];
-        $this->set_current_entry($postID);
-entry
+GLOBALS['entry']
-
-        if(!current_user_can('edit_post', $entry['ID']))
@@ -508 +539 @@
-
-    function create_attachment() {
+        global $wp, $wpdb, $wp_query, $blog_id;
-
-        $type = $this->get_accepted_content_type();
@@ -532 +564 @@
-        $file = wp_upload_bits( $slug, NULL, $bits);
-
+        log_app('wp_upload_bits returns:',print_r($file,true));
+        
-        $url = $file['url'];
-        $file = $file['file'];
@@ -696 +730 @@
-            $url .= '?action=/' . $this->ENTRIES_PATH;
-            if(isset($page) && is_int($page)) {
-
+amp;
-            }
-        } else {
@@ -712 +746 @@
-    }
-
+    function get_categories_url($page = NULL) {
+        global $use_querystring;
+        $url = get_bloginfo('url') . '/' . $this->script_name;
+        if ($use_querystring) {
+            $url .= '?action=/' . $this->CATEGORIES_PATH;
+        } else {
+            $url .= '/' . $this->CATEGORIES_PATH;
+        }
+        return $url;
+    }
+
+    function the_categories_url() {
+        $url = $this->get_categories_url();
+        echo $url;
+    }
+    
-    function get_attachments_url($page = NULL) {
-        global $use_querystring;
@@ -718 +768 @@
-            $url .= '?action=/' . $this->MEDIA_PATH;
-            if(isset($page) && is_int($page)) {
-
+amp;
-            }
-        } else {
@@ -739 +789 @@
-        if(!isset($postID)) {
-            global $post;
-post
+GLOBALS['post']
-        }
-        
-        if ($use_querystring) {
-
+amp;
-        } else {
-            $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->ENTRY_PATH . "/$postID";
@@ -761 +811 @@
-        if(!isset($postID)) {
-            global $post;
-post
+GLOBALS['post']
-        }
-        
-        if ($use_querystring) {
-
+amp;
-        } else {
-            $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_SINGLE_PATH ."/$postID";
@@ -816 +866 @@
-
-    function get_feed($page = 1, $post_type = 'post') {
+        global $post, $wp, $wp_query, $posts, $wpdb, $blog_id, $post_cache;
-        log_app('function',"get_feed($page, '$post_type')");
-        ob_start();
@@ -830 +881 @@
-        }
-        query_posts($query);
-
+
+
+
+
+
+
+
+
-
-        $total_count = $this->get_posts_count();
@@ -852 +910 @@
-<link rel="self" type="application/atom+xml" href="<?php $this->the_entries_url() ?>" />
-<rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights>
-
-
+
+
+
+
-<entry>
-
+$post->ID
-        <title type="html"><![CDATA[<?php the_title() ?>]]></title>
-        <updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
-        <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
-        <app:control>
-post
+GLOBALS['post']
-        </app:control>
-        <author>
@@ -869 +929 @@
-    <?php } ?>
-        </author>
-post
+GLOBALS['post']
-        <link rel="edit" href="<?php $this->the_entry_url() ?>" />
-        <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
@@ -879 +939 @@
-     <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" />
-    <?php } ?>   <summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-post
-?php echo get_the_content('', 0, '') ?
+GLOBALS['post']
+![CDATA[<?php echo get_the_content('', 0, '') ?>]]
-<?php endif; ?>
-    </entry>
@@ -896 +956 @@
-        log_app('function',"get_entry($postID, '$post_type')");
-        ob_start();
-
+, $wp, $wpdb, $blog_id, $post_cache
-        switch($post_type) {
-            case 'post':
@@ -906 +966 @@
-        }
-        query_posts($varname . '=' . $postID);
-
+
+
+
+
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#" xml:lang="<?php echo get_option('rss_language'); ?>">
-
+$post->ID
-    <title type="html"><![CDATA[<?php the_title_rss() ?>]]></title>
-
@@ -914 +977 @@
-    <published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
-    <app:control>
-post
+GLOBALS['post']
-    </app:control>
-    <author>
@@ -921 +984 @@
-        <uri><?php the_author_url()?></uri>
-    </author>
-post
+GLOBALS['post']
-    <link rel="edit" href="<?php $this->the_entry_url() ?>" />
-    <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
-post
+GLOBALS['post']
-<?php } else { ?>
-    <link href="<?php permalink_single_rss() ?>" />
@@ -933 +996 @@
-    <summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php }
-post
-?php echo get_the_content('', 0, '') ?
+GLOBALS['post']
+![CDATA[<?php echo get_the_content('', 0, '') ?>]]
-<?php endif; ?>
-</entry>
@@ -1026 +1089 @@
-            case 'attachment':
-                if ($use_querystring) {
-
+amp;
-                } else {
-                    $edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID";
@@ -1055 +1118 @@
-    function output($xml, $ctype = "application/atom+xml") {
-            status_header('200');
-get_option('blog_charset'
+strtolower(get_option('blog_charset')
-            header('Connection: close');
-            header('Content-Length: '. strlen($xml));