Merge branch 'hotfix/v1.1.2' into develop

protected/class/itemfile.php

@@ -30,8 +30,8 @@ class ItemFile {
     }
 
     public function updateItemFields($id, $fname, $tips) {
-	$this->__itemfile->filename = iconv('GB2312', 'UTF-8', $fname);
-	$this->__itemfile->tips = iconv('GB2312', 'UTF-8', $tips);
+	$this->__itemfile->filename = iconv('GBK', 'UTF-8', $fname);
+	$this->__itemfile->tips = iconv('GBK', 'UTF-8', $tips);
 	return $this->__itemfile->update(array('where' => 'iaid=?', 'param' => array($id)));
     }
 

protected/config/ver.conf.php

@@ -1,5 +1,5 @@
 <?php
 
 // Version
-$config['ver'] = 'v1.1';
+$config['ver'] = 'v1.1.2';
 

protected/controller/ClientController.php

@@ -95,7 +95,7 @@ class ClientController extends DooController
                     echo json_encode($status, JSON_UNESCAPED_UNICODE);
                     die();
                 }
-                $id = $this->actmeasure->insertMeasure(intval($this->params['uid']), $retval['pid'], $retval['stid'], iconv('GB2312', 'UTF-8', $this->params['bname']));
+                $id = $this->actmeasure->insertMeasure(intval($this->params['uid']), $retval['pid'], $retval['stid'], iconv('GBK', 'UTF-8', $this->params['bname']));
                 $this->measureauditact->insertMeasureAudit($pArray['pid'], 0, $pArray['uid'], 0, $id, $retval['stid'], 1, 'uncheck', 1); //加入业主
                 $uArray = $this->profile->getProWithUid($retval['uid']);
                 $strAvatar = $this->auth->getAvatar($uArray['userid']);
@@ -684,7 +684,7 @@ class ClientController extends DooController
     function auditMeasure()
     {
         if (isset($_POST['userid']) && isset($_POST['tenderid']) && isset($_POST['phaseno']) && isset($_POST['MD5_JL'])) {
-            $auditcontent = iconv('GB2312', 'UTF-8', $_POST['CheckerMemo']);
+            $auditcontent = iconv('GBK', 'UTF-8', $_POST['CheckerMemo']);
             $auditArray = $this->measureauditact->getLastNewRowInfo($_POST['tenderid'], $_POST['phaseno'], $_POST['userid']);
             if (isset($auditArray ['mastatus']) && ($auditArray ['mastatus'] == 'checked') || ($auditArray ['mastatus'] == 'checkno')) {
                 echo json_encode(array('status' => FALSE, 'msg' => '已审核完毕，请勿重复提交'), JSON_UNESCAPED_UNICODE);
@@ -881,7 +881,7 @@ class ClientController extends DooController
     function setCheckno()
     {
         if (isset($this->params['userid']) && isset($this->params['tenderid']) && isset($this->params['phaseno']) && isset($_POST['MD5_JL'])) {
-            $auditcontent = iconv('GB2312', 'UTF-8', $_POST['CheckerMemo']);
+            $auditcontent = iconv('GBK', 'UTF-8', $_POST['CheckerMemo']);
             $auditArray = $this->measureauditact->getRowInfo($this->params['tenderid'], $this->params['phaseno'], $this->params['userid']);
             if (isset($auditArray['maid'])) {
                 $intMaxTimes = $this->numofperact->getMaxTimes($this->params['tenderid'], $this->params['phaseno']);
@@ -986,7 +986,7 @@ class ClientController extends DooController
     public function updateTenderName()
     {
         if (isset($this->params['BidID']) && isset($this->params['BidNewName'])) {
-            if ($this->actmeasure->updateName($this->params['BidID'], iconv('GB2312', 'UTF-8', $this->params['BidNewName']))) {
+            if ($this->actmeasure->updateName($this->params['BidID'], iconv('GBK', 'UTF-8', $this->params['BidNewName']))) {
                 echo json_encode(array('status' => 'TRUE', 'msg' => ''), JSON_UNESCAPED_UNICODE);
                 die();
             } else {
@@ -1013,9 +1013,9 @@ class ClientController extends DooController
             }
             $fileArray = $this->upItemFile('upitem')[0];
             if (isset($fileArray['filepath'])) {
-                $memoStr = iconv('GB2312', 'UTF-8', $_POST['Memo']);
+                $memoStr = iconv('GBK', 'UTF-8', $_POST['Memo']);
                 $fnArray = explode('.', $fileArray['filename']);
-                $filenameStr = iconv('GB2312', 'UTF-8', $fnArray[0]);
+                $filenameStr = iconv('GBK', 'UTF-8', $fnArray[0]);
                 $postArray = array('mpid' => $this->params['tenderid'], 'ownerid' => $this->params['uid'], 'itemid' => $_POST['itemid'], 'filename' => $filenameStr, 'filesize' => $fileArray['filesize'], 'fileext' => $fileArray['fileext'], 'filepath' => $fileArray['filepath'], 'categoryid' => array_search($_POST['Category'], $this->fileTypeArray), 'tips' => $memoStr);
                 if ($this->itemfile->insertItemFileRecord($postArray) > 1) {
                     $extPath = pathinfo($fileArray['filepath']);