diff --git a/crmeb/index.php b/public/index.php similarity index 100% rename from crmeb/index.php rename to public/index.php diff --git a/crmeb/install/.keep b/public/install/.keep similarity index 100% rename from crmeb/install/.keep rename to public/install/.keep diff --git a/crmeb/install/auto.php b/public/install/auto.php similarity index 100% rename from crmeb/install/auto.php rename to public/install/auto.php diff --git a/crmeb/install/config.php b/public/install/config.php similarity index 100% rename from crmeb/install/config.php rename to public/install/config.php diff --git a/crmeb/install/crmeb.sql b/public/install/crmeb.sql similarity index 100% rename from crmeb/install/crmeb.sql rename to public/install/crmeb.sql diff --git a/crmeb/install/css/install.css b/public/install/css/install.css similarity index 100% rename from crmeb/install/css/install.css rename to public/install/css/install.css diff --git a/crmeb/install/images/.keep b/public/install/images/.keep similarity index 100% rename from crmeb/install/images/.keep rename to public/install/images/.keep diff --git a/crmeb/install/images/install/bg.png b/public/install/images/install/bg.png similarity index 100% rename from crmeb/install/images/install/bg.png rename to public/install/images/install/bg.png diff --git a/crmeb/install/images/install/btn.png b/public/install/images/install/btn.png similarity index 100% rename from crmeb/install/images/install/btn.png rename to public/install/images/install/btn.png diff --git a/crmeb/install/images/install/complete.png b/public/install/images/install/complete.png similarity index 100% rename from crmeb/install/images/install/complete.png rename to public/install/images/install/complete.png diff --git a/crmeb/install/images/install/header.png b/public/install/images/install/header.png similarity index 100% rename from crmeb/install/images/install/header.png rename to public/install/images/install/header.png diff --git a/crmeb/install/images/install/icon.png b/public/install/images/install/icon.png similarity index 100% rename from crmeb/install/images/install/icon.png rename to public/install/images/install/icon.png diff --git a/crmeb/install/images/install/icon_install.png b/public/install/images/install/icon_install.png similarity index 100% rename from crmeb/install/images/install/icon_install.png rename to public/install/images/install/icon_install.png diff --git a/crmeb/install/images/install/ignore.png b/public/install/images/install/ignore.png similarity index 100% rename from crmeb/install/images/install/ignore.png rename to public/install/images/install/ignore.png diff --git a/crmeb/install/images/install/loading.gif b/public/install/images/install/loading.gif similarity index 100% rename from crmeb/install/images/install/loading.gif rename to public/install/images/install/loading.gif diff --git a/crmeb/install/images/install/logo.png b/public/install/images/install/logo.png similarity index 100% rename from crmeb/install/images/install/logo.png rename to public/install/images/install/logo.png diff --git a/crmeb/install/images/install/pop_loading.gif b/public/install/images/install/pop_loading.gif similarity index 100% rename from crmeb/install/images/install/pop_loading.gif rename to public/install/images/install/pop_loading.gif diff --git a/crmeb/install/images/install/step.png b/public/install/images/install/step.png similarity index 100% rename from crmeb/install/images/install/step.png rename to public/install/images/install/step.png diff --git a/crmeb/install/images/install/tab.png b/public/install/images/install/tab.png similarity index 100% rename from crmeb/install/images/install/tab.png rename to public/install/images/install/tab.png diff --git a/crmeb/install/images/install/tips_system.png b/public/install/images/install/tips_system.png similarity index 100% rename from crmeb/install/images/install/tips_system.png rename to public/install/images/install/tips_system.png diff --git a/crmeb/install/index.php b/public/install/index.php similarity index 99% rename from crmeb/install/index.php rename to public/install/index.php index b47450ce..f6b2d74b 100644 --- a/crmeb/install/index.php +++ b/public/install/index.php @@ -28,7 +28,7 @@ date_default_timezone_set('PRC'); error_reporting(E_ALL & ~E_NOTICE); header('Content-Type: text/html; charset=UTF-8'); define('SITEDIR', _dir_path(substr(dirname(__FILE__), 0, -8)));//入口文件目录 -define('CRMEBDIR', _dir_path(substr(dirname(__FILE__), 0, -14)));//项目目录 +define('CRMEBDIR', _dir_path(substr(dirname(__FILE__), 0, -15)));//项目目录 //define('SITEDIR2', substr(SITEDIR,0,-7)); //echo SITEDIR; //exit;SITEDIR @@ -128,7 +128,7 @@ switch ($step) { $folder = array( - 'crmeb/install', + 'public/install', 'public/uploads', 'runtime', 'runtime/cache', diff --git a/crmeb/install/index_sae.php b/public/install/index_sae.php similarity index 100% rename from crmeb/install/index_sae.php rename to public/install/index_sae.php diff --git a/crmeb/install/js/ajaxForm.js b/public/install/js/ajaxForm.js similarity index 100% rename from crmeb/install/js/ajaxForm.js rename to public/install/js/ajaxForm.js diff --git a/crmeb/install/js/jquery.js b/public/install/js/jquery.js similarity index 100% rename from crmeb/install/js/jquery.js rename to public/install/js/jquery.js diff --git a/crmeb/install/js/validate.js b/public/install/js/validate.js similarity index 100% rename from crmeb/install/js/validate.js rename to public/install/js/validate.js diff --git a/crmeb/install/templates/footer.php b/public/install/templates/footer.php similarity index 100% rename from crmeb/install/templates/footer.php rename to public/install/templates/footer.php diff --git a/crmeb/install/templates/header.php b/public/install/templates/header.php similarity index 100% rename from crmeb/install/templates/header.php rename to public/install/templates/header.php diff --git a/crmeb/install/templates/s2_sae.php b/public/install/templates/s2_sae.php similarity index 100% rename from crmeb/install/templates/s2_sae.php rename to public/install/templates/s2_sae.php diff --git a/crmeb/install/templates/s3_sae.php b/public/install/templates/s3_sae.php similarity index 100% rename from crmeb/install/templates/s3_sae.php rename to public/install/templates/s3_sae.php diff --git a/crmeb/install/templates/step1.php b/public/install/templates/step1.php similarity index 100% rename from crmeb/install/templates/step1.php rename to public/install/templates/step1.php diff --git a/crmeb/install/templates/step2.php b/public/install/templates/step2.php similarity index 100% rename from crmeb/install/templates/step2.php rename to public/install/templates/step2.php diff --git a/crmeb/install/templates/step3.php b/public/install/templates/step3.php similarity index 100% rename from crmeb/install/templates/step3.php rename to public/install/templates/step3.php diff --git a/crmeb/install/templates/step4.php b/public/install/templates/step4.php similarity index 100% rename from crmeb/install/templates/step4.php rename to public/install/templates/step4.php diff --git a/crmeb/install/templates/step5.php b/public/install/templates/step5.php similarity index 100% rename from crmeb/install/templates/step5.php rename to public/install/templates/step5.php