From e522b82a7e6f76e813fae0ddadb45ddd4ccd4a6a Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Tue, 17 Apr 2018 15:53:36 +0800
Subject: [PATCH] * Add saveSuccess to common lang files.

---
 module/admin/control.php          | 2 +-
 module/admin/lang/en.php          | 9 ++++-----
 module/admin/lang/zh-cn.php       | 9 ++++-----
 module/admin/lang/zh-tw.php       | 9 ++++-----
 module/common/lang/en.php         | 1 +
 module/common/lang/zh-cn.php      | 1 +
 module/common/lang/zh-tw.php      | 1 +
 module/common/model.php           | 2 +-
 module/entry/control.php          | 4 ++--
 module/entry/lang/en.php          | 1 -
 module/entry/lang/zh-cn.php       | 1 -
 module/entry/lang/zh-tw.php       | 1 -
 module/mail/lang/en.php           | 1 -
 module/mail/lang/zh-cn.php        | 1 -
 module/mail/lang/zh-tw.php        | 1 -
 module/mail/view/save.html.php    | 2 +-
 module/product/control.php        | 6 +++---
 module/product/view/edit.html.php | 7 ++++++-
 module/product/view/view.html.php | 7 +++++--
 module/webhook/control.php        | 4 ++--
 module/webhook/lang/en.php        | 1 -
 module/webhook/lang/zh-cn.php     | 1 -
 module/webhook/lang/zh-tw.php     | 1 -
 23 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index db0f309c6a..967b5101e5 100644
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -328,7 +328,7 @@ class admin extends control
 
             $this->loadModel('setting')->setItem('system.admin.log.saveDays', $this->post->days);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
