← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gallery2/hardy-security

« back to all changes in this revision

Viewing changes to modules/core/AdminEditGroupUsers.inc

  • Committer: Bazaar Package Importer
  • Author(s): Michael C. Schultheiss
  • Date: 2006-04-16 16:42:35 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060416164235-8uy0u4bfjdxpge2o
Tags: 2.1.1-1
http://bugs.debian.org/362936
http://bugs.debian.org/359000
http://bugs.debian.org/362152
* New upstream release (Closes: #362936)
  + Bugfixes for Postgres7 (Closes: #359000, #362152)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/core/AdminEditGroupUsers.inc
3
3
 * $RCSfile: AdminEditGroupUsers.inc,v $
4
4
 *
5
5
 * Gallery - a web based photo album viewer and editor
6
 
 * Copyright (C) 2000-2005 Bharat Mediratta
 
6
 * Copyright (C) 2000-2006 Bharat Mediratta
7
7
 *
8
8
 * This program is free software; you can redistribute it and/or modify
9
9
 * it under the terms of the GNU General Public License as published by
19
19
 * along with this program; if not, write to the Free Software
20
20
 * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
21
21
 */
22
 
 
23
22
/**
24
 
 * @version $Revision: 1.32 $ $Date: 2005/08/23 03:49:02 $
 
23
 * @version $Revision: 1.35 $ $Date: 2006/01/17 01:52:01 $
25
24
 * @package GalleryCore
26
25
 * @subpackage UserInterface
27
26
 * @author Bharat Mediratta <bharat@menalto.com>
43
42
        global $gallery;
44
43
 
45
44
        $ret = GalleryCoreApi::assertUserIsSiteAdministrator();
46
 
        if ($ret->isError()) {
 
45
        if ($ret) {
47
46
            return array($ret->wrap(__FILE__, __LINE__), null);
48
47
        }
49
48
 
50
 
        $results = array();
51
 
        $error = array();
52
 
        $status = array();
 
49
        $results = $error = $status = array();
53
50
 
54
51
        /* Load the group */
55
52
        $groupId = GalleryUtilities::getRequestVariables('groupId');
56
53
        list ($ret, $group) = GalleryCoreApi::loadEntitiesById($groupId);
57
 
        if ($ret->isError()) {
 
54
        if ($ret) {
58
55
            return array($ret->wrap(__FILE__, __LINE__), null);
59
56
        }
60
57
 
90
87
                if (empty($error)) {
91
88
                    foreach ($form['userIds'] as $userId => $dummy) {
92
89
                        list ($ret, $user) = GalleryCoreApi::loadEntitiesById($userId);
93
 
                        if ($ret->isError()) {
 
90
                        if ($ret) {
94
91
                            return array($ret->wrap(__FILE__, __LINE__), null);
95
92
                        }
96
93
 
97
94
                        $ret = GalleryCoreApi::removeUserFromGroup($user->getId(), $groupId);
98
 
                        if ($ret->isError()) {
 
95
                        if ($ret) {
99
96
                            return array($ret->wrap(__FILE__, __LINE__), null);
100
97
                        }
101
98
                        $removedUsers++;
118
115
                } else {
119
116
                    list ($ret, $user) =
120
117
                        GalleryCoreApi::fetchUserByUsername($form['text']['userName']);
121
 
                    if ($ret->isError() && ($ret->getErrorCode() & ERROR_MISSING_OBJECT)) {
 
118
                    if ($ret && ($ret->getErrorCode() & ERROR_MISSING_OBJECT)) {
122
119
                        $error[] = 'form[error][text][userName][invalid]';
123
 
                    } else if ($ret->isError()) {
 
120
                    } else if ($ret) {
124
121
                        return array($ret->wrap(__FILE__, __LINE__), null);
125
122
                    } else {
126
123
                        /* Is the user already in the group? */
127
 
                        list ($ret, $inGroup) = GalleryCoreApi::isUserInGroup($user->getId(), $groupId);
128
 
                        if ($ret->isError()) {
 
124
                        list ($ret, $inGroup) =
 
125
                            GalleryCoreApi::isUserInGroup($user->getId(), $groupId);
 
126
                        if ($ret) {
129
127
                            return array($ret->wrap(__FILE__, __LINE__), null);
130
128
                        }
131
129
                        if ($inGroup) {
136
134
 
137
135
                if (empty($error)) {
138
136
                    $ret = GalleryCoreApi::addUserToGroup($user->getId(), $groupId);
139
 
                    if ($ret->isError()) {
 
137
                    if ($ret) {
140
138
                        return array($ret->wrap(__FILE__, __LINE__), null);
141
139
                    }
142
140
 
158
156
        $results['status'] = $status;
159
157
        $results['error'] = $error;
160
158
 
161
 
        return array(GalleryStatus::success(), $results);
 
159
        return array(null, $results);
162
160
    }
163
161
}
164
162
 
178
176
        global $gallery;
179
177
 
180
178
        $ret = GalleryCoreApi::assertUserIsSiteAdministrator();
181
 
        if ($ret->isError()) {
 
179
        if ($ret) {
182
180
            return array($ret->wrap(__FILE__, __LINE__), null);
183
181
        }
184
182
 
193
191
        /* Load the group */
194
192
        $groupId = GalleryUtilities::getRequestVariables('groupId');
195
193
        list ($ret, $group) = GalleryCoreApi::loadEntitiesById($groupId);
196
 
        if ($ret->isError()) {
 
194
        if ($ret) {
197
195
            return array($ret->wrap(__FILE__, __LINE__), null);
198
196
        }
199
197
 
205
203
 
206
204
        /* Initialize the user list */
207
205
        list ($ret, $totalUserCount) = GalleryCoreApi::fetchUserCount(null, $group->getId());
208
 
        if ($ret->isError()) {
 
206
        if ($ret) {
209
207
            return array($ret->wrap(__FILE__, __LINE__), null);
210
208
        }
211
209
 
235
233
                                        (($form['list']['page'] - 1) * $form['list']['pageSize']),
236
234
                                        $form['list']['filter']
237
235
                              );
238
 
        if ($ret->isError()) {
 
236
        if ($ret) {
239
237
            return array($ret->wrap(__FILE__, __LINE__), null);
240
238
        }
241
239
 
255
253
        $AdminEditGroupUsers = array();
256
254
        $AdminEditGroupUsers['totalUserCount'] = $totalUserCount;
257
255
        $AdminEditGroupUsers['canRemove'] = $canRemove;
258
 
        $AdminEditGroupUsers['group'] = $group->getMemberData();
 
256
        $AdminEditGroupUsers['group'] = (array)$group;
259
257
 
260
 
        /* Render the HTML body */
261
258
        $template->setVariable('AdminEditGroupUsers', $AdminEditGroupUsers);
262
259
        $template->setVariable('controller', 'core.AdminEditGroupUsers');
263
 
 
264
 
        return array(GalleryStatus::success(),
 
260
        return array(null,
265
261
                     array('body' => 'modules/core/templates/AdminEditGroupUsers.tpl'));
266
262
    }
267
263
}