Completed
Push — 1.10.x ( e39098...d9ba33 )
by Julito
34:46
created
main/social/group_invitation.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 // Database Table Definitions
20 20
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
21
-$tbl_group_rel_user	= Database::get_main_table(TABLE_USERGROUP_REL_USER);
21
+$tbl_group_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
22 22
 
23 23
 // setting the name of the tool
24 24
 $tool_name = get_lang('SubscribeUsersToGroup');
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     }
41 41
 }
42 42
 
43
-$interbreadcrumb[] = array('url' =>'groups.php','name' => get_lang('Groups'));
43
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
44 44
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']);
45 45
 $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('SubscribeUsersToGroup'));
46 46
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 
75 75
         if (is_array($user_list) && count($user_list) > 0) {
76 76
             //send invitation message
77
-            foreach ($user_list as $user_id){
77
+            foreach ($user_list as $user_id) {
78 78
                 $result = MessageManager::send_message(
79 79
                     $user_id,
80 80
                     $title,
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
 
111 111
             if (!isset($group_friend_list[$group_id]) ||
112 112
                 isset($group_friend_list[$group_id]) &&
113
-                $group_friend_list[$group_id]['relation_type'] == '' ) {
114
-                $Users[$friend['friend_user_id']]= array(
113
+                $group_friend_list[$group_id]['relation_type'] == '') {
114
+                $Users[$friend['friend_user_id']] = array(
115 115
                     'user_id' => $friend['friend_user_id'],
116 116
                     'firstname' => $friend['firstName'],
117 117
                     'lastname' => $friend['lastName'],
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
                 );
121 121
             }
122 122
         } else {
123
-            $Users[$friend['friend_user_id']]= array(
123
+            $Users[$friend['friend_user_id']] = array(
124 124
                 'user_id' => $friend['friend_user_id'],
125 125
                 'firstname' =>$friend['firstName'],
126 126
                 'lastname' => $friend['lastName'],
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
     }
132 132
 }
133 133
 
134
-if (is_array($Users) && count($Users) > 0 ) {
134
+if (is_array($Users) && count($Users) > 0) {
135 135
     foreach ($Users as $user) {
136 136
         if ($user['group_id'] != $group_id) {
137 137
             $nosessionUsersList[$user['user_id']] = api_get_person_name(
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 }
144 144
 
145 145
 $social_left_content = SocialManager::show_social_menu('invite_friends', $group_id);
146
-$social_right_content =  '<h2>'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h2>';
146
+$social_right_content = '<h2>'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h2>';
147 147
 
148 148
 if (count($nosessionUsersList) == 0) {
149 149
     $friends = SocialManager::get_friends(api_get_user_id());
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
     array(GROUP_USER_PERMISSION_PENDING_INVITATION)
180 180
 );
181 181
 
182
-if (is_array($members) && count($members)>0) {
182
+if (is_array($members) && count($members) > 0) {
183 183
     foreach ($members as &$member) {
184 184
         $image = UserManager::getUserPicture($member['id']);
185 185
         $member['image'] = '<img src="'.$image.'"  width="50px" height="50px"  />';
Please login to merge, or discard this patch.
main/social/groups.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -12,30 +12,30 @@  discard block
 block discarded – undo
12 12
 
13 13
 api_block_anonymous_users();
14 14
 
15
-if (api_get_setting('allow_social_tool') !='true') {
15
+if (api_get_setting('allow_social_tool') != 'true') {
16 16
     api_not_allowed();
17 17
 }
18 18
 $join_url = '';
19 19
 
20 20
 $this_section = SECTION_SOCIAL;
21
-$allowed_views = array('mygroups','newest','pop');
21
+$allowed_views = array('mygroups', 'newest', 'pop');
22 22
 $content = null;
23 23
 
24 24
 if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
25 25
     if ($_GET['view'] == 'mygroups') {
26
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
27
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyGroups'));
28
-    } else if ( $_GET['view'] == 'newest') {
29
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
30
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Newest'));
31
-    } else  {
32
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
33
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Popular'));
26
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
27
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('MyGroups'));
28
+    } else if ($_GET['view'] == 'newest') {
29
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
30
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Newest'));
31
+    } else {
32
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
33
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Popular'));
34 34
     }
35 35
 } else {
36
-    $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
36
+    $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
37 37
     if (!isset($_GET['id'])) {
38
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList'));
38
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('GroupList'));
39 39
     }
40 40
 }
41 41
 
@@ -72,16 +72,16 @@  discard block
 block discarded – undo
72 72
         } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
73 73
             $name .= ' '.Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
74 74
         }
75
-        $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
75
+        $url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
76 76
         
77
-        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
78
-        if ($count_users_group == 1 ) {
77
+        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0, 1000));
78
+        if ($count_users_group == 1) {
79 79
             $count_users_group = $count_users_group.' '.get_lang('Member');
80 80
         } else {
81 81
             $count_users_group = $count_users_group.' '.get_lang('Members');
82 82
         }
83 83
 
84
-        $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
84
+        $picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
85 85
         $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';
86 86
         
87 87
         $members = Display::returnFontAwesomeIcon('user').$count_users_group;
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
         $html .= '<div class="title-groups">';
94 94
         $html .= Display::tag('h5', $url);
95 95
         $html .= '</div>';
96
-        $html .= '<div class="members-groups">' . $members . '</div>';
96
+        $html .= '<div class="members-groups">'.$members.'</div>';
97 97
         if ($result['description'] != '') {
98
-            $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
98
+            $html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
99 99
         } else {
100 100
             $html .= '';
101 101
         }
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
103 103
         $html .= '</div>';
104 104
         
105 105
         $grid_item_2 = $html;
106
-        $grid_my_groups[]= array($grid_item_2);
106
+        $grid_my_groups[] = array($grid_item_2);
107 107
     }
108 108
 }
109 109
 
110 110
 // Newest groups
111
-$results = $usergroup->get_groups_by_age(4,false);
111
+$results = $usergroup->get_groups_by_age(4, false);
112 112
 
113 113
 $grid_newest_groups = array();
114 114
 foreach ($results as $result) {
@@ -117,16 +117,16 @@  discard block
 block discarded – undo
117 117
     $id = $result['id'];
118 118
     $name = cut($result['name'], GROUP_TITLE_LENGTH, true);
119 119
     
120
-    $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
121
-    if ($count_users_group == 1 ) {
120
+    $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0, 1000));
121
+    if ($count_users_group == 1) {
122 122
         $count_users_group = $count_users_group.' '.get_lang('Member');
123 123
     } else {
124 124
         $count_users_group = $count_users_group.' '.get_lang('Members');
125 125
     }
126 126
 
127
-    $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
127
+    $url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
128 128
     
129
-    $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
129
+    $picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
130 130
     $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';
131 131
     $members = Display::returnFontAwesomeIcon('user').$count_users_group;
132 132
     
@@ -138,15 +138,15 @@  discard block
 block discarded – undo
138 138
     $html .= '<div class="title-groups">';
139 139
     $html .= Display::tag('h5', $url);
140 140
     $html .= '</div>';
141
-    $html .= '<div class="members-groups">' . $members . '</div>';
141
+    $html .= '<div class="members-groups">'.$members.'</div>';
142 142
     if ($result['description'] != '') {
143
-        $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
143
+        $html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
144 144
     } else {
145 145
         $html .= '';
146 146
     }
147 147
     //Avoiding my groups
148 148
 
149
-    if (!in_array($id,$my_group_list)) {
149
+    if (!in_array($id, $my_group_list)) {
150 150
         $html .= '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
151 151
     }
152 152
     
@@ -157,11 +157,11 @@  discard block
 block discarded – undo
157 157
     
158 158
     $grid_item_2 = $html;
159 159
 
160
-    $grid_newest_groups[]= array($grid_item_2);
160
+    $grid_newest_groups[] = array($grid_item_2);
161 161
 }
162 162
 
163 163
 // Pop groups
164
-$results = $usergroup->get_groups_by_popularity(4,false);
164
+$results = $usergroup->get_groups_by_popularity(4, false);
165 165
 $grid_pop_groups = array();
166 166
 
167 167
 if (is_array($results) && count($results) > 0) {
@@ -169,18 +169,18 @@  discard block
 block discarded – undo
169 169
         $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
170 170
         $result['description'] = Security::remove_XSS($result['description'], STUDENT, true);
171 171
         $id = $result['id'];
172
-        $name = cut($result['name'],GROUP_TITLE_LENGTH,true);
172
+        $name = cut($result['name'], GROUP_TITLE_LENGTH, true);
173 173
 
174
-        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
175
-        if ($count_users_group == 1 ) {
174
+        $count_users_group = count($usergroup->get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0, 1000));
175
+        if ($count_users_group == 1) {
176 176
             $count_users_group = $count_users_group.' '.get_lang('Member');
177 177
         } else {
178 178
             $count_users_group = $count_users_group.' '.get_lang('Members');
179 179
         }
180 180
 
181
-        $url  = '<a href="group_view.php?id='.$id.'">' . $name . '</a>';
181
+        $url = '<a href="group_view.php?id='.$id.'">'.$name.'</a>';
182 182
         
183
-        $picture = $usergroup->get_picture_group($result['id'], $result['picture'],80);
183
+        $picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80);
184 184
         $result['picture'] = '<img class="social-groups-image" src="'.$picture['file'].'" />';
185 185
 
186 186
         $html = '<div class="row">';
@@ -191,15 +191,15 @@  discard block
 block discarded – undo
191 191
         $html .= '<div class="title-groups">';
192 192
         $html .= Display::tag('h5', $url);
193 193
         $html .= '</div>';
194
-        $html .= '<div class="members-groups">' . $members . '</div>';
194
+        $html .= '<div class="members-groups">'.$members.'</div>';
195 195
         if ($result['description'] != '') {
196
-            $html .= '<div class="description-groups">' . cut($result['description'],100,true) . '</div>';
196
+            $html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
197 197
         } else {
198 198
             $html .= '';
199 199
         }
200 200
         //Avoiding my groups
201 201
 
202
-        if (!in_array($id,$my_group_list)) {
202
+        if (!in_array($id, $my_group_list)) {
203 203
             $html .= '<a class="btn" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
204 204
         }
205 205
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
         $html .= '</div>';
209 209
 
210 210
         $grid_item_2 = $html;
211
-        $grid_pop_groups[]= array($grid_item_2);
211
+        $grid_pop_groups[] = array($grid_item_2);
212 212
     }
213 213
 }
214 214
 
@@ -222,61 +222,61 @@  discard block
 block discarded – undo
222 222
     switch ($view_group) {
223 223
         case 'mygroups':
224 224
             if (count($grid_my_groups) > 0) {
225
-                $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
225
+                $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true, false));
226 226
             }
227 227
             if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
228
-                $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
228
+                $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
229 229
                     get_lang('CreateASocialGroup').'</a>';
230 230
             } else {
231
-                if (api_is_allowed_to_edit(null,true)) {
232
-                    $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
231
+                if (api_is_allowed_to_edit(null, true)) {
232
+                    $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
233 233
                         get_lang('CreateASocialGroup').'</a>';
234 234
                 }
235 235
             }
236 236
             break;
237 237
         case 'newest':
238 238
             if (count($grid_newest_groups) > 0) {
239
-                $newest_content = Display::return_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
239
+                $newest_content = Display::return_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, false));
240 240
             }
241 241
             break;
242 242
         default:
243 243
             if (count($grid_pop_groups) > 0) {
244
-                $popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
244
+                $popular_content = Display::return_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, true, true));
245 245
             }
