* Fix bug

module/block/model.php

@@ -50,7 +50,7 @@ class blockModel extends model
 
         $data->params = helper::jsonEncode($data->params);
         $this->dao->replace(TABLE_BLOCK)->data($data)->exec();
-        $this->loadModel('score')->create('block', 'set');
+        if(!dao::isError()) $this->loadModel('score')->create('block', 'set');
     }
 
     /**

module/bug/model.php

@@ -200,7 +200,7 @@ class bugModel extends model
 
             $this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
             $bugID = $this->dao->lastInsertID();
-            $this->loadModel('score')->create('bug', 'create', $bugID);
+            if(!dao::isError()) $this->loadModel('score')->create('bug', 'create', $bugID);
             if(!empty($data->uploadImage[$i]) and !empty($file))
             {
                 $file['objectType'] = 'bug';
@@ -224,7 +224,7 @@ class bugModel extends model
             if(is_dir($realPath)) $classFile->removeDir($realPath);
             unset($_SESSION['bugImagesFile']);
         }
-        $this->loadModel('score')->create('ajax', 'batchCreate');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchCreate');
         return $actions;
     }
 
@@ -657,7 +657,7 @@ class bugModel extends model
                 }
             }
         }
-        $this->loadModel('score')->create('ajax', 'batchEdit');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchEdit');
         return $allChanges;
     }
 
@@ -761,9 +761,12 @@ class bugModel extends model
             ->get();
 
         $this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bugID)->exec();
-        $this->loadModel('score')->create('bug', 'confirmBug', $oldBug);
 
-        if(!dao::isError()) return common::createChanges($oldBug, $bug);
+        if(!dao::isError())
+        {
+            $this->loadModel('score')->create('bug', 'confirmBug', $oldBug);
+            return common::createChanges($oldBug, $bug);
+        }
     }
 
     /**
@@ -856,7 +859,7 @@ class bugModel extends model
             ->checkIF($bug->resolution == 'fixed',     'resolvedBuild','notempty')
             ->where('id')->eq((int)$bugID)
             ->exec();
-        $this->loadModel('score')->create('bug', 'resolve', $oldBug);
+        if(!dao::isError()) $this->loadModel('score')->create('bug', 'resolve', $oldBug);
         /* Link bug to build and release. */
         $this->linkBugToBuild($bugID, $bug->resolvedBuild);
     }
@@ -1863,7 +1866,7 @@ class bugModel extends model
 
         $condition = "`type`='bug' and account='{$this->app->user->account}'";
         $this->dao->insert(TABLE_USERTPL)->data($template)->batchCheck('title, content', 'notempty')->check('title', 'unique', $condition)->exec();
