Changeset 5951

Timestamp:

08/27/07 19:52:58 (10 months ago)

Author:

ryan

Message:

Bring in atomlib 0.4 and update wp-app to use it. Props eliast and placey. fixes #4191

Files:

• trunk/wp-app.php (modified) (43 diffs)
• trunk/wp-includes/atomlib.php (added)

trunk/wp-app.php

@@ -12 +12 @@
-require_once('./wp-config.php');
-require_once(ABSPATH . WPINC . '/post-template.php');
+require_once(ABSPATH . WPINC . '/atomlib.php');
-
-// Attempt to automatically detect whether to use querystring
@@ -29 +30 @@
-    }
-} else {
-
+.*
-}
-
-$app_logging = 0;
+
+// TODO: Should be an option somewhere
+$always_authenticate = 1;
-
-function log_app($label,$msg) {
-    global $app_logging;
-    if ($app_logging) {
-
+wp-
-        $date = gmdate( 'Y-m-d H:i:s' );
-        fwrite($fp, "\n\n$date - $label\n$msg\n");
@@ -58 +62 @@
-
-function wa_posts_where_include_drafts_filter($where) {
-
-
+
+
+
-}
-add_filter('posts_where', 'wa_posts_where_include_drafts_filter');
-
-class AtomEntry {
-    var $links = array();
-    var $categories = array();
-}
-
-class AtomParser {
-
-    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
-    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
-
-    var $depth = 0;
-    var $indent = 2;
-    var $in_content;
-    var $ns_contexts = array();
-    var $ns_decls = array();
-    var $is_xhtml = false;
-    var $skipped_div = false;
-
-    var $entry;
-
-    function AtomParser() {
-
-        $this->entry = new AtomEntry();
-        $this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
-        $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
-    }
-
-    function parse() {
-
-        global $app_logging;
-        array_unshift($this->ns_contexts, array());
-
-        $parser = xml_parser_create_ns();
-        xml_set_object($parser, $this);
-        xml_set_element_handler($parser, "start_element", "end_element");
-        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
-        xml_set_character_data_handler($parser, "cdata");
-        xml_set_default_handler($parser, "_default");
-        xml_set_start_namespace_decl_handler($parser, "start_ns");
-        xml_set_end_namespace_decl_handler($parser, "end_ns");
-
-        $contents = "";
-
-        $fp = fopen("php://input", "r");
-        while(!feof($fp)) {
-            $line = fgets($fp, 4096);
-
-            if($app_logging) $contents .= $line;
-
-            if(!xml_parse($parser, $line)) {
-                log_app("xml_parse_error", "line: $line");
-                $this->error = sprintf(__('XML error: %s at line %d')."\n",
-                    xml_error_string(xml_get_error_code($xml_parser)),
-                    xml_get_current_line_number($xml_parser));
-                log_app("xml_parse_error", $this->error);
-                return false;
-            }
-        }
-        fclose($fp);
-
-        xml_parser_free($parser);
-
-        log_app("AtomParser->parse()",trim($contents));
-
-        return true;
-    }
-
-    function start_element($parser, $name, $attrs) {
-
-        $tag = array_pop(split(":", $name));
-
-        array_unshift($this->ns_contexts, $this->ns_decls);
-
-        $this->depth++;
-
-        #print str_repeat(" ", $this->depth * $this->indent) . "start_element('$name')" ."\n";
-        #print str_repeat(" ", $this->depth+1 * $this->indent) . print_r($this->ns_contexts,true) ."\n";
-
-        if(!empty($this->in_content)) {
-            $attrs_prefix = array();
-
-            // resolve prefixes for attributes
-            foreach($attrs as $key => $value) {
-                $attrs_prefix[$this->ns_to_prefix($key)] = $this->xml_escape($value);
-            }
-            $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
-            if(strlen($attrs_str) > 0) {
-                $attrs_str = " " . $attrs_str;
-            }
-
-            $xmlns_str = join(' ', array_map($this->map_xmlns_func, array_keys($this->ns_contexts[0]), array_values($this->ns_contexts[0])));
-            if(strlen($xmlns_str) > 0) {
-                $xmlns_str = " " . $xmlns_str;
-            }
-
-            // handle self-closing tags (case: a new child found right-away, no text node)
-            if(count($this->in_content) == 2) {
-                array_push($this->in_content, ">");
-            }
-
-            array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}");
-        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
-            $this->in_content = array();
-            $this->is_xhtml = $attrs['type'] == 'xhtml';
-            array_push($this->in_content, array($tag,$this->depth));
-        } else if($tag == 'link') {
-            array_push($this->entry->links, $attrs);
-        } else if($tag == 'category') {
-            array_push($this->entry->categories, $attrs);
-        }
-
-        $this->ns_decls = array();
-    }
-
-    function end_element($parser, $name) {
-
-        $tag = array_pop(split(":", $name));
-
-        if(!empty($this->in_content)) {
-            if($this->in_content[0][0] == $tag &&
-            $this->in_content[0][1] == $this->depth) {
-                array_shift($this->in_content);
-                if($this->is_xhtml) {
-                    $this->in_content = array_slice($this->in_content, 2, count($this->in_content)-3);
-                }
-                $this->entry->$tag = join('',$this->in_content);
-                $this->in_content = array();
-            } else {
-                $endtag = $this->ns_to_prefix($name);
-                if (strpos($this->in_content[count($this->in_content)-1], '<' . $endtag) !== false) {
-                    array_push($this->in_content, "/>");
-                } else {
-                    array_push($this->in_content, "</$endtag>");
-                }
-            }
-        }
-
-        array_shift($this->ns_contexts);
-
-        #print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n";
-
-        $this->depth--;
-    }
-
-    function start_ns($parser, $prefix, $uri) {
-        #print str_repeat(" ", $this->depth * $this->indent) . "starting: " . $prefix . ":" . $uri . "\n";
-        array_push($this->ns_decls, array($prefix,$uri));
-    }
-
-    function end_ns($parser, $prefix) {
-        #print str_repeat(" ", $this->depth * $this->indent) . "ending: #" . $prefix . "#\n";
-    }
-
-    function cdata($parser, $data) {
-        #print str_repeat(" ", $this->depth * $this->indent) . "data: #" . $data . "#\n";
-        if(!empty($this->in_content)) {
-            // handle self-closing tags (case: text node found, need to close element started)
-            if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) {
-                array_push($this->in_content, ">");
-            }
-            array_push($this->in_content, $this->xml_escape($data));
-        }
-    }
-
-    function _default($parser, $data) {
-        # when does this gets called?
-    }
-
-
-    function ns_to_prefix($qname) {
-        $components = split(":", $qname);
-        $name = array_pop($components);
-
-        if(!empty($components)) {
-            $ns = join(":",$components);
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
-                        return "$mapping[0]:$name";
-                    }
-                }
-            }
-        }
-        return $name;
-    }
-
-    function xml_escape($string)
-    {
-             return str_replace(array('&','"',"'",'<','>'),
-                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
-                $string );
-    }
-}
-
-class AtomServer {
-
-    var $ATOM_CONTENT_TYPE = 'application/atom+xml';
-    var $CATEGORIES_CONTENT_TYPE = 'application/atomcat+xml';
-
+
+
+
+
-
-    var $ENTRIES_PATH = "posts";
@@ -268 +81 @@
-    var $MEDIA_PATH = "attachments";
-    var $ENTRY_PATH = "post";
+    var $SERVICE_PATH = "service";
-    var $MEDIA_SINGLE_PATH = "attachment";
-
@@ -285 +99 @@
-
-        $this->selectors = array(
-
+$
-                array('GET' => 'get_service'),
-
+$
-                array('GET' => 'get_categories_xml'),
-
+$
-                array('GET' => 'get_post',
-                        'PUT' => 'put_post',
-                        'DELETE' => 'delete_post'),
-[^/]+)?
+\d+)?$
-                array('GET' => 'get_posts',
-                        'POST' => 'create_post'),
-
+$
-                array('GET' => 'get_attachment',
-                        'POST' => 'create_attachment'),
-
+$
-                array('GET' => 'get_file',
-                        'PUT' => 'put_file',
-                        'DELETE' => 'delete_file'),
-
+$
-                array('GET' => 'get_attachment',
-                        'PUT' => 'put_attachment',
@@ -311 +125 @@
-
-    function handle_request() {
+        global $always_authenticate;
-
-        $path = $_SERVER['PATH_INFO'];
@@ -317 +132 @@
-        log_app('REQUEST',"$method $path\n================");
-
+        $this->process_conditionals();
-        //$this->process_conditionals();
-
@@ -325 +141 @@
-        }
-
-lame
+redirect to /service in case no path is found
-        if(strlen($path) == 0 || $path == '/') {
-
-
-
-
-
-
-
+
+
+
-        // dispatch
-        foreach($this->selectors as $regex => $funcs) {
-            if(preg_match($regex, $path, $matches)) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -354 +177 @@
-    function get_service() {
-        log_app('function','get_service()');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</service>
-
-EOD;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    fixed="yes" scheme="$home">
-    $categories
@@ -401 +229 @@
-     */
-    function create_post() {
-
+, $wpdb
-        $this->get_accepted_content_type($this->atom_content_types);
-
@@ -409 +237 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        $publish = (isset($entry->draft) && trim($entry->draft) == 'yes') ? false : true;
@@ -421 +265 @@
-        $post_status = ($publish) ? 'publish' : 'draft';
-        $post_author = (int) $user->ID;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        log_app('Inserting Post. Data:', print_r($post_data,true));
-
@@ -436 +285 @@
-            $this->internal_error(__('Sorry, your entry could not be posted. Something wrong happened.'));
-        }
+
+        // getting warning here about unable to set headers
+        // because something in the cache is printing to the buffer
+        // could we clean up wp_set_post_categories or cache to not print
+        // this could affect our ability to send back the right headers
+        @wp_set_post_categories($postID, $post_category);
-
-        $output = $this->get_entry($postID);
@@ -454 +309 @@
-
-    function put_post($postID) {
+        global $wpdb;
-
-        // checked for valid content-types (atom+xml)
@@ -464 +320 @@
-        }
-
-
+
+
+
-
-        // check for not found
@@ -470 +328 @@
-        $entry = $GLOBALS['entry'];
-        $this->set_current_entry($postID);
-        $this->escape($GLOBALS['entry']);
-
-        if(!current_user_can('edit_post', $entry['ID']))
@@ -479 +336 @@
-        extract($entry);
-
-
-
-
+
+
+
+
+
+
-
-        // let's not go backwards and make something draft again.
-        if(!$publish && $post_status == 'draft') {
-            $post_status = ($publish) ? 'publish' : 'draft';
-
-
-
+
+
+
+
+
+
+
+
-
-        $result = wp_update_post($postdata);
@@ -596 +461 @@
-
-    function put_attachment($postID) {
+        global $wpdb;
-
-        // checked for valid content-types (atom+xml)
@@ -606 +472 @@
-        }
-
-$parser->entry
+array_pop($parser->feed->entries)
-
-        // check for not found
-        global $entry;
-        $this->set_current_entry($postID);
-        $this->escape($entry);
-
-        if(!current_user_can('edit_post', $entry['ID']))
@@ -620 +485 @@
-        extract($entry);
-
-this->escape($parsed->title)
-this->escape($parsed->content)
+parsed->title[1]
+parsed->content[1]
-
-        $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt');
+        $this->escape($postdata);
-
-        $result = wp_update_post($postdata);
@@ -679 +545 @@
-            $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
-
+        status_header('200');
-        header('Content-Type: ' . $entry['post_mime_type']);
+        header('Connection: close');
-
-        $fp = fopen($location, "rb");
@@ -688 +556 @@
-
-        log_app('function',"get_file($postID)");
-$this->ok()
+exit
-    }
-
@@ -722 +590 @@
-        fclose($localfp);
-
+        $ID = $entry['ID'];
+        $pubtimes = $this->get_publish_time($entry);
+        $post_date = $pubtimes[0];
+        $post_date_gmt = $pubtimes[1];
+
+        $post_data = compact('ID', 'post_date', 'post_date_gmt');
+        $result = wp_update_post($post_data);
+
+        if (!$result) {
+            $this->internal_error(__('Sorry, your entry could not be posted. Something wrong happened.'));
+        }
+
-        log_app('function',"put_file($postID)");
-        $this->ok();
@@ -728 +608 @@
-    function get_entries_url($page = NULL) {
-        global $use_querystring;
+        if($GLOBALS['post_type'] == 'attachment') {
+            $path = $this->MEDIA_PATH;
+        } else {
+            $path = $this->ENTRIES_PATH;
+        }
-        $url = get_bloginfo('url') . '/' . $this->script_name;
-        if ($use_querystring) {
-this->ENTRIES_PATH
+path
-            if(isset($page) && is_int($page)) {
-                $url .= "&amp;eid=$page";
-            }
-        } else {
-this->ENTRIES_PATH
+path
-            if(isset($page) && is_int($page)) {
-                $url .= "/$page";
@@ -762 +647 @@
-        $url = $this->get_categories_url();
-        echo $url;
-    
+   
-
-    function get_attachments_url($page = NULL) {
@@ -786 +671 @@
-    }
-
+    function get_service_url() {
+        global $use_querystring;
+        $url = get_bloginfo('url') . '/' . $this->script_name;
+        if ($use_querystring) {
+            $url .= '?action=/' . $this->SERVICE_PATH;
+        } else {
+            $url .= '/' . $this->SERVICE_PATH;
+        }
+        return $url;
+    }
-
-    function get_entry_url($postID = NULL) {
@@ -817 +712 @@
-
-        if ($use_querystring) {
-
+/file
-        } else {
-
+file/
-        }
-
@@ -847 +742 @@
-        return;
-    }
-
-    function get_posts_count() {
-        global $wpdb;
-        log_app('function',"get_posts_count()");
-        return $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_date_gmt < '" . gmdate("Y-m-d H:i:s",time()) . "'");
-    }
-
-
-    function get_posts($page = 1, $post_type = 'post') {
@@ -862 +750 @@
-
-    function get_attachments($page = 1, $post_type = 'attachment') {
-
-
-
+
+
+
+
-    }
-
@@ -878 +767 @@
-
-        $count = get_option('posts_per_rss');
-
-
-
-
-
+
+
+
-        $post = $GLOBALS['post'];
-        $posts = $GLOBALS['posts'];
@@ -890 +777 @@
-        $blog_id = (int) $GLOBALS['blog_id'];
-        $post_cache = $GLOBALS['post_cache'];
-
-
-$total_count = $this->get_posts_count(
-(int) ceil($total_count / $count)
+
+
+log_app('function',"total_count(# $wp_query->max_num_pages #)"
+$wp_query->max_num_pages
-        $next_page = (($page + 1) > $last_page) ? NULL : $page + 1;
-        $prev_page = ($page - 1) < 1 ? NULL : $page - 1;
-        $last_page = ((int)$last_page == 1 || (int)$last_page == 0) ? NULL : (int) $last_page;
-http://www.w3.org/2005/Atom" xmlns:app="http://purl.org/atom/app#
+<?php echo $this->ATOM_NS ?>" xmlns:app="<?php echo $this->ATOMPUB_NS ?>
-<id><?php $this->the_entries_url() ?></id>
-<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
-<title type="text"><?php bloginfo_rss('name') ?></title>
-<subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
-application/atom+xml
+<?php echo $this->ATOM_CONTENT_TYPE ?>
-<?php if(isset($prev_page)): ?>
-application/atom+xml
+<?php echo $this->ATOM_CONTENT_TYPE ?>
-<?php endif; ?>
-<?php if(isset($next_page)): ?>
-application/atom+xml
+<?php echo $this->ATOM_CONTENT_TYPE ?>
-<?php endif; ?>
-application/atom+xml
-application/atom+xml
+<?php echo $this->ATOM_CONTENT_TYPE ?>
+<?php echo $this->ATOM_CONTENT_TYPE ?>
-<rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights>
-<generator uri="http://wordpress.com/" version="1.0.5-dc">WordPress.com Atom API</generator>
@@ -918 +805 @@
-<entry>
-        <id><?php the_guid($post->ID); ?></id>
-html"><![CDATA[<?php the_title
+text"><![CDATA[<?php the_title_rss
-        <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:edited><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></app:edited>
-        <app:control>
-            <app:draft><?php echo ($GLOBALS['post']->post_status == 'draft' ? 'yes' : 'no') ?></app:draft>
@@ -927 +815 @@
-            <name><?php the_author()?></name>
-            <email><?php the_author_email()?></email>
-
- 
-
+   
+   
+   
-        </author>
-
-
+
-        <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
+        <content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php the_guid(); ?>"/>
-    <?php } else { ?>
-        <link href="<?php the_permalink_rss() ?>" />
+        <?php if ( strlen( $GLOBALS['post']->post_content ) ) : ?>
+            <content type="html"><![CDATA[<?php echo get_the_content('', 0, '') ?>]]></content>
+        <?php endif; ?>
+    <?php } ?>
-        <link rel="edit" href="<?php $this->the_entry_url() ?>" />
+    <?php foreach(get_the_category() as $category) { ?>
+        <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" />
-    <?php } ?>
-
-
-
-
-
-
+
-    </entry>
-<?php
@@ -972 +861 @@
-        ?>
-        <?php log_app('$post',print_r($GLOBALS['post'],true)); ?>
-
+
+
-    <id><?php the_guid($post->ID); ?></id>
-html
+text
-
-    <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:edited><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></app:edited>
-    <app:control>
-        <app:draft><?php echo ($GLOBALS['post']->post_status == 'draft' ? 'yes' : 'no') ?></app:draft>
@@ -984 +875 @@
-        <name><?php the_author()?></name>
-        <email><?php the_author_email()?></email>
+    <?php if (get_the_author_url() && get_the_author_url() != 'http://') { ?>
-        <uri><?php the_author_url()?></uri>
+    <?php } ?>
-    </author>
-<?php if($GLOBALS['post']->post_type == 'attachment') { ?>
-    <link rel="edit" href="<?php $this->the_entry_url() ?>" />
-    <link rel="edit-media" href="<?php $this->the_media_url() ?>" />
-    <content type="<?php echo $GLOBALS['post']->post_mime_type ?>" src="<?php the_guid(); ?>"/>
-<?php } else { ?>
-    <link href="<?php the_permalink_rss() ?>" />
+    <?php if ( strlen( $GLOBALS['post']->post_content ) ) : ?>
+        <content type="<?php echo $GLOBALS['post']->post_mime_tpye ?>"><![CDATA[<?php echo get_the_content('', 0, '') ?>]]></content>
+    <?php endif; ?>
+<?php } ?>
-    <link rel="edit" href="<?php $this->the_entry_url() ?>" />
+<?php foreach(get_the_category() as $category) { ?>
+    <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->cat_name?>" />
-<?php } ?>
-<?php foreach(get_the_category() as $category) { ?>
-    <category scheme="<?php bloginfo_rss('home') ?>" term="<?php echo $category->name?>" />
-    <summary type="html"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-
-
-
-
-
+
-<?php
-        $entry = ob_get_contents();
-        break;
-        endwhile;
-        else:
-            $this->auth_required(__("Access Denied."));
-        endif;
-        ob_end_clean();
@@ -1074 +964 @@
-    }
-
+    function redirect($url) {
+
+        log_app('Status','302: Redirect');
+        $escaped_url = attribute_escape($url);
+        $content = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<html>
+  <head>
+    <title>302 Found</title>
+  </head>
+<body>
+  <h1>Found</h1>
+  <p>The document has moved <a href="$escaped_url">here</a>.</p>
+  </body>
+</html>
+
+EOD;
+        header('HTTP/1.1 302 Moved');
+        header('Content-Type: text/html');
+        header('Location: ' . $url);
+        echo $content;
+        exit;
+
+    }
+
+
-    function client_error($msg = 'Client Error') {
-i
+o
-        header('Content-Type: text/plain');
-        status_header('400');
@@ -1097 +1013 @@
-                break;
-        }
-'Content-Type: application/atom+xml'
+"Content-Type: $this->ATOM_CONTENT_TYPE"
-        if(isset($ctloc))
-            header('Content-Location: ' . $ctloc);
@@ -1110 +1026 @@
-        nocache_headers();
-        header('WWW-Authenticate: Basic realm="WordPress Atom Protocol"');
-        header('WWW-Authenticate: Form action="' . get_option('siteurl') . '/wp-login.php"', false);
-        header("HTTP/1.1 401 $msg");
-        header('Status: ' . $msg);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        exit;
-    }
-
-"application/atom+xml"
+'application/atom+xml'
-            status_header('200');
-            $xml = '<?xml version="1.0" encoding="' . strtolower(get_option('blog_charset')) . '"?>'."\n".$xml;
@@ -1146 +1074 @@
-    }
-
-
-
-    /*
-     * Access credential through various methods and perform login
@@ -1167 +1093 @@
-        if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
-            $login_data = array('login' => $_SERVER['PHP_AUTH_USER'],   'password' => $_SERVER['PHP_AUTH_PW']);
+            log_app("Basic Auth",$login_data['login']);
-        } else {
-            // else, do cookie-based authentication
@@ -1202 +1129 @@
-            if($acceptedType == '*' || $acceptedType == $type) {
-                if($acceptedSubtype == '*' || $acceptedSubtype == $subtype)
-
+ . "/" . $subtype
-            }
-        }
@@ -1208 +1135 @@
-        $this->invalid_media();
-    }
-
-
-
-    function process_conditionals() {
@@ -1254 +1179 @@
-    }
-
+    function rfc3339_str2time($str) {
+       
+        $match = false;
+        if(!preg_match("/(\d{4}-\d{2}-\d{2})T(\d{2}\:\d{2}\:\d{2})\.?\d{0,3}(Z|[+-]+\d{2}\:\d{2})/", $str, $match))
+            return false;
+    
+        if($match[3] == 'Z')
+            $match[3] == '+0000';
+    
+        return strtotime($match[1] . " " . $match[2] . " " . $match[3]);
+    }       
+
+    function get_publish_time($entry) {
+
+        $pubtime = $this->rfc3339_str2time($entry->published);
+       
+        if(!$pubtime) {
+            return array(current_time('mysql'),current_time('mysql',1));
+        } else {
+            return array(date("Y-m-d H:i:s", $pubtime), gmdate("Y-m-d H:i:s", $pubtime));
+        }