246 246
             break;
247 247
     }
248 248
 } else {
249 249
     $my_group_content = null;
250 250
     if (count($grid_my_groups) > 0) {
251
-        $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
251
+        $my_group_content = Display::return_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true, false));
252 252
     } else {
253 253
         $my_group_content = '<span class="muted">'.get_lang('GroupNone').'</span>';
254 254
     }
255 255
     if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
256
-        $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
256
+        $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
257 257
             get_lang('CreateASocialGroup').'</a>';
258 258
     } else {
259
-        if (api_is_allowed_to_edit(null,true)) {
260
-            $create_group_item =  '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
259
+        if (api_is_allowed_to_edit(null, true)) {
260
+            $create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.get_lang('CreateASocialGroup').'</a>';
261 261
         }
262 262
     }
263 263
     if (count($grid_newest_groups) > 0) {
264
-        $newest_content = Display::return_sortable_grid('mygroups', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
264
+        $newest_content = Display::return_sortable_grid('mygroups', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, false));
265 265
     } else {
266 266
         $newest_content = '<span class="muted">'.get_lang('GroupNone').'</span>';
267 267
     }
268 268
     if (count($grid_pop_groups) > 0) {
269
-        $popular_content = Display::return_sortable_grid('mygroups', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
269
+        $popular_content = Display::return_sortable_grid('mygroups', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true, true, true));
270 270
     } else {
271 271
         $popular_content = '<span class="muted">'.get_lang('GroupNone').'</span>';
272 272
     }
273 273
 }
