chamilo / chamilo-lms

main/coursecopy/import_backup.php

Spacing +10 added lines, -10 removed lines

@@ -98,21 +98,21 @@ 
         $cr->set_file_option($_POST['same_file_name_option']);
         $cr->restore();
         Display::display_normal_message(get_lang('ImportFinished'));
-        echo '<a class="btn btn-default" href="' . api_get_path(WEB_COURSE_PATH) . api_get_course_path() . '/index.php">' . get_lang('CourseHomepage') . '</a>';
+        echo '<a class="btn btn-default" href="'.api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php">'.get_lang('CourseHomepage').'</a>';
     } else {
         if (!$error) {
             Display::display_warning_message(get_lang('NoResourcesInBackupFile'));
-            echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+            echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
         } elseif ($filename === false) {
             Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'));
-            echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+            echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
         } else {
             if ($filename == '') {
                 Display::display_error_message(get_lang('SelectBackupFile'));
-                echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+                echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
             } else {
                 Display::display_error_message(get_lang('UploadError'));
-                echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+                echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
             }
         }
     }
@@ -142,10 +142,10 @@ 
         CourseSelectForm::display_form($course, $hiddenFields);
     } elseif ($filename === false) {
         Display::display_error_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'));
-        echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+        echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
     } else {
         Display::display_warning_message(get_lang('NoResourcesInBackupFile'));
-        echo '<a class="btn btn-default" href="import_backup.php?' . api_get_cidreq() . '">' . get_lang('TryAgain') . '</a>';
+        echo '<a class="btn btn-default" href="import_backup.php?'.api_get_cidreq().'">'.get_lang('TryAgain').'</a>';
     }
 } else {
     $user = api_get_user_info();
@@ -157,7 +157,7 @@ 
     $form = new FormValidator(
         'import_backup_form',
         'post',
-        api_get_path(WEB_CODE_PATH) . 'coursecopy/import_backup.php?' . api_get_cidreq(),
+        api_get_path(WEB_CODE_PATH).'coursecopy/import_backup.php?'.api_get_cidreq(),
         '',
         array('enctype' => 'multipart/form-data')
     );
@@ -189,7 +189,7 @@ 
         );
         $options['null'] = '-';
         foreach ($backups as $index => $backup) {
-            $options[$backup['file']] = $backup['course_code'] . ' (' . $backup['date'] . ')';
+            $options[$backup['file']] = $backup['course_code'].' ('.$backup['date'].')';
         }
         $form->addElement(
             'select',
@@ -207,7 +207,7 @@ 
             'radio',
             '',
             '',
-            '<i>' . get_lang('NoBackupsAvailable') . '</i>',
+            '<i>'.get_lang('NoBackupsAvailable').'</i>',
             '',
             'disabled="true"'
         );

main/social/home.php

Indentation +2 added lines, -2 removed lines

@@ -101,8 +101,8 @@
         $group_url = "group_view.php?id=$id";
 
         $result['name'] = '<div class="group-name">'.Display::url(
-                          api_ucwords(cut($result['name'], 40, true)), $group_url)
-                          .'</div><div class="count-username">'.
+                            api_ucwords(cut($result['name'], 40, true)), $group_url)
+                            .'</div><div class="count-username">'.
                             Display::returnFontAwesomeIcon('user').$result['count'].'</div>';
 
         $picture = $userGroup->get_picture_group(

Spacing +35 added lines, -35 removed lines

@@ -20,8 +20,8 @@ 
 api_block_anonymous_users();
 
 if (api_get_setting('allow_social_tool') != 'true') {
-    $url = api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
-    header('Location: ' . $url);
+    $url = api_get_path(WEB_CODE_PATH).'auth/profile.php';
+    header('Location: '.$url);
     exit;
 }
 
@@ -45,10 +45,10 @@ 
     $allowed_picture_types = api_get_supported_image_extensions();
     $form->addRule(
         'picture',
-        get_lang('OnlyImagesAllowed') . ' (' . implode(
+        get_lang('OnlyImagesAllowed').' ('.implode(
             ',',
             $allowed_picture_types
-        ) . ')',
+        ).')',
         'filetype',
         $allowed_picture_types
     );
@@ -68,7 +68,7 @@ 
                 $sql = "UPDATE $table_user
                         SET 
                             picture_uri = '$new_picture' 
-                        WHERE user_id =  " . api_get_user_id();
+                        WHERE user_id =  ".api_get_user_id();
 
                 $result = Database::query($sql);
             }
