ispman/install-data/templates vhost.ldif.template,1.3,1.4

Update of /cvsroot/ispman/ispman/install-data/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28998/install-data/templates

Modified Files:
	vhost.ldif.template 
Log Message:
fixed several bugs with vhost.ldif.template

Index: vhost.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/vhost.ldif.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vhost.ldif.template	30 Apr 2004 21:41:49 -0000	1.3
+++ vhost.ldif.template	1 May 2004 09:41:34 -0000	1.4
@@ -15,20 +15,20 @@
 ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
 uid: <perl>join '.' , ($r->param("ispmanVhostName"), $r->param("ispmanDomain"))</perl>
 homeDirectory: <perl>$r->param("homeDirectory") ||
-		(join "/",($domain_info->{'homeDirectory'},
+		(join "/",($r->param("domain_info")->{'homeDirectory'},
 			   "vhosts", $r->param("ispmanVhostName")))</perl>
-userPassword: <perl>$ispman->encryptPassWithMethod($r->param("userPassword"),
+userPassword: <perl>$ispman->encryptPassWithMethod($r->param("userPassword")||"",
 		$ispman->getConf('userPassHashMethod'))</perl>
 loginShell: <perl>$ispman->getConf("vhostShell")</perl>
 ispmanVhostServerAlias: <perl>$r->param("ispmanVhostServerAlias") || ""</perl>
 FTPStatus: <perl>$r->param("FTPStatus") || ""</perl>
-ispmanVhostStats: <perl>$r->param("ispmanVhostStats") || ""</perl>
-FTPQuotaMBytes: <perl>$r->param("FTPQuotaMBytes") || ""</perl>
+ispmanVhostStats: <perl>$r->param("ispmanVhostStats") || "enable"</perl>
+FTPQuotaMBytes: <perl>$r->param("FTPQuotaMBytes") || $ispman->getConf("ispmanVhostFtpQuota")</perl>
 ispmanVhostDocumentRoot: <perl>$r->param("ispmanVhostDocumentRoot") || "htdocs"</perl>
 ispmanVhostScriptDir: <perl>$r->param("ispmanVhostScriptDir") || "cgi-bin"</perl>
 ispmanVhostIpAddress: <perl>$r->param("ispmanVhostIpAddress") || $ispman->getConf("apacheVhostsIP") || "*"</perl>
-fileHost: <perl>$r->param("fileHost") || $domain_info->{'ispmanDomainDefaultFileServer'}</perl>
-DestinationAddress: <perl>$r->param("fileHost") || $domain_info->{'ispmanDomainDefaultFileServer'}</perl>
+fileHost: <perl>$r->param("fileHost") || $r->param("domain_info")->{'ispmanDomainDefaultFileServer'}</perl>
+DestinationAddress: <perl>$r->param("fileHost") || $r->param("domain_info")->{'ispmanDomainDefaultFileServer'}</perl>
 
 
 <perl>
@@ -43,12 +43,12 @@
 </perl>
 
 <perl>
-  "ispmanVhostExtraConf: " . $r->param("ispmanVhostExtraConf") . "\n" if $r->param("ispmanVhostExtraConf")
+  "ispmanVhostExtraConf: " . $r->param("ispmanVhostExtraConf") if $r->param("ispmanVhostExtraConf")
 </perl>   
 
 <perl>
   $text = '';
-  foreach my $webhost ($ispman->as_array($r->param("webHosts"))) {
+  foreach my $webhost ($ispman->as_array($r->param("webHost"))) {
     $text .= "webHost: " . $webhost . "\n";
   }
   $text;
@@ -58,12 +58,12 @@
    $substmap={ vhost => $r->param("ispmanVhostName"), domain => $r->param("ispmanDomain")};
    
    # process ispmanVhostLogdir
-   $text = "ispmanVhostLogdir: " . $r->param("ispmanVhostLogdir") ||
-   		$ispman->substitute($ispman->getConf('apacheLogsDirectory'),$substmap);
+   $text = "ispmanVhostLogdir: " . ($r->param("ispmanVhostLogdir") ||
+   		$ispman->substitute($ispman->getConf('apacheLogsDirectory'),$substmap));
    $text .= "\n";    
-   $text .= "ispmanVhostStatdir: " . $r->param("ispmanVhostStatdir") ||
-   		$ispman->substitute($ispman->getConf('apacheStatDirectory'),$substmap);
-   $text;
+   $text .= "ispmanVhostStatdir: " . ($r->param("ispmanVhostStatdir") ||
+   		$ispman->substitute($ispman->getConf('apacheStatDirectory'),$substmap));
+   $text
 </perl>
 
 



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click