From 6e71abe710d51747e8a091b414f42e5efcfe882e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 11 Jan 2018 22:39:47 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _common.php                     |  4 +++-
 che_close/d_setting/_common.php |  4 +++-
 d_setting/_common.php           |  4 +++-
 d_setting/set.php               | 22 +++++++++----------
 f_config/config.js              |  2 +-
 f_func/_common.php              |  4 +++-
 f_func/class._Session.php       |  6 ++++-
 f_func/class._Setting.php       | 13 ++++++-----
 f_install/install2Post.php      | 39 ++++++++++++++++++---------------
 f_retrival/_common.php          |  4 +++-
 i_banner/analytics.php          |  4 ++++
 i_entrance/_common.php          |  5 ++++-
 i_entrance/donation/_common.php |  4 +++-
 i_entrance/manage/_common.php   |  4 +++-
 i_entrance/member/_common.php   |  4 +++-
 i_login/_common.php             |  4 +++-
 i_login/findpw/_common.php      |  4 +++-
 i_login/join/_common.php        |  4 +++-
 i_other/_common.php             |  4 +++-
 i_popup/_common.php             |  4 +++-
 20 files changed, 93 insertions(+), 50 deletions(-)

diff --git a/_common.php b/_common.php
index 66df4ed9..bc36bd5c 100644
--- a/_common.php
+++ b/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '.');
+if(!defined('ROOT')){
+    define('ROOT', '.');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/che_close/d_setting/_common.php b/che_close/d_setting/_common.php
index ccba7f48..90e4756f 100644
--- a/che_close/d_setting/_common.php
+++ b/che_close/d_setting/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '../..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/d_setting/_common.php b/d_setting/_common.php
index ccba7f48..cea1c49d 100644
--- a/d_setting/_common.php
+++ b/d_setting/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/d_setting/set.php b/d_setting/set.php
index 213afc1f..f941935e 100644
--- a/d_setting/set.php
+++ b/d_setting/set.php
@@ -1,11 +1,11 @@
-<?php
-db_host
-db_user
-db_pass
-db_name
-smtp_host
-smtp_port
-smtp_id
-smtp_pw
-smtp_sender
-?>
+<?php /*
+localhost
+sam_dev
+letmein
+sammo
+smtp.gmail.com
+465
+aser
+ewrwer
+@gmail.com
+ */?>
diff --git a/f_config/config.js b/f_config/config.js
index 769219b2..1e31fcb8 100644
--- a/f_config/config.js
+++ b/f_config/config.js
@@ -1,5 +1,5 @@
 var W = "/";
-var HOME = "/sam/";
+var HOME = "/dev_sam/"; //TODO:install시 수정
 //var HOME = "http://62che.com/sam/";
 //var HOME = "http://localhost/sam/";
 
diff --git a/f_func/_common.php b/f_func/_common.php
index ccba7f48..cea1c49d 100644
--- a/f_func/_common.php
+++ b/f_func/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/f_func/class._Session.php b/f_func/class._Session.php
index 68847b20..a96c4d0b 100644
--- a/f_func/class._Session.php
+++ b/f_func/class._Session.php
@@ -12,7 +12,8 @@ class _Session {
         session_start();
 
         //첫 등장
-        if($_SESSION['ip'] == '') {
+
+        if(!isset($_SESSION['ip']) || $_SESSION['ip'] == '') {
             $_SESSION['ip'] = $_SERVER['REMOTE_ADDR'];
             $_SESSION['time'] = time();
         }
@@ -53,6 +54,9 @@ class _Session {
     }
 
     public function IsLoggedIn() {
+        if(!isset($_SESSION['noMember'])){
+            return false;
+        }
         if($_SESSION['noMember'] != 0) {
             return true;
         } else {
diff --git a/f_func/class._Setting.php b/f_func/class._Setting.php
index a290fc5e..afc0c0eb 100644
--- a/f_func/class._Setting.php
+++ b/f_func/class._Setting.php
@@ -26,11 +26,14 @@ class _Setting {
             $this->dbId = trim(str_replace("\n", "", $f[2]));
             $this->dbPw = trim(str_replace("\n", "", $f[3]));
             $this->dbName = trim(str_replace("\n", "", $f[4]));
-            $this->mailHost = trim(str_replace("\n", "", $f[5]));
-            $this->mailPort = trim(str_replace("\n", "", $f[6]));
-            $this->mailId = trim(str_replace("\n", "", $f[7]));
-            $this->mailPw = trim(str_replace("\n", "", $f[8]));
-            $this->mailAddr = trim(str_replace("\n", "", $f[9]));
+            if(count($f) > 10){
+                $this->mailHost = trim(str_replace("\n", "", $f[5]));
+                $this->mailPort = trim(str_replace("\n", "", $f[6]));
+                $this->mailId = trim(str_replace("\n", "", $f[7]));
+                $this->mailPw = trim(str_replace("\n", "", $f[8]));
+                $this->mailAddr = trim(str_replace("\n", "", $f[9]));
+            }
+            
         }
     }
 
diff --git a/f_install/install2Post.php b/f_install/install2Post.php
index 032c201b..99579b67 100644
--- a/f_install/install2Post.php
+++ b/f_install/install2Post.php
@@ -10,32 +10,35 @@ require_once(ROOT.W.F_CONFIG.W.DB.PHP);
 
 // 시스템정보 1개 등록
 $DB->InsertArray('SYSTEM', array(
-    JOIN     => 'N',
-    LOGIN    => 'N',
-    CRT_DATE => _Time::DatetimeNow(),
-    MDF_DATE => _Time::DatetimeNow()
+    'REG'     => 'N',
+    'LOGIN'    => 'N',
+    'CRT_DATE' => _Time::DatetimeNow(),
+    'MDF_DATE' => _Time::DatetimeNow()
 ));
 
 // 운영자 1명 등록
 $DB->InsertArray('MEMBER', array(
-    ID      => $id,
-    PW      => $pw,
-    PID     => '-',
-    NAME    => '운영자',
-    IP      => $_SERVER['REMOTE_ADDR'],
-    GRADE   => 6,
-    REG_DATE => _Time::DatetimeNow()
+    'ID'      => $id,
+    'PW'      => $pw,
+    'PID'     => '-',
+    'NAME'    => '운영자',
+    'EMAIL'   => 'nomail@nomail.com',
+    'IP'      => $_SERVER['REMOTE_ADDR'],
+    'GRADE'   => 6,
+    'REG_DATE' => _Time::DatetimeNow()
 ));
 
+
 // 부운영자 1명 등록
 $DB->InsertArray('MEMBER', array(
-    ID      => 'viceadmin',
-    PW      => md5('12qw!@QW12qw!@QW'),
-    PID     => '-',
-    NAME    => '부운영자',
-    IP      => $_SERVER['REMOTE_ADDR'],
-    GRADE   => 5,
-    REG_DATE => _Time::DatetimeNow()
+    'ID'      => 'viceadmin',
+    'PW'      => md5('12qw!@QWQPQP%12qw!@QWQPQP%'),
+    'PID'     => '-',
+    'NAME'    => '부운영자',
+    'EMAIL'   => 'nomail@nomail.com',
+    'IP'      => $_SERVER['REMOTE_ADDR'],
+    'GRADE'   => 5,
+    'REG_DATE' => _Time::DatetimeNow()
 ));
 
 ?>
diff --git a/f_retrival/_common.php b/f_retrival/_common.php
index ccba7f48..bc36bd5c 100644
--- a/f_retrival/_common.php
+++ b/f_retrival/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '.');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_banner/analytics.php b/i_banner/analytics.php
index bf3f0d19..52aa8198 100644
--- a/i_banner/analytics.php
+++ b/i_banner/analytics.php
@@ -1,3 +1,5 @@
+<?php
+/*
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
@@ -11,3 +13,5 @@
   })();
 
 </script>
+*/
+?>
\ No newline at end of file
diff --git a/i_entrance/_common.php b/i_entrance/_common.php
index ccba7f48..d56bd857 100644
--- a/i_entrance/_common.php
+++ b/i_entrance/_common.php
@@ -1,5 +1,8 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '..');
+}
+
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_entrance/donation/_common.php b/i_entrance/donation/_common.php
index 7cc95ce0..90e4756f 100644
--- a/i_entrance/donation/_common.php
+++ b/i_entrance/donation/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '../..');
+if(!defined('ROOT')){
+    define('ROOT', '../..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_entrance/manage/_common.php b/i_entrance/manage/_common.php
index 7cc95ce0..90e4756f 100644
--- a/i_entrance/manage/_common.php
+++ b/i_entrance/manage/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '../..');
+if(!defined('ROOT')){
+    define('ROOT', '../..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_entrance/member/_common.php b/i_entrance/member/_common.php
index 7cc95ce0..90e4756f 100644
--- a/i_entrance/member/_common.php
+++ b/i_entrance/member/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '../..');
+if(!defined('ROOT')){
+    define('ROOT', '../..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_login/_common.php b/i_login/_common.php
index ccba7f48..cea1c49d 100644
--- a/i_login/_common.php
+++ b/i_login/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_login/findpw/_common.php b/i_login/findpw/_common.php
index 7cc95ce0..90e4756f 100644
--- a/i_login/findpw/_common.php
+++ b/i_login/findpw/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '../..');
+if(!defined('ROOT')){
+    define('ROOT', '../..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_login/join/_common.php b/i_login/join/_common.php
index 7cc95ce0..90e4756f 100644
--- a/i_login/join/_common.php
+++ b/i_login/join/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '../..');
+if(!defined('ROOT')){
+    define('ROOT', '../..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_other/_common.php b/i_other/_common.php
index ccba7f48..cea1c49d 100644
--- a/i_other/_common.php
+++ b/i_other/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);
diff --git a/i_popup/_common.php b/i_popup/_common.php
index ccba7f48..cea1c49d 100644
--- a/i_popup/_common.php
+++ b/i_popup/_common.php
@@ -1,5 +1,7 @@
 <?php
-define(ROOT, '..');
+if(!defined('ROOT')){
+    define('ROOT', '..');
+}
 require_once(ROOT.'/f_config/config.php');
 require_once(ROOT.W.F_CONFIG.W.APP.PHP);
 require_once(ROOT.W.F_FUNC.W.FUNC.PHP);