diff --git a/config/config.php b/config/config.php
index f2ca73b6db..f5d486673c 100644
--- a/config/config.php
+++ b/config/config.php
@@ -138,7 +138,7 @@ define('TABLE_ACTION', '`' . $config->db->prefix . 'action`');
define('TABLE_FILE', '`' . $config->db->prefix . 'file`');
define('TABLE_HISTORY', '`' . $config->db->prefix . 'history`');
define('TABLE_EXTENSION', '`' . $config->db->prefix . 'extension`');
-define('TABLE_LANG', '`' . $config->db->prefix . 'lang`');
+if(!defined('TABLE_LANG')) define('TABLE_LANG', '`' . $config->db->prefix . 'lang`');
$config->objectTables['product'] = TABLE_PRODUCT;
$config->objectTables['story'] = TABLE_STORY;
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 83beb7babf..cfd30b5bf2 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -103,8 +103,8 @@
title);?> |
planTitle;?> |
story->sourceList[$story->source];?> |
- openedBy];?> |
- assignedTo];?> |
+ openedBy, $story->openedBy);?> |
+ assignedTo, $story->assignedTo);?> |
estimate;?> |
story->statusList[$story->status];?> |
story->stageList[$story->stage];?> |
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 71b8b9b1f0..1098d71277 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -95,7 +95,7 @@
>assignedTo == 'closed' ? 'Closed' : $task->assignedToRealName;?> |
- finishedBy];?> |
+ finishedBy, $task->finishedBy);?> |
cookie->windowWidth > $this->config->wideSize):?>
finishedDate, 5, 6);?> |
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index c03de0978c..016e79696e 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -93,19 +93,19 @@
| project->PM;?> |
- PM];?> |
+ PM, $project->PM);?> |
| project->PO;?> |
- PO];?> |
+ PO, $project->PO);?> |
| project->QD;?> |
- QD];?> |
+ QD, $project->QD);?> |
| project->RD;?> |
- RD];?> |
+ RD, $project->RD);?> |
| project->products;?> |
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index e232544371..57906fb2c6 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -148,7 +148,7 @@
| task->mailto;?> |
- mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?> |
+ mailto)); foreach($mailto as $account) echo ' ' . zget($users, $account, $account); ?> |
@@ -191,19 +191,19 @@
| task->openedBy;?> |
- openedBy) echo $users[$task->openedBy] . $lang->at . $task->openedDate;?> |
+ openedBy) echo zget($users, $task->openedBy, $task->openedBy) . $lang->at . $task->openedDate;?> |
| task->finishedBy;?> |
- finishedBy) echo $users[$task->finishedBy] . $lang->at . $task->finishedDate;?> |
+ finishedBy) echo zget($users, $task->finishedBy, $task->finishedBy) . $lang->at . $task->finishedDate;?> |
| task->canceledBy;?> |
- canceledBy) echo $users[$task->canceledBy] . $lang->at . $task->canceledDate;?> |
+ canceledBy) echo zget($users, $task->canceledBy, $task->canceledBy) . $lang->at . $task->canceledDate;?> |
| task->closedBy;?> |
- closedBy) echo $users[$task->closedBy] . $lang->at . $task->closedDate;?> |
+ closedBy) echo zget($users, $task->closedBy, $task->closedBy) . $lang->at . $task->closedDate;?> |
| task->closedReason;?> |
@@ -211,7 +211,7 @@
| task->lastEdited;?> |
- lastEditedBy) echo $users[$task->lastEditedBy] . $lang->at . $task->lastEditedDate;?> |
+ lastEditedBy) echo zget($users, $task->lastEditedBy, $task->lastEditedBy) . $lang->at . $task->lastEditedDate;?> |
diff --git a/module/user/model.php b/module/user/model.php
index 556b741a42..f9f2eba19b 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -619,6 +619,8 @@ class userModel extends model
public function failPlus($account)
{
$user = $this->dao->select('fails')->from(TABLE_USER)->where('account')->eq($account)->fetch();
+ if(empty($user)) return 0;
+
$fails = $user->fails;
$fails ++;
if($fails < $this->config->user->failTimes)
@@ -645,6 +647,8 @@ class userModel extends model
public function checkLocked($account)
{
$user = $this->dao->select('locked')->from(TABLE_USER)->where('account')->eq($account)->fetch();
+ if(empty($user)) return false;
+
if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) > $this->config->user->lockMinutes * 60) return false;
return true;
}