Completed
Push — 1.11.x ( 632923...de7471 )
by José
28:08
created
main/session/resume_session.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     $sessionRepository = Database::getManager()->getRepository('ChamiloCoreBundle:Session');
156 156
     $courses = $sessionRepository->getCoursesOrderedByPosition($session);
157 157
 
158
-	foreach ($courses as $course) {
158
+    foreach ($courses as $course) {
159 159
         //select the number of users
160 160
         $sql = "SELECT count(*)
161 161
                 FROM $tbl_session_rel_user sru,
@@ -167,37 +167,37 @@  discard block
 block discarded – undo
167 167
                     sru.relation_type <> ".SESSION_RELATION_TYPE_RRHH." AND
168 168
                     srcru.session_id = '".intval($sessionId)."'";
169 169
 
170
-		$rs = Database::query($sql);
170
+        $rs = Database::query($sql);
171 171
         $numberOfUsers = Database::result($rs, 0, 0);
172 172
 
173
-		// Get coachs of the courses in session
173
+        // Get coachs of the courses in session
174 174
 
175
-		$sql = "SELECT user.lastname, user.firstname, user.username
175
+        $sql = "SELECT user.lastname, user.firstname, user.username
176 176
                 FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
177 177
 				WHERE
178 178
 				    session_rcru.user_id = user.user_id AND
179 179
 				    session_rcru.session_id = '".intval($sessionId)."' AND
180 180
 				    session_rcru.c_id ='".intval($course->getId())."' AND
181 181
 				    session_rcru.status=2";
182
-		$rs = Database::query($sql);
182
+        $rs = Database::query($sql);
183 183
 
184
-		$coachs = array();
185
-		if (Database::num_rows($rs) > 0) {
186
-			while($info_coach = Database::fetch_array($rs)) {
184
+        $coachs = array();
185
+        if (Database::num_rows($rs) > 0) {
186
+            while($info_coach = Database::fetch_array($rs)) {
187 187
                 $coachs[] = api_get_person_name(
188 188
                         $info_coach['firstname'],
189 189
                         $info_coach['lastname']
190 190
                     ).' ('.$info_coach['username'].')';
191
-			}
192
-		} else {
193
-			$coach = get_lang('None');
194
-		}
191
+            }
192
+        } else {
193
+            $coach = get_lang('None');
194
+        }
195 195
 
196
-		if (count($coachs) > 0) {
197
-			$coach = implode('<br />',$coachs);
198
-		} else {
199
-			$coach = get_lang('None');
200
-		}
196
+        if (count($coachs) > 0) {
197
+            $coach = implode('<br />',$coachs);
198
+        } else {
199
+            $coach = get_lang('None');
200
+        }
201 201
 
202 202
         $orderButtons = null;
203 203
 
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 
234 234
         $courseUrl = api_get_course_url($course->getCode(), $sessionId);
235 235
 
236
-		// hide_course_breadcrumb the parameter has been added to hide the name
237
-		// of the course, that appeared in the default $interbreadcrumb
236
+        // hide_course_breadcrumb the parameter has been added to hide the name
237
+        // of the course, that appeared in the default $interbreadcrumb
238 238
         $courseItem .= '
239 239
 		<tr>
240 240
 			<td class="title">'.Display::url(
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 			</td>
261 261
 		</tr>';
262 262
         $count++;
263
-	}
263
+    }
264 264
     $courseListToShow .= $courseItem;
265 265
 }
266 266
 $courseListToShow .= '</table><br />';
Please login to merge, or discard this patch.
main/session/add_teachers_to_session.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -70,13 +70,13 @@
 block discarded – undo
70 70
     <tr>
71 71
         <td align="center">
72 72
             <?php