-            $this->send(array('result' => 'success', 'message' => $this->lang->admin->saveSuccess, 'locate' => 'reload'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
         }
 
         $this->loadModel('message');
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 643e542eff..ba89d1f93d 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -21,11 +21,10 @@ $lang->admin->ztCompany     = 'Verify your company';
 $lang->admin->captcha       = 'Verification Code';
 $lang->admin->getCaptcha    = 'Get Verification Code';
 
-$lang->admin->api           = 'API';
-$lang->admin->log           = 'Log';
-$lang->admin->setting       = 'Setting';
-$lang->admin->days          = 'Valid Days';
-$lang->admin->saveSuccess   = 'Saved.';
+$lang->admin->api     = 'API';
+$lang->admin->log     = 'Log';
+$lang->admin->setting = 'Setting';
+$lang->admin->days    = 'Valid Days';
 
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'Current Version is %s. ';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 0bf757b4a5..101ad988df 100644
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -21,11 +21,10 @@ $lang->admin->ztCompany     = '认证公司';
 $lang->admin->captcha       = '验证码';
 $lang->admin->getCaptcha    = '获取验证码';
 
-$lang->admin->api           = '接口';
-$lang->admin->log           = '日志';
-$lang->admin->setting       = '设置';
-$lang->admin->days          = '日志保存天数';
-$lang->admin->saveSuccess   = '保存成功';
+$lang->admin->api     = '接口';
+$lang->admin->log     = '日志';
+$lang->admin->setting = '设置';
+$lang->admin->days    = '日志保存天数';
 
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = '当前系统的版本是%s，';
diff --git a/module/admin/lang/zh-tw.php b/module/admin/lang/zh-tw.php
index 573bfc2be9..43c58f3900 100644
--- a/module/admin/lang/zh-tw.php
+++ b/module/admin/lang/zh-tw.php
@@ -21,11 +21,10 @@ $lang->admin->ztCompany     = '認證公司';
 $lang->admin->captcha       = '驗證碼';
 $lang->admin->getCaptcha    = '獲取驗證碼';
 
-$lang->admin->api           = '介面';
-$lang->admin->log           = '日誌';
-$lang->admin->setting       = '設置';
-$lang->admin->days          = '日誌保存天數';
-$lang->admin->saveSuccess   = '保存成功';
+$lang->admin->api     = '介面';
+$lang->admin->log     = '日誌';
+$lang->admin->setting = '設置';
+$lang->admin->days    = '日誌保存天數';
 
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = '當前系統的版本是%s，';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 029645499d..dfa899f4df 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -41,6 +41,7 @@ $lang->export       = 'Export';
 $lang->setFileName  = 'File Name';
 $lang->submitting   = 'Saving...';
 $lang->save         = 'Save';
+$lang->saveSuccess  = 'Saved successfully';
 $lang->confirm      = 'Confirm';
 $lang->preview      = 'View';
 $lang->goback       = 'Back';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 5a4c86a81c..8af5b4e8c7 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -41,6 +41,7 @@ $lang->export       = '导出';
 $lang->setFileName  = '文件名：';
 $lang->submitting   = '稍候...';
 $lang->save         = '保存';
+$lang->saveSuccess  = '保存成功';
 $lang->confirm      = '确认';
 $lang->preview      = '查看';
 $lang->goback       = '返回';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index f41c593689..2eb86b5055 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -41,6 +41,7 @@ $lang->export       = '導出';
 $lang->setFileName  = '檔案名：';
 $lang->submitting   = '稍候...';
 $lang->save         = '保存';
+$lang->saveSuccess  = '保存成功';
 $lang->confirm      = '確認';
 $lang->preview      = '查看';
 $lang->goback       = '返回';
diff --git a/module/common/model.php b/module/common/model.php
index 7fc17cbb3d..8f8ea981c0 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -762,7 +762,7 @@ EOD;
         if(strpos(',edit,copy,report,export,delete,', ",$method,") !== false) $module = 'common';
         $class = "icon-$module-$method";
         if(!$clickable) $class .= ' disabled';
-        if($icon) $class       .= ' icon-' . $icon;
+        if($icon)       $class .= ' icon-' . $icon;
 
 
         /* Create the icon link. */
diff --git a/module/entry/control.php b/module/entry/control.php
index b9cdaaedf5..dcd86a9293 100644
--- a/module/entry/control.php
+++ b/module/entry/control.php
@@ -49,7 +49,7 @@ class entry extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             $this->loadModel('action')->create('entry', $id, 'created');
-            $this->send(array('result' => 'success', 'message' => $this->lang->entry->saveSuccess, 'locate' => inlink('browse')));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
         $this->view->title      = $this->lang->entry->api . $this->lang->colon . $this->lang->entry->create;
@@ -78,7 +78,7 @@ class entry extends control
                 $actionID = $this->loadModel('action')->create('entry', $id, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->send(array('result' => 'success', 'message' => $this->lang->entry->saveSuccess, 'locate' => inlink('browse')));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
         $entry = $this->entry->getById($id);
diff --git a/module/entry/lang/en.php b/module/entry/lang/en.php
index d99fbc11b7..4465605caf 100644
--- a/module/entry/lang/en.php
+++ b/module/entry/lang/en.php
@@ -25,7 +25,6 @@ $lang->entry->editedDate  = 'Edited Date';
 $lang->entry->date        = 'Request Time';
 $lang->entry->url         = 'Request URL';
 
-$lang->entry->saveSuccess   = 'Save success.';
 $lang->entry->confirmDelete = 'Are you sure delete this entry?';
 $lang->entry->help          = 'Help';
 
diff --git a/module/entry/lang/zh-cn.php b/module/entry/lang/zh-cn.php
index c2afc09d0d..ab2b5553da 100644
--- a/module/entry/lang/zh-cn.php
+++ b/module/entry/lang/zh-cn.php
@@ -25,7 +25,6 @@ $lang->entry->editedDate  = '编辑时间';
 $lang->entry->date        = '请求时间';
 $lang->entry->url         = '请求地址';
 
-$lang->entry->saveSuccess   = '保存成功';
 $lang->entry->confirmDelete = '您确认要删除该应用吗？';
 $lang->entry->help          = '使用说明';
 
diff --git a/module/entry/lang/zh-tw.php b/module/entry/lang/zh-tw.php
index 9cb390ef38..e02e989d73 100644
--- a/module/entry/lang/zh-tw.php
+++ b/module/entry/lang/zh-tw.php
@@ -25,7 +25,6 @@ $lang->entry->editedDate  = '編輯時間';
 $lang->entry->date        = '請求時間';
 $lang->entry->url         = '請求地址';
 
-$lang->entry->saveSuccess   = '保存成功';
 $lang->entry->confirmDelete = '您確認要刪除該應用嗎？';
 $lang->entry->help          = '使用說明';
 
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index 1995ef3aec..f1e1dc9f84 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -4,7 +4,6 @@ $lang->mail->index         = 'Home';
 $lang->mail->detect        = 'Testing';
 $lang->mail->edit          = 'Edit Settings';
 $lang->mail->save          = 'Save';
-$lang->mail->saveSuccess   = 'Saved Successfully';
 $lang->mail->test          = 'Email Sending Test';
 $lang->mail->reset         = 'Reset';
 $lang->mail->resend        = 'Resend';
diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php
index 2cce024cad..fe70acb5a3 100755
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -4,7 +4,6 @@ $lang->mail->index         = '首页';
 $lang->mail->detect        = '检测';
 $lang->mail->edit          = '编辑配置';
 $lang->mail->save          = '保存';
-$lang->mail->saveSuccess   = '保存成功';
 $lang->mail->test          = '测试发信';
 $lang->mail->reset         = '重置';
 $lang->mail->resend        = '重发';
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index 1c50f650b4..e39bbe1633 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -4,7 +4,6 @@ $lang->mail->index         = '首頁';
 $lang->mail->detect        = '檢測';
 $lang->mail->edit          = '編輯配置';
 $lang->mail->save          = '保存';
-$lang->mail->saveSuccess   = '保存成功';
 $lang->mail->test          = '測試發信';
 $lang->mail->reset         = '重置';
 $lang->mail->resend        = '重發';
diff --git a/module/mail/view/save.html.php b/module/mail/view/save.html.php
index 2b1b0005d6..16908a3f2c 100755
--- a/module/mail/view/save.html.php
+++ b/module/mail/view/save.html.php
@@ -16,7 +16,7 @@
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['mail']);?></span>
       <strong><?php echo $lang->mail->common;?></strong>
-      <small class='text-success'> <?php echo $lang->mail->saveSuccess;?> <?php echo html::icon('ok-sign');?></small>
+      <small class='text-success'> <?php echo $lang->saveSuccess;?> <?php echo html::icon('ok-sign');?></small>
     </div>
   </div>
   <div class='alert alert-block with-icon'>
diff --git a/module/product/control.php b/module/product/control.php
index 862a0ee779..bd7bbe2df8 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -219,15 +219,15 @@ class product extends control
         if(!empty($_POST))
         {
             $productID = $this->product->create();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('product', $productID, 'opened');
 
             if(isset($this->config->global->flow) and $this->config->global->flow == 'onlyTest')
             {
-                die(js::locate($this->createLink($this->moduleName, 'build', "productID=$productID"), 'parent'));
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($this->moduleName, 'build', "productID=$productID")));
             }
 
