chamilo / chamilo-lms

main/social/group_view.php

Spacing +32 added lines, -32 removed lines

@@ -11,7 +11,7 @@ 
 
 api_block_anonymous_users();
 
-if (api_get_setting('allow_social_tool') !='true') {
+if (api_get_setting('allow_social_tool') != 'true') {
     api_not_allowed();
 }
 
@@ -65,7 +65,7 @@ 
 	document.getElementById("filepath_"+counter_image).innerHTML = "\n\
         <input type=\"file\" name=\"attach_"+counter_image+"\"  size=\"20\" />\n\
         <a href=\"javascript:remove_image_form("+id_elem1+")\">\n\
-            <img src=\"' . api_get_path(WEB_IMG_PATH) . 'delete.gif\">\n\
+            <img src=\"' . api_get_path(WEB_IMG_PATH).'delete.gif\">\n\
         </a>\n\
     ";
 
@@ -87,31 +87,31 @@ 
 
 </script>';
 
-$allowed_views = array('mygroups','newest','pop');
+$allowed_views = array('mygroups', 'newest', 'pop');
 $content = null;
 
-if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
+if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
     if ($_GET['view'] == 'mygroups') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyGroups'));
-    } else if ( $_GET['view'] == 'newest') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Newest'));
-    } else  {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Popular'));
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('MyGroups'));
+    } else if ($_GET['view'] == 'newest') {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Newest'));
+    } else {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Popular'));
     }
 } else {
-    $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
+    $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
     if (!isset($_GET['id'])) {
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('GroupList'));
     } else {
         //$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Group'));
     }
 }
 
 // getting group information
-$group_id	= isset($_GET['id']) ? intval($_GET['id']) : null;
+$group_id = isset($_GET['id']) ? intval($_GET['id']) : null;
 $relation_group_title = '';
 $role = 0;
 
@@ -120,9 +120,9 @@ 
 if ($group_id != 0) {
     $group_info = $usergroup->get($group_id);
 
-    $interbreadcrumb[]= array ('url' =>'#','name' => $group_info['name']);
+    $interbreadcrumb[] = array('url' =>'#', 'name' => $group_info['name']);
 
-    if (isset($_GET['action']) && $_GET['action']=='leave') {
+    if (isset($_GET['action']) && $_GET['action'] == 'leave') {
         $user_leaved = intval($_GET['u']);
         //I can "leave me myself"
         if (api_get_user_id() == $user_leaved) {
@@ -133,7 +133,7 @@ 
         }
     }
     // add a user to a group if its open
-    if (isset($_GET['action']) && $_GET['action']=='join') {
+    if (isset($_GET['action']) && $_GET['action'] == 'join') {
         // we add a user only if is a open group
         $user_join = intval($_GET['u']);
         if (api_get_user_id() == $user_join && !empty($group_id)) {
@@ -161,7 +161,7 @@ 
 $group_info = $usergroup->get($group_id);
 
 //Loading group information
-if (isset($_GET['status']) && $_GET['status']=='sent') {
+if (isset($_GET['status']) && $_GET['status'] == 'sent') {
     $social_right_content .= Display::return_message(get_lang('MessageHasBeenSent'), 'confirmation', false);
 }
 
@@ -170,7 +170,7 @@ 
 
 if (!$is_group_member && $group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
     if ($role == GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER) {
-        $social_right_content .=  Display::return_message(get_lang('YouAlreadySentAnInvitation'));
+        $social_right_content .= Display::return_message(get_lang('YouAlreadySentAnInvitation'));
     }
 }
 
@@ -179,13 +179,13 @@ 
         if (!in_array($role,
             array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))
         ) {
-            $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
+            $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
                 get_lang('JoinGroup').'</a>';
         } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-            $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
+            $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
                 get_lang('YouHaveBeenInvitedJoinNow').'</a>';
         }
-        $social_right_content .=  '<br /><br />';
+        $social_right_content .= '<br /><br />';
     }
     $content = MessageManager::display_messages_for_group($group_id);
     if ($is_group_member) {
@@ -244,21 +244,21 @@ 
         foreach ($members as $member) {
             // if is a member
             if (in_array($member['relation_type'],
-                array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))
+                array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR))
             ) {
                 //add icons
                 if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-                    $icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
+                    $icon = Display::return_icon('social_group_admin.png', get_lang('Admin'));
                 } elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-                    $icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
+                    $icon = Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
                 } else {
-                    $icon= '';
+                    $icon = '';
                 }
 
                 $userPicture = UserManager::getUserPicture($member['id']);
 
                 $member_content .= '<div class="">';
-                $member_name = Display::url(api_get_person_name(cut($member['firstname'],15),cut($member['lastname'],15)).'&nbsp;'.$icon, $member['user_info']['profile_url']);
+                $member_name = Display::url(api_get_person_name(cut($member['firstname'], 15), cut($member['lastname'], 15)).'&nbsp;'.$icon, $member['user_info']['profile_url']);
                 $member_content .= Display::div('<img class="social-groups-image img-circle" src="'.$userPicture.'"/>&nbsp'.$member_name);
                 $member_content .= '</div>';
             }