-        $this->loadModel('score')->create('bug', 'saveTplModal', $this->dao->lastInsertID());
+        if(!dao::isError()) $this->loadModel('score')->create('bug', 'saveTplModal', $this->dao->lastInsertID());
     }
 
     /**

module/project/control.php

@@ -1829,7 +1829,7 @@ class project extends control
                 $this->project->unlinkStory($projectID, $storyID);
             }
         }
-        $this->loadModel('score')->create('ajax', 'batchOther');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         die(js::locate($this->createLink('project', 'story', "projectID=$projectID")));
     }
 

module/project/model.php

@@ -291,7 +291,7 @@ class projectModel extends model
             $lib->main    = '1';
             $lib->acl     = $project->acl == 'open' ? 'open' : 'private';
             $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
-            $this->loadModel('score')->create('project', 'create', $projectID);
+            if(!dao::isError()) $this->loadModel('score')->create('project', 'create', $projectID);
             return $projectID;
         } 
     }
@@ -578,8 +578,11 @@ class projectModel extends model
             ->autoCheck()
             ->where('id')->eq((int)$projectID)
             ->exec();
-        $this->loadModel('score')->create('project', 'close', $oldProject);
-        if(!dao::isError()) return common::createChanges($oldProject, $project);
+        if(!dao::isError())
+        {
+            $this->loadModel('score')->create('project', 'close', $oldProject);
+            return common::createChanges($oldProject, $project);
+        }
     }
 
     /**

module/search/model.php

@@ -129,7 +129,7 @@ class searchModel extends model
         $formSessionName  = $this->post->module . 'Form';
         $this->session->set($querySessionName, $where);
         $this->session->set($formSessionName,  $_POST);
-        if($scoreNum > 2) $this->loadModel('score')->create('search', 'saveQueryAdvanced');
+        if($scoreNum > 2 && !dao::isError()) $this->loadModel('score')->create('search', 'saveQueryAdvanced');
     }
 
     /**
@@ -306,7 +306,7 @@ class searchModel extends model
                 $featureBarConfig->value   = json_encode($newConfig);
                 $this->dao->replace(TABLE_CONFIG)->data($featureBarConfig)->exec();
             }
-            $this->loadModel('score')->create('search', 'saveQuery', $queryID);
+            if(!dao::isError()) $this->loadModel('score')->create('search', 'saveQuery', $queryID);
             return $queryID;
         }
         return false;

module/story/control.php

@@ -726,7 +726,7 @@ class story extends control
 
         if(dao::isError()) die(js::error(dao::getError()));
         foreach($actions as $storyID => $actionID) $this->story->sendmail($storyID, $actionID);
-        $this->loadModel('score')->create('ajax', 'batchOther');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         die(js::locate($this->session->storyList, 'parent'));
     }
 
@@ -795,7 +795,7 @@ class story extends control
                     $this->story->sendmail($storyID, $actionID);
                 }
             }
-            $this->loadModel('score')->create('ajax', 'batchOther');
+            if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
             die(js::locate($this->session->storyList, 'parent'));
         }
 
@@ -875,7 +875,7 @@ class story extends control
             $this->action->logHistory($actionID, $changes);
             $this->story->sendmail($storyID, $actionID);
         }
-        $this->loadModel('score')->create('ajax', 'batchOther');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         die(js::reload('parent'));
     }
 
@@ -898,7 +898,7 @@ class story extends control
             $this->action->logHistory($actionID, $changes);
             $this->story->sendmail($storyID, $actionID);
         }
-        $this->loadModel('score')->create('ajax', 'batchOther');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         die(js::reload('parent'));
     }
 
@@ -921,7 +921,7 @@ class story extends control
             $this->action->logHistory($actionID, $changes);
             $this->story->sendmail($storyID, $actionID);
         }
-        $this->loadModel('score')->create('ajax', 'batchOther');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         die(js::reload('parent'));
     }
 
@@ -946,7 +946,7 @@ class story extends control
             $this->action->logHistory($actionID, $changes);
             $this->story->sendmail($storyID, $actionID);
         }
-        $this->loadModel('score')->create('ajax', 'batchOther');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         die(js::locate($this->session->storyList, 'parent'));
     }
 
@@ -969,7 +969,7 @@ class story extends control
                 $this->story->sendmail($storyID, $actionID);
             }
         }
-        $this->loadModel('score')->create('ajax', 'batchOther');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         die(js::locate($this->session->storyList));
     }
 

module/story/model.php

@@ -230,7 +230,7 @@ class storyModel extends model
                 }
             }
             $this->setStage($storyID);
-            $this->loadModel('score')->create('story', 'create',$storyID);
+            if(!dao::isError()) $this->loadModel('score')->create('story', 'create',$storyID);
             return array('status' => 'created', 'id' => $storyID);
         }
         return false;
@@ -345,7 +345,7 @@ class storyModel extends model
                 $this->dao->insert(TABLE_STORYSPEC)->data($specData)->exec();
 
                 $actionID = $this->action->create('story', $storyID, 'Opened', '');
-                $this->loadModel('score')->create('story', 'create',$storyID);
+                if(!dao::isError()) $this->loadModel('score')->create('story', 'create',$storyID);
                 $mails[$i] = new stdclass();
                 $mails[$i]->storyID  = $storyID;
                 $mails[$i]->actionID = $actionID;
@@ -361,7 +361,7 @@ class storyModel extends model
             if(is_dir($realPath)) $classFile->removeDir($realPath);
             unset($_SESSION['storyImagesFile']);
         }
-        $this->loadModel('score')->create('ajax', 'batchCreate');
+        if(!dao::isError())  $this->loadModel('score')->create('ajax', 'batchCreate');
         return $mails;
     }
 
@@ -619,7 +619,7 @@ class storyModel extends model
                 }
             }
         }
-        $this->loadModel('score')->create('ajax', 'batchEdit');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchEdit');
         return $allChanges;
     }
 
@@ -872,7 +872,7 @@ class storyModel extends model
             {
                 die(js::error('story#' . $storyID . dao::getError(true)));
             }
-            if($story->stage == 'released') $this->loadModel('score')->create('story', 'close', $storyID);
+            if(!dao::isError() && $story->stage == 'released') $this->loadModel('score')->create('story', 'close', $storyID);
         }
 
         return $allChanges;

module/task/control.php

@@ -473,7 +473,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
                 $this->task->sendmail($taskID, $actionID);
             }
-            $this->loadModel('score')->create('ajax', 'batchOther');
+            if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         }
         die(js::reload('parent'));
     }
@@ -503,7 +503,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
                 $this->task->sendmail($taskID, $actionID);
             }
-            $this->loadModel('score')->create('ajax', 'batchOther');
+            if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
             die(js::reload('parent'));
         }
     }
@@ -972,7 +972,7 @@ class task extends control
                 $cancelURL  = $this->server->HTTP_REFERER;
                 die(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
             }
-            $this->loadModel('score')->create('ajax', 'batchOther');
+            if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
         }
         die(js::reload('parent'));
     }

module/task/model.php

@@ -128,7 +128,7 @@ class taskModel extends model
                 }
             }
 
-            $this->loadModel('score')->create('task', 'create', $taskID);
+            if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
             $taskIdList[$assignedTo] = array('status' => 'created', 'id' => $taskID);
         }
         return $taskIdList;
@@ -229,7 +229,7 @@ class taskModel extends model
             $taskID = $this->dao->lastInsertID();
             if($story) $this->story->setStage($tasks->story[$i]);
             $actionID = $this->action->create('task', $taskID, 'Opened', '');
-            $this->loadModel('score')->create('task', 'create', $taskID);
+            if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID);
 
             $mails[$i] = new stdclass();
             $mails[$i]->taskID   = $taskID;
@@ -237,7 +237,7 @@ class taskModel extends model
         }
 
         $this->computeWorkingHours($tasks->parent[0]);
-        $this->loadModel('score')->create('ajax', 'batchCreate');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchCreate');
         return $mails;
     }
 
@@ -595,7 +595,7 @@ class taskModel extends model
                 die(js::error('task#' . $taskID . dao::getError(true)));
             }
         }
-        $this->loadModel('score')->create('ajax', 'batchEdit');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchEdit');
         return $allChanges;
     }
 
@@ -888,7 +888,7 @@ class taskModel extends model
         if($task->status == 'done')
         {
             $this->updateParentStatus($task->parent, 'done');
-            $this->loadModel('score')->create('task', 'finish', $taskID);
+            if(!dao::isError()) $this->loadModel('score')->create('task', 'finish', $taskID);
         }
         $this->computeWorkingHours($task->parent);
 
@@ -976,7 +976,7 @@ class taskModel extends model
         $this->computeWorkingHours($oldTask->parent);
 
         if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
-        if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID);
+        if($task->status == 'done' && !dao::isError()) $this->loadModel('score')->create('task', 'finish', $taskID);
         if(!dao::isError()) return common::createChanges($oldTask, $task);
     }
 
@@ -1033,10 +1033,13 @@ class taskModel extends model
 
         $this->dao->update(TABLE_TASK)->set('status')->eq('closed')->where('parent')->eq($taskID)->exec();
 
-        $this->loadModel('score')->create('task', 'close', $taskID);
         if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
 
-        if(!dao::isError()) return common::createChanges($oldTask, $task);
+        if(!dao::isError())
+        {
+            $this->loadModel('score')->create('task', 'close', $taskID);
+            return common::createChanges($oldTask, $task);
+        }
     }
 
     /**
@@ -2224,6 +2227,7 @@ class taskModel extends model
      *
      * @param  string $users
      * @param  string $current
+     *
      * @access public
      * @return void
      */
