From 66d8fe1b968d92f5a91045a911acc1bcf88204f9 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Fri, 20 Feb 2015 21:10:33 +0400
Subject: [PATCH] DomainPathHelper

---
 .../v/0.0.0/app/libraries/RainLoop/Actions.php   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 01e2d2b9d..e2fb5886a 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -3322,10 +3322,22 @@ class Actions
 	{
 		$sDomain = \strtolower(\trim($sDomain));
 
-		$sDomainPrefix = \substr(\preg_replace('/[^a-z0-9]+/', '', $sDomain), 0, 2);
+		$sTempDomain = \preg_replace('/^(webmail|email|mail|www|ssl)\./', '', $sDomain);
+		if (false === \strpos($sTempDomain, '.'))
+		{
+			$sTempDomain = $sDomain;
+		}
+
+		$sDomainPrefix = $sTempDomain;
+		if (false === \strpos($sDomainPrefix, '.'))
+		{
+			$sDomainPrefix = $sTempDomain;
+		}
+
+		$sDomainPrefix = \substr(\preg_replace('/[^a-z0-9]+/', '', $sDomainPrefix), 0, 2);
 		$sDomainPrefix = \str_pad($sDomainPrefix, 2, '_');
 
-		return 'domains/'.$sDomainPrefix.'/'.\urlencode($sDomain);
+		return 'd/'.\substr($sDomainPrefix, 0, 1).'/'.$sDomainPrefix.'/'.\urlencode($sTempDomain);
 	}
 
 	/**