@@ -266,10 +266,10 @@ 
     }
 
     if (!empty($create_thread_link)) {
-        $create_thread_link =  Display::div($create_thread_link, array('class'=>'pull-right'));
+        $create_thread_link = Display::div($create_thread_link, array('class'=>'pull-right'));
     }
     $headers = array(get_lang('Discussions'), get_lang('Members'));
-    $social_right_content .= Display::tabs($headers, array($content, $member_content),'tabs');
+    $social_right_content .= Display::tabs($headers, array($content, $member_content), 'tabs');
 } else {
     // if I already sent an invitation message
     if (!in_array(
@@ -280,9 +280,9 @@ 
         )
     )
     ) {
-        $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
+        $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
     } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-        $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
+        $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
     }
 }
 

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_add.php

Spacing +5 added lines, -5 removed lines

@@ -6,12 +6,12 @@ 
  * @author Julio Montoya <gugli100@gmail.com>
  */
 
-$language_file= 'userInfo';
+$language_file = 'userInfo';
 $cidReset = true;
 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();
 }
 
@@ -38,9 +38,9 @@ 
 $nameTools = get_lang('AddGroup');
 $this_section = SECTION_SOCIAL;
 
-$interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
-$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-$interbreadcrumb[]= array ('url' =>'#','name' => $nameTools);
+$interbreadcrumb[] = array('url' =>'home.php', 'name' => get_lang('Social'));
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' =>'#', 'name' => $nameTools);
 
 $social_avatar_block = SocialManager::show_social_avatar_block('group_add');
 $social_menu_block = SocialManager::show_social_menu('group_add');

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

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

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')."\">";
 }

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

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/permissions_functions.inc.php

Spacing +144 added lines, -144 removed lines

@@ -26,34 +26,34 @@ 
     $course_id = api_get_course_int_id();
     
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user')
+	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// We first delete all the existing permissions for that user/group/role
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
-	$result=Database::query($sql);
+	$sql = "DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
+	$result = Database::query($sql);
 
 	// looping through the post values to find the permission (containing the string permission* )
 	foreach ($_POST as $key => $value)
 	{
-		if (strstr($key,"permission*"))
+		if (strstr($key, "permission*"))
 		{
-			list($brol,$tool,$action)=explode("*",$key);
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
-			$result=Database::query($sql);
+			list($brol, $tool, $action) = explode("*", $key);
+			$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
+			$result = Database::query($sql);
 		}
 	}
 	return get_lang('PermissionsStored');
@@ -69,7 +69,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function store_one_permission($content, $action, $id, $tool,$permission) {
+function store_one_permission($content, $action, $id, $tool, $permission) {
 	global $rights_full;
     $course_id = api_get_course_int_id();
 	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
@@ -82,35 +82,35 @@ 
 
 	// Which database are we using (depending on the $content parameter)
     
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionGranted');
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionGranted');
 		}
 	}
-	if ($action=='revoke')
+	if ($action == 'revoke')
 	{
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionRevoked');
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionRevoked');
 		}
 	}
 	return $result_message;
