From ba9e613f1dda394666d1b4dc868f888dee86fea0 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Mon, 15 Jul 2013 00:16:07 +0000
Subject: [PATCH]  * code for task#1541.

---
 module/api/control.php        | 14 ++++++++++----
 module/api/lang/en.php        |  3 ++-
 module/api/lang/zh-cn.php     |  3 ++-
 module/api/view/view.html.php |  7 ++++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/module/api/control.php b/module/api/control.php
index 3108871640..7077325619 100644
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -76,16 +76,22 @@ class api extends control
                 $param = '';
                 if($action == 'extendModel')
                 {
-                    foreach($_POST as $key => $value) $param .= ',' . $key . '=' . $value;
-                    $param = ltrim($param, ',');
+                    if(!isset($_POST['noparam']))
+                    {
+                        foreach($_POST as $key => $value) $param .= ',' . $key . '=' . $value;
+                        $param = ltrim($param, ',');
+                    }
                     $url   = rtrim($host, '/') . inlink('getModel',  "moduleName={$method->className}&methodName={$method->methodName}&params=$param", 'json');
                     $url  .= $this->config->requestType == "PATH_INFO" ? '?' : '&';
                     $url  .= $this->config->sessionVar . '=' . session_id();
                 }
                 else
                 {
-                    foreach($_POST as $key => $value) $param .= '&' . $key . '=' . $value;
-                    $param = ltrim($param, '&');
+                    if(!isset($_POST['noparam']))
+                    {
+                        foreach($_POST as $key => $value) $param .= '&' . $key . '=' . $value;
+                        $param = ltrim($param, '&');
+                    }
                     $url   = rtrim($host, '/') . $this->createLink($method->className, $method->methodName, $param, 'json');
                     $url  .= $this->config->requestType == "PATH_INFO" ? '?' : '&';
                     $url  .= $this->config->sessionVar . '=' . session_id();
diff --git a/module/api/lang/en.php b/module/api/lang/en.php
index feb159dd16..10aa5619b7 100644
--- a/module/api/lang/en.php
+++ b/module/api/lang/en.php
@@ -17,9 +17,10 @@ $lang->api->position  = 'Position';
 $lang->api->startLine = "%s, line %s";
 $lang->api->desc      = 'Desc';
 $lang->api->debug     = 'Debug';
-$lang->api->noParam   = 'No params in this method';
 $lang->api->submit    = 'submit';
 $lang->api->url       = 'Request url';
 $lang->api->result    = 'Result';
 $lang->api->status    = 'status';
 $lang->api->data      = 'data';
+$lang->api->noParam   = 'No params in this method';
+$lang->api->post      = 'Refer to corresponding form for debugging POST.';
diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php
index 0210bfcafa..250963437c 100644
--- a/module/api/lang/zh-cn.php
+++ b/module/api/lang/zh-cn.php
@@ -17,9 +17,10 @@ $lang->api->position  = '位置';
 $lang->api->startLine = "%s,%s行";
 $lang->api->desc      = '描述';
 $lang->api->debug     = '调试';
-$lang->api->noParam   = '该方法没有参数';
 $lang->api->submit    = '提交';
 $lang->api->url       = '请求地址';
 $lang->api->result    = '返回结果';
 $lang->api->status    = '状态';
 $lang->api->data      = '内容';
+$lang->api->noParam   = 'GET方式调试不需要输入参数，';
+$lang->api->post      = 'POST方式调试请参照页面表单';
diff --git a/module/api/view/view.html.php b/module/api/view/view.html.php
index a2e18c804d..828e32dcae 100644
--- a/module/api/view/view.html.php
+++ b/module/api/view/view.html.php
@@ -19,8 +19,8 @@
   <tr>
     <td>
       <?php echo "<p class='strong'>{$lang->api->debug}</p>"?>
-      <?php if($method->parameters):?>
       <form method='post' id='apiForm'>
+      <?php if($method->parameters):?>
         <table>
           <?php foreach($method->parameters as $param):?>
           <tr>
@@ -34,10 +34,11 @@
             <td>
           </tr>
         </table>
-      </form>
       <?php else:?>
-      <?php echo $lang->api->noParam;?>
+      <?php echo html::hidden('noparam', '0') . $lang->api->noParam . html::submitButton($lang->api->submit);?>
       <?php endif;?>
+      </form>
+      <?php if($method->post) echo "<p>{$lang->api->post}</p>"?>
     </td>
   </tr>
   <tr>