Merge branch 'master' of http://120.79.101.85:8181/dengqi/msk

app/Http/Controllers/IndexController.php

@@ -206,7 +206,7 @@ class IndexController extends Controller
         $id = $request->id; 
         $node_type = DB::table('node')->orderBy('id','asc')->get();
         $node_sort = DB::table('node_sort')->orderBy('id','asc')->get();
-        $feeds = $feed->where('okDisplay',0)->where('nid',$id)->paginate(8);
+        $feeds = $feed->where('okDisplay',1)->where('nid',$id)->orderBy('id','desc')->paginate(8);
         // print_r($feeds);exit;
 
         $packs = $pack->where('id',$id)->first();
@@ -437,13 +437,25 @@ class IndexController extends Controller
     public function feedback(Request $request)
     {
         $feed = new Feedback;
+        $name = htmlspecialchars(trim($request->f_name));
+        if($name==''){
+            $result = array('msg' => '称呼不能为空!','code'=>500);
+            return response()->json($result);
+        }
+        if( strlen($name) > 32 ){
+            $result = array('msg' => '称呼太长了!','code'=>500);
+            return response()->json($result);
+        }
+
         if($request->f_Content==''){
-            $result = array('msg' => '不能为空!','code'=>500);
+            $result = array('msg' => '内容不能为空!','code'=>500);
             return response()->json($result);
         }
+
         $post = $request->all();
         unset($post['_token']);
         $post['add_time']=time();
+        $post['okDisplay'] = 1;
         $re = $feed->insert($post);
         if($re){
             $result = array('msg' => '留言成功!','code'=>200);

resources/views/index/gallery_show.blade.php

@@ -89,6 +89,9 @@
           <div class="am-form-group">
             <textarea class="" rows="5" name="f_Content" placeholder="留言"></textarea>
           </div>
+          <div class="am-form-group">
+            <input type="text" class=""  name="f_name" placeholder="称呼">
+          </div>
           {{csrf_field()}}
           <input type="hidden" name="nid" value="{{$packs->id}}">
           <div class="am-text-right">
@@ -130,7 +133,7 @@
               <div class="am-comment-main">
               <header class="am-comment-hd">
                 <div class="am-comment-meta">
-                <a href="#link-to-user" class="am-comment-author">某人</a> 评论于 <time datetime="2013-07-27T04:54:29-07:00" title="2013年7月27日 下午7:54 格林尼治标准时间+0800"> {{ date( "Y-m-d H:i:s", $feed->add_time)}}</time>
+                <a href="#link-to-user" class="am-comment-author">{{$feed->f_name}}</a> 评论于 <time datetime="2013-07-27T04:54:29-07:00" title="2013年7月27日 下午7:54 格林尼治标准时间+0800"> {{ date( "Y-m-d H:i:s", $feed->add_time)}}</time>
                 </div>
               </header>
               <div class="am-comment-bd">