@@ -95,9 +95,9 @@ 
         $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
 
         if ($result['count'] == 1) {
-            $result['count'] = '1 ' . get_lang('Member');
+            $result['count'] = '1 '.get_lang('Member');
         } else {
-            $result['count'] = $result['count'] . ' ' . get_lang('Members');
+            $result['count'] = $result['count'].' '.get_lang('Members');
         }
 
         $group_url = "group_view.php?id=$id";
@@ -114,9 +114,9 @@ 
             GROUP_IMAGE_SIZE_BIG
         );
 
-        $result['picture'] = '<img class="img-responsive" src="' . $picture['file'] . '" />';
-        $group_actions = '<div class="group-more"><a href="groups.php?#tab_browse-2">' . get_lang('SeeMore') . '</a></div>';
-        $group_info= '<div class="description"><p>' . cut($result['description'], 120, true) . "</p></div>";
+        $result['picture'] = '<img class="img-responsive" src="'.$picture['file'].'" />';
+        $group_actions = '<div class="group-more"><a href="groups.php?#tab_browse-2">'.get_lang('SeeMore').'</a></div>';
+        $group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
         $groups_newest[] = array(
             Display::url(
                 $result['picture'],
@@ -143,9 +143,9 @@ 
     $group_url = "group_view.php?id=$id";
 
     if ($result['count'] == 1) {
-        $result['count'] = '1 ' . get_lang('Member');
+        $result['count'] = '1 '.get_lang('Member');
     } else {
-        $result['count'] = $result['count'] . ' ' . get_lang('Members');
+        $result['count'] = $result['count'].' '.get_lang('Members');
     }
     $result['name'] = '<div class="group-name">'.Display::url(
             api_ucwords(cut($result['name'], 40, true)), $group_url)
@@ -157,42 +157,42 @@ 
         null,
         GROUP_IMAGE_SIZE_BIG
     );
-    $result['picture_uri'] = '<img class="img-responsive" src="' . $picture['file'] . '" />';
-    $group_actions = '<div class="group-more" ><a href="groups.php?#tab_browse-3">' . get_lang('SeeMore') . '</a></div>';
-    $group_info= '<div class="description"><p>' . cut($result['description'], 120, true) . "</p></div>";
+    $result['picture_uri'] = '<img class="img-responsive" src="'.$picture['file'].'" />';
+    $group_actions = '<div class="group-more" ><a href="groups.php?#tab_browse-3">'.get_lang('SeeMore').'</a></div>';
+    $group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
     $groups_pop[] = array(
         Display::url($result['picture_uri'], $group_url),
-        $result['name'],$group_info. $group_actions
+        $result['name'], $group_info.$group_actions
     );
 }
 