@@ -125,44 +125,44 @@ 
 */
 function get_permissions($content, $id) {
     $course_id = api_get_course_int_id();
-	$currentpermissions=array();
+	$currentpermissions = array();
 	// Which database are we using (depending on the $content parameter)
     $course_id_condition = " c_id = $course_id AND ";
 	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = 'user_id';
 	}
 	elseif ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = 'group_id';
 	}
 	elseif ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
 	}
 	elseif ($content == 'platform_role')
 	{
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_main_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
         $course_id_condition = '';
 	}
 	elseif ($content == 'task')
 	{
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+		$table = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 		$id_field = 'task_id';
 	}
 
 	// finding all the permissions. We store this in a multidimensional array
 	// where the first dimension is the tool.
-	$sql="
-		SELECT * FROM " . $table . "
-		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
+	$sql = "
+		SELECT * FROM " . $table."
+		WHERE $course_id_condition ".$id_field."='".Database::escape_string($id)."'";
 	$result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
+	while ($row = Database::fetch_array($result))
 		$currentpermissions[$row['tool']][] = $row['action'];
 
 	return $currentpermissions;
@@ -179,7 +179,7 @@ 
 */
 function limited_or_full($current_permissions)
 {
-	if (api_get_setting('permissions')=='limited')
+	if (api_get_setting('permissions') == 'limited')
 	{
 		foreach ($current_permissions as $tool=>$tool_rights)
 		{
@@ -187,15 +187,15 @@ 
 			// if it is visibility or move we have to grant the edit right
 			foreach ($tool_rights as $key=>$value)
 			{
-				if ($value=='View')
+				if ($value == 'View')
 				{
 					unset($current_permissions[$tool][$key]);
 				}
-				if ($value=='Visibility' OR $value=='Move')
+				if ($value == 'Visibility' OR $value == 'Move')
 				{
-					if (!in_array('Edit',$current_permissions[$tool]))
+					if (!in_array('Edit', $current_permissions[$tool]))
 					{
-						$current_permissions[$tool][]='Edit';
+						$current_permissions[$tool][] = 'Edit';
 					}
 					unset($current_permissions[$tool][$key]);
 				}
@@ -207,7 +207,7 @@ 
 		}
 		return $current_permissions;
 	}
-	if (api_get_setting('permissions')=='full')
+	if (api_get_setting('permissions') == 'full')
 	{
 		return $current_permissions;
 	}
@@ -222,12 +222,12 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
+function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions = array())
 {
-	$checked="";
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+	$checked = "";
+	if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 	{
-		$checked="checked";
+		$checked = "checked";
 	}
 	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
 
@@ -243,28 +243,28 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix($permission_array, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 	if ($course_admin) {
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 	} else {
-		if (in_array($permission,$inherited_permissions[$tool])) {
+		if (in_array($permission, $inherited_permissions[$tool])) {
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		} else {
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool])) {
 				if ($editable) {
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+					foreach ($_GET as $key=>$value) {
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -275,20 +275,20 @@ 
 			} else {
 				if ($editable)
 				{
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value)
 					{
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -315,7 +315,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 
 	if ($course_admin)
@@ -324,32 +324,32 @@ 
 	}
 	else
 	{
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
+		if (!empty($inherited_permissions) and in_array($permission, $inherited_permissions[$tool]))
 		{
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		}
 		else
 		{
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 			{
 				if ($editable)
 				{
 					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key => $value)
+					foreach ($_GET as $key => $value)
 					{
 						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url = $url . '?' . $urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -362,17 +362,17 @@ 
 					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -397,8 +397,8 @@ 
 	global $setting_visualisation;
     $course_id = api_get_course_int_id();
 
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
-	$platform_roles_table=Database::get_main_table(TABLE_ROLE);
+	$coures_roles_table = Database::get_course_table(TABLE_ROLE);
+	$platform_roles_table = Database::get_main_table(TABLE_ROLE);
 /*
 	// platform roles
 	$sql="SELECT * FROM $platform_roles_table";
@@ -430,27 +430,27 @@ 
 	}
 */
 	// course roles
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$sql = "SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
 		if (in_array($row['role_id'], $current_course_roles))
 		{
-			$checked='checked';
-			$image='checkbox_on2.gif';
-			$action='revoke';
+			$checked = 'checked';
+			$image = 'checkbox_on2.gif';
+			$action = 'revoke';
 		}
 		else
 		{
-			$checked='';
-			$image='wrong.gif';
-			$action='grant';
+			$checked = '';
+			$image = 'wrong.gif';
+			$action = 'grant';
 		}
-		if ($setting_visualisation=='checkbox')
+		if ($setting_visualisation == 'checkbox')
 		{
 			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
 		}
-		if ($setting_visualisation=='image')
+		if ($setting_visualisation == 'image')
 		{
 			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
 		}
@@ -470,24 +470,24 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles($content,$id, $scope='course') {
-    $course_id  = api_get_course_int_id();    
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+function get_roles($content, $id, $scope = 'course') {
+    $course_id = api_get_course_int_id();    
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	if ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	}
-	$table_role=Database::get_course_table(TABLE_ROLE);
+	$table_role = Database::get_course_table(TABLE_ROLE);
 
-	$current_roles=array();
+	$current_roles = array();
 	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result)) {
-		$current_roles[]=$row['role_id'];
+	$sql = "SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result)) {
+		$current_roles[] = $row['role_id'];
 	}
 	return $current_roles;
 }
@@ -498,26 +498,26 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_all_roles($content='course') {
+function get_all_roles($content = 'course') {
     $course_id = api_get_course_int_id();
     $course_id_condition = " WHERE c_id = $course_id ";
     
-	if ($content=='course')
+	if ($content == 'course')
 	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
+		$table_role = Database::get_course_table(TABLE_ROLE);
 	}
-	if ($content=='platform')
+	if ($content == 'platform')
 	{
-		$table_role=Database::get_main_table(TABLE_ROLE);
+		$table_role = Database::get_main_table(TABLE_ROLE);
 		$course_id_condition = '';
 	}
 
-	$current_roles=array();
-	$sql="SELECT * FROM $table_role $course_id_condition ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$current_roles = array();
+	$sql = "SELECT * FROM $table_role $course_id_condition ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
-		$roles[]=$row;
+		$roles[] = $row;
 	}
 
 	return $roles;
@@ -534,10 +534,10 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles_permissions($content,$id, $scope='course') {
+function get_roles_permissions($content, $id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	if ($content == 'user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
 	}
 
@@ -566,21 +566,21 @@ 
 	$sql = "
 		SELECT *
 		FROM
-			" . $table . " role_group_user,
-			" . $table_role . " role,
-			" . $table_role_permissions . " role_permissions
+			" . $table." role_group_user,
+			" . $table_role." role,
+			" . $table_role_permissions." role_permissions
 		WHERE
 		    role_group_user.c_id = $course_id AND
 		    $role_condition
-			role_group_user.scope = '" . $scope . "' AND
-			role_group_user." . $id_field . " = '" . $id . "' AND
+			role_group_user.scope = '".$scope."' AND
+			role_group_user." . $id_field." = '".$id."' AND
 			role_group_user.role_id = role.role_id AND
 			role.role_id = role_permissions.role_id";
 
 	$result = Database::query($sql);
     $current_role_permissions = array();
-	while ($row=Database::fetch_array($result)) {
-		$current_role_permissions[$row['tool']][]=$row['action'];
+	while ($row = Database::fetch_array($result)) {
+		$current_role_permissions[$row['tool']][] = $row['action'];
     }
 	return $current_role_permissions;
 }
@@ -594,33 +594,33 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 */
 
-function assign_role($content, $action, $id, $role_id, $scope='course') {
+function assign_role($content, $action, $id, $role_id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
-	} elseif($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	} elseif ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	} else {
 		return  get_lang('Error');
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
-		$result=Database::query($sql);
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleGranted');
+			$result_message = get_lang('RoleGranted');
 		}
 	}
     
-	if ($action=='revoke') {
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
-		$result=Database::query($sql);
+	if ($action == 'revoke') {
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleRevoked');
+			$result_message = get_lang('RoleRevoked');
 		}
 	}
 	return $result_message;
@@ -637,7 +637,7 @@ 
 	{
 		foreach ($permissions as $permissionkey=>$permissionvalue)
 		{
-			$array1[$tool][]=$permissionvalue;
+			$array1[$tool][] = $permissionvalue;
 		}
 	}
 	return $array1;