[Phpgroupware-cvs] CVS: etemplate/inc class.db_tools.inc.php, 1.17, 1.18 class.soetemplate.inc.php, 1.26, 1.27

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv26548/etemplate/inc

Modified Files:
        class.db_tools.inc.php class.soetemplate.inc.php 
Log Message:
added a unlink before each rename for windows systems

Index: class.db_tools.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.db_tools.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.db_tools.inc.php      29 Jun 2003 16:48:25 -0000      1.17
--- class.db_tools.inc.php      21 Jul 2003 16:07:38 -0000      1.18
***************
*** 564,568 ****
                                if 
(is_writable(PHPGW_SERVER_ROOT."/$app/setup"))
                                {
!                                       
rename($file,PHPGW_SERVER_ROOT."/$app/setup/tables_current.old.inc.php");
                                }
                                while ($header[strlen($header)-1] == "\t")
--- 564,573 ----
                                if 
(is_writable(PHPGW_SERVER_ROOT."/$app/setup"))
                                {
!                                       $old_file = PHPGW_SERVER_ROOT . 
"/$app/setup/tables_current.old.inc.php";
!                                       if (file_exists($old_file))
!                                       {
!                                               unlink($old_file);
!                                       }
!                                       rename($file,$old_file);
                                }
                                while ($header[strlen($header)-1] == "\t")
***************
*** 630,634 ****
                        if (is_writable(PHPGW_SERVER_ROOT."/$app/setup"))
                        {
!                               
rename($file,PHPGW_SERVER_ROOT."/$app/setup/setup.old.inc.php");
                        }
                        $fnew = 
eregi_replace("(.*\\$"."setup_info\\['$app'\\]\\['version'\\][ \\t]*=[ 
\\t]*')[^']*('.*)","\\1$new"."\\2",$fcontent);
--- 635,644 ----
                        if (is_writable(PHPGW_SERVER_ROOT."/$app/setup"))
                        {
!                               $old_file = PHPGW_SERVER_ROOT . 
"/$app/setup/setup.old.inc.php";
!                               if (file_exists($old_file))
!                               {
!                                       unlink($old_file);
!                               }
!                               rename($file,$old_file);
                        }
                        $fnew = 
eregi_replace("(.*\\$"."setup_info\\['$app'\\]\\['version'\\][ \\t]*=[ 
\\t]*')[^']*('.*)","\\1$new"."\\2",$fcontent);
***************
*** 729,733 ****
                                $update = str_replace('?>','',$update);
                                fclose($f);
!                               
rename($file_update,PHPGW_SERVER_ROOT."/$app/setup/tables_update.old.inc.php");
                        }
                        else
--- 739,748 ----
                                $update = str_replace('?>','',$update);
                                fclose($f);
!                               $old_file = PHPGW_SERVER_ROOT . 
"/$app/setup/tables_update.old.inc.php";
!                               if (file_exists($old_file))
!                               {
!                                       unlink($old_file);
!                               }
!                               rename($file_update,$old_file);
                        }
                        else

Index: class.soetemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.soetemplate.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.soetemplate.inc.php   9 Jul 2003 00:00:37 -0000       1.26
--- class.soetemplate.inc.php   21 Jul 2003 16:07:38 -0000      1.27
***************
*** 610,614 ****
                        if (file_exists($file))
                        {
!                               rename($file,"$dir/etemplates.old.inc.php");
                        }
  
--- 610,619 ----
                        if (file_exists($file))
                        {
!                               $old_file = "$dir/etemplates.old.inc.php";
!                               if (file_exists($old_file))
!                               {
!                                       unlink($old_file);
!                               }
!                               rename($file,$old_file);
                        }
  
***************
*** 778,782 ****
                        if (file_exists($file))
                        {
!                               rename($file,"$dir/phpgw_$lang.old.lang");
                        }
                        $solangfile->write_file($app,$langarr,$lang);
--- 783,792 ----
                        if (file_exists($file))
                        {
!                               $old_file = "$dir/phpgw_$lang.old.lang";
!                               if (file_exists($old_file))
!                               {
!                                       unlink($old_file);
!                               }
!                               rename($file,$old_file);
                        }
                        $solangfile->write_file($app,$langarr,$lang);