From 06861184a207a8ea4640b30c24f48ea161a33385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Thu, 2 Nov 2017 08:27:08 +0800
Subject: [PATCH] * fix score config

---
 module/score/config.php  | 74 ++++++++++++++++++++--------------------
 module/score/control.php |  6 ----
 module/score/model.php   |  4 +--
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/module/score/config.php b/module/score/config.php
index ac9c986bd6..7cb54d72bc 100644
--- a/module/score/config.php
+++ b/module/score/config.php
@@ -18,58 +18,58 @@ $config->score->search      = new stdClass();
 $config->score->extended    = new stdClass();
 
 /* Score rule. */
-$config->score->user->login          = array('times' => 3, 'time' => 24, 'score' => 1);
-$config->score->user->changePassword = array('times' => 1, 'time' => 0,  'score' => 10);
-$config->score->user->editProfile    = array('times' => 1, 'time' => 0,  'score' => 10);
+$config->score->user->login          = array('times' => 3, 'hour' => 24, 'score' => 1);
+$config->score->user->changePassword = array('times' => 1, 'hour' => 0,  'score' => 10);
+$config->score->user->editProfile    = array('times' => 1, 'hour' => 0,  'score' => 10);
 
-$config->score->tutorial->keepAll = array('times' => 1, 'time' => 0, 'score' => 100);
+$config->score->tutorial->keepAll = array('times' => 1, 'hour' => 0, 'score' => 100);
 
-$config->score->ajax->selectTheme       = array('times' => 1, 'time' => 0, 'score' => 10);
-$config->score->ajax->selectLang        = array('times' => 1, 'time' => 0, 'score' => 10);
-$config->score->ajax->showSearchMenu    = array('times' => 1, 'time' => 0, 'score' => 10);
-$config->score->ajax->dragSelected      = array('times' => 1, 'time' => 0, 'score' => 20);
-$config->score->ajax->lastNext          = array('times' => 1, 'time' => 0, 'score' => 20);
-$config->score->ajax->switchToDataTable = array('times' => 1, 'time' => 0, 'score' => 1);
-$config->score->ajax->submitPage        = array('times' => 1, 'time' => 0, 'score' => 1);
-$config->score->ajax->customMenu        = array('times' => 1, 'time' => 0, 'score' => 1);
-$config->score->ajax->quickJump         = array('times' => 1, 'time' => 0, 'score' => 10);
-$config->score->ajax->batchCreate       = array('times' => 1, 'time' => 0, 'score' => 20);
-$config->score->ajax->batchEdit         = array('times' => 1, 'time' => 0, 'score' => 20);
+$config->score->ajax->selectTheme       = array('times' => 1, 'hour' => 0, 'score' => 10);
+$config->score->ajax->selectLang        = array('times' => 1, 'hour' => 0, 'score' => 10);
+$config->score->ajax->showSearchMenu    = array('times' => 1, 'hour' => 0, 'score' => 10);
+$config->score->ajax->dragSelected      = array('times' => 1, 'hour' => 0, 'score' => 20);
+$config->score->ajax->lastNext          = array('times' => 1, 'hour' => 0, 'score' => 20);
+$config->score->ajax->switchToDataTable = array('times' => 1, 'hour' => 0, 'score' => 1);
+$config->score->ajax->submitPage        = array('times' => 1, 'hour' => 0, 'score' => 1);
+$config->score->ajax->customMenu        = array('times' => 1, 'hour' => 0, 'score' => 1);
+$config->score->ajax->quickJump         = array('times' => 1, 'hour' => 0, 'score' => 10);
+$config->score->ajax->batchCreate       = array('times' => 1, 'hour' => 0, 'score' => 20);
+$config->score->ajax->batchEdit         = array('times' => 1, 'hour' => 0, 'score' => 20);
 
-$config->score->doc->create = array('times' => 0, 'time' => 0, 'score' => 1);
+$config->score->doc->create = array('times' => 0, 'hour' => 0, 'score' => 1);
 
-$config->score->todo->create = array('times' => 5, 'time' => 24, 'score' => 1);
+$config->score->todo->create = array('times' => 5, 'hour' => 24, 'score' => 1);
 
-$config->score->story->create = array('times' => 0, 'time' => 0, 'score' => 1);
-$config->score->story->close  = array('times' => 0, 'time' => 0, 'score' => 1);
+$config->score->story->create = array('times' => 0, 'hour' => 0, 'score' => 1);
+$config->score->story->close  = array('times' => 0, 'hour' => 0, 'score' => 1);
 
