From ceb8132f3418b214729ee9bce4842040a23e1318 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 14 Jan 2018 04:01:07 +0900
Subject: [PATCH] =?UTF-8?q?delInDir=20=EC=88=98=EC=A0=95.=20install=5Fok?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |  4 +++-
 che_close/func.php                            |  4 ++--
 twe_close/data/connected.php                  |  1 -
 .../session/sess_0g2lnrmd2poc1blmuai0r5vfoq   |  2 +-
 .../session/sess_bl2knvun8a0dsp2e0hc12u2i06   |  1 -
 .../session/sess_e67fe7rdm5eaehoqrn0j6rodl1   |  1 -
 twe_close/func.php                            | 19 +++++++++++--------
 twe_close/install_ok.php                      |  6 +++++-
 twe_close/logs/.htaccess                      |  1 -
 9 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 twe_close/data/connected.php
 delete mode 100644 twe_close/data/session/sess_bl2knvun8a0dsp2e0hc12u2i06
 delete mode 100644 twe_close/data/session/sess_e67fe7rdm5eaehoqrn0j6rodl1
 delete mode 100644 twe_close/logs/.htaccess

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7dc85d41..e2cb2826 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,10 +6,12 @@
         "**/CVS": true,
         "**/.DS_Store": true,
         "**/logs/*.txt": true,
+        "**/session/sess*":true,
         
     },
     "search.exclude": {
-        "**/che_close": true,
+        "**/che_close/*": true,
         "e_lib/*":true,
+       
       },
 }
\ No newline at end of file
diff --git a/che_close/func.php b/che_close/func.php
index 7ef2380e..7350c1c3 100644
--- a/che_close/func.php
+++ b/che_close/func.php
@@ -82,7 +82,7 @@ function delInDir($dir) {
     while(false !== ($FolderOrFile = readdir($handle))) {
         if($FolderOrFile != "." && $FolderOrFile != "..") {
             if(is_dir("$dir/$FolderOrFile")) {
-                deldir("$dir/$FolderOrFile");
+                delInDir("$dir/$FolderOrFile");
             } // recursive
             else {
                 unlink("$dir/$FolderOrFile");
@@ -93,7 +93,7 @@ function delInDir($dir) {
 //    if(rmdir($dir)) {
 //        $success = true;
 //    }
-    return $success;
+    return true;
 }
 
 function GetImageURL($imgsvr) {
diff --git a/twe_close/data/connected.php b/twe_close/data/connected.php
deleted file mode 100644
index de11d5cd..00000000
--- a/twe_close/data/connected.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php/*jwh1807:유기체:13:127.0.0.1:1320151557*/
\ No newline at end of file
diff --git a/twe_close/data/session/sess_0g2lnrmd2poc1blmuai0r5vfoq b/twe_close/data/session/sess_0g2lnrmd2poc1blmuai0r5vfoq
index 444846e1..21b7d81a 100644
--- a/twe_close/data/session/sess_0g2lnrmd2poc1blmuai0r5vfoq
+++ b/twe_close/data/session/sess_0g2lnrmd2poc1blmuai0r5vfoq
@@ -1 +1 @@
-p_ip|s:12:"192.168.0.26";p_time|i:1515845555;
\ No newline at end of file
+p_ip|s:12:"192.168.0.26";p_time|i:1515870030;
\ No newline at end of file
diff --git a/twe_close/data/session/sess_bl2knvun8a0dsp2e0hc12u2i06 b/twe_close/data/session/sess_bl2knvun8a0dsp2e0hc12u2i06
deleted file mode 100644
index 788e8886..00000000
--- a/twe_close/data/session/sess_bl2knvun8a0dsp2e0hc12u2i06
+++ /dev/null
@@ -1 +0,0 @@
-p_ip|s:14:"125.209.213.87";p_time|i:1457326503;
\ No newline at end of file
diff --git a/twe_close/data/session/sess_e67fe7rdm5eaehoqrn0j6rodl1 b/twe_close/data/session/sess_e67fe7rdm5eaehoqrn0j6rodl1
deleted file mode 100644
index e2a88960..00000000
--- a/twe_close/data/session/sess_e67fe7rdm5eaehoqrn0j6rodl1
+++ /dev/null
@@ -1 +0,0 @@
-p_ip|s:14:"125.209.213.86";p_time|i:1457326490;
\ No newline at end of file
diff --git a/twe_close/func.php b/twe_close/func.php
index 7ef2380e..df78a67b 100644
--- a/twe_close/func.php
+++ b/twe_close/func.php
@@ -80,20 +80,23 @@ function abilityPowint() {
 function delInDir($dir) {
     $handle = opendir($dir);
     while(false !== ($FolderOrFile = readdir($handle))) {
-        if($FolderOrFile != "." && $FolderOrFile != "..") {
-            if(is_dir("$dir/$FolderOrFile")) {
-                deldir("$dir/$FolderOrFile");
-            } // recursive
-            else {
-                unlink("$dir/$FolderOrFile");
-            }
+        if($FolderOrFile == "." || $FolderOrFile == "..") {
+            continue;
+        }
+
+        $filepath = sprintf('%s/%s', $dir, $FolderOrFile);
+        if(is_dir($filepath)) {
+            delInDir($filepath);
+        } // recursive
+        else {
+            @unlink($filepath);
         }
     }
     closedir($handle);
 //    if(rmdir($dir)) {
 //        $success = true;
 //    }
-    return $success;
+    return true;
 }
 
 function GetImageURL($imgsvr) {
diff --git a/twe_close/install_ok.php b/twe_close/install_ok.php
index a4ae6fa8..48ed6139 100644
--- a/twe_close/install_ok.php
+++ b/twe_close/install_ok.php
@@ -2,10 +2,14 @@
 include "lib.php";
 include "schema.php";
 include "func.php";
-
+require_once "../e_lib/util.php";
 if(file_exists("d_setting/set.php")) error("이미 set.php가 생성되어 있습니다.<br><br>재설치하려면 해당 파일을 지우세요");
 
 
+$hostname = util::array_get($_POST['hostname'], '');
+$user_id = util::array_get($_POST['user_id'], '');
+$password = util::array_get($_POST['password'], '');
+$dbname = util::array_get($_POST['dbname'], '');
 
 // 호스트네임, 아이디, DB네임, 비밀번호의 공백여부 검사
 if(isBlank($hostname)) Error("HostName을 입력하세요","");
diff --git a/twe_close/logs/.htaccess b/twe_close/logs/.htaccess
deleted file mode 100644
index 698196ae..00000000
--- a/twe_close/logs/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from  all
\ No newline at end of file