Apply fixes from StyleCI

oiuv · Sep 21, 2020 · 32427d9 · 32427d9
1 parent a827e8a
commit 32427d9
Show file tree

Hide file tree

Showing 45 changed files with 390 additions and 396 deletions.
diff --git a/app/bank/controller/coupon.master.php b/app/bank/controller/coupon.master.php
@@ -83,7 +83,7 @@ private function batadd()
                 if ($value > 9999) {
                     $value = 9999;
                 }
-                for ($i = 0; $i < $number; ++$i) {
+                for ($i = 0; $i < $number; $i++) {
                     $this->coupon->randCoupon($value);
                 }
                 $message = [

diff --git a/app/certificate/controller/certificate.phone.php b/app/certificate/controller/certificate.phone.php
@@ -16,7 +16,7 @@ public function display()
     {
         $action = $this->ev->url(3);
         if (!method_exists($this, $action)) {
-            $action = "index";
+            $action = 'index';
         }
         $this->$action();
         exit;
@@ -31,31 +31,31 @@ private function apply()
             if ($user['usercoin'] < $ce['ceprice']) {
                 $message = [
                     'statusCode' => 300,
-                    "message"    => "余额不足，请到个人中心充值"
+                    'message'    => '余额不足，请到个人中心充值',
                 ];
                 exit(json_encode($message));
             }
             $cq = $this->ce->getCeQueueByArgs([
-                ["AND", "cequserid = :cequserid", "cequserid", $this->_user['sessionuserid']],
-                ["AND", "ceqceid = :ceqceid", "ceqceid", $ceid],
-                ["AND", "ceqstatus < 3"],
-                ["AND", "ceqtime >= :ceqtime", "ceqtime", TIME - $ce['cedays'] * 24 * 3600]
+                ['AND', 'cequserid = :cequserid', 'cequserid', $this->_user['sessionuserid']],
+                ['AND', 'ceqceid = :ceqceid', 'ceqceid', $ceid],
+                ['AND', 'ceqstatus < 3'],
+                ['AND', 'ceqtime >= :ceqtime', 'ceqtime', TIME - $ce['cedays'] * 24 * 3600],
             ]);
             if ($cq['ceqid']) {
                 $message = [
                     'statusCode' => 300,
-                    "message"    => "您已经申请过本证书了"
+                    'message'    => '您已经申请过本证书了',
                 ];
                 exit(json_encode($message));
             }
             $ce['cebasic'] = explode(',', $ce['cebasic']);
             foreach ($ce['cebasic'] as $basicid) {
                 if ($basicid) {
-                    $eh = $this->G->make('favor', 'exam')->getExamHistoryByArgs([["AND", "ehuserid = :ehuserid", "ehuserid", $this->_user['sessionuserid']], ["AND", "ehispass = 1"], ["AND", "ehtype = 2"], ["AND", "ehbasicid = :ehbasicid", "ehbasicid", $basicid]]);
+                    $eh = $this->G->make('favor', 'exam')->getExamHistoryByArgs([['AND', 'ehuserid = :ehuserid', 'ehuserid', $this->_user['sessionuserid']], ['AND', 'ehispass = 1'], ['AND', 'ehtype = 2'], ['AND', 'ehbasicid = :ehbasicid', 'ehbasicid', $basicid]]);
                     if (!$eh['ehid']) {
                         $message = [
                             'statusCode' => 300,
-                            "message"    => "您需要通过考试后才能申请"
+                            'message'    => '您需要通过考试后才能申请',
                         ];
                         exit(json_encode($message));
                     }
@@ -65,7 +65,7 @@ private function apply()
             if (!$info['useraddress'] || !$info['userphone']) {
                 $message = [
                     'statusCode' => 300,
-                    "message"    => "请填写地址和联系电话"
+                    'message'    => '请填写地址和联系电话',
                 ];
                 exit(json_encode($message));
             }
@@ -82,14 +82,13 @@ private function apply()
             $user = $this->user->getUserById($this->_user['sessionuserid']);
             $message = [
                 'statusCode'   => 200,
-                "message"      => "操作成功",
-                "callbackType" => "forward",
-                "forwardUrl"   => "index.php?certificate"
+                'message'      => '操作成功',
+                'callbackType' => 'forward',
+                'forwardUrl'   => 'index.php?certificate',
             ];
             exit(json_encode($message));
         }
 
-
         $this->tpl->assign('ce', $ce);
         $this->tpl->display('certificate_apply');
     }

diff --git a/app/content/cls/content.cls.php b/app/content/cls/content.cls.php
@@ -34,14 +34,14 @@ public function _init()
 
     public function setViewNumber($contentid)
     {
-        $data = [false, 'content', [['AND', "contentid = :contentid", 'contentid', $contentid]]];
+        $data = [false, 'content', [['AND', 'contentid = :contentid', 'contentid', $contentid]]];
         $sql = $this->pdosql->makeSelect($data);
         $r = $this->db->fetch($sql);
         $number = $r['contentview'] + 1;
         $data = [
             'table' => 'content',
             'value' => ['contentview' => $number],
-            'query' => [['AND', "contentid = :contentid", 'contentid', $contentid]]
+            'query' => [['AND', 'contentid = :contentid', 'contentid', $contentid]],
         ];
         $this->db->updateElement($data);
     }

diff --git a/app/content/controller/category.phone.php b/app/content/controller/category.phone.php
@@ -30,9 +30,9 @@ private function index()
         if ($cat['catuseurl'] && $cat['caturl']) {
             $message = [
                 'statusCode'   => 201,
-                "message"      => "操作成功",
-                "callbackType" => "forward",
-                "forwardUrl"   => html_entity_decode($cat['caturl'])
+                'message'      => '操作成功',
+                'callbackType' => 'forward',
+                'forwardUrl'   => html_entity_decode($cat['caturl']),
             ];
             exit(json_encode($message));
         }

diff --git a/app/content/controller/content.phone.php b/app/content/controller/content.phone.php
@@ -36,9 +36,9 @@ public function index()
         if ($content['contentlink']) {
             $message = [
                 'statusCode'   => 201,
-                "message"      => "操作成功",
-                "callbackType" => "forward",
-                "forwardUrl"   => html_entity_decode($content['contentlink'])
+                'message'      => '操作成功',
+                'callbackType' => 'forward',
+                'forwardUrl'   => html_entity_decode($content['contentlink']),
             ];
             exit(json_encode($message));
         }

diff --git a/app/core/controller/index.api.php b/app/core/controller/index.api.php
@@ -278,7 +278,7 @@ private function basic()
                 $this->db->exec($sql);
             }
         }
-        ++$page;
+        $page++;
         echo 'ok';
         if (count($rs) > 0) {
             echo '<script>window.location = "index.php?core-api-index-basic&page='.$page.'"</script>';

diff --git a/app/course/cls/course.cls.php b/app/course/cls/course.cls.php
@@ -70,7 +70,7 @@ public function getCourseContentStatus($courseid, $userid)
             if ($rs['logstatus']) {
                 $cdata['content'][$i] = $rs['logid'];
             }
-            ++$i;
+            $i++;
         }
         foreach ($cdata['course'] as $key => $p) {
             if ($key) {

diff --git a/app/course/controller/category.phone.php b/app/course/controller/category.phone.php
@@ -30,9 +30,9 @@ private function index()
         if ($cat['catuseurl'] && $cat['caturl']) {
             $message = [
                 'statusCode'   => 201,
-                "message"      => "操作成功",
-                "callbackType" => "forward",
-                "forwardUrl"   => html_entity_decode($cat['caturl'])
+                'message'      => '操作成功',
+                'callbackType' => 'forward',
+                'forwardUrl'   => html_entity_decode($cat['caturl']),
             ];
             exit(json_encode($message));
         }

diff --git a/app/course/controller/coupon.master.php b/app/course/controller/coupon.master.php
@@ -71,7 +71,7 @@ private function batadd()
                 if ($value > 9999) {
                     $value = 9999;
                 }
-                for ($i = 0; $i < $number; ++$i) {
+                for ($i = 0; $i < $number; $i++) {
                     $this->coupon->randCoupon($value);
                 }
                 $message = [

diff --git a/app/document/controller/upload.api.php b/app/document/controller/upload.api.php
@@ -34,8 +34,8 @@ public function index()
             $back = [
                 'error' => [
                     'number'  => 105,
-                    'message' => $message
-                ]
+                    'message' => $message,
+                ],
             ];
             exit(json_encode($back));
         }
@@ -58,15 +58,15 @@ public function index()
             $back = [
                 'fileName' => $upfile['name'],
                 'url'      => $fileurl,
-                'uploaded' => 1
+                'uploaded' => 1,
             ];
         } else {
             $message = '上传失败，附件类型不符!';
             $back = [
                 'error' => [
                     'number'  => 105,
-                    'message' => $message
-                ]
+                    'message' => $message,
+                ],
             ];
         }
         exit(json_encode($back));

diff --git a/app/exam/cls/exam.cls.php b/app/exam/cls/exam.cls.php
@@ -971,7 +971,7 @@ public function markscore($sessionvars, $questypes)
                                             break;
                                         }
 
