Changeset 5595

Timestamp:

2006/09/24 18:33:43 (20 years ago)

Author:

kakinaka

Message:

blank

Location:

temp/trunk

Files:

• data/lib/slib.php (modified) (1 diff)
• html/admin/system/bkup.php (modified) (1 diff)
• html/install/index.php (modified) (2 diffs)

temp/trunk/data/lib/slib.php

@@ -2417 +2417 @@
 }
 
+// ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤òºÆµ¢Åª¤Ë¥³¥Ô¡¼
+function sfCopyDir($src, $des, $mess, $override = false){
+    if(!is_dir($src)){
+        return false;
+    }
+
+    $oldmask = umask(0);
+    $mod= stat($src);
+    
+    // ¥Ç¥£¥ì¥¯¥È¥ê¤¬¤Ê¤±¤ì¤ÐºîÀ®¤¹¤ë
+    if(!file_exists($des)) {
+        mkdir($des, $mod[2]);
+    }
+    
+    $fileArray=glob( $src."*" );
+    foreach( $fileArray as $key => $data_ ){
+        // CVS´ÉÍý¥Õ¥¡¥¤¥ë¤Ï¥³¥Ô¡¼¤·¤Ê¤¤
+        if(ereg("/CVS/Entries", $data_)) {
+            break;
+        }
+        if(ereg("/CVS/Repository", $data_)) {
+            break;
+        }
+        if(ereg("/CVS/Root", $data_)) {
+            break;
+        }
+        
+        mb_ereg("^(.*[\/])(.*)",$data_, $matches);
+        $data=$matches[2];
+        if( is_dir( $data_ ) ){
+            $mess = lfCopyDir( $data_.'/', $des.$data.'/', $mess);
+        }else{
+            if(!$override && file_exists($des.$data)) {
+                $mess.= $des.$data . "¡§¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹\n";
+            } else {
+                if(@copy( $data_, $des.$data)) {
+                    $mess.= $des.$data . "¡§¥³¥Ô¡¼À®¸ù\n";
+                } else {
+                    $mess.= $des.$data . "¡§¥³¥Ô¡¼¼ºÇÔ\n";
+                }
+            }
+            $mod=stat($data_ );
+        }
+    }
+    umask($oldmask);
+    return $mess;
+}
 
 /* ¥Ç¥Ð¥Ã¥°ÍÑ ------------------------------------------------------------------------------------------------*/

temp/trunk/html/admin/system/bkup.php

@@ -181 +181 @@
         }
     }
-
+    
+
+    // ¾¦ÉʲèÁü¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼
+    if (!$err) {
+        
+    }
+    
+        
     if (!$err) {
         $arrErr['bkup_name'] = "¥Ð¥Ã¥¯¥¢¥Ã¥×¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£";

temp/trunk/html/install/index.php

@@ -336 +336 @@
     $objPage->tpl_mode = 'step0_1';
     // ¥Õ¥¡¥¤¥ë¥³¥Ô¡¼
-    $objPage->copy_mess = lfCopyDir("./user_data/", "../../html/user_data/", $objPage->copy_mess);
-    $objPage->copy_mess = lfCopyDir("./save_image/", "../../html/upload/save_image/", $objPage->copy_mess); 
+    $objPage->copy_mess = sfCopyDir("./user_data/", "../../html/user_data/", $objPage->copy_mess);
+    $objPage->copy_mess = sfCopyDir("./save_image/", "../../html/upload/save_image/", $objPage->copy_mess); 
     return $objPage;
 }
@@ -549 +549 @@
 }
 
-// ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤òºÆµ¢Åª¤Ë¥³¥Ô¡¼
-function lfCopyDir($src, $des, $mess, $override = false){
-    if(!is_dir($src)){
-        return false;
-    }
-
-    $oldmask = umask(0);
-    $mod= stat($src);
-    
-    // ¥Ç¥£¥ì¥¯¥È¥ê¤¬¤Ê¤±¤ì¤ÐºîÀ®¤¹¤ë
-    if(!file_exists($des)) {
-        mkdir($des, $mod[2]);
-    }
-    
-    $fileArray=glob( $src."*" );
-    foreach( $fileArray as $key => $data_ ){
-        // CVS´ÉÍý¥Õ¥¡¥¤¥ë¤Ï¥³¥Ô¡¼¤·¤Ê¤¤
-        if(ereg("/CVS/Entries", $data_)) {
-            break;
-        }
-        if(ereg("/CVS/Repository", $data_)) {
-            break;
-        }
-        if(ereg("/CVS/Root", $data_)) {
-            break;
-        }
-        
-        mb_ereg("^(.*[\/])(.*)",$data_, $matches);
-        $data=$matches[2];
-        if( is_dir( $data_ ) ){
-            $mess = lfCopyDir( $data_.'/', $des.$data.'/', $mess);
-        }else{
-            if(!$override && file_exists($des.$data)) {
-                $mess.= $des.$data . "¡§¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹\n";
-            } else {
-                if(@copy( $data_, $des.$data)) {
-                    $mess.= $des.$data . "¡§¥³¥Ô¡¼À®¸ù\n";
-                } else {
-                    $mess.= $des.$data . "¡§¥³¥Ô¡¼¼ºÇÔ\n";
-                }
-            }
-            $mod=stat($data_ );
-        }
-    }
-    umask($oldmask);
-    return $mess;
-}
 ?>