-$list=count($groups_newest);
+$list = count($groups_newest);
 $social_group_block = null;
 if ($list > 0) {
     $social_group_block .= '<div class="list-group-newest">';
-    $social_group_block .= '<div class="group-title">' . get_lang('Newest') . '</div>';
-    for ($i = 0;$i < $list; $i++) {
-        $social_group_block.='<div class="row">';
-        $social_group_block.='<div class="col-md-3">' . $groups_newest[$i][0] . '</div>';
-        $social_group_block.='<div class="col-md-9">' . $groups_newest[$i][1];
-        $social_group_block.= $groups_newest[$i][2] . '</div>';
-        $social_group_block.="</div>";
+    $social_group_block .= '<div class="group-title">'.get_lang('Newest').'</div>';
+    for ($i = 0; $i < $list; $i++) {
+        $social_group_block .= '<div class="row">';
+        $social_group_block .= '<div class="col-md-3">'.$groups_newest[$i][0].'</div>';
+        $social_group_block .= '<div class="col-md-9">'.$groups_newest[$i][1];
+        $social_group_block .= $groups_newest[$i][2].'</div>';
+        $social_group_block .= "</div>";
     }
-    $social_group_block.= "</div>";
+    $social_group_block .= "</div>";
 }
-$list=count($groups_pop);
+$list = count($groups_pop);
 if ($list > 0) {
     $social_group_block .= '<div class="list-group-newest">';
-    $social_group_block .= '<div class="group-title">' . get_lang('Popular') . '</div>';
-
-    for ($i = 0;$i < $list; $i++) {
-        $social_group_block.='<div class="row">';
-        $social_group_block.='<div class="col-md-3">' . $groups_pop[$i][0] . '</div>';
-        $social_group_block.='<div class="col-md-9">' . $groups_pop[$i][1];
-        $social_group_block.= $groups_pop[$i][2] . '</div>';
-        $social_group_block.="</div>";
+    $social_group_block .= '<div class="group-title">'.get_lang('Popular').'</div>';
+
+    for ($i = 0; $i < $list; $i++) {
+        $social_group_block .= '<div class="row">';
+        $social_group_block .= '<div class="col-md-3">'.$groups_pop[$i][0].'</div>';
+        $social_group_block .= '<div class="col-md-9">'.$groups_pop[$i][1];
+        $social_group_block .= $groups_pop[$i][2].'</div>';
+        $social_group_block .= "</div>";
     }
-    $social_group_block.= "</div>";
+    $social_group_block .= "</div>";
 }
 // My friends
 $friend_html = SocialManager::listMyFriendsBlock(

main/social/vcard_export.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 api_block_anonymous_users();
 
 if (isset($_REQUEST['userId'])) {
-	$userId = intval($_REQUEST['userId']);
+    $userId = intval($_REQUEST['userId']);
 } else {
     api_not_allowed();
 }

main/social/profile_friends_and_groups.inc.php

Spacing +22 added lines, -22 removed lines

@@ -32,14 +32,14 @@ 
         );
         $number_friends = count($friends);
         $friend_html = '';
-        $friend_html .= '<div><h3>' . get_lang('SocialFriend') . '</h3></div>';
+        $friend_html .= '<div><h3>'.get_lang('SocialFriend').'</h3></div>';
         $friend_html .= '<div id="friend-container" class="social-friend-container">';
         $friend_html .= '<div id="friend-header" >';
 
         if ($number_friends == 1) {
-            $friend_html .= '<div style="float:left;width:80%">' . $number_friends . ' ' . get_lang('Friend') . '</div>';
+            $friend_html .= '<div style="float:left;width:80%">'.$number_friends.' '.get_lang('Friend').'</div>';
         } else {
-            $friend_html .= '<div style="float:left;width:80%">' . $number_friends . ' ' . get_lang('Friends') . '</div>';
+            $friend_html .= '<div style="float:left;width:80%">'.$number_friends.' '.get_lang('Friends').'</div>';
         }
 
         $friend_html .= '</div>'; // close div friend-header
@@ -51,14 +51,14 @@ 
                     $friend['firstName'],
                     $friend['lastName']
                 );
-                $friend_html .= '<div id=div_' . $friend['friend_user_id'] . ' class="image_friend_network" ><span><center>';
+                $friend_html .= '<div id=div_'.$friend['friend_user_id'].' class="image_friend_network" ><span><center>';
 
                 $userPicture = UserManager::getUserPicture($friend['friend_user_id']);
 
-                $friend_html .= '<a href="profile.php?u=' . $friend['friend_user_id'].'">';
-                $friend_html .= '<img src="' . $userPicture . '" id="imgfriend_' . $friend['friend_user_id'] . '" title="' . $name_user . '" />';
+                $friend_html .= '<a href="profile.php?u='.$friend['friend_user_id'].'">';
+                $friend_html .= '<img src="'.$userPicture.'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'" />';
                 $friend_html .= '</center></span>';
-                $friend_html .= '<center class="friend">' . $name_user . '</a></center>';
+                $friend_html .= '<center class="friend">'.$name_user.'</a></center>';
                 $friend_html .= '</div>';
             }
         }
