Completed
Push — 1.11.x ( 5cb77e...c87450 )
by José
367:19 queued 327:00
created
main/messages/download.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
 $message_uid = '';
51 51
 $message_type = array('inbox','outbox');
52 52
 if (in_array($_GET['type'],$message_type)) {
53
-	if ($_GET['type'] == 'inbox') {
54
-		$message_uid = $row_users['user_receiver_id'];
55
-	} else {
56
-		$message_uid = $row_users['user_sender_id'];
57
-	}
53
+    if ($_GET['type'] == 'inbox') {
54
+        $message_uid = $row_users['user_receiver_id'];
55
+    } else {
56
+        $message_uid = $row_users['user_sender_id'];
57
+    }
58 58
 }
59 59
 
60 60
 // allow to the correct user for download this file
@@ -62,19 +62,19 @@  discard block
 block discarded – undo
62 62
 $userGroup = new UserGroup();
63 63
 
64 64
 if (!empty($row_users['group_id'])) {
65
-	$users_group = $userGroup->get_all_users_by_group($row_users['group_id']);
66
-	if (!in_array($current_uid,array_keys($users_group))) {
67
-		$not_allowed_to_edit = true;
68
-	}
65
+    $users_group = $userGroup->get_all_users_by_group($row_users['group_id']);
66
+    if (!in_array($current_uid,array_keys($users_group))) {
67
+        $not_allowed_to_edit = true;
68
+    }
69 69
 } else {
70
-	if ($current_uid != $message_uid) {
71
-		$not_allowed_to_edit = true;
72
-	}
70
+    if ($current_uid != $message_uid) {
71
+        $not_allowed_to_edit = true;
72
+    }
73 73
 }
74 74
 
75 75
 if ($not_allowed_to_edit) {
76
-	api_not_allowed();
77
-	exit;
76
+    api_not_allowed();
77
+    exit;
78 78
 }
79 79
 
80 80
 // set the path directory file
@@ -85,14 +85,14 @@  discard block
 block discarded – undo
85 85
         true
86 86
     );
87 87
 } else {
88
-	$path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
88
+    $path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
89 89
 }
90 90
 
91 91
 $full_file_name = $path_user_info['dir'].'message_attachments/'.$file_url;
92 92
 
93 93
 if (Security::check_abs_path($full_file_name, $path_user_info['dir'].'message_attachments/')) {
94 94
     // launch event
95
-	Event::event_download($file_url);
95
+    Event::event_download($file_url);
96 96
     DocumentManager::file_send_for_download($full_file_name,TRUE, $title);
97 97
 }
98 98
 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.
main/inc/ajax/exercise.ajax.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -488,7 +488,7 @@
 block discarded – undo
488 488
                     $remind_list
489 489
                 );
490 490
 
491
-                 // Destruction of the Question object
491
+                    // Destruction of the Question object
492 492
                 unset($objQuestionTmp);
493 493
                 if ($debug) {
494 494
                     error_log(" -- end question -- ");
Please login to merge, or discard this patch.
main/inc/ajax/course.ajax.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -258,13 +258,13 @@
 block discarded – undo
258 258
                 ), 'first');
259 259
 
260 260
                 $coachName = api_get_person_name($userResult['firstname'], $userResult['lastname']);
261
-           }
261
+            }
262 262
 
263
-           $courses[] = array(
264
-               'id' => $courseId,
265
-               'name' => $course['title'],
266
-               'coachName' => $coachName,
267
-           );
263
+            $courses[] = array(
264
+                'id' => $courseId,
265
+                'name' => $course['title'],
266
+                'coachName' => $coachName,
267
+            );
268 268
         }
269 269
 
270 270
         echo json_encode($courses);
Please login to merge, or discard this patch.
main/inc/ajax/thematic.ajax.php 1 patch
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 $thematic = new Thematic();
12 12
 