73
-             echo Display::select(
74
-                 'sessions[]',
75
-                 $sessionList,
76
-                 '',
77
-                 array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'sessions', 'size'=>'15px'),
78
-                 false
79
-             );
73
+                echo Display::select(
74
+                    'sessions[]',
75
+                    $sessionList,
76
+                    '',
77
+                    array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'sessions', 'size'=>'15px'),
78
+                    false
79
+                );
80 80
             ?>
81 81
         </td>
82 82
         <td align="center">
Please login to merge, or discard this patch.
main/session/session_category_edit.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
29 29
 $sql = "SELECT * FROM $tbl_session_category WHERE id='".$id."' ORDER BY name";
30 30
 $result = Database::query($sql);
31 31
 if (!$infos = Database::fetch_array($result)) {
32
-	header('Location: session_list.php');
33
-	exit();
32
+    header('Location: session_list.php');
33
+    exit();
34 34
 }
35 35
 
36 36
 list($year_start,$month_start,$day_start)=explode('-',$infos['date_start']);
37 37
 list($year_end,$month_end,$day_end)=explode('-',$infos['date_end']);
38 38
 
39 39
 if (!api_is_platform_admin() && $infos['session_admin_id']!=$_user['user_id'] && !api_is_session_admin()) {
40
-	api_not_allowed(true);
40
+    api_not_allowed(true);
41 41
 }
42 42
 
43 43
 if (isset($_POST['formSent']) && $_POST['formSent']) {
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         $day_end
61 61
     );
62 62
     if ($return == strval(intval($return))) {
63
-		Display::addFlash(Display::return_message(get_lang('SessionCategoryUpdate')));
63
+        Display::addFlash(Display::return_message(get_lang('SessionCategoryUpdate')));
64 64
         header('Location: session_category_list.php');
65 65
         exit();
66 66
     }
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 // display the header
74 74
 Display::display_header($tool_name);
75 75
 if (!empty($return)) {
76
-	Display::display_error_message($return,false);
76
+    Display::display_error_message($return,false);
77 77
 }
78 78
 ?>
79 79
 <div class="row">
Please login to merge, or discard this patch.
main/session/session_course_edit.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 $result = Database::query($sql);
38 38
 
39 39
 if (!list($session_name,$course_title) = Database::fetch_row($result)) {
40
-	header('Location: session_course_list.php?id_session='.$id_session);
41
-	exit();
40
+    header('Location: session_course_list.php?id_session='.$id_session);
41
+    exit();
42 42
 }
43 43
 
44 44
 //$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
@@ -48,63 +48,63 @@  discard block
 block discarded – undo
48 48
 
49 49
 $arr_infos = array();