-$config->score->task->create = array('times' => 0, 'time' => 0, 'score' => 1);
-$config->score->task->close  = array('times' => 0, 'time' => 0, 'score' => 1);
-$config->score->task->finish = array('times' => 0, 'time' => 0, 'score' => 1);
+$config->score->task->create = array('times' => 0, 'hour' => 0, 'score' => 1);
+$config->score->task->close  = array('times' => 0, 'hour' => 0, 'score' => 1);
+$config->score->task->finish = array('times' => 0, 'hour' => 0, 'score' => 1);
 
-$config->score->bug->create         = array('times' => 0, 'time' => 0, 'score' => 1);
-$config->score->bug->confirmBug     = array('times' => 0, 'time' => 0, 'score' => 1);
-$config->score->bug->createFormCase = array('times' => 0, 'time' => 0, 'score' => 1);
-$config->score->bug->resolve        = array('times' => 0, 'time' => 0, 'score' => 1);
-$config->score->bug->saveTplModal   = array('times' => 0, 'time' => 0, 'score' => 20);
+$config->score->bug->create         = array('times' => 0, 'hour' => 0, 'score' => 1);
+$config->score->bug->confirmBug     = array('times' => 0, 'hour' => 0, 'score' => 1);
+$config->score->bug->createFormCase = array('times' => 0, 'hour' => 0, 'score' => 1);
+$config->score->bug->resolve        = array('times' => 0, 'hour' => 0, 'score' => 1);
+$config->score->bug->saveTplModal   = array('times' => 0, 'hour' => 0, 'score' => 20);
 
-$config->score->testcase->create = array('times' => 0, 'time' => 0, 'score' => 1);
+$config->score->testcase->create = array('times' => 0, 'hour' => 0, 'score' => 1);
 
-$config->score->testtask->runCase = array('times' => 0, 'time' => 0, 'score' => 1);
+$config->score->testtask->runCase = array('times' => 0, 'hour' => 0, 'score' => 1);
 
-$config->score->build->create = array('times' => 0, 'time' => 0, 'score' => 10);
+$config->score->build->create = array('times' => 0, 'hour' => 0, 'score' => 10);
 
-$config->score->project->create = array('times' => 0, 'time' => 0, 'score' => 10);
-$config->score->project->close  = array('times' => 0, 'time' => 0, 'score' => 0);
+$config->score->project->create = array('times' => 0, 'hour' => 0, 'score' => 10);
+$config->score->project->close  = array('times' => 0, 'hour' => 0, 'score' => 0);
 
-$config->score->productplan->create = array('times' => 0, 'time' => 0, 'score' => 10);
+$config->score->productplan->create = array('times' => 0, 'hour' => 0, 'score' => 10);
 
-$config->score->release->create = array('times' => 0, 'time' => 0, 'score' => 10);
+$config->score->release->create = array('times' => 0, 'hour' => 0, 'score' => 10);
 
-$config->score->block->set = array('times' => 1, 'time' => 0, 'score' => 20);
+$config->score->block->set = array('times' => 1, 'hour' => 0, 'score' => 20);
 
-$config->score->search->saveQuery         = array('times' => 1, 'time' => 0, 'score' => 1);
-$config->score->search->saveQueryAdvanced = array('times' => 1, 'time' => 0, 'score' => 1);
+$config->score->search->saveQuery         = array('times' => 1, 'hour' => 0, 'score' => 1);
+$config->score->search->saveQueryAdvanced = array('times' => 1, 'hour' => 0, 'score' => 1);
 
 /* Extended rule. */
 $config->score->extended->changePassword = array('strength' => array(1 => 2, 2 => 5));
diff --git a/module/score/control.php b/module/score/control.php
index 68d3ae5fe8..60b8b8a8d4 100644
--- a/module/score/control.php
+++ b/module/score/control.php
@@ -23,12 +23,6 @@ class score extends control
         $this->score->create('ajax', $method);
     }
 
-
-    public function a()
-    {
-        $this->score->create('user');exit;
-    }
-
     /**
      * Initialize score.
      *
diff --git a/module/score/model.php b/module/score/model.php
index 2d939e8b17..30515a71c5 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -190,9 +190,9 @@ class scoreModel extends model
      */
     private function saveScore($account = '', $rule = array(), $module = '', $method = '', $desc = '', $objectID = 0, $time = '')
     {
-        if(!empty($rule['times']) || !empty($rule['time']))
+        if(!empty($rule['times']) || !empty($rule['hour']))
         {
-            if(empty($rule['time']))
+            if(empty($rule['hour']))
             {
                 $count = $this->dao->select('id')->from(TABLE_SCORE)->where('account')->eq($account)->andWhere('module')->eq($module)->andWhere('method')->eq($method)->count();
                 if($count >= $rule['times']) return true;