部分ajax接口移到server目录

Application/Home/Controller/CatalogController.class.php

@@ -31,133 +31,4 @@ class CatalogController extends BaseController {
         $this->display();        
     }
 
-    //保存目录
-    public function save(){
-        $cat_name = I("cat_name");
-        $s_number = I("s_number/d") ? I("s_number/d") : 99 ;
-        $cat_id = I("cat_id/d")? I("cat_id/d") : 0;
-        $parent_cat_id = I("parent_cat_id/d")? I("parent_cat_id/d") : 0;
-        $item_id =  I("item_id/d");
-
-        $login_user = $this->checkLogin();
-        if (!$this->checkItemPermn($login_user['uid'] , $item_id)) {
-            $this->message(L('no_permissions'));
-            return;
-        }
-        //禁止空目录的生成
-        if (!$cat_name) {
-            return;
-        }
-        
-        $data['cat_name'] = $cat_name ;
-        $data['s_number'] = $s_number ;
-        $data['item_id'] = $item_id ;
-        $data['parent_cat_id'] = $parent_cat_id ;
-        if ($parent_cat_id > 0 ) {
-           $data['level'] = 3;
-        }else{
-            $data['level'] = 2;
-        }
-
-        if ($cat_id > 0 ) {
-            
-            $ret = D("Catalog")->where(" cat_id = '$cat_id' ")->save($data);
-            $return = D("Catalog")->where(" cat_id = '$cat_id' ")->find();
-
-        }else{
-            $data['addtime'] = time();
-            $cat_id = D("Catalog")->add($data);
-            $return = D("Catalog")->where(" cat_id = '$cat_id' ")->find();
-            
-        }
-        if (!$return) {
-            $return['error_code'] = 10103 ;
-            $return['error_message'] = 'request  fail' ;
-        }
-        $this->sendResult($return);
-        
-    }
-
-    //获取目录列表
-    public function catList(){
-        $item_id = I("item_id/d");
-        if ($item_id > 0 ) {
-            $ret = D("Catalog")->where(" item_id = '$item_id' ")->order(" 's_number', addtime asc  ")->select();
-        }
-        if ($ret) {
-           $this->sendResult($ret);
-        }else{
-            $return['error_code'] = 10103 ;
-            $return['error_message'] = 'request  fail' ;
-            $this->sendResult($return);
-        }
-    }
-
-    //获取二级目录列表
-    public function secondCatList(){
-        $item_id = I("item_id/d");
-        if ($item_id > 0 ) {
-            $ret = D("Catalog")->where(" item_id = '$item_id' and level =2  ")->order(" 's_number', addtime asc  ")->select();
-        }
-        if ($ret) {
-           $this->sendResult($ret);
-        }else{
-            $return['error_code'] = 10103 ;
-            $return['error_message'] = 'request  fail' ;
-            $this->sendResult($return);
-        }
-    }
-
-    //获取一个目录的子目录列表（如果存在的话）
-    public function childCatList(){
-        $cat_id = I("cat_id/d");
-        if ($cat_id > 0 ) {
-            $ret = D("Catalog")->where(" parent_cat_id = '$cat_id' ")->order(" 's_number', addtime asc  ")->select();
-        }
-        if ($ret) {
-           $this->sendResult($ret);
-        }else{
-            $return['error_code'] = 10103 ;
-            $return['error_message'] = 'request  fail' ;
-            $this->sendResult($return);
-        }      
-    }
-    //删除目录
-    public function delete(){
-        $cat_id = I("cat_id/d")? I("cat_id/d") : 0;
-        $cat = D("Catalog")->where(" cat_id = '$cat_id' ")->find();
-        $item_id = $cat['item_id'];
-        
-        $login_user = $this->checkLogin();
-        if (!$this->checkItemPermn($login_user['uid'] , $item_id)) {
-            $return['error_code'] = -1 ;
-            $return['error_message'] = L('no_permissions');
-            $this->sendResult($return);
-            return;
-        }
-
-        if (D("Page")->where(" cat_id = '$cat_id' ")->find() || D("Catalog")->where(" parent_cat_id = '$cat_id' ")->find()) {
-            $return['error_code'] = -1 ;
-            $return['error_message'] = L('no_delete_empty_catalog') ;
-            $this->sendResult($return);
-            return;
-        }
-
-        if ($cat_id > 0 ) {
-            
-            $ret = D("Catalog")->where(" cat_id = '$cat_id' ")->delete();
-
-        }
-        if ($ret) {
-           $this->sendResult($ret);
-        }else{
-            $return['error_code'] = -1 ;
-            $return['error_message'] = 'request  fail' ;
-            $this->sendResult($return);
-        }
-    }
-
-
-
-
 }

