Changeset 3041

Timestamp:

11/11/2005 01:21:28 AM (21 years ago)

Author:

matt

Message:

Add HTTPS support, fixes #1372

Location:

trunk

Files:

• wp-admin/install.php (modified) (1 diff)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• xmlrpc.php (modified) (3 diffs)

trunk/wp-admin/install.php

@@ -7 +7 @@
 require_once('./upgrade-functions.php');
 
-$guessurl = str_replace('/wp-admin/install.php?step=2', '', 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) );
+$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+$guessurl = str_replace('/wp-admin/install.php?step=2', '', $schema . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) );
 
 if (isset($_GET['step']))

trunk/wp-admin/upgrade-schema.php

@@ -151 +151 @@
     global $wpdb;
 
-    $guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+    $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
     add_option('siteurl', $guessurl, __('WordPress web address'));
     add_option('blogname', __('My Weblog'), __('Blog title'));

trunk/wp-includes/functions.php

@@ -824 +824 @@
         $link_text = $matches[4][$i];
         $content = str_replace($link_match, $link_text.' '.$link_number, $content);
-        $link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? get_settings('home') . $link_url : $link_url;
+        $link_url = ((strtolower(substr($link_url,0,7)) != 'http://')||(strtolower(substr($link_url,0,7)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
         $links_summary .= "\n".$link_number.' '.$link_url;
     }

trunk/wp-login.php

@@ -12 +12 @@
     if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
         $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
-    
-    if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
-        update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
+
+    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+    if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
+        update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
 }
 

trunk/xmlrpc.php

@@ -325 +325 @@
       /* warning: here we make the assumption that the weblog's URI is on the same server */
       $filename = get_settings('home') . '/';
-      $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
+      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
       $f = fopen($filename, 'r');
@@ -360 +360 @@
       /* warning: here we make the assumption that the weblog's URI is on the same server */
       $filename = get_settings('home') . '/';
-      $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
+      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
       if ($f = fopen($filename, 'w+')) {
@@ -1148 +1148 @@
 
         // Check if the page linked to is in our site
-        $pos1 = strpos($pagelinkedto, str_replace('http://', '', str_replace('www.', '', get_settings('home'))));
+        $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_settings('home')));
         if( !$pos1 )
             return new IXR_Error(0, 'Is there no link to us?');