[pLog-svn] r3304 - in plog/trunk/class: dao net

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2006-04-30 11:40:45 +0000 (Sun, 30 Apr 2006)
New Revision: 3304

Modified:
   plog/trunk/class/dao/bloginfo.class.php
   plog/trunk/class/net/baserequestgenerator.class.php
Log:
use domainize function in a couple places, rather than just urlize

Modified: plog/trunk/class/dao/bloginfo.class.php
===================================================================
--- plog/trunk/class/dao/bloginfo.class.php	2006-04-30 11:36:12 UTC (rev 3303)
+++ plog/trunk/class/dao/bloginfo.class.php	2006-04-30 11:40:45 UTC (rev 3304)
@@ -634,7 +634,7 @@
 		 */
 		function setCustomDomain($customDomain)
 		{
-	        $this->_customDomain = $customDomain;
+	        $this->_customDomain = Textfilter::domainize($customDomain);
 		}
         
 		/**
@@ -644,7 +644,7 @@
 		{
                 // fill in the field if it hasn't been filled yet
 	        if($this->_customDomain === null){
-	        	$this->_customDomain = $this->getMangledBlog();
+	        	$this->_customDomain = Textfilter::domainize($this->getMangledBlog());
             }
 
 	    	return($this->_customDomain);

Modified: plog/trunk/class/net/baserequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/baserequestgenerator.class.php	2006-04-30 11:36:12 UTC (rev 3303)
+++ plog/trunk/class/net/baserequestgenerator.class.php	2006-04-30 11:40:45 UTC (rev 3304)
@@ -78,10 +78,16 @@
 		
 			// prepare the correct url if subdomains are enabled...
 			if( $this->_subdomainsEnabled && $blogInfo != null ) {
-				$this->_subdomainsBaseUrl = str_replace( "{blogname}", $blogInfo->getMangledBlog(), $this->_subdomainsBaseUrl );
+				$this->_subdomainsBaseUrl = str_replace("{blogname}",
+                                                        Textfilter::domainize($blogInfo->getMangledBlog()),
+                                                        $this->_subdomainsBaseUrl);
 				$ownerInfo = $blogInfo->getOwnerInfo();
-				$this->_subdomainsBaseUrl = str_replace( "{username}", Textfilter::urlize($ownerInfo->getUsername()), $this->_subdomainsBaseUrl );
-                $this->_subdomainsBaseUrl = str_replace( "{blogdomain}", $blogInfo->getCustomDomain(), $this->_subdomainsBaseUrl );
+				$this->_subdomainsBaseUrl = str_replace("{username}",
+                                                        Textfilter::domainize($ownerInfo->getUsername()),
+                                                        $this->_subdomainsBaseUrl);
+                $this->_subdomainsBaseUrl = str_replace("{blogdomain}",
+                                                        $blogInfo->getCustomDomain(),
+                                                        $this->_subdomainsBaseUrl);
 			}
             $this->_scriptName = $config->getValue( "script_name", DEFAULT_SCRIPT_NAME );