Application/Home/Controller/PageController.class.php

@@ -195,31 +195,6 @@ class PageController extends BaseController {
         
     }
 
-    //删除页面
-    public function delete(){
-        $page_id = I("page_id/d")? I("page_id/d") : 0;
-        $page = D("Page")->where(" page_id = '$page_id' ")->find();
-
-        $login_user = $this->checkLogin();
-        if (!$this->checkItemCreator($login_user['uid'] , $page['item_id']) && $login_user['uid'] != $page['author_uid']) {
-            $this->message(L('no_permissions_to_delete_page',array("author_username"=>$page['author_username'])));
-            return;
-        }
-
-        if ($page) {
-            
-            $ret = D("Page")->where(" page_id = '$page_id' ")->delete();
-            //更新项目时间
-            D("Item")->where(" item_id = '$page[item_id]' ")->save(array("last_update_time"=>time()));
-
-        }
-        if ($ret) {
-           $this->message(L('delete_succeeded'),U("Home/item/show?item_id={$page['item_id']}"));
-        }else{
-           $this->message(L('delete_failed'),U("Home/item/show?item_id={$page['item_id']}"));
-        }
-    }
-
     //历史版本
     public function history(){
         $page_id = I("page_id/d") ? I("page_id/d") : 0 ;

Application/Home/View/Catalog/edit.html

@@ -74,4 +74,4 @@
 
 <input type="hidden" id="default_parent_cat_id"  value="{$default_parent_cat_id}">
  <include file="Common/footer" />
- <script src="__PUBLIC__/js/catalog/edit.js?v=1.1.10thirde1"></script>
+ <script src="__PUBLIC__/js/catalog/edit.js?v=1.1.10thirde12"></script>

Application/Home/View/Page/edit.html

@@ -142,7 +142,7 @@
 <script src="__PUBLIC__/editor.md/plugins/table-dialog/table-dialog.js"></script>
 <script src="__PUBLIC__/editor.md/plugins/reference-link-dialog/reference-link-dialog.js"></script>
 
-<script src="__PUBLIC__/js/page/edit.js?v=1.1.2thirdonmopqrstutv12"></script>
+<script src="__PUBLIC__/js/page/edit.js?v=1.1.2thirdonmopqrstutv123"></script>
 <if condition="LANG_SET=='en-us'">
     <script src="__PUBLIC__/editor.md/languages/en.js"></script>
 </if>

Public/js/catalog/edit.js

@@ -10,7 +10,7 @@ $(function(){
 
   function getCatList(){
       $.get(
-        "?s=home/catalog/catList",
+        DocConfig.server+"/api/catalog/catList",
         { "item_id": item_id },
         function(data){
           $("#show-second-cat").html('');
@@ -47,7 +47,7 @@ $(function(){
     var default_parent_cat_id = $("#default_parent_cat_id").val();
     var item_id = $("#item_id").val();
     $.get(
-      "?s=home/catalog/secondCatList", 
+      DocConfig.server+"/api/catalog/secondCatList", 
       {"item_id": item_id},
       function(data) {
         $("#parent_cat_id").html('<OPTION value="0">'+lang["none"]+'</OPTION>');
@@ -79,7 +79,7 @@ $(function(){
       var cat_id = $("#cat_id").val();
       var parent_cat_id = $("#parent_cat_id").val();
       $.post(
-        "?s=home/catalog/save",
+        DocConfig.server+"/api/catalog/save",
         {"cat_name": cat_name , "s_number": s_number , "item_id": item_id , "cat_id": cat_id, "parent_cat_id": parent_cat_id  },
         function(data){
           if (data.error_code == 0) {
@@ -107,7 +107,7 @@ $(function(){
         var cat_id = $("#cat_id").val();
         if (cat_id > 0 ) {
             $.post(
-                "?s=home/catalog/delete",
+                DocConfig.server+"/api/catalog/delete",
                 { "cat_id": cat_id  },
                 function(data){
                   if (data.error_code == 0) {

Public/js/page/edit.js

@@ -17,7 +17,7 @@ $(function() {
     var default_second_cat_id = $("#default_second_cat_id").val();
     var item_id = $("#item_id").val();
     $.post(
-      "?s=home/catalog/secondCatList", {
+      DocConfig.server+"/api/catalog/secondCatList", {
         "item_id": item_id,
       },
       function(data) {
@@ -47,7 +47,7 @@ $(function() {
     var cat_id = $("#cat_id").val();
     var default_child_cat_id = $("#default_child_cat_id").val();
     $.post(
-      "?s=home/catalog/childCatList", {
+      DocConfig.server+"/api/catalog/childCatList", {
         "cat_id": cat_id
       },
       function(data) {

server/Application/Api/Controller/CatalogController.class.php

@@ -58,5 +58,85 @@ class CatalogController extends BaseController {
         }      
     }
 
+    //保存目录
+    public function save(){
+        $cat_name = I("cat_name");
+        $s_number = I("s_number/d") ? I("s_number/d") : 99 ;
+        $cat_id = I("cat_id/d")? I("cat_id/d") : 0;
+        $parent_cat_id = I("parent_cat_id/d")? I("parent_cat_id/d") : 0;
+        $item_id =  I("item_id/d");
 
+        $login_user = $this->checkLogin();
+        if (!$this->checkItemPermn($login_user['uid'] , $item_id)) {
+            $this->sendError(10303);
+            return;
+        }
+        //禁止空目录的生成
+        if (!$cat_name) {
+            return;
+        }
+        
+        $data['cat_name'] = $cat_name ;
+        $data['s_number'] = $s_number ;
+        $data['item_id'] = $item_id ;
+        $data['parent_cat_id'] = $parent_cat_id ;
+        if ($parent_cat_id > 0 ) {
+           $data['level'] = 3;
+        }else{
+            $data['level'] = 2;
+        }
+
+        if ($cat_id > 0 ) {
+            
+            $ret = D("Catalog")->where(" cat_id = '$cat_id' ")->save($data);
+            $return = D("Catalog")->where(" cat_id = '$cat_id' ")->find();
+
+        }else{
+            $data['addtime'] = time();
+            $cat_id = D("Catalog")->add($data);
+            $return = D("Catalog")->where(" cat_id = '$cat_id' ")->find();
+            
+        }
+        if (!$return) {
+            $return['error_code'] = 10103 ;
+            $return['error_message'] = 'request  fail' ;
+        }
+        $this->sendResult($return);
+        
+    }
+
+    //删除目录
+    public function delete(){
+        $cat_id = I("cat_id/d")? I("cat_id/d") : 0;
+        $cat = D("Catalog")->where(" cat_id = '$cat_id' ")->find();
+        $item_id = $cat['item_id'];
+        
+        $login_user = $this->checkLogin();
+        if (!$this->checkItemPermn($login_user['uid'] , $item_id)) {
+            $return['error_code'] = -1 ;
+            $return['error_message'] = L('no_permissions');
+            $this->sendResult($return);
+            return;
+        }
+
+        if (D("Page")->where(" cat_id = '$cat_id' ")->find() || D("Catalog")->where(" parent_cat_id = '$cat_id' ")->find()) {
+            $return['error_code'] = -1 ;
+            $return['error_message'] = L('no_delete_empty_catalog') ;
+            $this->sendResult($return);
+            return;
+        }
+
+        if ($cat_id > 0 ) {
+            
+            $ret = D("Catalog")->where(" cat_id = '$cat_id' ")->delete();
+
+        }
+        if ($ret) {
+           $this->sendResult($ret);
+        }else{
+            $return['error_code'] = -1 ;
+            $return['error_message'] = 'request  fail' ;
+            $this->sendResult($return);
+        }
+    }
 }