Ticket #5298: 5298.diff

wp-includes/default-filters.php

@@ -134 +134 @@
 add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
 add_filter('comment_email', 'antispambot');
 
+//Atom SSL support
+add_filter('atom_service_url','atom_service_url_filter');
+
 // Actions
 add_action('wp_head', 'rsd_link');
 add_action('wp_head', 'wlwmanifest_link');

wp-includes/functions.php

@@ -1484 +1484 @@
         return abs( intval( $maybeint ) );
 }
 
-?>
- No newline at end of file
+/**
+ * Determines if the blog can be accessed over SSL
+ * @return bool whether of not SSL access is available
+ */
+function blog_is_accessable_via_ssl()
+{
+        if (in_array('curl', get_loaded_extensions())) {
+                 $ssl = preg_replace( '/^http:\/\//', 'https://',  get_bloginfo('url') );
+
+                 $ch = curl_init();
+                 curl_setopt($ch, CURLOPT_URL, $ssl);
+                 curl_setopt($ch, CURLOPT_FAILONERROR, true);
+                 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+                 $data = curl_exec ($ch);
+
+                 $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+                 curl_close ($ch);
+
+                 if ($status == 200 || $status == 401) {
+                         return true;
+                 }
+        }
+        return false;
+}
+
+function atom_service_url_filter($url)
+{
+        if ( blog_is_accessable_via_ssl() )
+                return  preg_replace( '/^http:\/\//', 'https://',  $url );
+}
+?>

wp-app.php

@@ -68 +68 @@
         var $MEDIA_SINGLE_PATH = "attachment";
 
         var $params = array();
-        var $script_name = "wp-app.php";
         var $media_content_types = array('image/*','audio/*','video/*');
         var $atom_content_types = array('application/atom+xml');
 
@@ -80 +79 @@
         function AtomServer() {
 
                 $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
+                $this->app_base = get_bloginfo('url') . '/' . $this->script_name . '/';
+                if ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
+                        $this->app_base = preg_replace( '/^http:\/\//', 'https://', $this->app_base );
+                }
 
                 $this->selectors = array(
                         '@/service$@' =>
@@ -594 +597 @@
                 } else {
                         $path = $this->ENTRIES_PATH;
                 }
-                $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $path;
+                $url = $this->app_base . $path;
                 if(isset($page) && is_int($page)) {
                         $url .= "/$page";
                 }
@@ -607 +610 @@
         }
 
         function get_categories_url($page = NULL) {
-                return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->CATEGORIES_PATH;
+                return $this->app_base . $this->CATEGORIES_PATH;
         }
 
         function the_categories_url() {
@@ -616 +619 @@
         }
 
         function get_attachments_url($page = NULL) {
-                $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_PATH;
+                $url = $this->app_base . $this->MEDIA_PATH;
                 if(isset($page) && is_int($page)) {
                         $url .= "/$page";
                 }
@@ -629 +632 @@
         }
 
         function get_service_url() {
-                return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->SERVICE_PATH;
+                return $this->app_base . $this->SERVICE_PATH;
         }
 
         function get_entry_url($postID = NULL) {
@@ -638 +641 @@
                         $postID = (int) $GLOBALS['post']->ID;
                 }
 
-                $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->ENTRY_PATH . "/$postID";
+                $url = $this->app_base . $this->ENTRY_PATH . "/$postID";
 
                 log_app('function',"get_entry_url() = $url");
                 return $url;
@@ -655 +658 @@
                         $postID = (int) $GLOBALS['post']->ID;
                 }
 
-                $url = get_bloginfo('url') . '/' . $this->script_name . '/' . $this->MEDIA_SINGLE_PATH ."/file/$postID";
+                $url = $this->app_base . $this->MEDIA_SINGLE_PATH ."/file/$postID";
 
                 log_app('function',"get_media_url() = $url");
                 return $url;
@@ -919 +922 @@
                                 $ctloc = $this->get_entry_url($post_ID);
                                 break;
                         case 'attachment':
-                                $edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID";
+                                $edit = $this->app_base . "attachments/$post_ID";
                                 break;
                 }
                 header("Content-Type: $this->ATOM_CONTENT_TYPE");

xmlrpc.php

@@ -19 +19 @@
 
 if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd
 header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
-
 ?>
 <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
@@ -32 +31 @@
       <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
-      <api name="Atom" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/wp-app.php/service" /> 
+      <api name="Atom" blogID="" preferred="false" apiLink="<?php apply_filters('atom_service_url',bloginfo_rss('wpurl')."/wp-app.php/service"?>" /> 
     </apis>
   </service>
 </rsd>