projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored admin_group_editp.php.
[timetracker.git]
/
WEB-INF
/
lib
/
ttGroupHelper.class.php
diff --git
a/WEB-INF/lib/ttGroupHelper.class.php
b/WEB-INF/lib/ttGroupHelper.class.php
index
01429aa
..
39cdb78
100644
(file)
--- a/
WEB-INF/lib/ttGroupHelper.class.php
+++ b/
WEB-INF/lib/ttGroupHelper.class.php
@@
-67,7
+67,7
@@
class ttGroupHelper {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- $parent_id = $user->get
Active
Group();
+ $parent_id = $user->getGroup();
$org_id = $user->org_id;
$sql = "select id from tt_groups where parent_id = $parent_id and org_id = $org_id".
$org_id = $user->org_id;
$sql = "select id from tt_groups where parent_id = $parent_id and org_id = $org_id".
@@
-86,7
+86,7
@@
class ttGroupHelper {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- $parent_id = $user->get
Active
Group();
+ $parent_id = $user->getGroup();
$org_id = $user->org_id;
$name = $fields['name'];
$description = $fields['description'];
$org_id = $user->org_id;
$name = $fields['name'];
$description = $fields['description'];
@@
-156,7
+156,7
@@
class ttGroupHelper {
// Obtain subgroups and call self recursively on them.
$subgroups = $user->getSubgroups($group_id);
foreach($subgroups as $subgroup) {
// Obtain subgroups and call self recursively on them.
$subgroups = $user->getSubgroups($group_id);
foreach($subgroups as $subgroup) {
- if (!
$this->
markGroupDeleted($subgroup['id']))
+ if (!
ttGroupHelper::
markGroupDeleted($subgroup['id']))
return false;
}
return false;
}
@@
-207,7
+207,8
@@
class ttGroupHelper {
}
// Mark group deleted.
}
// Mark group deleted.
- $sql = "update tt_groups set status = null where id = $group_id and org_id = $org_id";
+ $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+ $sql = "update tt_groups set status = null $modified_part where id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error')) return false;
@@
-220,10
+221,13
@@
class ttGroupHelper {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- // TODO: add modified info to sql for some tables, depending on table name.
+ // Add modified info to sql for some tables, depending on table name.
+ if ($table_name == 'tt_users') {
+ $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+ }
$org_id = $user->org_id; // The only security measure we use here for match.
$org_id = $user->org_id; // The only security measure we use here for match.
- $sql = "update $table_name set status = null where group_id = $group_id and org_id = $org_id";
+ $sql = "update $table_name set status = null
$modified_part
where group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
@@
-259,7
+263,7
@@
class ttGroupHelper {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- $group_id = $user->get
Active
Group();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
$sql = "select * from tt_roles".
" where group_id = $group_id and org_id = $org_id and status is not null";
$org_id = $user->org_id;
$sql = "select * from tt_roles".
" where group_id = $group_id and org_id = $org_id and status is not null";