From 3eccc858eb8a20af4ce900760572bd671d30106b Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 8 Aug 2022 10:57:31 +0800
Subject: [PATCH] * Format Code for port.

---
 module/caselib/lang/de.php              |  2 +-
 module/caselib/lang/fr.php              |  2 +-
 module/caselib/lang/vi.php              |  2 +-
 module/caselib/lang/zh-cn.php           |  2 +-
 module/caselib/lang/zh-tw.php           |  2 +-
 module/caselib/view/showimport.html.php | 32 ++++++++++++-------------
 module/group/lang/resource.php          |  4 ++--
 module/port/control.php                 |  7 +++++-
 module/port/model.php                   | 31 ++++++------------------
 module/port/view/header.html.php        | 30 +++++++++++------------
 10 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php
index e26b452b0c..ad755d2159 100644
--- a/module/caselib/lang/de.php
+++ b/module/caselib/lang/de.php
@@ -21,7 +21,7 @@ $lang->caselib->createCase       = 'Create Case';
 $lang->caselib->delete           = "Delete Suite";
 $lang->caselib->linkVersion      = "Version";
 $lang->caselib->deleted          = 'Deleted';
-$lang->caselib->exportTemplate    = 'Export Template';
+$lang->caselib->exportTemplate   = 'Export Template';
 $lang->caselib->batchCreateCase  = 'Batch Create';
 $lang->caselib->import           = 'Import';
 $lang->caselib->showImport       = 'Imported Data';
diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php
index 4a81eff2f3..c169f5b2a6 100644
--- a/module/caselib/lang/fr.php
+++ b/module/caselib/lang/fr.php
@@ -21,7 +21,7 @@ $lang->caselib->createCase       = 'Créer CasTest';
 $lang->caselib->delete           = "Supprimer Suite";
 $lang->caselib->linkVersion      = "Version";
 $lang->caselib->deleted          = 'Supprimé';
-$lang->caselib->exportTemplate    = 'Exporter Modèle';
+$lang->caselib->exportTemplate   = 'Exporter Modèle';
 $lang->caselib->batchCreateCase  = 'Créer par lot';
 $lang->caselib->import           = 'Importer';
 $lang->caselib->showImport       = 'Données Importées';
diff --git a/module/caselib/lang/vi.php b/module/caselib/lang/vi.php
index 5b5c7eb1d8..50e5831f53 100644
--- a/module/caselib/lang/vi.php
+++ b/module/caselib/lang/vi.php
@@ -21,7 +21,7 @@ $lang->caselib->createCase      = 'Tạo tình huống';
 $lang->caselib->delete          = "Xóa Suite";
 $lang->caselib->linkVersion     = "Phiên bản";
 $lang->caselib->deleted         = 'Đã xóa';
-$lang->caselib->exportTemplate   = 'Xuất mẫu';
+$lang->caselib->exportTemplate  = 'Xuất mẫu';
 $lang->caselib->batchCreateCase = 'Tạo hàng loạt';
 $lang->caselib->import          = 'Nhập';
 $lang->caselib->importAction    = 'Nhập tình huống';
diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php
index 96371f98c8..1f30e8c5f1 100644
--- a/module/caselib/lang/zh-cn.php
+++ b/module/caselib/lang/zh-cn.php
@@ -21,7 +21,7 @@ $lang->caselib->createCase       = '创建用例';
 $lang->caselib->delete           = "删除";
 $lang->caselib->linkVersion      = "版本";
 $lang->caselib->deleted          = '已删除';
-$lang->caselib->exportTemplate    = '导出模板';
+$lang->caselib->exportTemplate   = '导出模板';
 $lang->caselib->batchCreateCase  = '批量创建用例';
 $lang->caselib->import           = '导入';
 $lang->caselib->showImport       = '显示导入数据';
diff --git a/module/caselib/lang/zh-tw.php b/module/caselib/lang/zh-tw.php
index 7b0c73a0a8..a6c51091eb 100644
--- a/module/caselib/lang/zh-tw.php
+++ b/module/caselib/lang/zh-tw.php
@@ -21,7 +21,7 @@ $lang->caselib->createCase       = '創建用例';
 $lang->caselib->delete           = "刪除";
 $lang->caselib->linkVersion      = "版本";
 $lang->caselib->deleted          = '已刪除';
-$lang->caselib->exportTemplate    = '導出模板';
+$lang->caselib->exportTemplate   = '導出模板';
 $lang->caselib->batchCreateCase  = '批量創建用例';
 $lang->caselib->import           = '導入';
 $lang->caselib->showImport       = '顯示導入數據';
