ispman/ispman-web/cgi-bin/tmpl/vhosts edit.tmpl,1.21,1.22

Update of /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/vhosts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30036/ispman-web/cgi-bin/tmpl/vhosts

Modified Files:
	edit.tmpl 
Log Message:
delayed change of vhost edit form for new logdir/statdir policy

Index: edit.tmpl
===================================================================
RCS file: /cvsroot/ispman/ispman/ispman-web/cgi-bin/tmpl/vhosts/edit.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- edit.tmpl	13 Feb 2004 20:44:12 -0000	1.21
+++ edit.tmpl	1 May 2004 09:47:29 -0000	1.22
@@ -92,7 +92,7 @@
 
 
 <tr>
-    <td>Script  directory options </td>
+    <td>Script directory options </td>
     <td>
         <select name=ispmanVhostScriptDirOption MULTIPLE>
 	<perl>
@@ -162,15 +162,13 @@
     <td>Log Directory </td>
     <td>
         <perl>
-          if ($ispman->{'vhost'}->{'ispmanVhostLogdir'} ne "") {
+          $substmap={ vhost => $r->param("ispmanVhostName"), domain => $r->param("ispmanDomain")};
+
+          if ($ispman->{'vhost'}->{'ispmanVhostLogdir'}) {
             $logdir = $ispman->{'vhost'}->{'ispmanVhostLogdir'};
           } else {
-            if (lc($ispman->getConf('apacheLogsDirectory')) eq 'none') {
-              $logdir = join "/", ($ispman->{'vhost'}->{'ispmanVhostName'}, "logs");
-            } else {
-              $logdir = join "/", ($ispman->getConf('apacheLogsDirectory'), "vhosts");
-            }
-          }
+              $logdir = $ispman->substitute($ispman->getConf('apacheLogsDirectory'),$substmap);
+	  }
           $logdir
         </perl>
         <input size=35 type=hidden name=ispmanVhostLogdir value="<perl> $logdir</perl>">
@@ -180,14 +178,10 @@
     <td>Stats Directory (/stats/) </td>
     <td>
         <perl>
-          if ($ispman->{'vhost'}->{'ispmanVhostStatdir'} ne "") {
+          if ($ispman->{'vhost'}->{'ispmanVhostStatdir'}) {
             $statdir = $ispman->{'vhost'}->{'ispmanVhostStatdir'};
-          } else {  
-            if (lc($ispman->getConf('apacheLogsDirectory')) eq 'none') {
-              $statdir = join "/", ($ispman->{'vhost'}->{'ispmanVhostName'}, "stats");
-            } else {
-              $statdir = join "/", ($ispman->getConf('apacheLogsDirectory'), "domainis", $ispman->{'vhost'}->{'ispmanDomain'}, $ispman->{'vhost'}->{'ispmanVhostName'});
-            }
+          } else {
+            $statdir = $ispman->substititue($ispman->getConf('apacheStatDirectory'),$substmap);
           }
           $statdir
         </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