1.9.0 no.5 up

protected/controller/ClientController.php

@@ -98,14 +98,14 @@ class ClientController extends DooController
             echo json_encode(array('status' => FALSE, 'msg' => '登录失败，请更新软件。'), JSON_UNESCAPED_UNICODE);
             die;
         }
-        if (isset($_POST['v4name']) && isset($_POST['v4pass']) && !empty($_POST['version'])) {
+        if (!empty($_POST['version'])) {
             try {
                 if ($this->modelconfig->getOne(array('select' => 'onoff', 'asArray' => TRUE))['onoff'] != 1) {
-                    $versionTotal = array_sum(explode('.', $_POST['version']));
+                    $versionTotal = implode("",explode('.', $_POST['version']));
                     $StrJson = ($this->modelconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
                     $jsonObj = json_decode($StrJson, true);
                     if ($jsonObj) {
-                        $versionTotalUp = array_sum(explode('.', $jsonObj['version']));
+                        $versionTotalUp = implode("",explode('.', $jsonObj['version']));
                         $strJson = json_encode(array('status' => 'upgrade', 'msg' => '您的客户端需要升级，请点击确定按钮，下载新版本，并且覆盖安装。', 'url' => $jsonObj['download']), JSON_UNESCAPED_UNICODE);
                         if ($jsonObj['condition'] == 1) {
                             if ($versionTotalUp != $versionTotal) {
@@ -120,24 +120,29 @@ class ClientController extends DooController
                             }
                         }
                     }
-                    if ($this->auth->login($_POST['v4name'], $_POST['v4pass'])) {
-                        $uinfo = $this->auth->getUinfo();
-                        if (isset($uinfo['isstop']) && $uinfo['isstop'] > 0) {
-                            echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
-                            die;
-                        }
-                        if (isset($uinfo['uid'])) {
-                            $userArray = $this->profile->getProWithUid($uinfo['uid']);
-                            $avatarStr = $userArray['avatar'];
-                            if (isset($userArray['userid'])) {
-                                $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr);
-                                echo json_encode(array('status' => 'true', 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                    if(isset($_POST['v4name']) && isset($_POST['v4pass'])){
+                        if ($this->auth->login($_POST['v4name'], $_POST['v4pass'])) {
+                            $uinfo = $this->auth->getUinfo();
+                            if (isset($uinfo['isstop']) && $uinfo['isstop'] > 0) {
+                                echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
                                 die;
                             }
-                        }
+                            if (isset($uinfo['uid'])) {
+                                $userArray = $this->profile->getProWithUid($uinfo['uid']);
+                                $avatarStr = $userArray['avatar'];
+                                if (isset($userArray['userid'])) {
+                                    $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr);
+                                    echo json_encode(array('status' => 'true', 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                                    die;
+                                }
+                            }
 
-                    } else {
-                        echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
+                        } else {
+                            echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
+                            die;
+                        }
+                    }else{
+                        echo json_encode(array('status' => 'false', 'msg' => '参数错误'), JSON_UNESCAPED_UNICODE);
                         die;
                     }
                 } else {

protected/controller/ProjectController.php

@@ -969,7 +969,7 @@ class ProjectController extends DooController
         $this->data['nosign'] = '';
 
         //获取项目信息
-        $searchsql = 'isinter!=0';
+        $searchsql = 'isinter=3';
 //        $itemlist = $this->sign->getSignGroupByProject($searchsql);
 //        if(!empty($itemlist)){
 //            foreach($itemlist as $ik => $iv){

protected/controller/RProjectController.php

@@ -948,7 +948,7 @@ class RProjectController extends DooController
         $this->data['nosign'] = '';
 
         //获取项目信息
-        $searchsql = 'isinter!=0 and sid IN (SELECT sid FROM jl_sign_audit WHERE jl_sign_audit.audituid='.$this->auth->getUid().')';
+        $searchsql = 'isinter=3';
 
         if(isset($this->params['pid']) && is_numeric($this->params['pid'])){
             $pagestr .= '/'.$this->params['pid'];
@@ -1002,9 +1002,13 @@ class RProjectController extends DooController
         $this->data['phasenolist'] = isset($phasenolist) ? $phasenolist : '';
         $this->data['pager'] = $pager->output;
 
-
+        $numStatusArray = $this->numofperact->getLastStatus3($this->params['pid'], $this->params['pmid']);
+        if (!isset($numStatusArray['currstatus'])) {
+            $numStatusArray['currstatus'] = 'uncheck';
+        }
         $this->data['pid'] = $this->params['pid'];
         $this->data['pmid'] = $this->params['pmid'];
+        $this->data['mpid'] = $numStatusArray['mpid'];
         $this->render('r-project-section-intermediate', $this->data, TRUE);
     }
 

protected/module/admin/controller/ItemController.php

@@ -60,7 +60,7 @@ class ItemController extends DooController {
                     $this->mailer->setEmails($_POST['email']);
                     $this->mailer->seteTitle('新账号开通');
                     $this->mailer->setClientName($postArray['realname']);
-                    $signupConfigStr = '<p>开通了计量支付云版的帐号：</p><p>登录帐号（邮箱）：<b><a href="mailto:' . $_POST['email'] . '" target="_blank">' . $_POST['email'] . '</a></b></p><p>登录密码：<b>' . $passwdStr . '</b></p><p>请及时登录并修改您的个人信息及密码。</p>';
+                    $signupConfigStr = '<p>开通了计量支付云版的帐号：</p><p>登录帐号（邮箱）：<b><a href="mailto:' . $_POST['email'] . '" target="_blank">' . $_POST['email'] . '</a></b></p><p>登录密码：<b>' . $passwdStr . '</b></p><p>请及时登录并修改您的个人信息及密码。</p><p><b style="font-size:20px">登录云端，下载桌面软件：</b><br><a href="'.Doo::conf()->APP_URL.'" style="font-size:20px">'.Doo::conf()->APP_URL.'</a></p>';
                     $this->mailer->setContent($signupConfigStr);
                     $this->mailer->send_mail();
                     return Doo::conf()->APP_URL . 'manage/user/list';