-            die(js::locate($this->createLink($this->moduleName, 'browse', "productID=$productID"), 'parent'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($this->moduleName, 'browse', "productID=$productID")));
         }
 
         $this->product->setMenu($this->products, key($this->products));
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 57583ce1f9..f0d406c872 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -66,7 +66,12 @@
             <th><?php echo $lang->product->whitelist;?></th>
             <td colspan='2'><?php echo html::checkbox('whitelist', $groups, $product->whitelist);?></td>
           </tr>  
-          <tr><td></td><td colspan='2'><?php echo html::submitButton();?></td></tr>
+          <tr>
+            <td colspan='3' class='text-center'>
+              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+            </td>
+          </tr>
         </tbody>
       </table>
     </form>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 2a94d30bb1..43f21e9adf 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -215,8 +215,11 @@
     if(!$product->deleted)
     {
         ob_start();
-        common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe text-danger', true);
-        echo "<div class='divider'></div>";
+        if($product->status != 'closed')
+        {
+            common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe text-danger', true);
+            echo "<div class='divider'></div>";
+        }
 
         common::printIcon('product', 'edit', $params, $product);
         common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin');
diff --git a/module/webhook/control.php b/module/webhook/control.php
index 86382877bd..3c367a03c8 100644
--- a/module/webhook/control.php
+++ b/module/webhook/control.php
@@ -53,7 +53,7 @@ class webhook extends control
         {
             $this->webhook->create();
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
-            $this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse')));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
         $this->app->loadLang('action');
@@ -80,7 +80,7 @@ class webhook extends control
         {
             $this->webhook->update($id);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
-            $this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse')));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
         $this->app->loadLang('action');
diff --git a/module/webhook/lang/en.php b/module/webhook/lang/en.php
index 5382fa3645..de81884c53 100644
--- a/module/webhook/lang/en.php
+++ b/module/webhook/lang/en.php
@@ -48,7 +48,6 @@ $lang->webhook->paramsList['date']       = 'Date';
 $lang->webhook->paramsList['comment']    = 'Comment';
 $lang->webhook->paramsList['text']       = 'Action Desc';
 
-$lang->webhook->saveSuccess   = 'Save success.';
 $lang->webhook->confirmDelete = 'Are your sure delete this hook?';
 
 $lang->webhook->trimWords = '';
diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php
index f72ca1f8ef..0a18d0c807 100644
--- a/module/webhook/lang/zh-cn.php
+++ b/module/webhook/lang/zh-cn.php
@@ -48,7 +48,6 @@ $lang->webhook->paramsList['date']       = '操作日期';
 $lang->webhook->paramsList['comment']    = '备注';
 $lang->webhook->paramsList['text']       = '操作内容';
 
-$lang->webhook->saveSuccess   = '保存成功';
 $lang->webhook->confirmDelete = '您确认要删除该webhook吗？';
 
 $lang->webhook->trimWords = '了';
diff --git a/module/webhook/lang/zh-tw.php b/module/webhook/lang/zh-tw.php
index 447d3c0769..77eb4542b1 100644
--- a/module/webhook/lang/zh-tw.php
+++ b/module/webhook/lang/zh-tw.php
@@ -48,7 +48,6 @@ $lang->webhook->paramsList['date']       = '操作日期';
 $lang->webhook->paramsList['comment']    = '備註';
 $lang->webhook->paramsList['text']       = '操作內容';
 
-$lang->webhook->saveSuccess   = '保存成功';
 $lang->webhook->confirmDelete = '您確認要刪除該webhook嗎？';
 
 $lang->webhook->trimWords = '了';