Changeset 6339 for trunk/wp-app.php

Timestamp:

11/17/2007 11:21:34 AM (18 years ago)

Author:

westi

Message:

Ensure that we offer https access to atom if it is available. Fixes #5298 props rubys.

File:

• trunk/wp-app.php (modified) (9 diffs)

trunk/wp-app.php

@@ -69 +69 @@
 
     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');
@@ -81 +80 @@
 
         $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(
@@ -595 +598 @@
             $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";
@@ -608 +611 @@
 
     function get_categories_url($page = NULL) {
-        return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->CATEGORIES_PATH;
+        return $this->app_base . $this->CATEGORIES_PATH;
     }
 
@@ -617 +620 @@
 
     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";
@@ -630 +633 @@
 
     function get_service_url() {
-        return get_bloginfo('url') . '/' . $this->script_name . '/' . $this->SERVICE_PATH;
+        return $this->app_base . $this->SERVICE_PATH;
     }
 
@@ -639 +642 @@
         }
 
-        $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");
@@ -656 +659 @@
         }
 
-        $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");
@@ -920 +923 @@
                 break;
             case 'attachment':
-                $edit = get_bloginfo('url') . '/' . $this->script_name . "/attachments/$post_ID";
+                $edit = $this->app_base . "attachments/$post_ID";
                 break;
         }