计量支付附件、短信合并

字符串拼接时，单引号被分割为空格链接。

protected/config/sms.conf.php

@@ -1,4 +1,5 @@
 <?php
 $config['SMS_URL'] = 'http://sms.haotingyun.com/v2/sms/single_send.json';
 $config['SMS_AUTHKEY'] = 'fb5ef483e44b9556512a9febef376051';
-$config['SMS_TIPS'] = array('AUDIT_NOTICE' => '【纵横通行账号】您的验证码是', 'END_MSG' => '，15分钟内有效。', 'AUDIT_NOTICE_AUDITOR' => '，已审批通过。请您继续审批。', 'AUDIT_NOTICE_AUDITOR2' => '，需要您继续审批。');
+$config['SMS_TIPS_PRE'] = '【纵横计量支付】';
+$config['SMS_TIPS'] = array('AUDIT_NOTICE' => $config['SMS_TIPS_PRE'] . '验证码：', 'END_MSG' => '，15分钟内有效。', 'AUDIT_NOTICE_AUDITOR' => '，已审批通过。请您继续审批。', 'AUDIT_NOTICE_AUDITOR2' => '，需要您继续审批。');

protected/controller/ClientController.php

@@ -180,7 +180,7 @@ class ClientController extends DooController
                                 $verifyUserArray = $this->profile->getVerifiedMobile($firstAuditor['auditoruid']);
                                 $pmnameArray = $this->actmeasure->getRowByPmid($this->params['tenderid']);
                                 if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// // XXXX（标段名），陈特，已审批通过。请您继续审批。
-                                    $this->__auditNotice($verifyUserArray['mobile'], $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
+                                    $this->__auditNotice($verifyUserArray['mobile'], Doo::conf()->SMS_TIPS_PRE . $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
                                 }
                                 // SMS End
                             }
@@ -772,16 +772,18 @@ class ClientController extends DooController
                                     if ($v['maid'] == $auditArray['maid']) {// 找到当前用户
                                         if ($k == ($countAudit - 1)) {//如果是最后一个
                                             $this->measureauditact->updateMastatus($auditUserArray[0]['maid']);
+                                            $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[0]['auditoruid']);
+                                            $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[0]['pmid']);
                                         } else {
                                             $this->measureauditact->updateMastatus($auditUserArray[$k + 1]['maid']);//变更下一个状态
-                                            // SMS Start
-                                            $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[$k]['auditoruid']);
-                                            $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[$k + 1]['pmid']);
-                                            if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// // XXXX（标段名），陈特，已审批通过。请您继续审批。
-                                                $this->__auditNotice($verifyUserArray['mobile'], $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
-                                            }
-                                            // SMS End
+                                            $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[$k + 1]['auditoruid']);
+                                            $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[$k]['pmid']);
                                         }
+                                        // SMS Start
+                                        if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// // XXXX（标段名），陈特，已审批通过。请您继续审批。
+                                            $this->__auditNotice($verifyUserArray['mobile'], Doo::conf()->SMS_TIPS_PRE . $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
+                                        }
+                                        // SMS End
                                         $this->numofperact->updateAuditStatus($_POST['tenderid'], $_POST['phaseno'], 'checking', $iniTimes);
                                         echo json_encode(array('status' => TRUE, 'msg' => ''), JSON_UNESCAPED_UNICODE);
                                         die();
@@ -819,7 +821,7 @@ class ClientController extends DooController
             $MeasureArray = $this->actmeasure->getRowByPmid($this->params['tenderid']);
             if (isset($updateArray['filepath'])) {
                 $pathinfo = pathinfo($updateArray['filepath']);
-                $downfileurl[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo ['dirname'] . ' / ' . $pathinfo ['filename'] . ' / ProjectFile . rmf', 'MD5_Jl' => $updateArray['filehashcode'], 'proName' => $projectArray['pname'], 'stName' => $stArray['stname'], 'pnameid' => $projectArray['pid'], 'ptypeid' => $stArray['stid'], 'BidName' => $MeasureArray['pmname']);
+                $downfileurl[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo ['dirname'] . '/' . $pathinfo ['filename'] . '/ProjectFile.rmf', 'MD5_Jl' => $updateArray['filehashcode'], 'proName' => $projectArray['pname'], 'stName' => $stArray['stname'], 'pnameid' => $projectArray['pid'], 'ptypeid' => $stArray['stid'], 'BidName' => $MeasureArray['pmname']);
                 echo json_encode(array('status' => TRUE, 'msg' => '', 'info' => $downfileurl), JSON_UNESCAPED_UNICODE);
                 die();
             } else {
@@ -880,7 +882,7 @@ class ClientController extends DooController
                 $attfileArray = $this->attfile->getLastData($value['stid']);
                 foreach ($attfileArray as $k => $v) {
                     $pathinfo = pathinfo($v['filepath']);
-                    $retArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo ['dirname'] . ' / ' . $pathinfo ['filename'] . ' / ProjectFile . rmf', 'proName' => $proArray['pname'], 'stName' => $value['stname'], 'MD5_Jl' => $v['filehashcode']);
+                    $retArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo ['dirname'] . '/' . $pathinfo ['filename'] . '/ProjectFile.rmf', 'proName' => $proArray['pname'], 'stName' => $value['stname'], 'MD5_Jl' => $v['filehashcode']);
                 }
             }
             echo json_encode(array('status' => TRUE, 'msg' => '', 'info' => $retArray), JSON_UNESCAPED_UNICODE);
