Changeset 2177

Timestamp:

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

Author:

gregmac

Message:

Add support for blank site_protocol (if not explicity passed to base, tries to auto-detect http or https); Add support for auto-detecting domain part of site_domain from HTTP_HOST; Add fallback support for blank site_domain (makes a best effort)

Location:

trunk

Files:

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

trunk/application/config/config.php

@@ -2 +2 @@
 /**
  * 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.
  */
 $config['site_domain'] = 'localhost/kohana/';

trunk/system/helpers/url.php

@@ -22 +22 @@
         {
                 $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';
 
-                $base_url = $protocol.'://'.Config::item('core.site_domain', TRUE);
-
+                $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 ($index == TRUE AND $index = Config::item('core.index_page'))
                 {