@@ -2231,21 +2235,24 @@ class taskModel extends model
     {
         /* Process user */
         if(!is_array($users)) $users = explode(',', trim($users, ','));
-        if(!$current) return reset($users);
-
-        $hit  = false;
-        $next = '';
-        foreach($users as $key => $account)
+        if(!$current || !in_array($current, $users) || array_search($current, $users) == max(array_keys($users)))
         {
-            if($hit)
+            return reset($users);
+        }
+
+        $next = '';
+        while(true)
+        {
+            if(current($users) == $current)
             {
-                $next = $account;
+                $next = next($users);
                 break;
             }
-
-            if($account == $current) $hit = true;
+            else
+            {
+                next($users);
+            }
         }
-        if($next == '') return reset($users);
         return $next;
     }
 
@@ -2253,6 +2260,7 @@ class taskModel extends model
      * Get task's team member pairs.
      *
      * @param  object $task
+     *
      * @access public
      * @return array
      */

module/task/view/view.html.php

@@ -35,7 +35,7 @@
     {
         ob_start();
         echo "<div class='btn-group'>";
-        common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transmit);
+        common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
         common::printIcon('task', 'start',          "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
         common::printIcon('task', 'restart',        "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
         common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe', true);

module/testcase/model.php

@@ -225,7 +225,7 @@ class testcaseModel extends model
                 unset($cases->keywords[$i]);
             }
         }