@@ -894,7 +896,7 @@ class ClientController extends DooController
                     $attfileArray = $this->contractact->getRowByStid($attArray['stid']);
                     $pathinfo = pathinfo($attArray['filepath']);
                     if (isset($pathinfo['dirname']))
-                        $newattArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo ['dirname'] . ' / ' . $pathinfo ['filename'] . ' / ProjectFile . rmf', 'proName' => $proArray['pname'], 'stName' => $attfileArray['stname'], 'MD5_Jl' => $attArray['filehashcode']);
+                        $newattArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo ['dirname'] . '/' . $pathinfo ['filename'] . '/ProjectFile.rmf', 'proName' => $proArray['pname'], 'stName' => $attfileArray['stname'], 'MD5_Jl' => $attArray['filehashcode']);
                 }
                 echo json_encode(array('status' => TRUE, 'msg' => '', 'info' => $newattArray), JSON_UNESCAPED_UNICODE);
                 die();
@@ -941,7 +943,7 @@ class ClientController extends DooController
                     }
                     $res = $this->zip->open(Doo::conf()->SITE_PATH . $fp[0]['filepath']);
                     $extPath = pathinfo($fp[0]['filepath']);
-                    $extPathdir = Doo::conf()->SITE_PATH . $extPath ['dirname'] . ' / ' . $extPath['filename'];
+                    $extPathdir = Doo::conf()->SITE_PATH . $extPath ['dirname'] . '/' . $extPath['filename'];
                     if ($res === TRUE) {
                         if (!$this->dir_create($extPathdir)) {
                             return FALSE;
@@ -1037,7 +1039,7 @@ class ClientController extends DooController
                 $downArray = NULL;
                 $pathinfo = pathinfo($urlinfoArray['filepath']);
                 if (isset($pathinfo['dirname'])) {
-                    $downArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo['dirname'] . ' / ' . $pathinfo['filename'] . ' / ProjectFile . rmf', 'MD5_Jl' => $urlinfoArray['filehashcode'], 'proName' => $proArray['pname'], 'stName' => $stArray['stname'], 'pnameid' => $proArray['pid'], 'ptypeid' => $stArray['stid'], 'BidName' => $MeasureArray['pmname']);
+                    $downArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo['dirname'] . '/' . $pathinfo['filename'] . '/ProjectFile.rmf', 'MD5_Jl' => $urlinfoArray['filehashcode'], 'proName' => $proArray['pname'], 'stName' => $stArray['stname'], 'pnameid' => $proArray['pid'], 'ptypeid' => $stArray['stid'], 'BidName' => $MeasureArray['pmname']);
                     echo json_encode(array('status' => TRUE, 'msg' => '', 'info' => $downArray), JSON_UNESCAPED_UNICODE);
                     die();
                 } else {

protected/controller/RProjectController.php

@@ -457,6 +457,12 @@ class RProjectController extends DooController
                             if ($v['maid'] == $auditArray['maid']) {
                                 if ($k == ($countAudit - 1)) {//如果是最后一个
                                     $this->measureauditact->updateMastatus($auditUserArray[0]['maid']);
+                                    // SMS Start
+                                    $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[0]['auditoruid']);
+                                    // var_dump($verifyUserArray);
+                                    $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[0]['pmid']);
+                                    // var_dump($pmnameArray);
+                                    // SMS End
                                 } else {
                                     $this->measureauditact->updateMastatus($auditUserArray[$k + 1]['maid']);
                                     // SMS Start
@@ -464,14 +470,16 @@ class RProjectController extends DooController
                                     // var_dump($verifyUserArray);
                                     $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[$k + 1]['pmid']);
                                     // var_dump($pmnameArray);
-                                    if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// XXXX（标段名），陈特，已审批通过。请您继续审批。
-                                        $retval = $this->__auditNotice($verifyUserArray['mobile'], $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
+                                    // SMS End
+                                }
+                                // SMS Start
+                                if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// XXXX（标段名），陈特，已审批通过。请您继续审批。
+                                    $retval = $this->__auditNotice($verifyUserArray['mobile'], Doo::conf()->SMS_TIPS_PRE . $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
 //                                        var_dump($pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
 //                                        var_dump($retval);
 //                                        var_dump($this->sms->getErrors());
-                                    }
-                                    // SMS End
                                 }
+                                // SMS End
                                 $this->numofperact->updateAuditStatus($lastRowArray['pmid'], $lastRowArray['numpname'], 'checking', $maxTimes['times']);
                                 echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                                 die();