13 13
 switch ($action) {
14
-	case 'save_thematic_plan':
15
-		/*$title_list         = $_REQUEST['title'];
14
+    case 'save_thematic_plan':
15
+        /*$title_list         = $_REQUEST['title'];
16 16
 		$description_list   = $_REQUEST['desc'];
17 17
 		//$description_list   = $_REQUEST['description'];
18 18
 		$description_type   = $_REQUEST['description_type'];
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
 		$thematic_plan_data = $thematic->get_thematic_plan_data();
26 26
 		$return = $thematic->get_thematic_plan_div($thematic_plan_data);
27 27
 		echo $return[$_REQUEST['thematic_id']];*/
28
-		break;
29
-	case 'save_thematic_advance':
30
-		if (!api_is_allowed_to_edit(null, true)) {
31
-			echo '';
32
-			exit;
33
-		}
34
-		/*
28
+        break;
29
+    case 'save_thematic_advance':
30
+        if (!api_is_allowed_to_edit(null, true)) {
31
+            echo '';
32
+            exit;
33
+        }
34
+        /*
35 35
         if (($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) || (!empty($_REQUEST['duration_in_hours']) && !is_numeric($_REQUEST['duration_in_hours'])) ) {
36 36
             if ($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) {
37 37
                 $start_date_error = true;
@@ -79,80 +79,80 @@  discard block
 block discarded – undo
79 79
         $thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true);
80 80
         $return = $thematic->get_thematic_advance_div($thematic_advance_data);
81 81
         echo $return[$_REQUEST['thematic_id']][$_REQUEST['thematic_advance_id']];*/
82
-		break;
83
-	case 'get_datetime_by_attendance':
84
-		$attendance_id       = intval($_REQUEST['attendance_id']);
85
-		$thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
82
+        break;
83
+    case 'get_datetime_by_attendance':
84
+        $attendance_id       = intval($_REQUEST['attendance_id']);
85
+        $thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
86 86
 
87
-		$label = '';
88
-		$input_select = '';
89
-		if (!empty($attendance_id)) {
90
-			$attendance = new Attendance();
91
-			$thematic   = new Thematic();
92
-			$thematic_list = $thematic->get_thematic_list();
87
+        $label = '';
88
+        $input_select = '';
89
+        if (!empty($attendance_id)) {
90
+            $attendance = new Attendance();
91
+            $thematic   = new Thematic();
92
+            $thematic_list = $thematic->get_thematic_list();
93 93
 
94
-			$my_list = $thematic_list_temp = array();
95
-			foreach ($thematic_list as $item) {
96
-				$my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
97
-				$thematic_list_temp = array_merge($my_list, $thematic_list_temp);
98
-			}
99
-			$new_thematic_list = array();
94
+            $my_list = $thematic_list_temp = array();
95
+            foreach ($thematic_list as $item) {
96
+                $my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
97
+                $thematic_list_temp = array_merge($my_list, $thematic_list_temp);
98
+            }
99
+            $new_thematic_list = array();
100 100
 
101
-			foreach($thematic_list_temp as $item) {
102
-				if (!empty($item['attendance_id']) ) {
103
-					$new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
104
-				}
105
-			}
101
+            foreach($thematic_list_temp as $item) {
102
+                if (!empty($item['attendance_id']) ) {
103
+                    $new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
104
+                }
105
+            }
106 106
 
107
-			$attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
107
+            $attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
108 108
 
109
-			$label = get_lang('StartDate');
110
-			if (!empty($attendance_calendar)) {
111
-				$input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
112
-				foreach ($attendance_calendar as $calendar) {
113
-					$selected = null;
114
-					$insert = true;
115
-					//checking if was already taken
116
-					foreach ($new_thematic_list as $key => $thematic_item) {
117
-						//if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
118
-						if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
119
-							$insert = false;
120
-							if ($thematic_advance_id == $key) {
121
-								$insert = true;
122
-								$selected = 'selected';
123
-							}
124
-							break;
125
-						}
126
-					}
127
-					if ($insert == true) {
128
-						$input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
129
-					}
130
-				}
131
-				$input_select .= '</select>';
132
-			} else {
133
-				$input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
134
-			}
135
-		}
136
-		?>
109
+            $label = get_lang('StartDate');
110
+            if (!empty($attendance_calendar)) {
111
+                $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
112
+                foreach ($attendance_calendar as $calendar) {
113
+                    $selected = null;
114
+                    $insert = true;
115
+                    //checking if was already taken
116
+                    foreach ($new_thematic_list as $key => $thematic_item) {
117
+                        //if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
118
+                        if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
119
+                            $insert = false;
120
+                            if ($thematic_advance_id == $key) {
121
+                                $insert = true;
122
+                                $selected = 'selected';
123
+                            }
124
+                            break;
125
+                        }
126
+                    }
127
+                    if ($insert == true) {
128
+                        $input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
129
+                    }
130
+                }
131
+                $input_select .= '</select>';
132
+            } else {
133
+                $input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
134
+            }
135
+        }
136
+        ?>
137 137
 		<div class="form-group">
138 138
 			<label class="col-sm-2 control-label"><?php echo $label ?></label>
139 139
 			<div class="col-sm-10"><?php echo $input_select ?></div>
140 140
 		</div>
141 141
 		<?php
142
-		break;
143
-	case 'update_done_thematic_advance':
144
-		$thematic_advance_id = intval($_GET['thematic_advance_id']);
145
-		$total_average = 0;
146
-		if (!empty($thematic_advance_id)) {
147
-			$thematic = new Thematic();
148
-			$affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
149
-			//if ($affected_rows) {
150
-			$total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
151
-			//}
152
-		}
153
-		echo $total_average;
154
-		break;
155
-	default:
156
-		echo '';
142
+        break;
143
+    case 'update_done_thematic_advance':
144
+        $thematic_advance_id = intval($_GET['thematic_advance_id']);
145
+        $total_average = 0;
146
+        if (!empty($thematic_advance_id)) {
147
+            $thematic = new Thematic();
148
+            $affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
149
+            //if ($affected_rows) {
150
+            $total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
151
+            //}
152
+        }
153
+        echo $total_average;
154
+        break;
155
+    default:
156
+        echo '';
157 157
 }
158 158
 exit;
Please login to merge, or discard this patch.
main/inc/ajax/model.ajax.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
         }
732 732
 
733 733
         break;
734
-	case 'get_user_skill_ranking':
734
+    case 'get_user_skill_ranking':
735 735
         $columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank');
736 736
         $result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $whereCondition);
737 737
         $result = msort($result, 'skills_acquired', 'asc');
@@ -1281,7 +1281,7 @@  discard block
 block discarded – undo
1281 1281
 
1282 1282
             if (!empty($item['certif_min_score']) && !empty($item['document_id'])) {
1283 1283
                 $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL);
1284
-                 $item['has_certificates'] = '1';
1284
+                    $item['has_certificates'] = '1';
1285 1285
             } else {
1286 1286
                 $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL);
1287 1287
                 $item['has_certificates'] = '0';
Please login to merge, or discard this patch.
main/inc/local.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -758,7 +758,7 @@
 block discarded – undo
758 758
     //    $gidReset = true;
759 759
 } // end else
760 760
 
761
- // Now check for anonymous user mode
761
+    // Now check for anonymous user mode
762 762
 if (isset($use_anonymous) && $use_anonymous) {
763 763
     //if anonymous mode is set, then try to set the current user as anonymous
764 764
     //if he doesn't have a login yet
Please login to merge, or discard this patch.