274 274
 
275 275
 if (!empty($create_group_item)) {
276
-    $social_right_content .=  Display::page_subheader($create_group_item);
276
+    $social_right_content .= Display::page_subheader($create_group_item);
277 277
 }
278 278
 $headers = array(get_lang('Newest'), get_lang('Popular'), get_lang('MyGroups'));
279
-$social_right_content .= Display::tabs($headers, array($newest_content, $popular_content, $my_group_content),'tab_browse');
279
+$social_right_content .= Display::tabs($headers, array($newest_content, $popular_content, $my_group_content), 'tab_browse');
280 280
 
281 281
 $show_message = null;
282 282
 if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'show_message' && isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'topic_deleted') {
Please login to merge, or discard this patch.
main/social/group_members.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
     $group_id
118 118
 );
119 119
 $social_menu_block = SocialManager::show_social_menu('member_list', $group_id);
120
-$social_right_content = '<h2>' . $group_info['name'] . '</h2>';
120
+$social_right_content = '<h2>'.$group_info['name'].'</h2>';
121 121
 
122 122
 foreach ($users as $user) {
123 123
     switch ($user['relation_type']) {
@@ -136,24 +136,24 @@  discard block
 block discarded – undo
136 136
                 )
137 137
             )
138 138
             ) {
139
-                $user['link'] = '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=delete">' .
139
+                $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete">'.
140 140
                     Display::return_icon(
141 141
                         'delete.png',
142 142
                         get_lang('DeleteFromGroup')
143
-                    ) . '</a>' .
144
-                    '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=set_moderator">' .
143
+                    ).'</a>'.
144
+                    '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=set_moderator">'.
145 145
                     Display::return_icon(
146 146
                         'social_moderator_add.png',
147 147
                         get_lang('AddModerator')
148
-                    ) . '</a>';
148
+                    ).'</a>';
149 149
             }
150 150
             break;
151 151
         case GROUP_USER_PERMISSION_PENDING_INVITATION:
152
-            $user['link'] = '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=add">' .
152
+            $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=add">'.
153 153
                 Display::return_icon(
154 154
                     'pending_invitation.png',
155 155
                     get_lang('PendingInvitation')
156
-                ) . '</a>';
156
+                ).'</a>';
157 157
             break;
158 158
         case GROUP_USER_PERMISSION_MODERATOR:
159 159
             $user['link'] = Display::return_icon(
@@ -162,17 +162,17 @@  discard block
 block discarded – undo
162 162
             );
163 163
             //only group admin can manage moderators
164 164
             if ($user_role == GROUP_USER_PERMISSION_ADMIN) {
165
-                $user['link'] .= '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=delete_moderator">'.
165
+                $user['link'] .= '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete_moderator">'.
166 166
                     Display::return_icon(
167 167
                         'social_moderator_delete.png',
168 168
                         get_lang('DeleteModerator')
169
-                    ) . '</a>';
169
+                    ).'</a>';
170 170
             }
171 171
             break;
172 172
     }
173 173
 
174 174
     $userPicture = UserManager::getUserPicture($user['id']);
175
-    $user['image'] = '<img src="' . $userPicture . '"  width="50px" height="50px"  />';
175
+    $user['image'] = '<img src="'.$userPicture.'"  width="50px" height="50px"  />';
176 176
     $new_member_list[] = $user;
177 177
 }
178 178
 if (count($new_member_list) > 0) {
Please login to merge, or discard this patch.
main/social/group_add.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,12 +6,12 @@  discard block
 block discarded – undo
6 6
  * @author Julio Montoya <[email protected]>
7 7
  */
8 8
 
9
-$language_file= 'userInfo';
9
+$language_file = 'userInfo';
10 10
 $cidReset = true;
11 11
 require_once '../inc/global.inc.php';
12 12
 
13 13
 api_block_anonymous_users();
14
-if (api_get_setting('allow_social_tool') !='true') {
14
+if (api_get_setting('allow_social_tool') != 'true') {
15 15
     api_not_allowed();
16 16
 }
17 17
 
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 $nameTools = get_lang('AddGroup');
39 39
 $this_section = SECTION_SOCIAL;
40 40
 
41
-$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
42
-$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
43
-$interbreadcrumb[]= array ('url' =>'#','name' => $nameTools);
41
+$interbreadcrumb[] = array('url' =>'home.php', 'name' => get_lang('Social'));
42
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
43
+$interbreadcrumb[] = array('url' =>'#', 'name' => $nameTools);
44 44
 
45 45
 $social_avatar_block = SocialManager::show_social_avatar_block('group_add');
46 46
 $social_menu_block = SocialManager::show_social_menu('group_add');
Please login to merge, or discard this patch.
main/social/group_waiting_list.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,13 +11,13 @@  discard block
 block discarded – undo
11 11
 require_once '../inc/global.inc.php';
12 12
 
13 13
 api_block_anonymous_users();
14
-if (api_get_setting('allow_social_tool') !='true') {
14
+if (api_get_setting('allow_social_tool') != 'true') {
15 15
     api_not_allowed();
16 16
 }
17 17
 
18 18
 $this_section = SECTION_SOCIAL;
19 19
 
20
-$group_id= intval($_GET['id']);
20
+$group_id = intval($_GET['id']);
21 21
 $usergroup = new UserGroup();
22 22
 
23 23
 //todo @this validation could be in a function in group_portal_manager
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
     }
36 36
 }
37 37
 
38
-$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
38
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
39 39
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']);
40
-$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('WaitingList'));
40
+$interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('WaitingList'));
41 41
 