-        $this->loadModel('score')->create('ajax', 'batchCreate');
+        if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchCreate');
     }
 
     /**

module/testtask/model.php

@@ -897,7 +897,7 @@ class testtaskModel extends model
             }
         }
 
-        $this->loadModel('score')->create('testtask', 'runCase', $runID);
+        if(!dao::isError()) $this->loadModel('score')->create('testtask', 'runCase', $runID);
 
         return $caseResult;
     }

module/todo/model.php

@@ -93,8 +93,8 @@ class todoModel extends model
                     die(js::reload('parent'));
                 }
                 $todoID = $this->dao->lastInsertID();
-                $this->loadModel('action')->create('todo', $todoID, 'opened');
                 $this->loadModel('score')->create('todo', 'create', $todoID);
+                $this->loadModel('action')->create('todo', $todoID, 'opened');
             }
             else
             {

module/user/model.php

@@ -408,9 +408,9 @@ class userModel extends model
             }
         }
         if(!empty($user->password) and $user->account == $this->app->user->account) $this->app->user->password = $user->password;
-        $this->loadModel('score')->create('user', 'editProfile');
         if(!dao::isError())
         {
+            $this->loadModel('score')->create('user', 'editProfile');
             $this->loadModel('mail');
             if($this->config->mail->mta == 'sendcloud' and $user->email != $oldUser->email)
             {
@@ -538,7 +538,10 @@ class userModel extends model
         $this->dao->update(TABLE_USER)->data($user)->autoCheck()->where('id')->eq((int)$userID)->exec();
         $this->app->user->password       = $user->password;
         $this->app->user->modifyPassword = false;
-        $this->loadModel('score')->create('user', 'changePassword', $this->computePasswordStrength($this->post->password1));
+        if(!dao::isError())
+        {
+            $this->loadModel('score')->create('user', 'changePassword', $this->computePasswordStrength($this->post->password1));
+        }
     }
 
     /**