chamilo / chamilo-lms

main/social/skills_ranking.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 //Add the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
-$interbreadcrumb[] = array("url" => "index.php","name" => get_lang('Skills'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('Skills'));
 
 //jqgrid will use this URL to do the selects
 $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_user_skill_ranking';
@@ -28,7 +28,7 @@ 
     get_lang('Rank')
 );
 
-$column_model   = array(
+$column_model = array(
     array(
         'name' => 'photo',
         'index' => 'photo',

main/social/group_topics.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 require_once '../inc/global.inc.php';
 
 api_block_anonymous_users();
-if (api_get_setting('allow_social_tool') !='true') {
+if (api_get_setting('allow_social_tool') != 'true') {
     api_not_allowed();
 }
 
@@ -64,7 +64,7 @@ 
     }
 
     if ($_POST['action'] == 'edit_message_group') {
-        $edit_message_id =  intval($_POST['message_id']);
+        $edit_message_id = intval($_POST['message_id']);
         $res = MessageManager::send_message(
             0,
             $title,
@@ -96,7 +96,7 @@ 
 
     // display error messages
     if (!$res) {
-        $social_right_content .= Display::return_message(get_lang('Error'),'error');
+        $social_right_content .= Display::return_message(get_lang('Error'), 'error');
     }
     $topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : null;
     if ($_POST['action'] == 'add_message_group') {
@@ -194,9 +194,9 @@ 
 </script>';
 
 $this_section = SECTION_SOCIAL;
-$interbreadcrumb[] = array('url' => 'groups.php',   'name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' => 'groups.php', 'name' => get_lang('Groups'));
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => Security::remove_XSS($group_info['name']));
-$interbreadcrumb[] = array('url' => '#',  'name' => get_lang('Discussions'));
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Discussions'));
 
 $social_left_content = SocialManager::show_social_menu('member_list', $group_id);
 $show_message = null;

main/social/group_members.php

Spacing +10 added lines, -10 removed lines

@@ -117,7 +117,7 @@ 
     $group_id
 );
 $social_menu_block = SocialManager::show_social_menu('member_list', $group_id);
-$social_right_content = '<h2>' . $group_info['name'] . '</h2>';
+$social_right_content = '<h2>'.$group_info['name'].'</h2>';
 
 foreach ($users as $user) {
     switch ($user['relation_type']) {
@@ -136,24 +136,24 @@ 
                 )
             )
             ) {
-                $user['link'] = '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=delete">' .
+                $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete">'.
                     Display::return_icon(
                         'delete.png',
                         get_lang('DeleteFromGroup')
-                    ) . '</a>' .
-                    '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=set_moderator">' .
+                    ).'</a>'.
+                    '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=set_moderator">'.
                     Display::return_icon(
                         'social_moderator_add.png',
                         get_lang('AddModerator')
-                    ) . '</a>';
+                    ).'</a>';
             }
             break;
         case GROUP_USER_PERMISSION_PENDING_INVITATION:
-            $user['link'] = '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=add">' .
+            $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=add">'.
                 Display::return_icon(
                     'pending_invitation.png',
                     get_lang('PendingInvitation')
-                ) . '</a>';
+                ).'</a>';
             break;
         case GROUP_USER_PERMISSION_MODERATOR:
             $user['link'] = Display::return_icon(
@@ -162,17 +162,17 @@ 
             );
             //only group admin can manage moderators
             if ($user_role == GROUP_USER_PERMISSION_ADMIN) {
-                $user['link'] .= '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=delete_moderator">'.
+                $user['link'] .= '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete_moderator">'.
                     Display::return_icon(
                         'social_moderator_delete.png',
                         get_lang('DeleteModerator')
-                    ) . '</a>';
+                    ).'</a>';
             }
             break;
     }
 
     $userPicture = UserManager::getUserPicture($user['id']);
-    $user['image'] = '<img src="' . $userPicture . '"  width="50px" height="50px"  />';
+    $user['image'] = '<img src="'.$userPicture.'"  width="50px" height="50px"  />';
     $new_member_list[] = $user;
 }
 if (count($new_member_list) > 0) {

main/social/group_waiting_list.php

Spacing +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@ 
 require_once '../inc/global.inc.php';
 
 api_block_anonymous_users();
-if (api_get_setting('allow_social_tool') !='true') {
+if (api_get_setting('allow_social_tool') != 'true') {
     api_not_allowed();
 }
 
 $this_section = SECTION_SOCIAL;
 
-$group_id= intval($_GET['id']);
+$group_id = intval($_GET['id']);
 $usergroup = new UserGroup();
 
 //todo @this validation could be in a function in group_portal_manager
@@ -35,9 +35,9 @@ 
     }
 }
 
-$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']);
-$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('WaitingList'));
+$interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('WaitingList'));
 
 // Group information
 $admins = $usergroup->get_users_by_group(
@@ -49,7 +49,7 @@ 
 );
 $show_message = '';
 
-if (isset($_GET['action']) && $_GET['action']=='accept') {
+if (isset($_GET['action']) && $_GET['action'] == 'accept') {
     // we add a user only if is a open group
     $user_join = intval($_GET['u']);
     //if i'm a moderator
@@ -59,7 +59,7 @@ 
     }
 }
 
-if (isset($_GET['action']) && $_GET['action']=='deny') {
+if (isset($_GET['action']) && $_GET['action'] == 'deny') {
     // we add a user only if is a open group
     $user_join = intval($_GET['u']);
     //if i'm a moderator
@@ -69,9 +69,9 @@ 
     }
 }
 
