← Back to branch summary

~xibo-maintainers/xibo/tuttle

« back to all changes in this revision

Viewing changes to server/lib/data/datasetgroupsecurity.data.class.php

  • Committer: Dan Garner
  • Date: 2014-10-21 16:07:57 UTC
  • mfrom: (345.2.61 server-170-alpha2)
  • Revision ID: dan@xibo.org.uk-20141021160757-vbg562lzvp24dxm4
[cms] Merged lp:~dangarner/xibo/server-170-alpha2

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/lib/data/datasetgroupsecurity.data.class.php
27
27
        if ($dataSetId == 0 || $dataSetId == '')
28
28
            return $this->SetError(25001, __('Missing dataSetId'));
29
29
 
30
 
        try {
31
 
            $dbh = PDOConnect::init();
32
 
 
33
 
            $sth = $dbh->prepare('SELECT `group`.groupid, `group`.`group`, view, edit, del, `group`.isuserspecific
34
 
              FROM `group`
35
 
               LEFT OUTER JOIN lkdatasetgroup
36
 
               ON lkdatasetgroup.GroupID = group.GroupID
37
 
                   AND lkdatasetgroup.DataSetID = :datasetid
38
 
             WHERE `group`.GroupID <> :groupid
39
 
            ORDER BY `group`.IsEveryone DESC, `group`.IsUserSpecific, `group`.`Group`');
40
 
 
41
 
            $sth->execute(array(
42
 
                    'datasetid' => $dataSetId,
43
 
                    'groupid' => $groupId
44
 
                ));
45
 
 
46
 
            $security = array();
47
 
 
48
 
            foreach($sth->fetchAll() as $row) {
49
 
                $security[] = array(
50
 
                        'groupid' => Kit::ValidateParam($row['groupid'], _INT),
51
 
                        'group' => Kit::ValidateParam($row['group'], _STRING),
52
 
                        'view' => Kit::ValidateParam($row['view'], _INT),
53
 
                        'edit' => Kit::ValidateParam($row['edit'], _INT),
54
 
                        'del' => Kit::ValidateParam($row['del'], _INT),
55
 
                        'isuserspecific' => Kit::ValidateParam($row['isuserspecific'], _INT),
56
 
                    );
57
 
            }
58
 
          
59
 
            return $security;
60
 
        }
61
 
        catch (Exception $e) {
62
 
            
63
 
            Debug::LogEntry('error', $e->getMessage());
64
 
        
65
 
            if (!$this->IsError())
66
 
                $this->SetError(1, __('Unknown Error'));
67
 
        
68
 
            return false;
69
 
        }
 
30
        $userGroup = new UserGroup();
 
31
        if (!$result = $userGroup->GetPermissionsForObject('lkdatasetgroup', 'DataSetID', $dataSetId))
 
32
            return $this->SetError($userGroup->GetErrorMessage());
 
33
 
 
34
        $security = array();
 
35
 
 
36
        foreach($result as $row) {
 
37
            $security[] = array(
 
38
                    'groupid' => Kit::ValidateParam($row['groupid'], _INT),
 
39
                    'group' => Kit::ValidateParam($row['group'], _STRING),
 
40
                    'view' => Kit::ValidateParam($row['view'], _INT),
 
41
                    'edit' => Kit::ValidateParam($row['edit'], _INT),
 
42
                    'del' => Kit::ValidateParam($row['del'], _INT),
 
43
                    'isuserspecific' => Kit::ValidateParam($row['isuserspecific'], _INT),
 
44
                );
 
45
        }
 
46
      
 
47
        return $security;
70
48
    }
71
49
 
72
50
    /**