diff --git a/module/action/model.php b/module/action/model.php index 84ecbe3297..a2dda98a2e 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -439,7 +439,10 @@ class actionModel extends model if(is_array($desc)) { $extra = strtolower($action->extra); + + /* Fix bug #741. */ if(isset($desc['extra'])) $desc['extra'] = $this->lang->$objectType->{$desc['extra']}; + if(isset($desc['extra'][$extra])) { echo str_replace('$extra', $desc['extra'][$extra], $desc['main']); diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index 109c84a68e..daa56c5acf 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -78,7 +78,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); visits;?> id&from=company", '', 'list'); + common::printIcon('user', 'edit', "userID=$user->account&from=company", '', 'list'); if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) { echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn-icon iframe'"); diff --git a/module/install/model.php b/module/install/model.php index 0c5581e9fa..26241ed35e 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -147,12 +147,8 @@ class installModel extends model */ public function checkSessionSavePath() { - if(preg_match('/WIN/i', PHP_OS)) - { - $sessionSavePath = preg_replace("/\d;/", '', session_save_path()); - return $result = (is_dir($sessionSavePath) and is_writable($sessionSavePath)) ? 'ok' : 'fail'; - } - return 'ok'; + $sessionSavePath = preg_replace("/\d;/", '', session_save_path()); + return $result = (is_dir($sessionSavePath) and is_writable($sessionSavePath)) ? 'ok' : 'fail'; } /** diff --git a/module/my/control.php b/module/my/control.php index fe7bdfe747..c4b2eebd31 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -369,7 +369,7 @@ class my extends control $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->editProfile; $this->view->position[] = $this->lang->my->editProfile; - $this->view->user = $this->user->getById($this->app->user->id); + $this->view->user = $this->user->getById($this->app->user->account); $this->display(); } @@ -392,7 +392,7 @@ class my extends control $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->changePassword; $this->view->position[] = $this->lang->my->changePassword; - $this->view->user = $this->user->getById($this->app->user->id); + $this->view->user = $this->user->getById($this->app->user->account); $this->display(); } diff --git a/module/productplan/model.php b/module/productplan/model.php index 16850378e8..f235daa7cd 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -137,7 +137,7 @@ class productplanModel extends model public function update($planID) { $oldPlan = $this->getById($planID); - $plan = fixer::input('post')->stripTags($this->config->productplan->editor->edit['id'], $this->config->allowedTags)->get(); + $plan = fixer::input('post')->stripTags($this->config->productplan->editor->edit['id'], $this->config->allowedTags)->remove('delta')->get(); $this->dao->update(TABLE_PRODUCTPLAN) ->data($plan) ->autoCheck() diff --git a/module/project/control.php b/module/project/control.php index ff1d04ab49..7315fefcaf 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1594,7 +1594,9 @@ class project extends control { if(isset($_POST['storyIDList'])) { - foreach($this->post->storyIDList as $storyID) + $storyIDList = $this->post->storyIDList; + $_POST = array(); + foreach($storyIDList as $storyID) { $this->project->unlinkStory($projectID, $storyID); } diff --git a/module/user/model.php b/module/user/model.php index 1abc88a4ae..0bafb1f177 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -326,7 +326,7 @@ class userModel extends model $oldUser = $this->getById($userID); - $userID = (int)$userID; + $userID = $oldUser->id; $user = fixer::input('post') ->setDefault('join', '0000-00-00') ->setIF($this->post->password1 != false, 'password', md5($this->post->password1))