WordPress.org

Make WordPress Core

Changeset 3041


Ignore:
Timestamp:
11/11/05 01:21:28 (9 years ago)
Author:
matt
Message:

Add HTTPS support, fixes #1372

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/install.php

    r2992 r3041  
    77require_once('./upgrade-functions.php'); 
    88 
    9 $guessurl = str_replace('/wp-admin/install.php?step=2', '', 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) ); 
     9$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; 
     10$guessurl = str_replace('/wp-admin/install.php?step=2', '', $schema . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) ); 
    1011 
    1112if (isset($_GET['step'])) 
  • trunk/wp-admin/upgrade-schema.php

    r2974 r3041  
    151151    global $wpdb; 
    152152 
    153     $guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); 
     153    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; 
     154    $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); 
    154155    add_option('siteurl', $guessurl, __('WordPress web address')); 
    155156    add_option('blogname', __('My Weblog'), __('Blog title')); 
  • trunk/wp-includes/functions.php

    r3028 r3041  
    824824        $link_text = $matches[4][$i]; 
    825825        $content = str_replace($link_match, $link_text.' '.$link_number, $content); 
    826         $link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? get_settings('home') . $link_url : $link_url; 
     826        $link_url = ((strtolower(substr($link_url,0,7)) != 'http://')||(strtolower(substr($link_url,0,7)) != 'https://')) ? get_settings('home') . $link_url : $link_url; 
    827827        $links_summary .= "\n".$link_number.' '.$link_url; 
    828828    } 
  • trunk/wp-login.php

    r2985 r3041  
    1212    if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) 
    1313        $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] ); 
    14      
    15     if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') ) 
    16         update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); 
     14 
     15    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; 
     16    if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') ) 
     17        update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); 
    1718} 
    1819 
  • trunk/xmlrpc.php

    r3009 r3041  
    325325      /* warning: here we make the assumption that the weblog's URI is on the same server */ 
    326326      $filename = get_settings('home') . '/'; 
    327       $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); 
     327      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); 
    328328 
    329329      $f = fopen($filename, 'r'); 
     
    360360      /* warning: here we make the assumption that the weblog's URI is on the same server */ 
    361361      $filename = get_settings('home') . '/'; 
    362       $filename = preg_replace('#http://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); 
     362      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); 
    363363 
    364364      if ($f = fopen($filename, 'w+')) { 
     
    11481148 
    11491149        // Check if the page linked to is in our site 
    1150         $pos1 = strpos($pagelinkedto, str_replace('http://', '', str_replace('www.', '', get_settings('home')))); 
     1150        $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_settings('home'))); 
    11511151        if( !$pos1 ) 
    11521152            return new IXR_Error(0, 'Is there no link to us?'); 
Note: See TracChangeset for help on using the changeset viewer.