projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more refactoring in invoices for subgroups.
[timetracker.git]
/
WEB-INF
/
lib
/
ttRoleHelper.class.php
diff --git
a/WEB-INF/lib/ttRoleHelper.class.php
b/WEB-INF/lib/ttRoleHelper.class.php
index
ee15146
..
c324d68
100644
(file)
--- a/
WEB-INF/lib/ttRoleHelper.class.php
+++ b/
WEB-INF/lib/ttRoleHelper.class.php
@@
-37,7
+37,7
@@
class ttRoleHelper {
$mdb2 = getConnection();
$sql = "select id, name, description, rank, rights, status from tt_roles
$mdb2 = getConnection();
$sql = "select id, name, description, rank, rights, status from tt_roles
- where id = $id and group_id = ".$user->get
Active
Group()." and (status = 0 or status = 1)";
+ where id = $id and group_id = ".$user->getGroup()." and (status = 0 or status = 1)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
@@
-56,7
+56,7
@@
class ttRoleHelper {
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
global $user;
- $sql = "select id from tt_roles where group_id = ".$user->get
Active
Group().
+ $sql = "select id from tt_roles where group_id = ".$user->getGroup().
" and name = ".$mdb2->quote($role_name)." and (status = 1 or status = 0)";
$res = $mdb2->query($sql);
" and name = ".$mdb2->quote($role_name)." and (status = 1 or status = 0)";
$res = $mdb2->query($sql);
@@
-89,7
+89,7
@@
class ttRoleHelper {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- $sql = "select rights from tt_roles where group_id = ".$user->get
Active
Group()." and id = $role_id";
+ $sql = "select rights from tt_roles where group_id = ".$user->getGroup()." and id = $role_id";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
@@
-102,13
+102,15
@@
class ttRoleHelper {
}
// getRoleByRank looks up a role by its rank.
}
// getRoleByRank looks up a role by its rank.
- static function getRoleByRank($rank
, $group_id
) {
+ static function getRoleByRank($rank) {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- $rank = (int) $rank; // Cast to int just in case for better security.
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+ $rank = (int) $rank; // Cast to int just in case.
- $sql = "select id from tt_roles where group_id = $group_id and rank = $rank and (status = 1 or status = 0)";
+ $sql = "select id from tt_roles where group_id = $group_id and
org_id = $org_id and
rank = $rank and (status = 1 or status = 0)";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
@@
-124,7
+126,7
@@
class ttRoleHelper {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- $group_id = $user->get
Active
Group();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
$id = (int)$fields['id'];
$org_id = $user->org_id;
$id = (int)$fields['id'];
@@
-144,7
+146,7
@@
class ttRoleHelper {
global $user;
$mdb2 = getConnection();
global $user;
$mdb2 = getConnection();
- $group_id = $user->get
Active
Group();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
// Mark the task as deleted.
$org_id = $user->org_id;
// Mark the task as deleted.
@@
-156,10
+158,11
@@
class ttRoleHelper {
// insert - inserts an entry into tt_roles table.
static function insert($fields)
{
// insert - inserts an entry into tt_roles table.
static function insert($fields)
{
+ global $user;
$mdb2 = getConnection();
$mdb2 = getConnection();
- $group_id =
(int) $fields['group_id']
;
- $org_id =
(int) $fields['org_id']
;
+ $group_id =
$user->getGroup()
;
+ $org_id =
$user->org_id
;
$name = $fields['name'];
$rank = (int) $fields['rank'];
$description = $fields['description'];
$name = $fields['name'];
$rank = (int) $fields['rank'];
$description = $fields['description'];
@@
-172,10
+175,7
@@
class ttRoleHelper {
if (is_a($affected, 'PEAR_Error'))
return false;
if (is_a($affected, 'PEAR_Error'))
return false;
- $sql = "SELECT LAST_INSERT_ID() AS last_id";
- $res = $mdb2->query($sql);
- $val = $res->fetchRow();
- $last_id = $val['last_id'];
+ $last_id = $mdb2->lastInsertID('tt_roles', 'id');
return $last_id;
}
return $last_id;
}