50 50
 if (isset($_POST['formSent']) && $_POST['formSent']) {
51
-	$formSent = 1;
51
+    $formSent = 1;
52 52
 
53
-	// get all tutor by course_code in the session
54
-	$sql = "SELECT user_id
53
+    // get all tutor by course_code in the session
54
+    $sql = "SELECT user_id
55 55
 	        FROM $tbl_session_rel_course_rel_user
56 56
 	        WHERE session_id = '$id_session' AND c_id = '".$courseId."' AND status = 2";
57
-	$rs_coaches = Database::query($sql);
57
+    $rs_coaches = Database::query($sql);
58 58
 
59
-	$coaches_course_session = array();
60
-	if (Database::num_rows($rs_coaches) > 0){
61
-		while ($row_coaches = Database::fetch_row($rs_coaches)) {
62
-			$coaches_course_session[] = $row_coaches[0];
63
-		}
64
-	}
59
+    $coaches_course_session = array();
60
+    if (Database::num_rows($rs_coaches) > 0){
61
+        while ($row_coaches = Database::fetch_row($rs_coaches)) {
62
+            $coaches_course_session[] = $row_coaches[0];
63
+        }
64
+    }
65 65
 
66
-	$id_coaches= $_POST['id_coach'];
66
+    $id_coaches= $_POST['id_coach'];
67 67
 
68
-	if (is_array($id_coaches) && count($id_coaches) > 0) {
68
+    if (is_array($id_coaches) && count($id_coaches) > 0) {
69 69
 
70
-		foreach ($id_coaches as $id_coach) {
71
-			$id_coach = intval($id_coach);
70
+        foreach ($id_coaches as $id_coach) {
71
+            $id_coach = intval($id_coach);
72 72
             $rs1 = SessionManager::set_coach_to_course_session(
73 73
                 $id_coach,
74 74
                 $id_session,
75 75
                 $courseId
76 76
             );
77
-		}
77
+        }
78 78
 
79
-		// set status to 0 other tutors from multiple list
80
-		$array_intersect = array_diff($coaches_course_session,$id_coaches);
79
+        // set status to 0 other tutors from multiple list
80
+        $array_intersect = array_diff($coaches_course_session,$id_coaches);
81 81
 
82
-		foreach ($array_intersect as $no_coach_user_id) {
83
-			$rs2 = SessionManager::set_coach_to_course_session(
84
-				$no_coach_user_id,
85
-				$id_session,
82
+        foreach ($array_intersect as $no_coach_user_id) {
83
+            $rs2 = SessionManager::set_coach_to_course_session(
84
+                $no_coach_user_id,
85
+                $id_session,
86 86
                 $courseId,
87
-				true
88
-			);
89
-		}
87
+                true
88
+            );
89
+        }
90 90
 
91
-		header('Location: '.Security::remove_XSS($_GET['page']).'?id_session='.$id_session);
92
-		exit();
93
-	}
91
+        header('Location: '.Security::remove_XSS($_GET['page']).'?id_session='.$id_session);
92
+        exit();
93
+    }
94 94
 } else {
95
-	$sql = "SELECT user_id
95
+    $sql = "SELECT user_id
96 96
 	        FROM $tbl_session_rel_course_rel_user
97 97
 	        WHERE
98 98
                 session_id = '$id_session' AND
99 99
                 c_id = '".$courseId."' AND
100 100
                 status = 2 ";
101
-	$rs = Database::query($sql);
101
+    $rs = Database::query($sql);
102 102
 
103
-	if (Database::num_rows($rs) > 0) {
104
-		while ($infos = Database::fetch_array($rs)) {
105
-			$arr_infos[] = $infos['user_id'];
106
-		}
107
-	}
103
+    if (Database::num_rows($rs) > 0) {
104
+        while ($infos = Database::fetch_array($rs)) {
105
+            $arr_infos[] = $infos['user_id'];
106
+        }
107
+    }
108 108
 }
109 109
 
110 110
 $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
Please login to merge, or discard this patch.
main/session/add_many_session_to_category.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,12 +197,12 @@
 block discarded – undo
197 197
         if (!empty($rows_session_category)) {
198 198
             foreach($rows_session_category as $category) {
199 199
                 if($category['id'] == $categoryId)
200
-                      echo '<option value="'.$category['id'].'" selected>'.$category['name'].'</option>';
201
-                  else
202
-                      echo '<option value="'.$category['id'].'">'.$category['name'].'</option>';
200
+                        echo '<option value="'.$category['id'].'" selected>'.$category['name'].'</option>';
201
+                    else
202
+                        echo '<option value="'.$category['id'].'">'.$category['name'].'</option>';
203 203
             }
204 204
         }
205
-          ?>
205
+            ?>
206 206
       </select>
207 207
     </td>
208 208
 </tr>
Please login to merge, or discard this patch.
main/messages/index.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@
 block discarded – undo
5 5
 */
6 6
 require_once '../inc/global.inc.php';
7 7
 if (api_get_setting('allow_social_tool')=='true' &&  api_get_setting('allow_message_tool')=='true') {
8
-	header('Location:inbox.php?f=social');
8
+    header('Location:inbox.php?f=social');
9 9
 } elseif ( api_get_setting('allow_message_tool')=='true') {
10
-	header('Location:inbox.php');
10
+    header('Location:inbox.php');
11 11
 }