diff --git a/module/caselib/view/showimport.html.php b/module/caselib/view/showimport.html.php
index af3cdacb07..bb360fbda2 100644
--- a/module/caselib/view/showimport.html.php
+++ b/module/caselib/view/showimport.html.php
@@ -1,16 +1,16 @@
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <?php
-    $requiredFields = $datas->requiredFields;
-    $allCount       = $datas->allCount;
-    $allPager       = $datas->allPager;
-    $pagerID        = $datas->pagerID;
-    $isEndPage      = $datas->isEndPage;
-    $maxImport      = $datas->maxImport;
-    $dataInsert     = $datas->dataInsert;
-    $fields         = $datas->fields;
-    $suhosinInfo    = $datas->suhosinInfo;
-    $model          = $datas->model;
-    $datas          = $datas->datas;
+$requiredFields = $datas->requiredFields;
+$allCount       = $datas->allCount;
+$allPager       = $datas->allPager;
+$pagerID        = $datas->pagerID;
+$isEndPage      = $datas->isEndPage;
+$maxImport      = $datas->maxImport;
+$dataInsert     = $datas->dataInsert;
+$fields         = $datas->fields;
+$suhosinInfo    = $datas->suhosinInfo;
+$model          = $datas->model;
+$datas          = $datas->datas;
 ?>
 <style>
 form{overflow-x: scroll}
@@ -25,7 +25,7 @@ form{overflow-x: scroll}
 <?php elseif(empty($maxImport) and $allCount > $this->config->file->maxImport):?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
-    <h2><?php echo $lang->task->import;?></h2>
+    <h2><?php echo $lang->port->import;?></h2>
   </div>
   <p><?php echo sprintf($lang->file->importSummary, $allCount, html::input('maxImport', $config->file->maxImport, "style='width:50px'"), ceil($allCount / $config->file->maxImport));?></p>
   <p><?php echo html::commonButton($lang->import, "id='import'", 'btn btn-primary');?></p>
@@ -44,13 +44,13 @@ $(function()
 <?php js::set('requiredFields', $requiredFields);?>
 <div id="mainContent" class="main-content">
   <div class="main-header clearfix">
-    <h2><?php echo $lang->task->import;?></h2>
+    <h2><?php echo $lang->port->import;?></h2>
   </div>
   <form class='main-form' target='hiddenwin' method='post'>
     <table class='table table-form' id='showData'>
       <thead>
         <tr>
-          <th class='w-70px'> <?php echo $lang->task->id?></th>
+          <th class='w-70px'> <?php echo $lang->port->id?></th>
 
           <?php foreach($fields as $key => $value):?>
 
@@ -102,7 +102,7 @@ $(function()
             }
             else
             {
-                $sub = (strpos($object->title, '>') === 0) ? " <sub style='vertical-align:sub;color:red'>{$lang->port->children}</sub>" : " <sub style='vertical-align:sub;color:gray'>{$lang->task->new}</sub>";
+                $sub = (strpos($object->title, '>') === 0) ? " <sub style='vertical-align:sub;color:red'>{$lang->port->children}</sub>" : " <sub style='vertical-align:sub;color:gray'>{$lang->port->new}</sub>";
                 echo $addID++ . $sub;
             }
             echo html::hidden("lib[$key]", $libID);
@@ -177,7 +177,7 @@ $(function()
               foreach($appendFields as $field)
               {
                   if(!$field->show) continue;
-                  $value = $field->defaultValue ? $field->defaultValue : zget($task, $field->field, '');
+                  $value = $field->defaultValue ? $field->defaultValue : zget($datas, $field->field, '');
                   echo '<td>' . $this->flow->buildControl($field, $value, "$field->field[$key]", true) . '</td>';
               }
           }
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index d613dfe5a6..333ecfee8e 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -981,7 +981,7 @@ $lang->resource->testcase->batchEdit               = 'batchEdit';
 $lang->resource->testcase->delete                  = 'deleteAction';
 $lang->resource->testcase->batchDelete             = 'batchDelete';
 $lang->resource->testcase->export                  = 'exportAction';
-$lang->resource->testcase->exportTemplate           = 'exportTemplate';
+$lang->resource->testcase->exportTemplate          = 'exportTemplate';
 $lang->resource->testcase->import                  = 'importAction';
 $lang->resource->testcase->showImport              = 'showImport';
 $lang->resource->testcase->confirmChange           = 'confirmChange';
@@ -1118,7 +1118,7 @@ $lang->resource->caselib->delete           = 'deleteAction';
 $lang->resource->caselib->view             = 'view';
 $lang->resource->caselib->createCase       = 'createCase';
 $lang->resource->caselib->batchCreateCase  = 'batchCreateCase';
-$lang->resource->caselib->exportTemplate    = 'exportTemplate';
+$lang->resource->caselib->exportTemplate   = 'exportTemplate';
 $lang->resource->caselib->import           = 'importAction';
 $lang->resource->caselib->showImport       = 'showImport';
 
diff --git a/module/port/control.php b/module/port/control.php
index 48b186e719..8bd1d77070 100644
--- a/module/port/control.php
+++ b/module/port/control.php
@@ -22,6 +22,8 @@ class port extends control
     /**
      * Export Template.
      *
+     * @param  int    $model
+     * @param  string $params
      * @access public
      * @return void
      */
@@ -91,6 +93,8 @@ class port extends control
     /**
      * Import.
      *
+     * @param  int    $model
+     * @param  string $locate
      * @access public
      * @return void
      */
@@ -135,6 +139,7 @@ class port extends control
      * Ajax get Tbody .
      *
      * @param  string $model
+     * @param  int    $lastID
      * @param  int    $pagerID
      * @access public
      * @return void
@@ -162,7 +167,7 @@ class port extends control
      * @param  string $model
      * @param  string $field
      * @param  string $value
-     * @param  string $id
+     * @param  string $index
      * @access public
      * @return void
      */
diff --git a/module/port/model.php b/module/port/model.php
index 6d52295e9f..7ef2fc73b7 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -141,7 +141,7 @@ class portModel extends model
     {
         if(file_exists($filePath))
         {
-            $tmpPath = $this->app->getAppRoot() . 'tmp/import/excel';
+            $tmpPath = $this->app->getAppRoot() . 'tmp/import/excel' . $this->app->user->account . time();
             $this->app->loadClass('pclzip', true);
             $zip   = new pclzip($filePath);
             $zip->extract(PCLZIP_OPT_PATH, $tmpPath);
@@ -171,30 +171,11 @@ class portModel extends model
             }
 
             $result = $zip->create($tmpPath,PCLZIP_OPT_REMOVE_PATH,$tmpPath);
-            $this->deleteDir($tmpPath);
+            $zfile  = $this->app->loadClass('zfile');
+            $zfile->removeDir($tmpPath);
         }
     }
 
