From 2a3cab868b81cdaca3d30e88f0550a96f298c53b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Sep 2010 06:20:59 -0400
Subject: [PATCH] Implemented: FS#1324 - Add new file system path splitter for large installations

---
 interface/lib/plugins/sites_web_domain_plugin.inc.php |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/interface/lib/plugins/sites_web_domain_plugin.inc.php b/interface/lib/plugins/sites_web_domain_plugin.inc.php
index b1e1689..85a4cc0 100644
--- a/interface/lib/plugins/sites_web_domain_plugin.inc.php
+++ b/interface/lib/plugins/sites_web_domain_plugin.inc.php
@@ -9,6 +9,22 @@
 
 	var $plugin_name        = 'sites_web_domain_plugin';
 	var $class_name         = 'sites_web_domain_plugin';
+	
+	// TODO: This function is a duplicate from the one in interface/web/sites/web_domain_edit.php
+	//       There should be a single "token replacement" function to be called from modules and
+	//	 from the main code.
+	// Returna a "3/2/1" path hash from a numeric id '123'
+	function id_hash($id,$levels) {
+		$hash = "" . $id % 10 ;
+		$id /= 10 ;
+		$levels -- ;
+		while ( $levels > 0 ) {
+			$hash .= "/" . $id % 10 ;
+			$id /= 10 ;
+			$levels-- ;
+		}
+		return $hash;
+	}
 
     /*
             This function is called when the plugin is loaded
@@ -39,6 +55,11 @@
         $app->uses("getconf");        
         $web_config = $app->getconf->get_server_config(intval($page_form->dataRecord['server_id']),'web');            
         $document_root = str_replace("[website_id]",$page_form->id,$web_config["website_path"]);
+		$document_root = str_replace("[website_idhash_1]",$this->id_hash($page_form->id,1),$document_root);
+		$document_root = str_replace("[website_idhash_2]",$this->id_hash($page_form->id,1),$document_root);
+		$document_root = str_replace("[website_idhash_3]",$this->id_hash($page_form->id,1),$document_root);
+		$document_root = str_replace("[website_idhash_4]",$this->id_hash($page_form->id,1),$document_root);
+		
         // get the ID of the client
         if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {                    
             $client_group_id = $_SESSION["s"]["user"]["default_group"];
@@ -53,11 +74,20 @@
         // Set the values for document_root, system_user and system_group
         $system_user 				= $app->db->quote('web'.$page_form->id);
         $system_group 				= $app->db->quote('client'.$client_id);
-        $document_root 				= $app->db->quote(str_replace("[client_id]",$client_id,$document_root));
-        $php_open_basedir 			= str_replace("[website_path]",$document_root,$web_config["php_open_basedir"]);
+		
+		$document_root 				= str_replace("[client_id]",$client_id,$document_root);
+		$document_root				= str_replace("[client_idhash_1]",$this->id_hash($client_id,1),$document_root);
+		$document_root				= str_replace("[client_idhash_2]",$this->id_hash($client_id,2),$document_root);
+		$document_root				= str_replace("[client_idhash_3]",$this->id_hash($client_id,3),$document_root);
+		$document_root				= str_replace("[client_idhash_4]",$this->id_hash($client_id,4),$document_root);
+		$document_root 				= $app->db->quote($document_root);
+        
+		$php_open_basedir 			= str_replace("[website_path]",$document_root,$web_config["php_open_basedir"]);
         $php_open_basedir 			= $app->db->quote(str_replace("[website_domain]",$page_form->dataRecord['domain'],$php_open_basedir));
-        $htaccess_allow_override 	= $app->db->quote($web_config["htaccess_allow_override"]);
-        $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir'  WHERE domain_id = ".$page_form->id;
+		
+		$htaccess_allow_override 	= $app->db->quote($web_config["htaccess_allow_override"]);
+        
+		$sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir'  WHERE domain_id = ".$page_form->id;
 		$app->db->query($sql);
 	}
 }              	
\ No newline at end of file

--
Gitblit v1.9.1