42 42
 // Group information
43 43
 $admins = $usergroup->get_users_by_group(
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 );
50 50
 $show_message = '';
51 51
 
52
-if (isset($_GET['action']) && $_GET['action']=='accept') {
52
+if (isset($_GET['action']) && $_GET['action'] == 'accept') {
53 53
     // we add a user only if is a open group
54 54
     $user_join = intval($_GET['u']);
55 55
     //if i'm a moderator
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     }
60 60
 }
61 61
 
62
-if (isset($_GET['action']) && $_GET['action']=='deny') {
62
+if (isset($_GET['action']) && $_GET['action'] == 'deny') {
63 63
     // we add a user only if is a open group
64 64
     $user_join = intval($_GET['u']);
65 65
     //if i'm a moderator
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
     }
70 70
 }
71 71
 
72
-if (isset($_GET['action']) && $_GET['action']=='set_moderator') {
72
+if (isset($_GET['action']) && $_GET['action'] == 'set_moderator') {
73 73
     // we add a user only if is a open group
74
-    $user_moderator= intval($_GET['u']);
74
+    $user_moderator = intval($_GET['u']);
75 75
     //if i'm the admin
76 76
     if ($usergroup->is_group_admin($group_id)) {
77 77
         $usergroup->update_user_role($user_moderator, $group_id, GROUP_USER_PERMISSION_MODERATOR);
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 $social_left_content = SocialManager::show_social_menu('waiting_list', $group_id);
92 92
 
93 93
 // Display form
94
-foreach($users as $user) {
94
+foreach ($users as $user) {
95 95
     switch ($user['relation_type']) {
96 96
         case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
97 97
             $user['link']  = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.
Please login to merge, or discard this patch.
main/social/friends.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
             if (isset($friends[$j])) {
129 129
                 $friend = $friends[$j];
130 130
                 $user_name = api_xml_http_response_encode($friend['firstName'].' '.$friend['lastName']);
131
-				$userPicture = UserManager::getUserPicture($friend['friend_user_id']);
131
+                $userPicture = UserManager::getUserPicture($friend['friend_user_id']);
132 132
 
133 133
                 $friend_html .= '
134 134
                     <div class="col-md-3">
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -132,15 +132,15 @@
 block discarded – undo
132 132
 
133 133
                 $friend_html .= '
134 134
                     <div class="col-md-3">
135
-                        <div class="thumbnail text-center" id="div_' . $friends[$j]['friend_user_id'] . '">
136
-                            <img src="' . $userPicture . '" class="img-responsive" id="imgfriend_' . $friend['friend_user_id'] . '" title="'.$user_name.'">
135
+                        <div class="thumbnail text-center" id="div_' . $friends[$j]['friend_user_id'].'">
136
+                            <img src="' . $userPicture.'" class="img-responsive" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$user_name.'">
137 137
                             <div class="caption">
138 138
                                 <h3>
139
-                                    <a href="profile.php?u=' . $friend['friend_user_id'] . '">' . $user_name . '</a>
139
+                                    <a href="profile.php?u=' . $friend['friend_user_id'].'">'.$user_name.'</a>
140 140
                                 </h3>
141 141
                                 <p>
142
-                                    <button class="btn btn-danger" onclick="delete_friend(this)" id=img_' . $friend['friend_user_id'] . '>
143
-                                        ' . get_lang('Delete') . '
142
+                                    <button class="btn btn-danger" onclick="delete_friend(this)" id=img_' . $friend['friend_user_id'].'>
143
+                                        ' . get_lang('Delete').'
144 144
                                     </button>
145 145
                                 </p>
146 146
                             </div>
Please login to merge, or discard this patch.
main/permissions/group_permissions.inc.php 3 patches
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -15,27 +15,27 @@  discard block
 block discarded – undo
15 15
 // ---------------------------------------------------
16 16
 if ($_POST['StoreGroupPermissions'] and $setting_visualisation=='checkbox')
17 17
 {
18
-	$result_message=store_permissions('group', $group_id);
19
-	if ($result_message)
20
-	{
21
-		Display::display_normal_message($result_message);
22
-	}
18
+    $result_message=store_permissions('group', $group_id);
19
+    if ($result_message)
20
+    {
21
+        Display::display_normal_message($result_message);
22
+    }
23 23
 }
24 24
 if (isset($_GET['action']))
25 25
 {
26
-	if (($_GET['action']=='grant' OR $_GET['action']=='revoke')  AND isset($_GET['permission']) AND isset($_GET['tool']))
27
-	{
28
-		$result_message=store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
29
-	}
30
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
31
-	{
32
-		$result_message=assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
33
-		echo 'hier';
34
-	}
26
+    if (($_GET['action']=='grant' OR $_GET['action']=='revoke')  AND isset($_GET['permission']) AND isset($_GET['tool']))
27
+    {
28
+        $result_message=store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
29
+    }
30
+    if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
31
+    {
32
+        $result_message=assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
33
+        echo 'hier';
34
+    }
35 35
 }
36 36
 if (isset($result_message))
37 37
 {
38
-	Display::display_normal_message($result_message);
38
+    Display::display_normal_message($result_message);
39 39
 }
40 40
 
41 41
 // ---------------------------------------------------
@@ -59,11 +59,11 @@  discard block
 block discarded – undo
59 59
 $inherited_permissions=limited_or_full($inherited_permissions);
60 60
 if (api_get_setting('permissions')=='limited')
61 61
 {
62
-	$header_array=$rights_limited;
62
+    $header_array=$rights_limited;
63 63
 }
64 64
 if (api_get_setting('permissions')=='full')
65 65
 {
66
-	$header_array=$rights_full;
66
+    $header_array=$rights_full;
67 67
 }
68 68
 
69 69
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
@@ -72,12 +72,12 @@  discard block
 block discarded – undo
72 72
 // ---------------------------------------------------
73 73
 if (api_get_setting('group_roles')=='true')
74 74
 {
75
-	// the list of the roles for the user
76
-	echo '<strong>'.get_lang('GroupRoles').'</strong><br />';
77
-	$current_group_course_roles=get_roles('group',$group_id);
78
-	$current_group_platform_roles=get_roles('group',$group_id, 'platform');
79
-	display_role_list($current_group_course_roles, $current_group_platform_roles);
80
-	echo '<br />';
75
+    // the list of the roles for the user
76
+    echo '<strong>'.get_lang('GroupRoles').'</strong><br />';
77
+    $current_group_course_roles=get_roles('group',$group_id);
78
+    $current_group_platform_roles=get_roles('group',$group_id, 'platform');
79
+    display_role_list($current_group_course_roles, $current_group_platform_roles);
80
+    echo '<br />';
81 81
 }
82 82
 
83 83
 
@@ -92,47 +92,47 @@  discard block
 block discarded – undo
92 92
 echo "\t\t<th>".get_lang('Module')."</th>\n";
93 93
 foreach ($header_array as $header_key=>$header_value)
94 94
 {
95
-	echo "\t\t<th>".get_lang($header_value)."</th>\n";
95
+    echo "\t\t<th>".get_lang($header_value)."</th>\n";
96 96
 }
97 97
 echo "\t</tr>\n";
98 98
 
99 99
 // the main area with the checkboxes or images
100 100
 foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
101 101
 {
102
-	echo "\t<tr>\n";
103
-	echo "\t\t<td>\n";
104
-	echo get_lang($tool);
105
-	echo "\t\t</td>\n";
102
+    echo "\t<tr>\n";
103
+    echo "\t\t<td>\n";
104
+    echo get_lang($tool);
105
+    echo "\t\t</td>\n";
106 106
 
107
-	foreach ($header_array as $key=>$value)
108
-	{
109
-		echo "\t\t<td align='center'>\n";
110
-		if (in_array($value,$rights))
111
-		{
112
-			if ($setting_visualisation=='checkbox')
113
-			{
114
-				//display_checkbox_matrix($current_group_permissions, $tool, $value);
115
-				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions,$course_admin);
116
-			}
117
-			if ($setting_visualisation=='image')
118
-			{
119
-				//display_image_matrix($current_group_permissions, $tool, $value);
120
-				display_image_matrix($current_group_permissions, $tool, $value,$inherited_permissions, $course_admin);
121
-			}
122
-		}
123
-		// note: in a later stage this part will be replaced by a function
124
-		// so that we can easily switch between a checkbox approach or an image approach
125
-		// where every click is in fact a change of status. In the checkbox approach you first have to
126
-		// do the changes and then store them by clicking the submit button.
127
-		echo "\t\t</td>\n";
128
-	}
129
-	echo "\t</tr>\n";
107
+    foreach ($header_array as $key=>$value)
108
+    {
109
+        echo "\t\t<td align='center'>\n";
110
+        if (in_array($value,$rights))
111
+        {
112
+            if ($setting_visualisation=='checkbox')
113
+            {
114
+                //display_checkbox_matrix($current_group_permissions, $tool, $value);
115
+                display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions,$course_admin);
116
+            }
117
+            if ($setting_visualisation=='image')
118
+            {
119
+                //display_image_matrix($current_group_permissions, $tool, $value);
120
+                display_image_matrix($current_group_permissions, $tool, $value,$inherited_permissions, $course_admin);
121
+            }
122
+        }
123
+        // note: in a later stage this part will be replaced by a function
124
+        // so that we can easily switch between a checkbox approach or an image approach
125
+        // where every click is in fact a change of status. In the checkbox approach you first have to
126
+        // do the changes and then store them by clicking the submit button.
127
+        echo "\t\t</td>\n";
128
+    }
129
+    echo "\t</tr>\n";
130 130
 }
131 131
 
132 132
 echo "</table>\n";
133 133
 if ($setting_visualisation=='checkbox')
134 134
 {
135
-	echo "<input type=\"Submit\" name=\"StoreGroupPermissions\" value=\"".get_lang('StorePermissions')."\">";
135
+    echo "<input type=\"Submit\" name=\"StoreGroupPermissions\" value=\"".get_lang('StorePermissions')."\">";
136 136
 }
137 137
 echo "</form>";
138 138
 
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -13,9 +13,9 @@  discard block
 block discarded – undo
13 13
 // ---------------------------------------------------
14 14
 // 			ACTIONS
15 15
 // ---------------------------------------------------
16
-if ($_POST['StoreGroupPermissions'] and $setting_visualisation=='checkbox')
16
+if ($_POST['StoreGroupPermissions'] and $setting_visualisation == 'checkbox')
17 17
 {
18
-	$result_message=store_permissions('group', $group_id);
18
+	$result_message = store_permissions('group', $group_id);
19 19
 	if ($result_message)
20 20
 	{
21 21
 		Display::display_normal_message($result_message);
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
23 23
 }
24 24
 if (isset($_GET['action']))
25 25
 {
26
-	if (($_GET['action']=='grant' OR $_GET['action']=='revoke')  AND isset($_GET['permission']) AND isset($_GET['tool']))
26
+	if (($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke') AND isset($_GET['permission']) AND isset($_GET['tool']))
27 27
 	{
28
-		$result_message=store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
28
+		$result_message = store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
29 29
 	}
30
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
30
+	if (isset($_GET['role']) AND ($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke'))
31 31
 	{
32
-		$result_message=assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
32
+		$result_message = assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
33 33
 		echo 'hier';
34 34
 	}
35 35
 }
@@ -41,41 +41,41 @@  discard block
 block discarded – undo
41 41
 // ---------------------------------------------------
42 42
 // 			RETRIEVING THE PERMISSIONS
43 43
 // ---------------------------------------------------
44
-$current_group_permissions=array();
45
-$current_group_permissions=get_permissions('group',$group_id);
44
+$current_group_permissions = array();
45
+$current_group_permissions = get_permissions('group', $group_id);
46 46
 // @todo current group permissions and current role permissions
47 47
 
48 48
 // ---------------------------------------------------
49 49
 //   INHERITED PERMISSIONS (group roles)
50 50
 // ---------------------------------------------------
51
-$group_course_roles_permissions=get_roles_permissions('group',$group_id, 'course');
52
-$group_platform_roles_permissions=get_roles_permissions('group',$group_id, 'platform');
53
-$inherited_permissions=permission_array_merge($group_course_roles_permissions,$group_platform_roles_permissions);
51
+$group_course_roles_permissions = get_roles_permissions('group', $group_id, 'course');
52
+$group_platform_roles_permissions = get_roles_permissions('group', $group_id, 'platform');
53
+$inherited_permissions = permission_array_merge($group_course_roles_permissions, $group_platform_roles_permissions);
54 54
 
55 55
 // ---------------------------------------------------
56 56
 // 			LIMITED OR FULL
57 57
 // ---------------------------------------------------
58
-$current_group_permissions=limited_or_full($current_group_permissions);
59
-$inherited_permissions=limited_or_full($inherited_permissions);
60
-if (api_get_setting('permissions')=='limited')
58
+$current_group_permissions = limited_or_full($current_group_permissions);
59
+$inherited_permissions = limited_or_full($inherited_permissions);
60
+if (api_get_setting('permissions') == 'limited')
61 61
 {
62
-	$header_array=$rights_limited;
62
+	$header_array = $rights_limited;
63 63
 }
64
-if (api_get_setting('permissions')=='full')
64
+if (api_get_setting('permissions') == 'full')
65 65
 {
66
-	$header_array=$rights_full;
66
+	$header_array = $rights_full;
67 67
 }
68 68
 
69 69
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
70 70
 // ---------------------------------------------------
71 71
 // 		DISPLAYING THE ROLES LIST
72 72
 // ---------------------------------------------------
73
-if (api_get_setting('group_roles')=='true')
73
+if (api_get_setting('group_roles') == 'true')
74 74
 {
75 75
 	// the list of the roles for the user
76 76
 	echo '<strong>'.get_lang('GroupRoles').'</strong><br />';
77
-	$current_group_course_roles=get_roles('group',$group_id);
78
-	$current_group_platform_roles=get_roles('group',$group_id, 'platform');
77
+	$current_group_course_roles = get_roles('group', $group_id);
78
+	$current_group_platform_roles = get_roles('group', $group_id, 'platform');
79 79
 	display_role_list($current_group_course_roles, $current_group_platform_roles);
80 80
 	echo '<br />';
81 81
 }
@@ -107,17 +107,17 @@  discard block
 block discarded – undo
107 107
 	foreach ($header_array as $key=>$value)
108 108
 	{
109 109
 		echo "\t\t<td align='center'>\n";
110
-		if (in_array($value,$rights))
110
+		if (in_array($value, $rights))
111 111
 		{
112
-			if ($setting_visualisation=='checkbox')
112
+			if ($setting_visualisation == 'checkbox')
113 113
 			{
114 114
 				//display_checkbox_matrix($current_group_permissions, $tool, $value);
115
-				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions,$course_admin);
115
+				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions, $course_admin);
116 116
 			}
117
-			if ($setting_visualisation=='image')
117
+			if ($setting_visualisation == 'image')
118 118
 			{
119 119
 				//display_image_matrix($current_group_permissions, $tool, $value);
120
-				display_image_matrix($current_group_permissions, $tool, $value,$inherited_permissions, $course_admin);
120
+				display_image_matrix($current_group_permissions, $tool, $value, $inherited_permissions, $course_admin);
121 121
 			}
122 122
 		}
123 123
 		// note: in a later stage this part will be replaced by a function
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 }
131 131
 
132 132
 echo "</table>\n";
133
-if ($setting_visualisation=='checkbox')
133
+if ($setting_visualisation == 'checkbox')
134 134
 {
135 135
 	echo "<input type=\"Submit\" name=\"StoreGroupPermissions\" value=\"".get_lang('StorePermissions')."\">";
136 136
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,9 +97,11 @@
 block discarded – undo
97 97
 echo "\t</tr>\n";
98 98
 
99 99
 // the main area with the checkboxes or images
100
-foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
100
+foreach ($tool_rights as $tool=>$rights) {
101
+    // $tool_rights contains all the possible tools and their rights
101 102
 {
102 103
 	echo "\t<tr>\n";
104
+}
103 105
 	echo "\t\t<td>\n";
104 106
 	echo get_lang($tool);
105 107
 	echo "\t\t</td>\n";
Please login to merge, or discard this patch.
main/permissions/all_permissions.inc.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,15 +10,15 @@  discard block
 block discarded – undo
10 10
  * Code
11 11
  */
12 12
 // possible permissions
13
-$rights_full=array("View","Add","Edit","Delete","Visibility","Move");
14
-$rights_limited=array("Add","Edit","Delete");
13
+$rights_full = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
14
+$rights_limited = array("Add", "Edit", "Delete");
15 15
 
16 16
 
17 17
 // first we determine what can be done in each tool. We do this for each tool.
18
-$tool_rights[TOOL_LINK]=array("View","Add","Edit","Delete","Visibility", "Move");
19
-$tool_rights[TOOL_DOCUMENT]=array("View","Add","Edit","Delete","Visibility","Move");
18
+$tool_rights[TOOL_LINK] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
19
+$tool_rights[TOOL_DOCUMENT] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
20 20
 //$tool_rights[TOOL_CALENDAR_EVENT]=array("View","Add","Edit","Delete","Visibility");
21
-$tool_rights[TOOL_ANNOUNCEMENT]=array("View","Add","Edit","Delete","Visibility", "Move");
21
+$tool_rights[TOOL_ANNOUNCEMENT] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
22 22
 //$tool_rights[TOOL_STUDENTPUBLICATION]=array("View","Edit","Delete","Visibility");
23 23
 //$tool_rights[TOOL_COURSE_DESCRIPTION]=array("View","Add","Edit","Delete","Visibility");
24 24
 //$tool_rights[TOOL_LEARNPATH]=array("View","Add","Edit","Delete","Visibility");
@@ -26,13 +26,13 @@  discard block
 block discarded – undo
26 26
 //$tool_rights[TOOL_BB_POST]=array("View","Add","Edit","Delete");
27 27
 //$tool_rights[TOOL_DROPBOX]=array("View","Add","Delete");
28 28
 //$tool_rights[TOOL_QUIZ]=array("View","Add","Edit","Delete","Visibility");
29
-$tool_rights[TOOL_USER]=array("View","Add","Edit","Delete");
29
+$tool_rights[TOOL_USER] = array("View", "Add", "Edit", "Delete");
30 30
 //$tool_rights[TOOL_GROUP]=array("View","Add","Edit","Delete");
31 31
 //$tool_rights[TOOL_CHAT]=array("View","Delete");
32 32
 //$tool_rights[TOOL_CONFERENCE]=array("View","Add","Edit","Delete");
33 33
 //$tool_rights[TOOL_STUDENTPUBLICATION]=array("View","Add","Edit","Delete");
34 34
 
35 35
 // this value can be checkbox or image
36
-$setting_visualisation='image';
36
+$setting_visualisation = 'image';
37 37
 
38 38
 ?>
Please login to merge, or discard this patch.
main/permissions/blog_permissions.inc.php 2 patches
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 		WHERE status = '1' AND c_id = '".api_get_course_int_id()."'";
50 50
 $result = Database::query($sql);
51 51
 while ($user = Database::fetch_assoc($result)) {
52
-	unset($blog_users[$user['user_id']]);
52
+    unset($blog_users[$user['user_id']]);
53 53
 }
54 54
 
55 55
 //$user_id=$userIdViewed;
@@ -84,30 +84,30 @@  discard block
 block discarded – undo
84 84
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
85 85
 // ------------------------------------------------------------------
86 86
 if (api_get_setting('user_roles')=='true') {
87
-	// course roles that are assigned to the user
88
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
89
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
90
-	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
91
-	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
92
-	// groepsge�rfde permissions in beschouwing worden genomen
93
-	// dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
94
-	// en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
95
-	// omvatten.
96
-	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
97
-	// ophalen.
98
-	// platform roles that are assigned to the user
99
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
100
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
87
+    // course roles that are assigned to the user
88
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
89
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
90
+    // NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
91
+    // (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
92
+    // groepsge�rfde permissions in beschouwing worden genomen
93
+    // dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
94
+    // en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
95
+    // omvatten.
96
+    // NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
97
+    // ophalen.
98
+    // platform roles that are assigned to the user
99
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
100
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
101 101
 }
102 102
 // ------------------------------------------------------------------
103 103
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
104 104
 // ------------------------------------------------------------------
105 105
 if (api_get_setting('group_roles')=='true') {
106
-	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
107
-	foreach ($groups_of_user as $group) {
108
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
109
-		//$inherited_permissions[$tool][]=$permission;
110
-	}
106
+    // NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
107
+    foreach ($groups_of_user as $group) {
108
+        $this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
109
+        //$inherited_permissions[$tool][]=$permission;
110
+    }
111 111
 }
112 112
 
113 113
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
@@ -118,12 +118,12 @@  discard block
 block discarded – undo
118 118
 
119 119
 if (api_get_setting('user_roles')=='true')
120 120
 {
121
-	// the list of the roles for the user
122
-	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
123
-	$current_user_course_roles=get_roles('user',$user_id);
124
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
125
-	display_role_list($current_user_course_roles, $current_user_platform_roles);
126
-	echo '<br />';
121
+    // the list of the roles for the user
122
+    echo '<strong>'.get_lang('UserRoles').'</strong><br />';
123
+    $current_user_course_roles=get_roles('user',$user_id);
124
+    $current_user_platform_roles=get_roles('user',$user_id, 'platform');
125
+    display_role_list($current_user_course_roles, $current_user_platform_roles);
126
+    echo '<br />';
127 127
 }
128 128
 
129 129
 // ---------------------------------------------------
@@ -133,59 +133,59 @@  discard block
 block discarded – undo
133 133
 
134 134
 // the header
135 135
 echo "\t<tr>\n";
136
-	echo "\t\t<th rowspan=\"2\">".get_lang('Module')."</th>\n";
137
-	echo "\t\t<th colspan=\"4\">".get_lang('ArticleManager')."</th>\n";
138
-	echo "\t\t<th colspan=\"3\">".get_lang('CommentManager')."</th>\n";
139
-	echo "\t\t<th colspan=\"3\">".get_lang('BlogManager')."</th>\n";
136
+    echo "\t\t<th rowspan=\"2\">".get_lang('Module')."</th>\n";
137
+    echo "\t\t<th colspan=\"4\">".get_lang('ArticleManager')."</th>\n";
138
+    echo "\t\t<th colspan=\"3\">".get_lang('CommentManager')."</th>\n";
139
+    echo "\t\t<th colspan=\"3\">".get_lang('BlogManager')."</th>\n";
140 140
 echo "\t</tr>\n";
141 141
 
142 142
 // Subheader
143 143
 echo "\t<tr>\n";
144
-	echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
145
-	echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
146
-	echo "\t\t<th align='center'>".get_lang('Edit')."</th>\n";
147
-	echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
148
-	echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
149
-	echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
150
-	echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
151
-	echo "\t\t<th align='center'>".get_lang('Tasks')."</th>\n";
152
-	echo "\t\t<th align='center'>".get_lang('Members')."</th>\n";
153
-	echo "\t\t<th align='center'>".get_lang('Roles')."</th>\n";
144
+    echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
145
+    echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
146
+    echo "\t\t<th align='center'>".get_lang('Edit')."</th>\n";
147
+    echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
148
+    echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
149
+    echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
150
+    echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
151
+    echo "\t\t<th align='center'>".get_lang('Tasks')."</th>\n";
152
+    echo "\t\t<th align='center'>".get_lang('Members')."</th>\n";
153
+    echo "\t\t<th align='center'>".get_lang('Roles')."</th>\n";
154 154
 echo "\t</tr>\n";
155 155
 
156 156
 // the main area with the checkboxes or images
157 157
 foreach ($blog_users as $user_id => $user_name) { // $blog_users contains all the users in this blog
158
-	// ---------------------------------------------------
159
-	// 			RETRIEVING THE PERMISSIONS OF THE USER
160
-	// ---------------------------------------------------
161
-	$current_user_permissions = array();
162
-	$current_user_permissions = get_permissions('user', $user_id);
163
-
164
-	echo "\t<tr>\n";
165
-	echo "\t\t<td>\n";
166
-	echo $user_name;
167
-	echo "\t\t</td>\n";
168
-
169
-	foreach ($rights_full as $key => $value) {
170
-
171
-		echo "\t\t<td align='center'>\n";
172
-		if (in_array($value,$rights_blog)) {
173
-			display_image_matrix_for_blogs(
174
-				$current_user_permissions,
175
-				$user_id,
176
-				'BLOG_'.$blog_id,
177
-				$value,
178
-				(isset($inherited_permissions) ? $inherited_permissions : null),
179
-				(isset($course_admin) ? $course_admin : null)
180
-			);
181
-		}
182
-		// note: in a later stage this part will be replaced by a function
183
-		// so that we can easily switch between a checkbox approach or an image approach
184
-		// where every click is in fact a change of status. In the checkbox approach you first have to
185
-		// do the changes and then store them by clicking the submit button.
186
-		echo "\t\t</td>\n";
187
-	}
188
-	echo "\t</tr>\n";
158
+    // ---------------------------------------------------
159
+    // 			RETRIEVING THE PERMISSIONS OF THE USER
160
+    // ---------------------------------------------------
161
+    $current_user_permissions = array();
162
+    $current_user_permissions = get_permissions('user', $user_id);
163
+
164
+    echo "\t<tr>\n";
165
+    echo "\t\t<td>\n";
166
+    echo $user_name;
167
+    echo "\t\t</td>\n";
168
+
169
+    foreach ($rights_full as $key => $value) {
170
+
171
+        echo "\t\t<td align='center'>\n";
172
+        if (in_array($value,$rights_blog)) {
173
+            display_image_matrix_for_blogs(
174
+                $current_user_permissions,
175
+                $user_id,
176
+                'BLOG_'.$blog_id,
177
+                $value,
178
+                (isset($inherited_permissions) ? $inherited_permissions : null),
179
+                (isset($course_admin) ? $course_admin : null)
180
+            );
181
+        }
182
+        // note: in a later stage this part will be replaced by a function
183
+        // so that we can easily switch between a checkbox approach or an image approach
184
+        // where every click is in fact a change of status. In the checkbox approach you first have to
185
+        // do the changes and then store them by clicking the submit button.
186
+        echo "\t\t</td>\n";
187
+    }
188
+    echo "\t</tr>\n";
189 189
 }
190 190
 
191 191
 echo "</table>\n";
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 // Remove the blog creater because he has all the rights automatically
45 45
 // and we want to keep it that way.
46
-$tbl_course_rel_user = $table=Database::get_main_table(TABLE_MAIN_COURSE_USER);
46
+$tbl_course_rel_user = $table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
47 47
 $sql = "SELECT user_id
48 48
 		FROM $tbl_course_rel_user
49 49
 		WHERE status = '1' AND c_id = '".api_get_course_int_id()."'";
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 // ------------------------------------------------------------------
84 84
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
85 85
 // ------------------------------------------------------------------
86
-if (api_get_setting('user_roles')=='true') {
86
+if (api_get_setting('user_roles') == 'true') {
87 87
 	// course roles that are assigned to the user
88
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
89
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
88
+	$current_user_role_permissions_of_user = get_roles_permissions('user', $user_id);
89
+	$inherited_permissions = permission_array_merge($inherited_permissions, $current_user_role_permissions_of_user);
90 90
 	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
91 91
 	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
92 92
 	// groepsge�rfde permissions in beschouwing worden genomen
@@ -96,16 +96,16 @@  discard block
 block discarded – undo
96 96
 	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
97 97
 	// ophalen.
98 98
 	// platform roles that are assigned to the user
99
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
100
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
99
+	$current_user_role_permissions_of_user = get_roles_permissions('user', $user_id, 'platform');
100
+	$inherited_permissions = permission_array_merge($inherited_permissions, $current_user_role_permissions_of_user);
101 101
 }
102 102
 // ------------------------------------------------------------------
103 103
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
104 104
 // ------------------------------------------------------------------
105
-if (api_get_setting('group_roles')=='true') {
105
+if (api_get_setting('group_roles') == 'true') {
106 106
 	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
107 107
 	foreach ($groups_of_user as $group) {
108
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
108
+		$this_current_group_role_permissions_of_user = get_roles_permissions('user', $user_id);
109 109
 		//$inherited_permissions[$tool][]=$permission;
110 110
 	}
111 111
 }
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 // 		DISPLAYING THE ROLES LIST
117 117
 // ---------------------------------------------------
118 118
 
119
-if (api_get_setting('user_roles')=='true')
119
+if (api_get_setting('user_roles') == 'true')
120 120
 {
121 121
 	// the list of the roles for the user
122 122
 	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
123
-	$current_user_course_roles=get_roles('user',$user_id);
124
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
123
+	$current_user_course_roles = get_roles('user', $user_id);
124
+	$current_user_platform_roles = get_roles('user', $user_id, 'platform');
125 125
 	display_role_list($current_user_course_roles, $current_user_platform_roles);
126 126
 	echo '<br />';
127 127
 }
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	foreach ($rights_full as $key => $value) {
170 170
 
171 171
 		echo "\t\t<td align='center'>\n";
172
-		if (in_array($value,$rights_blog)) {
172
+		if (in_array($value, $rights_blog)) {
173 173
 			display_image_matrix_for_blogs(
174 174
 				$current_user_permissions,
175 175
 				$user_id,
Please login to merge, or discard this patch.