diff --git a/module/port/control.php b/module/port/control.php index decc297470..0725f3a71a 100644 --- a/module/port/control.php +++ b/module/port/control.php @@ -104,13 +104,11 @@ class port extends control $file = $this->loadModel('file')->getUpload('file'); $file = $file[0]; $shortName = $this->file->getSaveName($file['pathname']); - if(empty($shortName)) - { - die(js::alert($this->lang->excel->emptyFileName)); - } - $extension = $file['extension']; - $fileName = $this->file->savePath . $shortName; + if(empty($shortName)) die(js::alert($this->lang->excel->emptyFileName)); + + $extension = $file['extension']; + $fileName = $this->file->savePath . $shortName; move_uploaded_file($file['tmpname'], $fileName); diff --git a/module/port/model.php b/module/port/model.php index 91a7d79a7a..7dae8978f5 100644 --- a/module/port/model.php +++ b/module/port/model.php @@ -401,10 +401,8 @@ class portModel extends model $dataList = array(); $sysDataFields = explode(',', $this->portConfig->sysDataFields); - foreach($sysDataFields as $field) - { - $dataList[$field] = $this->loadModel($field)->getPairs(); - } + + foreach($sysDataFields as $field) $dataList[$field] = $this->loadModel($field)->getPairs(); return $dataList; } @@ -523,8 +521,7 @@ class portModel extends model */ public function getSourceByLang($lang) { - $lang = isset($this->modelLang->$lang) ? $this->modelLang->$lang : ''; - return $lang; + return isset($this->modelLang->$lang) ? $this->modelLang->$lang : ''; } /** @@ -733,10 +730,7 @@ class portModel extends model } /* Deal children datas and multiple tasks .*/ - if($modelDatas) - { - $modelDatas = $this->updateChildDatas($modelDatas); - } + if($modelDatas) $modelDatas = $this->updateChildDatas($modelDatas); return $modelDatas; } @@ -790,10 +784,7 @@ class portModel extends model $relatedObjectIdList = array(); $relatedObjects = array(); - foreach($datas as $data) - { - $relatedObjectIdList[$data->$object] = $data->$object; - } + foreach($datas as $data) $relatedObjectIdList[$data->$object] = $data->$object; if($object == 'openedBuild') $object = 'build';