12 12
 exit;
Please login to merge, or discard this patch.
main/messages/outbox.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -9,20 +9,20 @@  discard block
 block discarded – undo
9 9
 api_block_anonymous_users();
10 10
 
11 11
 if (isset($_GET['messages_page_nr'])) {
12
-	if (api_get_setting('allow_social_tool')=='true' &&
12
+    if (api_get_setting('allow_social_tool')=='true' &&
13 13
         api_get_setting('allow_message_tool')=='true'
14 14
     ) {
15
-		$social_link = '';
16
-		if ($_REQUEST['f']=='social') {
17
-			$social_link = '&f=social';
18
-		}
19
-		header('Location:outbox.php?pager='.Security::remove_XSS($_GET['messages_page_nr']).$social_link.'');
20
-		exit;
21
-	}
15
+        $social_link = '';
16
+        if ($_REQUEST['f']=='social') {
17
+            $social_link = '&f=social';
18
+        }
19
+        header('Location:outbox.php?pager='.Security::remove_XSS($_GET['messages_page_nr']).$social_link.'');
20
+        exit;
21
+    }
22 22
 }
23 23
 
24 24
 if (api_get_setting('allow_message_tool')!='true'){
25
-	api_not_allowed();
25
+    api_not_allowed();
26 26
 }
27 27
 //jquery thickbox already called from main/inc/header.inc.php
28 28
 
@@ -54,13 +54,13 @@  discard block
 block discarded – undo
54 54
 		MAIN CODE
55 55
 */
56 56
 if (isset($_GET['f']) && $_GET['f']=='social') {
57
-	$this_section = SECTION_SOCIAL;
58
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));
59
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
57
+    $this_section = SECTION_SOCIAL;
58
+    $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));
59
+    $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
60 60
 } else {
61
-	$this_section = SECTION_MYPROFILE;
62
-	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
63
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
61
+    $this_section = SECTION_MYPROFILE;
62
+    $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
63
+    $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox'));
64 64
 }
65 65
 
66 66
 $actions = '';
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 
84 84
 if (isset($info_delete_outbox[0]) && trim($info_delete_outbox[0])=='delete') {
85 85
     for ($i = 1; $i <= $count_delete_outbox; $i++) {
86
-		MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]);
87
-	}
86
+        MessageManager::delete_message_by_user_sender(api_get_user_id(),$info_delete_outbox[$i]);
87
+    }
88 88
     $message_box=get_lang('SelectedMessagesDeleted').
89 89
         '&nbsp
90 90
         <br><a href="../social/index.php?#remote-tab-3">'.
Please login to merge, or discard this patch.
main/attendance/attendance_controller.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -636,11 +636,11 @@
 block discarded – undo
636 636
             }
637 637
             $formToDisplay = $form->returnForm();
638 638
         } else {
639
-           if (!empty($sessionId)) {
640
-               $sessionInfo = api_get_session_info($sessionId);
641
-               $startDate = $sessionInfo['access_start_date'];
642
-               $endDate = $sessionInfo['access_end_date'];
643
-           }
639
+            if (!empty($sessionId)) {
640
+                $sessionInfo = api_get_session_info($sessionId);
641
+                $startDate = $sessionInfo['access_start_date'];
642
+                $endDate = $sessionInfo['access_end_date'];
643
+            }
644 644
         }
645 645
 
646 646
         $attendance = new Attendance();
Please login to merge, or discard this patch.
main/course_home/vertical_activity.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
         $content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
92 92
             <table width="100%">';
93 93
                 $content .= CourseHome::show_session_data($session_id);
94
-             $content .=  '</table></div>';
94
+                $content .=  '</table></div>';
95 95
     }
96 96
 
97 97
     $content .=  '<div class="Authoringview">';
Please login to merge, or discard this patch.