-                                        ++$rlen;
+                                        $rlen++;
                                     }
                                     $score = floatval($sessionvars['examsessionsetting']['examsetting']['questype'][$key]['score'] * $rlen / $alen);
                                 } else {
@@ -1013,7 +1013,7 @@ public function markscore($sessionvars, $questypes)
                                                 $rlen = 0;
                                                 break;
                                             }
-                                            ++$rlen;
+                                            $rlen++;
                                         }
                                         $score = $sessionvars['examsessionsetting']['examsetting']['questype'][$key]['score'] * $rlen / $alen;
                                     } else {

diff --git a/app/exam/cls/favor.cls.php b/app/exam/cls/favor.cls.php
@@ -237,9 +237,9 @@ public function modifyExamHistory($ehid, $args)
     public function delExamHistory($ehid, $userid = false)
     {
         if ($userid) {
-            $data = ["examhistory", [["AND", "ehid = :ehid", 'ehid', $ehid], ["AND", "ehuserid = :ehuserid", 'ehuserid', $userid]]];
+            $data = ['examhistory', [['AND', 'ehid = :ehid', 'ehid', $ehid], ['AND', 'ehuserid = :ehuserid', 'ehuserid', $userid]]];
         } else {
-            $data = ["examhistory", [["AND", "ehid = :ehid", 'ehid', $ehid]]];
+            $data = ['examhistory', [['AND', 'ehid = :ehid', 'ehid', $ehid]]];
         }
         $sql = $this->pdosql->makeDelete($data);
         $this->db->exec($sql);

diff --git a/app/exam/cls/question.cls.php b/app/exam/cls/question.cls.php
@@ -255,7 +255,7 @@ public function selectScaleQuestions($examid, $basic)
                     $par = 0;
                     foreach ($number as $nkey => $t) {
                         if (!$par && ($t > 0)) {
-                            ++$par;
+                            $par++;
                             $trand = rand(1, 4);
                             if ($trand < 3) {
                                 $qrs = $this->getRandQuestionRowsList([['AND', 'find_in_set(quest2knows.qkknowsid,:knowsids)', 'knowsids', $knowsids], ['AND', 'questionrows.qrlevel = :qrlevel', 'qrlevel', $nkey], ['AND', 'questionrows.qrtype = :qrtype', 'qrtype', $key], ['AND', 'questionrows.qrnumber <= :qrnumber', 'qrnumber', $t]]);
@@ -339,7 +339,7 @@ public function selectScaleQuestions($examid, $basic)
                     $par = 0;
                     $t = $num;
                     if (!$par) {
-                        ++$par;
+                        $par++;
                         $trand = rand(1, 4);
                         if ($trand < 3) {
                             $qrs = $this->getRandQuestionRowsList([['AND', 'find_in_set(quest2knows.qkknowsid,:knowsids)', 'knowsids', $knowsids], ['AND', 'questionrows.qrtype = :qrtype', 'qrtype', $key], ['AND', 'questionrows.qrnumber <= :qrnumber', 'qrnumber', $t]]);
@@ -446,7 +446,7 @@ public function selectQuestions($examid, $basic)
             $par = 0;
             foreach ($number as $nkey => $t) {
                 if (!$par) {
-                    ++$par;
+                    $par++;
                     $trand = rand(1, 4);
                     if ($trand < 3) {
                         $qrs = $this->getRandQuestionRowsList([['AND', 'find_in_set(quest2knows.qkknowsid,:knowsids)', 'knowsids', $knowsids], ['AND', 'questionrows.qrlevel = :qrlevel', 'qrlevel', $nkey], ['AND', 'questionrows.qrtype = :qrtype', 'qrtype', $key], ['AND', 'questionrows.qrnumber <= :qrnumber', 'qrnumber', $t]]);
@@ -541,7 +541,7 @@ public function selectQuestionsByKnows($knowsid, $qt)
             $qrid = 0;
             $par = 0;
             if (!$par) {
-                ++$par;
+                $par++;
                 $trand = rand(1, 4);
                 if ($trand < 3) {
                     $qrs = $this->getRandQuestionRowsList([['AND', 'find_in_set(quest2knows.qkknowsid,:knowsids)', 'knowsids', $knowsids], ['AND', 'questionrows.qrtype = :qrtype', 'qrtype', $key], ['AND', 'questionrows.qrnumber <= :qrnumber', 'qrnumber', $t]]);
@@ -559,7 +559,7 @@ public function selectQuestionsByKnows($knowsid, $qt)
                     if ((count($r) >= $t)) {
                         if ($t <= 1) {
                             $question[$key][] = $r[array_rand($r, 1)];
-                            --$t;
+                            $t--;
                         } else {
                             $ts = array_rand($r, $t);
                             foreach ($ts as $tmp) {

diff --git a/app/exam/cls/section.cls.php b/app/exam/cls/section.cls.php
@@ -210,23 +210,23 @@ public function getQuestionsByKnows($knowsid)
         $knows['knowsnumber'] = unserialize($knows['knowsnumber']);
         $knows['knowsquestions'] = unserialize($knows['knowsquestions']);
         if (!$knows['knowsquestions']) {
-            $data = ['DISTINCT questionid', ['questions', 'quest2knows'], [["AND", "find_in_set(quest2knows.qkknowsid,:knowsid)", 'knowsid', $knowsid], ["AND", "quest2knows.qktype = 0"], ["AND", "quest2knows.qkquestionid = questions.questionid"], ["AND", "questions.questionstatus = 1"]], false, false, false];
+            $data = ['DISTINCT questionid', ['questions', 'quest2knows'], [['AND', 'find_in_set(quest2knows.qkknowsid,:knowsid)', 'knowsid', $knowsid], ['AND', 'quest2knows.qktype = 0'], ['AND', 'quest2knows.qkquestionid = questions.questionid'], ['AND', 'questions.questionstatus = 1']], false, false, false];
             $sql1 = $this->pdosql->makeSelect($data);
-            $data = ['questionid,questiontype', "questions", [["AND", "questionid in (%CHILDSQL%)"]], false, "questionparent asc,questionsequence asc,questionid asc", false];
+            $data = ['questionid,questiontype', 'questions', [['AND', 'questionid in (%CHILDSQL%)']], false, 'questionparent asc,questionsequence asc,questionid asc', false];
             $sql = $this->pdosql->makeSelect($data);
-            $sql['sql'] = str_replace("%CHILDSQL%", $sql1['sql'], $sql['sql']);
+            $sql['sql'] = str_replace('%CHILDSQL%', $sql1['sql'], $sql['sql']);
             $sql['v'] = array_merge($sql1['v'], $sql['v']);
             $r = $this->db->fetchAll($sql);
             $t = [];
             $n = [];
             foreach ($r as $p) {
                 $t[$p['questiontype']][] = $p['questionid'];
             }
-            $data = ['DISTINCT questionid', ['questions', 'questionrows', 'quest2knows'], [["AND", "find_in_set(quest2knows.qkknowsid,:knowsid)", 'knowsid', $knowsid], ["AND", "quest2knows.qktype = 1"], ["AND", "quest2knows.qkquestionid = questionrows.qrid"], ["AND", "questions.questionparent = questionrows.qrid"], ["AND", "questionrows.qrstatus = 1"]], false, false, false];
+            $data = ['DISTINCT questionid', ['questions', 'questionrows', 'quest2knows'], [['AND', 'find_in_set(quest2knows.qkknowsid,:knowsid)', 'knowsid', $knowsid], ['AND', 'quest2knows.qktype = 1'], ['AND', 'quest2knows.qkquestionid = questionrows.qrid'], ['AND', 'questions.questionparent = questionrows.qrid'], ['AND', 'questionrows.qrstatus = 1']], false, false, false];
             $sql1 = $this->pdosql->makeSelect($data);
-            $data = ['questionid,qrtype', ['questions', 'questionrows'], [["AND", "questionid in (%CHILDSQL%)"], ["AND", "questionparent = qrid"]], false, "questionparent asc,questionsequence asc,questionid asc", false];
+            $data = ['questionid,qrtype', ['questions', 'questionrows'], [['AND', 'questionid in (%CHILDSQL%)'], ['AND', 'questionparent = qrid']], false, 'questionparent asc,questionsequence asc,questionid asc', false];
             $sql = $this->pdosql->makeSelect($data);
-            $sql['sql'] = str_replace("%CHILDSQL%", $sql1['sql'], $sql['sql']);
+            $sql['sql'] = str_replace('%CHILDSQL%', $sql1['sql'], $sql['sql']);
             $sql['v'] = array_merge($sql1['v'], $sql['v']);
             $r = $this->db->fetchAll($sql);
             foreach ($r as $p) {

diff --git a/app/exam/controller/basic.master.php b/app/exam/controller/basic.master.php
@@ -166,7 +166,7 @@ private function stats()
                         $stats[$question['questionid']]['number'] = intval($stats[$question['questionid']]['number']) + 1;
                         if ($p['ehuseranswer'][$question['questionid']] && 0 == $questiontype[$question['questiontype']]['questsort'] && $questiontype[$question['questiontype']]['questchoice'] < 5) {
                             if (is_array($p['ehuseranswer'][$question['questionid']])) {
-                                $p['ehuseranswer'][$question['questionid']] = implode("", $p['ehuseranswer'][$question['questionid']]);
+                                $p['ehuseranswer'][$question['questionid']] = implode('', $p['ehuseranswer'][$question['questionid']]);
                             }
                             foreach ($os as $o) {
                                 if (false !== strpos($p['ehuseranswer'][$question['questionid']], $o)) {
@@ -189,7 +189,7 @@ private function stats()
                             $stats[$question['questionid']]['number'] = intval($stats[$question['questionid']]['number']) + 1;
                             if ($p['ehuseranswer'][$question['questionid']] && 0 == $questiontype[$question['questiontype']]['questsort'] && $questiontype[$question['questiontype']]['questchoice'] < 5) {
                                 if (is_array($p['ehuseranswer'][$question['questionid']])) {
-                                    $p['ehuseranswer'][$question['questionid']] = implode("", $p['ehuseranswer'][$question['questionid']]);
+                                    $p['ehuseranswer'][$question['questionid']] = implode('', $p['ehuseranswer'][$question['questionid']]);
                                 }
                                 foreach ($os as $o) {
                                     if (false !== strpos($p['ehuseranswer'][$question['questionid']], $o)) {
@@ -331,9 +331,9 @@ private function delhistory()
         $this->favor->delExamHistory($ehid);
         $message = [
             'statusCode'   => 200,
-            "message"      => "操作成功",
-            "callbackType" => 'forward',
-            "forwardUrl"   => "reload"
+            'message'      => '操作成功',
+            'callbackType' => 'forward',
+            'forwardUrl'   => 'reload',
         ];
         exit(json_encode($message));
     }
@@ -1121,9 +1121,9 @@ private function savepaper()
         $result = $this->exam->markscore($sessionvars, $questype);
         $message = [
             'statusCode'   => 200,
-            "message"      => "操作成功",
-            "callbackType" => "forward",
-            "forwardUrl"   => "reload"
+            'message'      => '操作成功',
+            'callbackType' => 'forward',
+            'forwardUrl'   => 'reload',
         ];
         $this->G->R($message);
     }

diff --git a/app/exam/controller/basic.teach.php b/app/exam/controller/basic.teach.php
@@ -116,7 +116,7 @@ private function savepaper()
                                         break;
                                     }
 
-                                    ++$rlen;
+                                    $rlen++;
                                 }
                                 $score = floatval($sessionvars['examsessionsetting']['examsetting']['questype'][$key]['score'] * $rlen / $alen);
                             } else {
@@ -159,7 +159,7 @@ private function savepaper()
                                             break;
                                         }
 
-                                        ++$rlen;
+                                        $rlen++;
                                     }
                                     $score = $sessionvars['examsessionsetting']['examsetting']['questype'][$key]['score'] * $rlen / $alen;
                                 } else {