From 4912532f0d0e74a48e0f9a97de9b74aef1084b9e Mon Sep 17 00:00:00 2001
From: xurongyao <rongyao_xu@163.com>
Date: Sat, 15 Sep 2018 11:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=AE=89=E8=A3=85=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=94=AF=E6=8C=81=E6=A0=B9=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?index.php=E8=AE=BF=E9=97=AE=EF=BC=8C=E4=B9=9F=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=83=8Ftp5=E4=B8=80=E6=A0=B7=E5=8F=AA=E5=AF=B9=E5=A4=96?=
 =?UTF-8?q?=E5=BC=80=E6=94=BEcrmeb=E4=B8=80=E4=B8=AA=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/install/index.php           | 26 +++++++++++++++++---------
 crmeb/install/templates/step2.php | 16 +++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/crmeb/install/index.php b/crmeb/install/index.php
index e868e70f..d1310dc5 100644
--- a/crmeb/install/index.php
+++ b/crmeb/install/index.php
@@ -336,17 +336,25 @@ switch ($step) {
 }
 
 function testwrite($d) {
-    $tfile = "_test.txt";
-    $fp = @fopen($d . "/" . $tfile, "w");
-    if (!$fp) {
+    if(is_dir($d)){
+        $tfile = "_test.txt";
+        $fp = @fopen($d . "/" . $tfile, "w");
+        if (!$fp) {
+            return false;
+        }
+        fclose($fp);
+        $rs = @unlink($d . "/" . $tfile);
+        if ($rs) {
+            return true;
+        }
+        return false;
+    }else{
+        if(is_writeable($d)){
+            return true;
+        }
         return false;
     }
-    fclose($fp);
-    $rs = @unlink($d . "/" . $tfile);
-    if ($rs) {
-        return true;
-    }
-    return false;
+
 }
 
 function sql_execute($sql, $tablepre) {
diff --git a/crmeb/install/templates/step2.php b/crmeb/install/templates/step2.php
index 9959f923..3db3ef1d 100644
--- a/crmeb/install/templates/step2.php
+++ b/crmeb/install/templates/step2.php
@@ -84,13 +84,15 @@
 		foreach($folder as $dir){
 		     $Testdir = CRMEBDIR.$dir;
 //			 echo $Testdir."<br/>";
-		         dir_create($Testdir);
-			 if(TestWrite($Testdir)){
-			     $w = '<span class="correct_span">&radic;</span>可写 ';
-			 }else{
-			     $w = '<span class="correct_span error_span">&radic;</span>不可写 ';
-				 $err++;
-			 }
+             dir_create($Testdir);
+             if(testwrite($Testdir)){
+                 $w = '<span class="correct_span">&radic;</span>可写 ';
+             }else{
+                 $w = '<span class="correct_span error_span">&radic;</span>不可写 ';
+                 $err++;
+             }
+
+
 			 if(is_readable($Testdir)){
 			     $r = '<span class="correct_span">&radic;</span>可读' ;
 			 }else{