From 3664bd09c8bbac1c459b9b53a9fa5e2edab49aa0 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 10:44:21 +0800
Subject: [PATCH]  * fix bug #1314.

---
 module/score/model.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/module/score/model.php b/module/score/model.php
index 2581d4cf07..be845e55e7 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -43,7 +43,7 @@ class scoreModel extends model
         $desc     = $this->lang->score->modules[$module];
         $user     = empty($account) ? $this->app->user->account : $account;
         $time     = empty($time) ? helper::now() : $time;
-        $extended = "ruleExtended[$module][$method]";
+        $extended = $this->config->score->ruleExtended[$module][$method];
 
         if(is_numeric($param)) $desc .= 'ID:' . $param;
 
@@ -54,9 +54,9 @@ class scoreModel extends model
 
                 if($method == 'changePassword')
                 {
-                    if(!empty($this->config->score->{$extended}['strength'][$param]))
+                    if(!empty($extended['strength'][$param]))
                     {
-                        $rule['score'] = $rule['score'] + $this->config->score->{$extended}['strength'][$param];
+                        $rule['score'] = $rule['score'] + $extended['strength'][$param];
                     }
                     $desc = $this->lang->score->methods[$module][$method];
                 }
@@ -69,7 +69,7 @@ class scoreModel extends model
                     if(!empty($openedBy))
                     {
                         $newRule          = $rule;
-                        $newRule['score'] = $this->config->score->{$extended}['createID'];
+                        $newRule['score'] = $extended['createID'];
                         $this->saveScore($openedBy, $newRule, $module, $method, $desc, $time);
                         unset($newRule);
                     }
@@ -86,9 +86,9 @@ class scoreModel extends model
 
                     $task = $this->loadModel('task')->getById($param);
 
-                    if(!empty($this->config->score->{$extended}['pri'][$task->pri]))
+                    if(!empty($extended['pri'][$task->pri]))
                     {
-                        $rule['score'] = $rule['score'] + $this->config->score->{$extended}['pri'][$task->pri];
+                        $rule['score'] = $rule['score'] + $extended['pri'][$task->pri];
                     }
 
                     if(!empty($task->estimate))
@@ -111,15 +111,15 @@ class scoreModel extends model
                 {
                     $user  = $param->openedBy;
                     $desc .= 'ID:' . $param->id;
-                    if(!empty($this->config->score->{$extended}['severity'][$param->severity]))
+                    if(!empty($extended['severity'][$param->severity]))
                     {
-                        $rule['score'] = $rule['score'] + $this->config->score->{$extended}['severity'][$param->severity];
+                        $rule['score'] = $rule['score'] + $extended['severity'][$param->severity];
                     }
                 }
 
-                if($method == 'resolve' && !empty($this->config->score->{$extended}['severity'][$param->severity]))
+                if($method == 'resolve' && !empty($extended['severity'][$param->severity]))
                 {
-                    $rule['score'] = $rule['score'] + $this->config->score->{$extended}['severity'][$param->severity];
+                    $rule['score'] = $rule['score'] + $extended['severity'][$param->severity];
                 }
                 break;
             case 'testTask':
@@ -134,10 +134,10 @@ class scoreModel extends model
                     /* Project PM. */
                     if(!empty($param->PM))
                     {
-                        $rule['score'] = $this->config->score->{$extended}['manager']['close'];
+                        $rule['score'] = $extended['manager']['close'];
                         if($param->end > date('Y-m-d', $timestamp))
                         {
-                            $rule['score'] += $this->config->score->{$extended}['manager']['onTime'];
+                            $rule['score'] += $extended['manager']['onTime'];
                         }
                         $this->saveScore($param->PM, $rule, $module, $method, $desc, $time);
                     }
@@ -146,10 +146,10 @@ class scoreModel extends model
                     $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('project')->eq($param->id)->fetchPairs();
                     if(!empty($teams))
                     {
-                        $rule['score'] = $this->config->score->{$extended}['member']['close'];
+                        $rule['score'] = $extended['member']['close'];
                         if($param->end > date('Y-m-d', $timestamp))
                         {
-                            $rule['score'] += $this->config->score->{$extended}['member']['onTime'];
+                            $rule['score'] += $extended['member']['onTime'];
                         }
 
                         foreach($teams as $user)