-if (isset($_GET['action']) && $_GET['action']=='set_moderator') {
+if (isset($_GET['action']) && $_GET['action'] == 'set_moderator') {
     // we add a user only if is a open group
-    $user_moderator= intval($_GET['u']);
+    $user_moderator = intval($_GET['u']);
     //if i'm the admin
     if ($usergroup->is_group_admin($group_id)) {
         $usergroup->update_user_role($user_moderator, $group_id, GROUP_USER_PERMISSION_MODERATOR);
@@ -91,7 +91,7 @@ 
 $social_left_content = SocialManager::show_social_menu('waiting_list', $group_id);
 
 // Display form
-foreach($users as $user) {
+foreach ($users as $user) {
     switch ($user['relation_type']) {
         case GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
             $user['link']  = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.

main/social/friends.php

Indentation +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
             if (isset($friends[$j])) {
                 $friend = $friends[$j];
                 $user_name = api_xml_http_response_encode($friend['firstName'].' '.$friend['lastName']);
-				$userPicture = UserManager::getUserPicture($friend['friend_user_id']);
+                $userPicture = UserManager::getUserPicture($friend['friend_user_id']);
 
                 $friend_html .= '
                     <div class="col-md-3">

Spacing +5 added lines, -5 removed lines

@@ -132,15 +132,15 @@
 
                 $friend_html .= '
                     <div class="col-md-3">
-                        <div class="thumbnail text-center" id="div_' . $friends[$j]['friend_user_id'] . '">
-                            <img src="' . $userPicture . '" class="img-responsive" id="imgfriend_' . $friend['friend_user_id'] . '" title="'.$user_name.'">
+                        <div class="thumbnail text-center" id="div_' . $friends[$j]['friend_user_id'].'">
+                            <img src="' . $userPicture.'" class="img-responsive" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$user_name.'">
                             <div class="caption">
                                 <h3>
-                                    <a href="profile.php?u=' . $friend['friend_user_id'] . '">' . $user_name . '</a>
+                                    <a href="profile.php?u=' . $friend['friend_user_id'].'">'.$user_name.'</a>
                                 </h3>
                                 <p>
-                                    <button class="btn btn-danger" onclick="delete_friend(this)" id=img_' . $friend['friend_user_id'] . '>
-                                        ' . get_lang('Delete') . '
+                                    <button class="btn btn-danger" onclick="delete_friend(this)" id=img_' . $friend['friend_user_id'].'>
+                                        ' . get_lang('Delete').'
                                     </button>
                                 </p>
                             </div>

main/permissions/group_permissions.inc.php

Indentation +52 added lines, -52 removed lines

@@ -15,27 +15,27 @@ 
 // ---------------------------------------------------
 if ($_POST['StoreGroupPermissions'] and $setting_visualisation=='checkbox')
 {
-	$result_message=store_permissions('group', $group_id);
-	if ($result_message)
-	{
-		Display::display_normal_message($result_message);
-	}
+    $result_message=store_permissions('group', $group_id);
+    if ($result_message)
+    {
+        Display::display_normal_message($result_message);
+    }
 }
 if (isset($_GET['action']))
 {
-	if (($_GET['action']=='grant' OR $_GET['action']=='revoke')  AND isset($_GET['permission']) AND isset($_GET['tool']))
-	{
-		$result_message=store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
-	}
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
-	{
-		$result_message=assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
-		echo 'hier';
-	}
+    if (($_GET['action']=='grant' OR $_GET['action']=='revoke')  AND isset($_GET['permission']) AND isset($_GET['tool']))
+    {
+        $result_message=store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
+    }
+    if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+    {
+        $result_message=assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
+        echo 'hier';
+    }
 }
 if (isset($result_message))
 {
-	Display::display_normal_message($result_message);
+    Display::display_normal_message($result_message);
 }
 
 // ---------------------------------------------------
@@ -59,11 +59,11 @@ 
 $inherited_permissions=limited_or_full($inherited_permissions);
 if (api_get_setting('permissions')=='limited')
 {
-	$header_array=$rights_limited;
+    $header_array=$rights_limited;
 }
 if (api_get_setting('permissions')=='full')
 {
-	$header_array=$rights_full;
+    $header_array=$rights_full;
 }
 
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
@@ -72,12 +72,12 @@ 
 // ---------------------------------------------------
 if (api_get_setting('group_roles')=='true')
 {
-	// the list of the roles for the user
-	echo '<strong>'.get_lang('GroupRoles').'</strong><br />';
-	$current_group_course_roles=get_roles('group',$group_id);
-	$current_group_platform_roles=get_roles('group',$group_id, 'platform');
-	display_role_list($current_group_course_roles, $current_group_platform_roles);
-	echo '<br />';
+    // the list of the roles for the user
+    echo '<strong>'.get_lang('GroupRoles').'</strong><br />';
+    $current_group_course_roles=get_roles('group',$group_id);
+    $current_group_platform_roles=get_roles('group',$group_id, 'platform');
+    display_role_list($current_group_course_roles, $current_group_platform_roles);
+    echo '<br />';
 }
 
 
@@ -92,47 +92,47 @@ 
 echo "\t\t<th>".get_lang('Module')."</th>\n";
 foreach ($header_array as $header_key=>$header_value)
 {
-	echo "\t\t<th>".get_lang($header_value)."</th>\n";
+    echo "\t\t<th>".get_lang($header_value)."</th>\n";
 }
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
 foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
 {
-	echo "\t<tr>\n";
-	echo "\t\t<td>\n";
-	echo get_lang($tool);
-	echo "\t\t</td>\n";
+    echo "\t<tr>\n";
+    echo "\t\t<td>\n";
+    echo get_lang($tool);
+    echo "\t\t</td>\n";
 
-	foreach ($header_array as $key=>$value)
-	{
-		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights))
-		{
-			if ($setting_visualisation=='checkbox')
-			{
-				//display_checkbox_matrix($current_group_permissions, $tool, $value);
-				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions,$course_admin);
-			}
-			if ($setting_visualisation=='image')
-			{
-				//display_image_matrix($current_group_permissions, $tool, $value);
-				display_image_matrix($current_group_permissions, $tool, $value,$inherited_permissions, $course_admin);
-			}
-		}
-		// note: in a later stage this part will be replaced by a function
-		// so that we can easily switch between a checkbox approach or an image approach
-		// where every click is in fact a change of status. In the checkbox approach you first have to
-		// do the changes and then store them by clicking the submit button.
-		echo "\t\t</td>\n";
-	}
-	echo "\t</tr>\n";
+    foreach ($header_array as $key=>$value)
+    {
+        echo "\t\t<td align='center'>\n";
+        if (in_array($value,$rights))
+        {
+            if ($setting_visualisation=='checkbox')
+            {
+                //display_checkbox_matrix($current_group_permissions, $tool, $value);
+                display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions,$course_admin);
+            }
+            if ($setting_visualisation=='image')
+            {
+                //display_image_matrix($current_group_permissions, $tool, $value);
+                display_image_matrix($current_group_permissions, $tool, $value,$inherited_permissions, $course_admin);
+            }
+        }
+        // note: in a later stage this part will be replaced by a function
+        // so that we can easily switch between a checkbox approach or an image approach
+        // where every click is in fact a change of status. In the checkbox approach you first have to
+        // do the changes and then store them by clicking the submit button.
+        echo "\t\t</td>\n";
+    }
+    echo "\t</tr>\n";
 }
 
 echo "</table>\n";
 if ($setting_visualisation=='checkbox')
 {
-	echo "<input type=\"Submit\" name=\"StoreGroupPermissions\" value=\"".get_lang('StorePermissions')."\">";
+    echo "<input type=\"Submit\" name=\"StoreGroupPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }
 echo "</form>";
 

Spacing +26 added lines, -26 removed lines

@@ -13,9 +13,9 @@ 
 // ---------------------------------------------------
 // 			ACTIONS
 // ---------------------------------------------------
-if ($_POST['StoreGroupPermissions'] and $setting_visualisation=='checkbox')
+if ($_POST['StoreGroupPermissions'] and $setting_visualisation == 'checkbox')
 {
-	$result_message=store_permissions('group', $group_id);
+	$result_message = store_permissions('group', $group_id);
 	if ($result_message)
 	{
 		Display::display_normal_message($result_message);
@@ -23,13 +23,13 @@ 
 }
 if (isset($_GET['action']))
 {
-	if (($_GET['action']=='grant' OR $_GET['action']=='revoke')  AND isset($_GET['permission']) AND isset($_GET['tool']))
+	if (($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke') AND isset($_GET['permission']) AND isset($_GET['tool']))
 	{
-		$result_message=store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
+		$result_message = store_one_permission('group', $_GET['action'], $group_id, $_GET['tool'], $_GET['permission']);
 	}
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+	if (isset($_GET['role']) AND ($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke'))
 	{
-		$result_message=assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
+		$result_message = assign_role('group', $_GET['action'], $group_id, $_GET['role'], $_GET['scope']);
 		echo 'hier';
 	}
 }
@@ -41,41 +41,41 @@ 
 // ---------------------------------------------------
 // 			RETRIEVING THE PERMISSIONS
 // ---------------------------------------------------
-$current_group_permissions=array();
-$current_group_permissions=get_permissions('group',$group_id);
+$current_group_permissions = array();
+$current_group_permissions = get_permissions('group', $group_id);
 // @todo current group permissions and current role permissions
 
 // ---------------------------------------------------
 //   INHERITED PERMISSIONS (group roles)
 // ---------------------------------------------------
-$group_course_roles_permissions=get_roles_permissions('group',$group_id, 'course');
-$group_platform_roles_permissions=get_roles_permissions('group',$group_id, 'platform');
-$inherited_permissions=permission_array_merge($group_course_roles_permissions,$group_platform_roles_permissions);
+$group_course_roles_permissions = get_roles_permissions('group', $group_id, 'course');
+$group_platform_roles_permissions = get_roles_permissions('group', $group_id, 'platform');
+$inherited_permissions = permission_array_merge($group_course_roles_permissions, $group_platform_roles_permissions);
 
 // ---------------------------------------------------
 // 			LIMITED OR FULL
 // ---------------------------------------------------
-$current_group_permissions=limited_or_full($current_group_permissions);
-$inherited_permissions=limited_or_full($inherited_permissions);
-if (api_get_setting('permissions')=='limited')
+$current_group_permissions = limited_or_full($current_group_permissions);
+$inherited_permissions = limited_or_full($inherited_permissions);
+if (api_get_setting('permissions') == 'limited')
 {
-	$header_array=$rights_limited;
+	$header_array = $rights_limited;
 }
-if (api_get_setting('permissions')=='full')
+if (api_get_setting('permissions') == 'full')
 {
-	$header_array=$rights_full;
+	$header_array = $rights_full;
 }
 
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
 // ---------------------------------------------------
 // 		DISPLAYING THE ROLES LIST
 // ---------------------------------------------------
-if (api_get_setting('group_roles')=='true')
+if (api_get_setting('group_roles') == 'true')
 {
 	// the list of the roles for the user
 	echo '<strong>'.get_lang('GroupRoles').'</strong><br />';
-	$current_group_course_roles=get_roles('group',$group_id);
-	$current_group_platform_roles=get_roles('group',$group_id, 'platform');
+	$current_group_course_roles = get_roles('group', $group_id);
+	$current_group_platform_roles = get_roles('group', $group_id, 'platform');
 	display_role_list($current_group_course_roles, $current_group_platform_roles);
 	echo '<br />';
 }
@@ -107,17 +107,17 @@ 
 	foreach ($header_array as $key=>$value)
 	{
 		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights))
+		if (in_array($value, $rights))
 		{
-			if ($setting_visualisation=='checkbox')
+			if ($setting_visualisation == 'checkbox')
 			{
 				//display_checkbox_matrix($current_group_permissions, $tool, $value);
-				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions,$course_admin);
+				display_checkbox_matrix($current_group_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
-			if ($setting_visualisation=='image')
+			if ($setting_visualisation == 'image')
 			{
 				//display_image_matrix($current_group_permissions, $tool, $value);
-				display_image_matrix($current_group_permissions, $tool, $value,$inherited_permissions, $course_admin);
+				display_image_matrix($current_group_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
 		}
 		// note: in a later stage this part will be replaced by a function
@@ -130,7 +130,7 @@ 
 }
 
 echo "</table>\n";
-if ($setting_visualisation=='checkbox')
+if ($setting_visualisation == 'checkbox')
 {
 	echo "<input type=\"Submit\" name=\"StoreGroupPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }

Braces +3 added lines, -1 removed lines

@@ -97,9 +97,11 @@
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
-foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
+foreach ($tool_rights as $tool=>$rights) {
+    // $tool_rights contains all the possible tools and their rights
 {
 	echo "\t<tr>\n";
+}
 	echo "\t\t<td>\n";
 	echo get_lang($tool);
 	echo "\t\t</td>\n";

main/permissions/all_permissions.inc.php

Spacing +7 added lines, -7 removed lines

@@ -10,15 +10,15 @@ 
  * Code
  */
 // possible permissions
-$rights_full=array("View","Add","Edit","Delete","Visibility","Move");
-$rights_limited=array("Add","Edit","Delete");
+$rights_full = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
+$rights_limited = array("Add", "Edit", "Delete");
 
 
 // first we determine what can be done in each tool. We do this for each tool.
-$tool_rights[TOOL_LINK]=array("View","Add","Edit","Delete","Visibility", "Move");
-$tool_rights[TOOL_DOCUMENT]=array("View","Add","Edit","Delete","Visibility","Move");
+$tool_rights[TOOL_LINK] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
+$tool_rights[TOOL_DOCUMENT] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
 //$tool_rights[TOOL_CALENDAR_EVENT]=array("View","Add","Edit","Delete","Visibility");
-$tool_rights[TOOL_ANNOUNCEMENT]=array("View","Add","Edit","Delete","Visibility", "Move");
+$tool_rights[TOOL_ANNOUNCEMENT] = array("View", "Add", "Edit", "Delete", "Visibility", "Move");
 //$tool_rights[TOOL_STUDENTPUBLICATION]=array("View","Edit","Delete","Visibility");
 //$tool_rights[TOOL_COURSE_DESCRIPTION]=array("View","Add","Edit","Delete","Visibility");
 //$tool_rights[TOOL_LEARNPATH]=array("View","Add","Edit","Delete","Visibility");
@@ -26,13 +26,13 @@ 
 //$tool_rights[TOOL_BB_POST]=array("View","Add","Edit","Delete");
 //$tool_rights[TOOL_DROPBOX]=array("View","Add","Delete");
 //$tool_rights[TOOL_QUIZ]=array("View","Add","Edit","Delete","Visibility");
-$tool_rights[TOOL_USER]=array("View","Add","Edit","Delete");
+$tool_rights[TOOL_USER] = array("View", "Add", "Edit", "Delete");
 //$tool_rights[TOOL_GROUP]=array("View","Add","Edit","Delete");
 //$tool_rights[TOOL_CHAT]=array("View","Delete");
 //$tool_rights[TOOL_CONFERENCE]=array("View","Add","Edit","Delete");
 //$tool_rights[TOOL_STUDENTPUBLICATION]=array("View","Add","Edit","Delete");
 
 // this value can be checkbox or image
-$setting_visualisation='image';
+$setting_visualisation = 'image';
 
 ?>

main/permissions/blog_permissions.inc.php

Indentation +71 added lines, -71 removed lines

@@ -49,7 +49,7 @@ 
 		WHERE status = '1' AND c_id = '".api_get_course_int_id()."'";
 $result = Database::query($sql);
 while ($user = Database::fetch_assoc($result)) {
-	unset($blog_users[$user['user_id']]);
+    unset($blog_users[$user['user_id']]);
 }
 
 //$user_id=$userIdViewed;
@@ -84,30 +84,30 @@ 
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
 // ------------------------------------------------------------------
 if (api_get_setting('user_roles')=='true') {
-	// course roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
-	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
-	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
-	// groepsge�rfde permissions in beschouwing worden genomen
-	// dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
-	// en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
-	// omvatten.
-	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
-	// ophalen.
-	// platform roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // course roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
+    // (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
+    // groepsge�rfde permissions in beschouwing worden genomen
+    // dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
+    // en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
+    // omvatten.
+    // NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
+    // ophalen.
+    // platform roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
 }
 // ------------------------------------------------------------------
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
 // ------------------------------------------------------------------
 if (api_get_setting('group_roles')=='true') {
-	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
-	foreach ($groups_of_user as $group) {
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
-		//$inherited_permissions[$tool][]=$permission;
-	}
+    // NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
+    foreach ($groups_of_user as $group) {
+        $this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
+        //$inherited_permissions[$tool][]=$permission;
+    }
 }
 
 echo "<form method=\"post\" action=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."\">";
@@ -118,12 +118,12 @@ 
 
 if (api_get_setting('user_roles')=='true')
 {
-	// the list of the roles for the user
-	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
-	$current_user_course_roles=get_roles('user',$user_id);
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
-	display_role_list($current_user_course_roles, $current_user_platform_roles);
-	echo '<br />';
+    // the list of the roles for the user
+    echo '<strong>'.get_lang('UserRoles').'</strong><br />';
+    $current_user_course_roles=get_roles('user',$user_id);
+    $current_user_platform_roles=get_roles('user',$user_id, 'platform');
+    display_role_list($current_user_course_roles, $current_user_platform_roles);
+    echo '<br />';
 }
 
 // ---------------------------------------------------
@@ -133,59 +133,59 @@ 
 
 // the header
 echo "\t<tr>\n";
-	echo "\t\t<th rowspan=\"2\">".get_lang('Module')."</th>\n";
-	echo "\t\t<th colspan=\"4\">".get_lang('ArticleManager')."</th>\n";
-	echo "\t\t<th colspan=\"3\">".get_lang('CommentManager')."</th>\n";
-	echo "\t\t<th colspan=\"3\">".get_lang('BlogManager')."</th>\n";
+    echo "\t\t<th rowspan=\"2\">".get_lang('Module')."</th>\n";
+    echo "\t\t<th colspan=\"4\">".get_lang('ArticleManager')."</th>\n";
+    echo "\t\t<th colspan=\"3\">".get_lang('CommentManager')."</th>\n";
+    echo "\t\t<th colspan=\"3\">".get_lang('BlogManager')."</th>\n";
 echo "\t</tr>\n";
 
 // Subheader
 echo "\t<tr>\n";
-	echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Edit')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Tasks')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Members')."</th>\n";
-	echo "\t\t<th align='center'>".get_lang('Roles')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Edit')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Add')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Delete')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Rate')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Tasks')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Members')."</th>\n";
+    echo "\t\t<th align='center'>".get_lang('Roles')."</th>\n";
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
 foreach ($blog_users as $user_id => $user_name) { // $blog_users contains all the users in this blog
-	// ---------------------------------------------------
-	// 			RETRIEVING THE PERMISSIONS OF THE USER
-	// ---------------------------------------------------
-	$current_user_permissions = array();
-	$current_user_permissions = get_permissions('user', $user_id);
-
-	echo "\t<tr>\n";
-	echo "\t\t<td>\n";
-	echo $user_name;
-	echo "\t\t</td>\n";
-
-	foreach ($rights_full as $key => $value) {
-
-		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights_blog)) {
-			display_image_matrix_for_blogs(
-				$current_user_permissions,
-				$user_id,
-				'BLOG_'.$blog_id,
-				$value,
-				(isset($inherited_permissions) ? $inherited_permissions : null),
-				(isset($course_admin) ? $course_admin : null)
-			);
-		}
-		// note: in a later stage this part will be replaced by a function
-		// so that we can easily switch between a checkbox approach or an image approach
-		// where every click is in fact a change of status. In the checkbox approach you first have to
-		// do the changes and then store them by clicking the submit button.
-		echo "\t\t</td>\n";
-	}
-	echo "\t</tr>\n";
+    // ---------------------------------------------------
+    // 			RETRIEVING THE PERMISSIONS OF THE USER
+    // ---------------------------------------------------
+    $current_user_permissions = array();
+    $current_user_permissions = get_permissions('user', $user_id);
+
+    echo "\t<tr>\n";
+    echo "\t\t<td>\n";
+    echo $user_name;
+    echo "\t\t</td>\n";
+
+    foreach ($rights_full as $key => $value) {
+
+        echo "\t\t<td align='center'>\n";
+        if (in_array($value,$rights_blog)) {
+            display_image_matrix_for_blogs(
+                $current_user_permissions,
+                $user_id,
+                'BLOG_'.$blog_id,
+                $value,
+                (isset($inherited_permissions) ? $inherited_permissions : null),
+                (isset($course_admin) ? $course_admin : null)
+            );
+        }
+        // note: in a later stage this part will be replaced by a function
+        // so that we can easily switch between a checkbox approach or an image approach
+        // where every click is in fact a change of status. In the checkbox approach you first have to
+        // do the changes and then store them by clicking the submit button.
+        echo "\t\t</td>\n";
+    }
+    echo "\t</tr>\n";
 }
 
 echo "</table>\n";

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
 
 // Remove the blog creater because he has all the rights automatically
 // and we want to keep it that way.
-$tbl_course_rel_user = $table=Database::get_main_table(TABLE_MAIN_COURSE_USER);
+$tbl_course_rel_user = $table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $sql = "SELECT user_id
 		FROM $tbl_course_rel_user
 		WHERE status = '1' AND c_id = '".api_get_course_int_id()."'";
@@ -83,10 +83,10 @@ 
 // ------------------------------------------------------------------
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
 // ------------------------------------------------------------------
-if (api_get_setting('user_roles')=='true') {
+if (api_get_setting('user_roles') == 'true') {
 	// course roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+	$current_user_role_permissions_of_user = get_roles_permissions('user', $user_id);
+	$inherited_permissions = permission_array_merge($inherited_permissions, $current_user_role_permissions_of_user);
 	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
 	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
 	// groepsge�rfde permissions in beschouwing worden genomen
@@ -96,16 +96,16 @@ 
 	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
 	// ophalen.
 	// platform roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+	$current_user_role_permissions_of_user = get_roles_permissions('user', $user_id, 'platform');
+	$inherited_permissions = permission_array_merge($inherited_permissions, $current_user_role_permissions_of_user);
 }
 // ------------------------------------------------------------------
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
 // ------------------------------------------------------------------
-if (api_get_setting('group_roles')=='true') {
+if (api_get_setting('group_roles') == 'true') {
 	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
 	foreach ($groups_of_user as $group) {
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
+		$this_current_group_role_permissions_of_user = get_roles_permissions('user', $user_id);
 		//$inherited_permissions[$tool][]=$permission;
 	}
 }
@@ -116,12 +116,12 @@ 
 // 		DISPLAYING THE ROLES LIST
 // ---------------------------------------------------
 
-if (api_get_setting('user_roles')=='true')
+if (api_get_setting('user_roles') == 'true')
 {
 	// the list of the roles for the user
 	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
-	$current_user_course_roles=get_roles('user',$user_id);
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
+	$current_user_course_roles = get_roles('user', $user_id);
+	$current_user_platform_roles = get_roles('user', $user_id, 'platform');
 	display_role_list($current_user_course_roles, $current_user_platform_roles);
 	echo '<br />';
 }
@@ -169,7 +169,7 @@ 
 	foreach ($rights_full as $key => $value) {
 
 		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights_blog)) {
+		if (in_array($value, $rights_blog)) {
 			display_image_matrix_for_blogs(
 				$current_user_permissions,
 				$user_id,

main/permissions/user_permissions.inc.php

Spacing +41 added lines, -41 removed lines

@@ -5,10 +5,10 @@ 
 /**
  * Code
  */
-$user_id=$userIdViewed;
-if ($mainUserInfo['status']==1)
+$user_id = $userIdViewed;
+if ($mainUserInfo['status'] == 1)
 {
-	$course_admin=1;
+	$course_admin = 1;
 }
 include_once('permissions_functions.inc.php');
 include_once('all_permissions.inc.php');
@@ -17,9 +17,9 @@ 
 // ---------------------------------------------------
 // 			ACTIONS
 // ---------------------------------------------------
-if ($_POST['StoreUserPermissions'] and $setting_visualisation=='checkbox')
+if ($_POST['StoreUserPermissions'] and $setting_visualisation == 'checkbox')
 {
-	$result_message=store_permissions('user', $user_id);
+	$result_message = store_permissions('user', $user_id);
 	if ($result_message)
 	{
 		Display::display_normal_message($result_message);
@@ -27,13 +27,13 @@ 
 }
 if (isset($_GET['action']))
 {
-	if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+	if (isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke'))
 	{
-		$result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
+		$result_message = store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
 	}
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+	if (isset($_GET['role']) AND ($_GET['action'] == 'grant' OR $_GET['action'] == 'revoke'))
 	{
-		$result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
+		$result_message = assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
 	}
 }
 if (isset($result_message))
@@ -44,33 +44,33 @@ 
 // ---------------------------------------------------
 // 			RETRIEVING THE PERMISSIONS OF THE USER
 // ---------------------------------------------------
-$current_user_permissions=array();
-$current_user_permissions=get_permissions('user',$user_id);
+$current_user_permissions = array();
+$current_user_permissions = get_permissions('user', $user_id);
 
 
 //   INHERITED PERMISSIONS (group permissions, user roles, group roles)
 
 // 			RETRIEVING THE PERMISSIONS OF THE GROUPS OF THE USER
-$groups_of_user=array();
-$groups_of_user=GroupManager::get_group_ids($_course['real_id'],$user_id);
+$groups_of_user = array();
+$groups_of_user = GroupManager::get_group_ids($_course['real_id'], $user_id);
 foreach ($groups_of_user as $group)
 {
-	$this_group_permissions=get_permissions('group',$group);
+	$this_group_permissions = get_permissions('group', $group);
 	foreach ($this_group_permissions as $tool=>$permissions)
 	{
 		foreach ($permissions as $permission)
 		{
-			$inherited_group_permissions[$tool][]=$permission;
+			$inherited_group_permissions[$tool][] = $permission;
 		}
 	}
 }
-$inherited_permissions=$inherited_group_permissions;
+$inherited_permissions = $inherited_group_permissions;
 
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
-if (api_get_setting('user_roles')=='true') {
+if (api_get_setting('user_roles') == 'true') {
 	// course roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+	$current_user_role_permissions_of_user = get_roles_permissions('user', $user_id);
+	$inherited_permissions = permission_array_merge($inherited_permissions, $current_user_role_permissions_of_user);
 	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
 	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
 	// groepsge�rfde permissions in beschouwing worden genomen
@@ -80,16 +80,16 @@ 
 	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
 	// ophalen.
 	// platform roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+	$current_user_role_permissions_of_user = get_roles_permissions('user', $user_id, 'platform');
+	$inherited_permissions = permission_array_merge($inherited_permissions, $current_user_role_permissions_of_user);
 }
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
-if (api_get_setting('group_roles')=='true')
+if (api_get_setting('group_roles') == 'true')
 {
 	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
 	foreach ($groups_of_user as $group)
 	{
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
+		$this_current_group_role_permissions_of_user = get_roles_permissions('user', $user_id);
 		//$inherited_permissions[$tool][]=$permission;
 	}
 }
@@ -97,15 +97,15 @@ 
 // ---------------------------------------------------
 // 			LIMITED OR FULL
 // ---------------------------------------------------
-$current_user_permissions=limited_or_full($current_user_permissions);
-$inherited_permissions=limited_or_full($inherited_permissions);
-if (api_get_setting('permissions')=='limited')
+$current_user_permissions = limited_or_full($current_user_permissions);
+$inherited_permissions = limited_or_full($inherited_permissions);
+if (api_get_setting('permissions') == 'limited')
 {
-	$header_array=$rights_limited;
+	$header_array = $rights_limited;
 }
-if (api_get_setting('permissions')=='full')
+if (api_get_setting('permissions') == 'full')
 {
-	$header_array=$rights_full;
+	$header_array = $rights_full;
 }
 
 
@@ -114,12 +114,12 @@ 
 // ---------------------------------------------------
 // 		DISPLAYING THE ROLES LIST
 // ---------------------------------------------------
-if (api_get_setting('user_roles')=='true')
+if (api_get_setting('user_roles') == 'true')
 {
 	// the list of the roles for the user
 	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
-	$current_user_course_roles=get_roles('user',$user_id);
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
+	$current_user_course_roles = get_roles('user', $user_id);
+	$current_user_platform_roles = get_roles('user', $user_id, 'platform');
 	display_role_list($current_user_course_roles, $current_user_platform_roles);
 	echo '<br />';
 }
@@ -144,12 +144,12 @@ 
 {
 	echo "\t<tr>\n";
 	echo "\t\t<td>\n";
-	if (strstr($tool,'BLOG'))
+	if (strstr($tool, 'BLOG'))
 	{
 		// Not dealing with a real tool here, get name of this blog
 		// Strip blog id
-		$tmp = strpos($tool,'_')+1;
-		$blog_id = substr($tool,$tmp,strlen($tool));
+		$tmp = strpos($tool, '_') + 1;
+		$blog_id = substr($tool, $tmp, strlen($tool));
 		// Get title
 		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
 	}
@@ -164,15 +164,15 @@ 
 	{
 
 		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights))
+		if (in_array($value, $rights))
 		{
-			if ($setting_visualisation=='checkbox')
+			if ($setting_visualisation == 'checkbox')
 			{
-				display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
+				display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
-			if ($setting_visualisation=='image')
+			if ($setting_visualisation == 'image')
 			{
-				display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
+				display_image_matrix($current_user_permissions, $tool, $value, $inherited_permissions, $course_admin);
 			}
 		}
 		// note: in a later stage this part will be replaced by a function
@@ -185,7 +185,7 @@ 
 }
 
 echo "</table>\n";
-if ($setting_visualisation=='checkbox')
+if ($setting_visualisation == 'checkbox')
 {
 	echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }

Braces +4 added lines, -3 removed lines

@@ -140,9 +140,11 @@ 
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
-foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
+foreach ($tool_rights as $tool=>$rights) {
+    // $tool_rights contains all the possible tools and their rights
 {
 	echo "\t<tr>\n";
+}
 	echo "\t\t<td>\n";
 	if (strstr($tool,'BLOG'))
 	{
@@ -152,8 +154,7 @@ 
 		$blog_id = substr($tool,$tmp,strlen($tool));
 		// Get title
 		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
-	}
-	else
+	} else
 	{
 		echo get_lang($tool);
 	}

Indentation +93 added lines, -93 removed lines

@@ -8,7 +8,7 @@ 
 $user_id=$userIdViewed;
 if ($mainUserInfo['status']==1)
 {
-	$course_admin=1;
+    $course_admin=1;
 }
 include_once('permissions_functions.inc.php');
 include_once('all_permissions.inc.php');
@@ -19,26 +19,26 @@ 
 // ---------------------------------------------------
 if ($_POST['StoreUserPermissions'] and $setting_visualisation=='checkbox')
 {
-	$result_message=store_permissions('user', $user_id);
-	if ($result_message)
-	{
-		Display::display_normal_message($result_message);
-	}
+    $result_message=store_permissions('user', $user_id);
+    if ($result_message)
+    {
+        Display::display_normal_message($result_message);
+    }
 }
 if (isset($_GET['action']))
 {
-	if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
-	{
-		$result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
-	}
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
-	{
-		$result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
-	}
+    if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+    {
+        $result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
+    }
+    if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+    {
+        $result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
+    }
 }
 if (isset($result_message))
 {
-	Display::display_normal_message($result_message);
+    Display::display_normal_message($result_message);
 }
 
 // ---------------------------------------------------
@@ -55,43 +55,43 @@ 
 $groups_of_user=GroupManager::get_group_ids($_course['real_id'],$user_id);
 foreach ($groups_of_user as $group)
 {
-	$this_group_permissions=get_permissions('group',$group);
-	foreach ($this_group_permissions as $tool=>$permissions)
-	{
-		foreach ($permissions as $permission)
-		{
-			$inherited_group_permissions[$tool][]=$permission;
-		}
-	}
+    $this_group_permissions=get_permissions('group',$group);
+    foreach ($this_group_permissions as $tool=>$permissions)
+    {
+        foreach ($permissions as $permission)
+        {
+            $inherited_group_permissions[$tool][]=$permission;
+        }
+    }
 }
 $inherited_permissions=$inherited_group_permissions;
 
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
 if (api_get_setting('user_roles')=='true') {
-	// course roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
-	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
-	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
-	// groepsge�rfde permissions in beschouwing worden genomen
-	// dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
-	// en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
-	// omvatten.
-	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
-	// ophalen.
-	// platform roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // course roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
+    // (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
+    // groepsge�rfde permissions in beschouwing worden genomen
+    // dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
+    // en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
+    // omvatten.
+    // NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
+    // ophalen.
+    // platform roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
 }
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
 if (api_get_setting('group_roles')=='true')
 {
-	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
-	foreach ($groups_of_user as $group)
-	{
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
-		//$inherited_permissions[$tool][]=$permission;
-	}
+    // NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
+    foreach ($groups_of_user as $group)
+    {
+        $this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
+        //$inherited_permissions[$tool][]=$permission;
+    }
 }
 
 // ---------------------------------------------------
@@ -101,11 +101,11 @@ 
 $inherited_permissions=limited_or_full($inherited_permissions);
 if (api_get_setting('permissions')=='limited')
 {
-	$header_array=$rights_limited;
+    $header_array=$rights_limited;
 }
 if (api_get_setting('permissions')=='full')
 {
-	$header_array=$rights_full;
+    $header_array=$rights_full;
 }
 
 
@@ -116,12 +116,12 @@ 
 // ---------------------------------------------------
 if (api_get_setting('user_roles')=='true')
 {
-	// the list of the roles for the user
-	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
-	$current_user_course_roles=get_roles('user',$user_id);
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
-	display_role_list($current_user_course_roles, $current_user_platform_roles);
-	echo '<br />';
+    // the list of the roles for the user
+    echo '<strong>'.get_lang('UserRoles').'</strong><br />';
+    $current_user_course_roles=get_roles('user',$user_id);
+    $current_user_platform_roles=get_roles('user',$user_id, 'platform');
+    display_role_list($current_user_course_roles, $current_user_platform_roles);
+    echo '<br />';
 }
 
 // ---------------------------------------------------
@@ -135,59 +135,59 @@ 
 echo "\t\t<th>".get_lang('Module')."</th>\n";
 foreach ($header_array as $header_key=>$header_value)
 {
-	echo "\t\t<th>".get_lang($header_value)."</th>\n";
+    echo "\t\t<th>".get_lang($header_value)."</th>\n";
 }
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
 foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
 {
-	echo "\t<tr>\n";
-	echo "\t\t<td>\n";
-	if (strstr($tool,'BLOG'))
-	{
-		// Not dealing with a real tool here, get name of this blog
-		// Strip blog id
-		$tmp = strpos($tool,'_')+1;
-		$blog_id = substr($tool,$tmp,strlen($tool));
-		// Get title
-		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
-	}
-	else
-	{
-		echo get_lang($tool);
-	}
-
-	echo "\t\t</td>\n";
-
-	foreach ($header_array as $key=>$value)
-	{
-
-		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights))
-		{
-			if ($setting_visualisation=='checkbox')
-			{
-				display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
-			}
-			if ($setting_visualisation=='image')
-			{
-				display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
-			}
-		}
-		// note: in a later stage this part will be replaced by a function
-		// so that we can easily switch between a checkbox approach or an image approach
-		// where every click is in fact a change of status. In the checkbox approach you first have to
-		// do the changes and then store them by clicking the submit button.
-		echo "\t\t</td>\n";
-	}
-	echo "\t</tr>\n";
+    echo "\t<tr>\n";
+    echo "\t\t<td>\n";
+    if (strstr($tool,'BLOG'))
+    {
+        // Not dealing with a real tool here, get name of this blog
+        // Strip blog id
+        $tmp = strpos($tool,'_')+1;
+        $blog_id = substr($tool,$tmp,strlen($tool));
+        // Get title
+        echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
+    }
+    else
+    {
+        echo get_lang($tool);
+    }
+
+    echo "\t\t</td>\n";
+
+    foreach ($header_array as $key=>$value)
+    {
+
+        echo "\t\t<td align='center'>\n";
+        if (in_array($value,$rights))
+        {
+            if ($setting_visualisation=='checkbox')
+            {
+                display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
+            }
+            if ($setting_visualisation=='image')
+            {
+                display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
+            }
+        }
+        // note: in a later stage this part will be replaced by a function
+        // so that we can easily switch between a checkbox approach or an image approach
+        // where every click is in fact a change of status. In the checkbox approach you first have to
+        // do the changes and then store them by clicking the submit button.
+        echo "\t\t</td>\n";
+    }
+    echo "\t</tr>\n";
 }
 
 echo "</table>\n";
 if ($setting_visualisation=='checkbox')
 {
-	echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
+    echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }
 echo "</form><br />";