[TEP-COMMIT] CVS: catalog/catalog/install/templates/pages install_2.php,1.5,1.6 install_3.php,1.7,1.8 install_4.php,1.10,1.11

Update of /cvsroot/tep/catalog/catalog/install/templates/pages
In directory sc8-pr-cvs1:/tmp/cvs-serv28747/templates/pages

Modified Files:
	install_2.php install_3.php install_4.php 
Log Message:
fix bug 1247 - fix the paths for windows based servers


Index: install_2.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/install/templates/pages/install_2.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- install_2.php	9 Jul 2003 01:11:06 -0000	1.5
+++ install_2.php	11 Jul 2003 14:59:01 -0000	1.6
@@ -74,9 +74,12 @@
 
 <?php
     } else {
-      if (!$script_filename = str_replace('\\', '/', getenv('PATH_TRANSLATED'))) {
+      $script_filename = getenv('PATH_TRANSLATED');
+      if (empty($script_filename)) {
         $script_filename = getenv('SCRIPT_FILENAME');
       }
+
+      $script_filename = str_replace('\\', '/', $script_filename);
       $script_filename = str_replace('//', '/', $script_filename);
 
       $dir_fs_www_root_array = explode('/', dirname($script_filename));

Index: install_3.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/install/templates/pages/install_3.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- install_3.php	9 Jul 2003 01:11:06 -0000	1.7
+++ install_3.php	11 Jul 2003 14:59:01 -0000	1.8
@@ -10,9 +10,12 @@
   Released under the GNU General Public License
 */
 
-  if (!$script_filename = str_replace('\\', '/', getenv('PATH_TRANSLATED'))) {
+  $script_filename = getenv('PATH_TRANSLATED');
+  if (empty($script_filename)) {
     $script_filename = getenv('SCRIPT_FILENAME');
   }
+
+  $script_filename = str_replace('\\', '/', $script_filename);
   $script_filename = str_replace('//', '/', $script_filename);
 
   $dir_fs_www_root_array = explode('/', dirname($script_filename));

Index: install_4.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/install/templates/pages/install_4.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- install_4.php	9 Jul 2003 01:11:06 -0000	1.10
+++ install_4.php	11 Jul 2003 14:59:01 -0000	1.11
@@ -15,9 +15,12 @@
   $www_location = 'http://' . getenv('HTTP_HOST') . getenv('SCRIPT_NAME');
   $www_location = substr($www_location, 0, strpos($www_location, 'install'));
 
-  if (!$script_filename = str_replace('\\', '/', getenv('PATH_TRANSLATED'))) {
+  $script_filename = getenv('PATH_TRANSLATED');
+  if (empty($script_filename)) {
     $script_filename = getenv('SCRIPT_FILENAME');
   }
+
+  $script_filename = str_replace('\\', '/', $script_filename);
   $script_filename = str_replace('//', '/', $script_filename);
 
   $dir_fs_www_root_array = explode('/', dirname($script_filename));



-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1