-    /**
-     * Delete directory.
-     *
-     * @param string $dir
-     */
-    public function deleteDir($dir)
-    {
-        foreach (scandir($dir) as $file) {
-            if ($file === '.' || $file === '..') {
-                continue;
-            } elseif (is_file($dir . '/' . $file)) {
-                unlink($dir . '/' . $file);
-            } elseif (is_dir($dir . '/' . $file)) {
-                $this->deleteDir($dir . '/' . $file);
-            }
-        }
-
-        rmdir($dir);
-    }
-
     /**
      * export
      *
@@ -225,6 +206,7 @@ class portModel extends model
     /**
      * Init postFields.
      *
+     * @param  string $model
      * @access public
      * @return void
      */
@@ -412,7 +394,7 @@ class portModel extends model
      * Init system datafields list.
      *
      * @access public
-     * @return void
+     * @return array
      */
     public function initSysDataFields()
     {
@@ -478,7 +460,7 @@ class portModel extends model
      * @param  string $model
      * @param  string $filter
      * @access public
-     * @return void
+     * @return array
      */
     public function format($model = '', $filter = '')
     {
@@ -903,6 +885,7 @@ class portModel extends model
     /**
      * Get datas by file.
      *
+     * @param  int    $file
      * @access public
      * @return void
      */
diff --git a/module/port/view/header.html.php b/module/port/view/header.html.php
index 97b63a50f5..134d9ef81b 100644
--- a/module/port/view/header.html.php
+++ b/module/port/view/header.html.php
@@ -1,19 +1,19 @@
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <?php
-    $requiredFields = $datas->requiredFields;
-    $allCount       = $datas->allCount;
-    $allPager       = $datas->allPager;
-    $pagerID        = $datas->pagerID;
-    $isEndPage      = $datas->isEndPage;
-    $maxImport      = $datas->maxImport;
-    $dataInsert     = $datas->dataInsert;
-    $fields         = $datas->fields;
-    $suhosinInfo    = $datas->suhosinInfo;
-    $model          = $datas->model;
-    $datas          = $datas->datas;
-    $appendFields   = $this->session->appendFields;
-    $notEmptyRule   = $this->session->notEmptyRule;
-    $insert         = $this->session->insert;
+$requiredFields = $datas->requiredFields;
+$allCount       = $datas->allCount;
+$allPager       = $datas->allPager;
+$pagerID        = $datas->pagerID;
+$isEndPage      = $datas->isEndPage;
+$maxImport      = $datas->maxImport;
+$dataInsert     = $datas->dataInsert;
+$fields         = $datas->fields;
+$suhosinInfo    = $datas->suhosinInfo;
+$model          = $datas->model;
+$datas          = $datas->datas;
+$appendFields   = $this->session->appendFields;
+$notEmptyRule   = $this->session->notEmptyRule;
+$insert         = $this->session->insert;
 ?>
 <style>
 form{overflow-x: scroll}
@@ -28,7 +28,7 @@ form{overflow-x: scroll}
 <?php elseif(empty($maxImport) and $allCount > $this->config->file->maxImport):?>
 <div id="mainContent" class="main-content">
   <div class="main-header">
-    <h2><?php echo $lang->task->import;?></h2>
+    <h2><?php echo $lang->port->import;?></h2>
   </div>
   <p><?php echo sprintf($lang->file->importSummary, $allCount, html::input('maxImport', $config->file->maxImport, "style='width:50px'"), ceil($allCount / $config->file->maxImport));?></p>
   <p><?php echo html::commonButton($lang->import, "id='import'", 'btn btn-primary');?></p>