X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttUser.class.php;h=587ca73c6f346edcc2a0c84d17dfb4e562871315;hb=45a530c33fdd7ab2ccd1905c24a371c94e17eac5;hp=60f4f984b40c5f61a374e2ca35f4a7ab13dd8c2c;hpb=91f127aa192430faa62c59530f42ee5d82b9f7e3;p=timetracker.git
diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 60f4f984..587ca73c 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -59,7 +59,6 @@ class ttUser {
var $punch_mode = 0; // Whether punch mode is enabled for user.
var $allow_overlap = 0; // Whether to allow overlapping time entries.
var $future_entries = 0; // Whether to allow creating future entries.
- var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
var $bcc_email = null; // Bcc email.
var $allow_ip = null; // Specification from where user is allowed access.
var $password_complexity = null; // Password complexity example.
@@ -142,7 +141,6 @@ class ttUser {
$this->punch_mode = $config->getDefinedValue('punch_mode');
$this->allow_overlap = $config->getDefinedValue('allow_overlap');
$this->future_entries = $config->getDefinedValue('future_entries');
- $this->uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
if ($this->isPluginEnabled('wu')) {
$minutes_in_unit = $config->getIntValue('minutes_in_unit');
if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
@@ -232,11 +230,14 @@ class ttUser {
$result = array();
$mdb2 = getConnection();
- $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
+ $group_id = $this->getGroup();
+ $org_id = $this->org_id;
+ $user_id = $this->getUser();
+
// Do a query with inner join to get assigned projects.
- $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
- inner join tt_user_project_binds upb on (upb.user_id = ".$this->getUser()." and upb.project_id = p.id and upb.status = 1)
- where p.group_id = $group_id and p.status = 1 order by p.name";
+ $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p".
+ " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
+ " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
@@ -290,9 +291,12 @@ class ttUser {
$mdb2 = getConnection();
+ $group_id = $this->getGroup();
+ $org_id = $this->org_id;
+
// Get active clients for group.
$clients = array();
- $sql = "select id, name, address, projects from tt_clients where group_id = $this->group_id and status = 1";
+ $sql = "select id, name, address, projects from tt_clients where group_id = $group_id and org_id = $org_id and status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
@@ -742,7 +746,7 @@ class ttUser {
$user_part .= ' '.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_name).'';
}
if ($this->behalf_group_id) {
- $user_part .= ', '.$i18n->get('label.on_behalf').' '.htmlspecialchars($this->behalf_group_name).'';
+ $user_part .= ', '.htmlspecialchars($this->behalf_group_name).'';
} else {
if ($this->group_name) // Note: we did not require group names in the past.
$user_part .= ', '.$this->group_name;