From d8c01a4988acf9a398f696bbee5805736634e5db Mon Sep 17 00:00:00 2001
From: mr-liusg <mr.liusg@m.scnu.edu.cn>
Date: Mon, 18 Apr 2016 17:51:14 +0800
Subject: [PATCH] update

---
 .htaccess                                            | 1 +
 Application/Home/Controller/ItemController.class.php | 4 +---
 Application/Home/View/Page/edit.html                 | 2 +-
 robots.txt                                           | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 robots.txt

diff --git a/.htaccess b/.htaccess
index 929995c67..94547b9f2 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,5 +4,6 @@
 
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond $1 !^(index\.php|robots\.txt|favicon\.ico)
   RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L]
 </IfModule>
\ No newline at end of file
diff --git a/Application/Home/Controller/ItemController.class.php b/Application/Home/Controller/ItemController.class.php
index 2aca91345..3bb53a5c3 100644
--- a/Application/Home/Controller/ItemController.class.php
+++ b/Application/Home/Controller/ItemController.class.php
@@ -100,8 +100,6 @@ public function show(){
             }
         }
 
-
-
         $share_url = get_domain().__APP__.'/'.$item_id;
 
         $ItemPermn = $this->checkItemPermn($uid , $item_id) ;
@@ -175,7 +173,7 @@ public function pwd(){
             $item = D("Item")->where("item_id = '$item_id' ")->find();
             if ($item['password'] == $password) {
                 session("visit_item_".$item_id , 1 );
-                header("location:".U("Home/item/show").'?item_id='.$item_id);
+                header("location:".U("Home/Item/show").'?item_id='.$item_id);
             }else{
                 
                 $this->message("访问密码不正确");
diff --git a/Application/Home/View/Page/edit.html b/Application/Home/View/Page/edit.html
index 03fbbac8d..00247a6dd 100755
--- a/Application/Home/View/Page/edit.html
+++ b/Application/Home/View/Page/edit.html
@@ -30,7 +30,7 @@
         </div>
         <div class="head-right pull-right">
             <a href="#" class="btn btn-primary " id="save">保存</a>
-            <a href="../item/show?item_id={$item_id}&page_id={$page.page_id}" class="btn cancel">取消</a>
+            <a href="../Item/show?item_id={$item_id}&page_id={$page.page_id}" class="btn cancel">取消</a>
         </div>
     </header>
     <br>
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 000000000..f10c4676e
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,2 @@
+User-agent: * 
+Disallow: /
\ No newline at end of file