Changeset 2178

Timestamp:

02/27/2008 02:12:48 PM (11 months ago)

Author:

gregmac

Message:

Allow html::base() to return absolute paths (no protocol/domain) when possible; change defaults for site_domain and site_protocol to be '/kohana/' and blank, respectively

Location:

trunk

Files:

• application/config/config.php (modified) (1 diff)
• system/helpers/url.php (modified) (2 diffs)

trunk/application/config/config.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
- * Domain name, with the installation directory. Default: localhost/kohana/
- * If this starts with a /, Kohana will try to get the domain from HTTP_HOST
- * from  the web server.
+ * Base path of the web site. If this includes a domain, (eg, "localhost/kohana/") then
+ * a full URL will be used (eg, "http://localhost/kohana/"). If it only includes the path, 
+ * and a site_protocol is specified, the domain will be auto-detected.
  */
-$config['site_domain'] = 'localhost/kohana/';
+$config['site_domain'] = '/kohana/';
 
 /**
- * Default protocol used to access the website. Default: http
+ * Force a default protocol to be used by the site. If no site_protocol is specified, then the 
+ * current protocol is used, or when possible, only an absolute path (with no protocol/domain) 
+ * is used.
  */
-$config['site_protocol'] = 'http';
+$config['site_protocol'] = '';
 
 /**

trunk/system/helpers/url.php

@@ -15 +15 @@
          * Base URL, with or without the index page.
          *
+         * If protocol (and core.site_protocol) and core.site_domain are both empty, 
+         * then 
+         *
          * @param   boolean  include the index page
          * @param   boolean  non-default protocol
@@ -22 +25 @@
         {
                 $protocol = ($protocol == FALSE) ? Config::item('core.site_protocol') : strtolower($protocol);
-                // try to auto-detect protocol
-                empty($protocol) AND $protocol = (isset($_SERVER['HTTPS']) AND ($_SERVER['HTTPS'] != '')) ? 'https' : 'http';
-
+                
                 $site_domain = Config::item('core.site_domain', TRUE);
-                // Add current servername if site_domain starts with a /
-                (strlen($site_domain) > 0 AND $site_domain[0] == '/') AND $site_domain = $_SERVER['HTTP_HOST'].$site_domain;
                 
-                // if site_domain is empty, no base url. This results in 
-                // a relative path (eg, "index.php/") being returned
-                $base_url = (!empty($site_domain)) ? $protocol.'://'.$site_domain : '';
+                if (empty($protocol))
+                {
+                        if (strlen($site_domain) > 0 AND $site_domain[0] != '/') 
+                        {
+                                // try to guess protocol, provide full http://domain/path...
+                                $base_url = (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.$site_domain;
+                        }
+                        else
+                        {
+                                // provide only path, eg /path...
+                                $base_url = !empty($site_domain) ? $site_domain : '';
+                        }
+                }
+                else
+                {
+                        // return a full url
+                        
+                        // Add current servername if site_domain starts with a /
+                        if (empty($site_domain) OR $site_domain[0] == '/')
+                        {
+                                $base_url = $protocol.'://'.$_SERVER['HTTP_HOST'].(!empty($site_domain) ? $site_domain : '');
+                        }
+                        else 
+                        {
+                                $base_url = $protocol.'://'.(!empty($site_domain) ? $site_domain : '');
+                        }
+                }
                 
+                // make sure base_url ends in a slash
+                (!empty($base_url) AND ($base_url[strlen($base_url)-1] != '/')) AND $base_url .= '/';
+                
+                // add index.php if needed
                 if ($index == TRUE AND $index = Config::item('core.index_page'))
                 {