@@ -73,7 +73,7 @@ 
             $i = 1;
             foreach ($results as $result) {
                 $id = $result['id'];
-                $url_open = '<a href="group_view.php?id=' . $id . '">';
+                $url_open = '<a href="group_view.php?id='.$id.'">';
                 $url_close = '</a>';
                 $icon = '';
                 $name = cut($result['name'], 20, true);
@@ -94,11 +94,11 @@ 
                     $userGroup->get_all_users_by_group($id)
                 );
                 if ($count_users_group == 1) {
-                    $count_users_group = $count_users_group . ' ' . get_lang(
+                    $count_users_group = $count_users_group.' '.get_lang(
                             'Member'
                         );
                 } else {
-                    $count_users_group = $count_users_group . ' ' . get_lang(
+                    $count_users_group = $count_users_group.' '.get_lang(
                             'Members'
                         );
                 }
@@ -107,40 +107,40 @@ 
                     $result['picture_uri'],
                     80
                 );
-                $item_name = '<div class="box_shared_profile_group_title">' . $url_open . api_xml_http_response_encode($name) . $icon . $url_close . '</div>';
+                $item_name = '<div class="box_shared_profile_group_title">'.$url_open.api_xml_http_response_encode($name).$icon.$url_close.'</div>';
                 $item_description = '';
                 if (!empty($result['description'])) {
                     $item_description = '<div class="box_shared_profile_group_description">
                         <span class="social-groups-text2">' .
-                        api_xml_http_response_encode(get_lang('Description')) . '</span><p class="social-groups-text4">' .
-                        cut(api_xml_http_response_encode($result['description']), 120, true ) . '</p></div>';
+                        api_xml_http_response_encode(get_lang('Description')).'</span><p class="social-groups-text4">'.
+                        cut(api_xml_http_response_encode($result['description']), 120, true).'</p></div>';
                 }
 
                 $result['picture_uri'] = '<div class="box_shared_profile_group_image">
-                                          <img class="social-groups-image" src="' . $picture['file'] . '" /></div>';
+                                          <img class="social-groups-image" src="' . $picture['file'].'" /></div>';
                 $item_actions = '';
                 if (api_get_user_id() == $user_id) {
-                    $item_actions = '<div class="box_shared_profile_group_actions"><a href="group_view.php?id=' . $id . '">' .
-                        get_lang('SeeMore') . $url_close . '</div>';
+                    $item_actions = '<div class="box_shared_profile_group_actions"><a href="group_view.php?id='.$id.'">'.
+                        get_lang('SeeMore').$url_close.'</div>';
                 }
                 $grid_my_groups[] = array(
                     $item_name,
-                    $url_open . $result['picture_uri'] . $url_close,
-                    $item_description . $item_actions
+                    $url_open.$result['picture_uri'].$url_close,
+                    $item_description.$item_actions
                 );
                 $i++;
             }
         }
         if (count($grid_my_groups) > 0) {
             echo '<div style="margin-top:20px">';
-            echo '<div><h3>' . get_lang('MyGroups') . '</h3></div>';
+            echo '<div><h3>'.get_lang('MyGroups').'</h3></div>';
             $count_groups = 0;
             if (count($results) == 1) {
-                $count_groups = count($results) . ' ' . get_lang('Group');
+                $count_groups = count($results).' '.get_lang('Group');
             } else {
-                $count_groups = count($results) . ' ' . get_lang('Groups');
+                $count_groups = count($results).' '.get_lang('Groups');
             }
-            echo '<div>' . $count_groups . '</div>';
+            echo '<div>'.$count_groups.'</div>';
 
             Display::display_sortable_grid(
                 'shared_profile_mygroups',

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_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/skills_wheel.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 $url = api_get_path(WEB_AJAX_PATH)."skill.ajax.php?a=get_skills_tree_json&load_user=$userId";
 $tpl->assign('wheel_url', $url);
 
-$url  = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
+$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
 $tpl->assign('url', $url);
 
 $tpl->assign('user_info', $userInfo);

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/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,