From d2fbd1acdf543a69d68585b516a3bdb1fa7b308a Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 24 Aug 2023 15:42:32 +0800 Subject: [PATCH] * Replace and, or to &&, ||. --- module/task/control.php | 14 +++++++------- module/task/model.php | 34 +++++++++++++++++----------------- module/task/tao.php | 36 ++++++++++++++++++------------------ 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index 4694d1416f..6f999dd1cc 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -146,7 +146,7 @@ class task extends control /* Update other data related to the task after it is created. */ $this->task->afterBatchCreate($taskIdList); - if(!isset($output['laneID']) or !isset($output['columnID'])) $this->loadModel('kanban')->updateLane($executionID, 'task'); + if(!isset($output['laneID']) || !isset($output['columnID'])) $this->loadModel('kanban')->updateLane($executionID, 'task'); $response = $this->taskZen->responseAfterbatchCreate($taskIdList, $execution); return $this->send($response); @@ -332,7 +332,7 @@ class task extends control $this->session->set('executionList', $this->app->getURI(true), 'execution'); // This allow get var of session as `$_SESSION['app-execution']['executionList']`. $execution = $this->view->execution ?? $this->execution->getById($task->execution); - if(!helper::isAjaxRequest('modal') and $execution->type == 'kanban') + if(!helper::isAjaxRequest('modal') && $execution->type == 'kanban') { helper::setcookie('taskToOpen', (string)$taskID); return $this->send(array('load' => $this->createLink('execution', 'kanban', "executionID=$execution->id"))); @@ -531,7 +531,7 @@ class task extends control $task = $this->task->getById($taskID); /* Show a confirm message if the task has no consumed effort. */ - if($confirm == 'no' and $task->consumed - $effort->consumed == 0) + if($confirm == 'no' && $task->consumed - $effort->consumed == 0) { $formUrl = $this->createLink('task', 'deleteWorkhour', "effortID=$effortID&confirm=yes"); return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.confirm('{$this->lang->task->confirmDeleteLastEffort}').then((res) => {if(res) $.ajaxSubmit({url: '$formUrl'});});")); @@ -637,7 +637,7 @@ class task extends control if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError()); /* Record log. */ - if($this->post->comment != '' or !empty($changes)) + if($this->post->comment != '' || !empty($changes)) { $actionID = $this->loadModel('action')->create('task', $taskID, 'Paused', $this->post->comment); $this->action->logHistory($actionID, $changes); @@ -885,7 +885,7 @@ class task extends control $changes = $this->task->activate($task, $this->post->comment, $teamData, $output); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - if($this->post->comment != '' or !empty($changes)) + if($this->post->comment != '' || !empty($changes)) { $actionID = $this->loadModel('action')->create('task', $taskID, 'Activated', $this->post->comment); $this->action->logHistory($actionID, $changes); @@ -908,7 +908,7 @@ class task extends control $teamMembers = array(); foreach($this->view->members as $account => $name) { - if(!$account or in_array($account, $teamAccounts)) $teamMembers[$account] = $name; + if(!$account || in_array($account, $teamAccounts)) $teamMembers[$account] = $name; } $this->view->teamMembers = $teamMembers; } @@ -1059,7 +1059,7 @@ class task extends control /* Get execution info and export fields. */ $execution = $this->execution->getByID($executionID); $allExportFields = $this->config->task->exportFields; - if($execution->lifetime == 'ops' or in_array($execution->attribute, array('request', 'review'))) $allExportFields = str_replace(' story,', '', $allExportFields); + if($execution->lifetime == 'ops' || in_array($execution->attribute, array('request', 'review'))) $allExportFields = str_replace(' story,', '', $allExportFields); if($_POST) { diff --git a/module/task/model.php b/module/task/model.php index 42d437dcad..ca65b6626a 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -684,7 +684,7 @@ class taskModel extends model } /* Compute hours and manage team for multi-task. */ - if($teamData and $teamData->team and count(array_filter($teamData->team)) > 1) + if($teamData && $teamData->team && count(array_filter($teamData->team)) > 1) { $teams = $this->manageTaskTeam($oldTask->mode, $task, $teamData); if(!empty($teams)) $task = $this->computeMultipleHours($oldTask, $task, array(), false); @@ -700,13 +700,13 @@ class taskModel extends model unset($oldTask->parent, $task->parent); /* Logging history when multi-task team members have changed. */ - if(!empty($oldTask->team) and !empty($teamData->team)) list($oldTask, $task) = $this->taskTao->createChangesForTeam($oldTask, $task); + if(!empty($oldTask->team) && !empty($teamData->team)) list($oldTask, $task) = $this->taskTao->createChangesForTeam($oldTask, $task); $this->loadModel('file')->processFile4Object('task', $oldTask, $task); $changes = common::createChanges($oldTask, $task); /* Record log. */ - if($this->post->comment != '' or !empty($changes)) + if($this->post->comment != '' || !empty($changes)) { $action = !empty($changes) ? 'Edited' : 'Commented'; $actionID = $this->loadModel('action')->create('task', $taskID, $action, $this->post->comment); @@ -901,7 +901,7 @@ class taskModel extends model $team = array_filter($postData->team); foreach($team as $i => $account) { - if($postData->teamConsumed[$i] == 0 and $postData->teamLeft[$i] == 0) + if($postData->teamConsumed[$i] == 0 && $postData->teamLeft[$i] == 0) { dao::$errors[] = $this->lang->task->noticeTaskStart; return false; @@ -1063,7 +1063,7 @@ class taskModel extends model } $changes = common::createChanges($task, $newTask, 'task'); - if($changes and $actionID) $this->loadModel('action')->logHistory($actionID, $changes); + if($changes && $actionID) $this->loadModel('action')->logHistory($actionID, $changes); if($changes) $allChanges = array_merge($allChanges, $changes); $task = $newTask; } @@ -1076,7 +1076,7 @@ class taskModel extends model if($task->parent > 0) $this->updateParentStatus($task->id); if($task->story) $this->loadModel('story')->setStage($task->story); if($task->status != $oldStatus) $this->loadModel('kanban')->updateLane($task->execution, 'task', $taskID); - if($task->status == 'done' and !dao::isError()) $this->loadModel('score')->create('task', 'finish', $taskID); + if($task->status == 'done' && !dao::isError()) $this->loadModel('score')->create('task', 'finish', $taskID); } return $allChanges; @@ -1155,7 +1155,7 @@ class taskModel extends model $this->loadModel('score')->create('task', 'close', $task->id); /* Confirm need update issue status. */ - if(isset($oldTask->fromIssue) and $oldTask->fromIssue > 0) + if(isset($oldTask->fromIssue) && $oldTask->fromIssue > 0) { $fromIssue = $this->loadModel('issue')->getByID($oldTask->fromIssue); if($fromIssue->status != 'closed') @@ -1227,7 +1227,7 @@ class taskModel extends model { $taskID = $task->id; - if(strpos($this->config->task->activate->requiredFields, 'comment') !== false and !$comment) + if(strpos($this->config->task->activate->requiredFields, 'comment') !== false && !$comment) { dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->comment); return false; @@ -1398,7 +1398,7 @@ class taskModel extends model $parentIdList = array(); foreach($tasks as $task) { - if($task->parent <= 0 or isset($tasks[$task->parent]) or isset($parentIdList[$task->parent])) continue; + if($task->parent <= 0 || isset($tasks[$task->parent]) || isset($parentIdList[$task->parent])) continue; $parentIdList[$task->parent] = $task->parent; } @@ -1572,7 +1572,7 @@ class taskModel extends model foreach($tasks as $task) { /* 如果任务不是父任务，或者父任务已经在任务列表中，或者父任务已经在当前列表中，则跳过处理。*/ - if($task->parent <= 0 or isset($tasks[$task->parent]) or isset($parentIdList[$task->parent])) continue; + if($task->parent <= 0 || isset($tasks[$task->parent]) || isset($parentIdList[$task->parent])) continue; $parentIdList[$task->parent] = $task->parent; } @@ -1716,11 +1716,11 @@ class taskModel extends model foreach($tasks as $key => $task) { /* Compute task progress. */ - if($task->consumed == 0 and $task->left == 0) + if($task->consumed == 0 && $task->left == 0) { $task->progress = 0; } - elseif($task->consumed != 0 and $task->left == 0) + elseif($task->consumed != 0 && $task->left == 0) { $task->progress = 100; } @@ -1758,7 +1758,7 @@ class taskModel extends model { $members = array_column($task->team, 'account'); if(!in_array($this->app->user->account, $members)) return false; - if($task->mode == 'linear' and $this->app->user->account != $task->assignedTo) return false; + if($task->mode == 'linear' && $this->app->user->account != $task->assignedTo) return false; return true; } @@ -1803,7 +1803,7 @@ class taskModel extends model $newTeamInfo = new stdclass(); $newTeamInfo->consumed = $currentTeam->consumed + $effort->consumed - $oldEffort->consumed; if($currentTeam->status != 'done') $newTeamInfo->left = $data->left; - if($currentTeam->status != 'done' and $newTeamInfo->consumed > 0 and $data->left == 0) $newTeamInfo->status = 'done'; + if($currentTeam->status != 'done' && $newTeamInfo->consumed > 0 && $data->left == 0) $newTeamInfo->status = 'done'; $this->dao->update(TABLE_TASKTEAM)->data($newTeamInfo)->where('id')->eq($currentTeam->id)->exec(); $data = $this->computeMultipleHours($task, $data); @@ -1961,7 +1961,7 @@ class taskModel extends model /* Story changed or not. */ $task->needConfirm = false; - if(!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion) $task->needConfirm = true; + if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion) $task->needConfirm = true; /* Set product type for task. */ if(!empty($task->product)) @@ -2031,7 +2031,7 @@ class taskModel extends model $children = array(); foreach($tasks as $task) { - if($task->parent > 0 and isset($tasks[$task->parent])) + if($task->parent > 0 && isset($tasks[$task->parent])) { $children[$task->parent][$task->id] = $task; unset($tasks[$task->id]); @@ -2403,7 +2403,7 @@ class taskModel extends model } /* Process table statistics data. */ - if($field != 'date' and $field != 'deadline') asort($fields); + if($field != 'date' && $field != 'deadline') asort($fields); foreach($fields as $field => $count) { $data = new stdclass(); diff --git a/module/task/tao.php b/module/task/tao.php index 7dd740ce9f..0bbd7f8eeb 100644 --- a/module/task/tao.php +++ b/module/task/tao.php @@ -130,7 +130,7 @@ class taskTao extends taskModel $actionID = $this->action->create('task', $task->id, 'Started', $record->work); } /* Activate task by effort. */ - elseif($newTask->left != 0 and strpos('done,pause,cancel,closed,pause', $task->status) !== false) + elseif($newTask->left != 0 && strpos('done,pause,cancel,closed,pause', $task->status) !== false) { $newTask->status = 'doing'; $newTask->assignedTo = $this->app->user->account; @@ -167,7 +167,7 @@ class taskTao extends taskModel ->orderBy('date_desc,id_desc')->limit(1)->fetch(); $consumed = $task->consumed + $effort->consumed - $oldEffort->consumed; - $left = ($lastEffort and $effort->id == $lastEffort->id) ? $effort->left : $task->left; + $left = ($lastEffort && $effort->id == $lastEffort->id) ? $effort->left : $task->left; $now = helper::now(); $data = new stdclass(); @@ -176,7 +176,7 @@ class taskTao extends taskModel $data->status = $task->status; $data->lastEditedBy = $this->app->user->account; $data->lastEditedDate = $now; - if(empty($left) and strpos('wait,doing,pause', $task->status) !== false) + if(empty($left) && strpos('wait,doing,pause', $task->status) !== false) { $data->status = 'done'; $data->finishedBy = $this->app->user->account; @@ -234,11 +234,11 @@ class taskTao extends taskModel { dao::$errors["consumed[$id]"] = $this->lang->task->error->consumedThisTime; } - elseif(!is_numeric($consumed) and !empty($consumed)) + elseif(!is_numeric($consumed) && !empty($consumed)) { dao::$errors["consumed[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->totalNumber; } - elseif(is_numeric($consumed) and $consumed <= 0) + elseif(is_numeric($consumed) && $consumed <= 0) { dao::$errors["consumed[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->record, '0'); } @@ -246,7 +246,7 @@ class taskTao extends taskModel /* Check left hours. */ if($left === '') dao::$errors["left[$id]"] = $this->lang->task->error->left; if(!is_numeric($left)) dao::$errors["left[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->leftNumber; - if(is_numeric($left) and $left < 0) dao::$errors["left[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->left, '0'); + if(is_numeric($left) && $left < 0) dao::$errors["left[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->left, '0'); } if(dao::isError()) return false; @@ -276,7 +276,7 @@ class taskTao extends taskModel ->orderBy('date desc,id desc')->limit(2)->fetchAll(); $lastTwoEfforts = isset($lastTwoEfforts[1]) ? $lastTwoEfforts[1] : ''; if($lastTwoEfforts) $left = $lastTwoEfforts->left; - if(empty($lastTwoEfforts) and $left == 0) $left = $task->estimate; + if(empty($lastTwoEfforts) && $left == 0) $left = $task->estimate; } /* 如果该任务是多人团队任务则做一些额外的处理。*/ @@ -303,14 +303,14 @@ class taskTao extends taskModel $newTeamInfo = new stdclass(); $newTeamInfo->consumed = $currentTeam->consumed - $effort->consumed; if($currentTeam->status != 'done') $newTeamInfo->left = $left; - if($currentTeam->status == 'done' and $left > 0 and $task->mode == 'multi') + if($currentTeam->status == 'done' && $left > 0 && $task->mode == 'multi') { $newTeamInfo->status = 'doing'; $newTeamInfo->left = $left; } - if($currentTeam->status != 'done' and $newTeamInfo->consumed > 0 and $left == 0) $newTeamInfo->status = 'done'; - if($task->mode == 'multi' and $currentTeam->status == 'done' and ($newTeamInfo->consumed == 0 and $left == 0)) + if($currentTeam->status != 'done' && $newTeamInfo->consumed > 0 && $left == 0) $newTeamInfo->status = 'done'; + if($task->mode == 'multi' && $currentTeam->status == 'done' && ($newTeamInfo->consumed == 0 && $left == 0)) { $newTeamInfo->status = 'doing'; $newTeamInfo->left = $currentTeam->estimate; @@ -337,7 +337,7 @@ class taskTao extends taskModel $data->consumed = $consumed; $data->left = $left; $data->status = ($left == 0 && $consumed != 0) ? 'done' : $task->status; - if($effort->isLast and $consumed == 0 and $task->status != 'wait') + if($effort->isLast && $consumed == 0 && $task->status != 'wait') { $data->status = 'wait'; $data->left = $task->estimate; @@ -350,7 +350,7 @@ class taskTao extends taskModel $data->closedDate = null; if($task->assignedTo == 'closed') $data->assignedTo = $this->app->user->account; } - elseif($effort->isLast and $left != 0 and strpos('done,pause,cancel,closed', $task->status) !== false) + elseif($effort->isLast && $left != 0 && strpos('done,pause,cancel,closed', $task->status) !== false) { $data->status = 'doing'; $data->finishedBy = ''; @@ -361,7 +361,7 @@ class taskTao extends taskModel $data->canceledDate = null; $data->closedDate = null; } - elseif($consumed != 0 and $left == 0 and strpos('done,pause,cancel,closed', $task->status) === false) + elseif($consumed != 0 && $left == 0 && strpos('done,pause,cancel,closed', $task->status) === false) { $now = helper::now(); $data->status = 'done'; @@ -508,7 +508,7 @@ class taskTao extends taskModel $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('parent')->eq((int)$taskID)->exec(); $this->dao->update(TABLE_TASK)->set('assignedTo=openedBy')->where('parent')->eq((int)$taskID)->exec(); - if(!dao::isError() and count($oldChildrenTasks) > 0) + if(!dao::isError() && count($oldChildrenTasks) > 0) { $this->loadModel('action'); foreach($oldChildrenTasks as $oldChildrenTask) @@ -606,7 +606,7 @@ class taskTao extends taskModel } /* Set the datetime and operator when the task is modified. */ - if(empty($task->lastEditedDate) or empty($task->lastEditedBy)) + if(empty($task->lastEditedDate) || empty($task->lastEditedBy)) { $task->lastEditedBy = $this->app->user->account; $task->lastEditedDate = helper::now(); @@ -1044,7 +1044,7 @@ class taskTao extends taskModel $this->dao->update(TABLE_TASK)->data($data)->autoCheck()->where('parent')->eq($parentID)->exec(); $this->computeWorkingHours($parentID); - if(!dao::isError() and count($oldChildrenTasks) > 0) + if(!dao::isError() && count($oldChildrenTasks) > 0) { $this->loadModel('action'); foreach($oldChildrenTasks as $oldChildrenTask) @@ -1075,7 +1075,7 @@ class taskTao extends taskModel ->where('id')->eq($currentTeam->id) ->exec(); - if($task->mode == 'linear' and empty($record->order)) $this->updateEffortOrder($effortID, $currentTeam->order); + if($task->mode == 'linear' && empty($record->order)) $this->updateEffortOrder($effortID, $currentTeam->order); } /** @@ -1157,7 +1157,7 @@ class taskTao extends taskModel $task->closedReason = 'done'; } - if($status == 'doing' or $status == 'wait') + if($status == 'doing' || $status == 'wait') { if($parentTask->assignedTo == 'closed') {