From 45f5d00dea8fbfbe6d67a5aa9c03df25647d9767 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Mon, 2 Jul 2012 15:48:03 +0000
Subject: [PATCH]  * Refactory the clearData function.

---
 module/admin/control.php             | 26 ++++++--------------------
 module/admin/view/cleardata.html.php |  4 ++--
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index 7f87d8f6f0..d9fc4bfc9e 100644
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -112,36 +112,22 @@ class admin extends control
         }
     }
 
-    /**
-     * clear data.
-     * 
-     * @access public
-     * @return void
-     */
-    public function clearData()
-    {
-        if(!empty($_POST))
-        {
-            $this->confirmClearData();
-        }
-
-        $this->display();
-    }
-
     /**
      * Confirm clear data.
      * 
-     * @param  string $confirm no|yes
+     * @param  string $confirm ''|no|yes
      * @access public
      * @return void
      */
-    public function confirmClearData($confirm = 'no')
+    public function clearData($confirm = '')
     {
+        if($confirm == '') $this->display();
+
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->admin->confirmClearData, inlink('confirmClearData', "confirm=yes")));
+            die(js::confirm($this->lang->admin->confirmClearData, inlink('clearData', "confirm=yes")));
         }
-        else
+        elseif($confirm == 'yes')
         {
             $result = $this->admin->clearData();
             if($result)
diff --git a/module/admin/view/cleardata.html.php b/module/admin/view/cleardata.html.php
index f8e409cc1f..54d8e27775 100755
--- a/module/admin/view/cleardata.html.php
+++ b/module/admin/view/cleardata.html.php
@@ -11,11 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<form method='post' target='hiddenwin'>
+<form method='post' target='hiddenwin' action='<?php echo $this->inLink('clearData', 'confirm=no')?>'>
   <table align='center' class='table-5'>
     <caption><?php echo $lang->admin->clearData;?></caption>
     <tr><td><?php echo nl2br($lang->admin->clearDataDesc);?></td></tr>
-    <tr><td class='a-center'><?php echo html::submitButton($lang->admin->clearData) . html::hidden('confirm', 'no');?></td></tr>
+    <tr><td class='a-center'><?php echo html::submitButton($lang->admin->clearData);?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>