Completed
Push — 1.11.x ( 3ebade...c47d58 )
by José
213:48 queued 162:56
created
main/tracking/question_course_report.php 2 patches
Indentation   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -14,20 +14,20 @@  discard block
 block discarded – undo
14 14
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
15 15
 
16 16
 if (!$is_allowedToTrack) {
17
-	Display :: display_header(null);
18
-	api_not_allowed();
19
-	Display :: display_footer();
17
+    Display :: display_header(null);
18
+    api_not_allowed();
19
+    Display :: display_footer();
20 20
 }
21 21
 
22 22
 $export_to_xls = false;
23 23
 if (isset($_GET['export'])) {
24
-	$export_to_xls = true;
24
+    $export_to_xls = true;
25 25
 }
26 26
 
27 27
 if (api_is_platform_admin() ) {
28
-	$global = true;
28
+    $global = true;
29 29
 } else {
30
-	$global = false;
30
+    $global = false;
31 31
 }
32 32
 $global = true;
33 33
 
@@ -45,14 +45,14 @@  discard block
 block discarded – undo
45 45
 $session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) : null;
46 46
 
47 47
 if (empty($session_id)) {
48
-	$temp_course_list = CourseManager :: get_courses_list();
48
+    $temp_course_list = CourseManager :: get_courses_list();
49 49
 } else {
50
-	$temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
50
+    $temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
51 51
 }
52 52
 
53 53
 foreach ($temp_course_list  as $temp_course_item) {
54
-	$course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
-	$course_select_list[$temp_course_item['code']]	= $course_item['title'];
54
+    $course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
+    $course_select_list[$temp_course_item['code']]	= $course_item['title'];
56 56
 }
57 57
 
58 58
 //Get session list
@@ -95,132 +95,132 @@  discard block
 block discarded – undo
95 95
 $course_info = api_get_course_info($course_code);
96 96
 
97 97
 if (!empty($course_info)) {
98
-	$list = new LearnpathList('', $course_code);
99
-	$lp_list = $list->get_flat_list();
98
+    $list = new LearnpathList('', $course_code);
99
+    $lp_list = $list->get_flat_list();
100 100
 
101
-	$main_question_list = array();
101
+    $main_question_list = array();
102 102
 
103
-	foreach ($lp_list as $lp_id => $lp) {
103
+    foreach ($lp_list as $lp_id => $lp) {
104 104
         $exercise_list = Event::get_all_exercises_from_lp(
105 105
             $lp_id,
106 106
             $course_info['real_id']
107 107
         );
108 108
 
109
-		foreach ($exercise_list as $exercise) {
110
-			$my_exercise = new Exercise($course_info['real_id']);
111
-			$my_exercise->read($exercise['path']);
112
-			$question_list = $my_exercise->selectQuestionList();
113
-
114
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
115
-				$exercise['path'],
116
-				$course_info['real_id'],
117
-				$session_id
118
-			);
119
-
120
-			foreach ($question_list as $question_id) {
121
-				$question_data = Question::read($question_id);
122
-				$main_question_list[$question_id] = $question_data;
123
-				$quantity_exercises = 0;
124
-				$question_result = 0;
125
-
126
-				foreach ($exercise_stats as $stats) {
127
-					if (!empty($stats['question_list'])) {
128
-						foreach($stats['question_list'] as $my_question_stat) {
129
-							if ($question_id == $my_question_stat['question_id']) {
130
-								$question_result =  $question_result + $my_question_stat['marks'];
131
-								$quantity_exercises++;
132
-							}
133
-						}
134
-					}
135
-				}
136
-
137
-				if (!empty($quantity_exercises)) {
138
-					// Score % average
139
-					$main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
140
-				} else {
141
-					$main_question_list[$question_id]->results = 0;
142
-				}
143
-
144
-				$main_question_list[$question_id]->quantity = $quantity_exercises;
145
-			}
146
-		}
147
-	}
109
+        foreach ($exercise_list as $exercise) {
110
+            $my_exercise = new Exercise($course_info['real_id']);
111
+            $my_exercise->read($exercise['path']);
112
+            $question_list = $my_exercise->selectQuestionList();
113
+
114
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
115
+                $exercise['path'],
116
+                $course_info['real_id'],
117
+                $session_id
118
+            );
119
+
120
+            foreach ($question_list as $question_id) {
121
+                $question_data = Question::read($question_id);
122
+                $main_question_list[$question_id] = $question_data;
123
+                $quantity_exercises = 0;
124
+                $question_result = 0;
125
+
126
+                foreach ($exercise_stats as $stats) {
127
+                    if (!empty($stats['question_list'])) {
128
+                        foreach($stats['question_list'] as $my_question_stat) {
129
+                            if ($question_id == $my_question_stat['question_id']) {
130
+                                $question_result =  $question_result + $my_question_stat['marks'];
131
+                                $quantity_exercises++;
132
+                            }
133
+                        }
134
+                    }
135
+                }
136
+
137
+                if (!empty($quantity_exercises)) {
138
+                    // Score % average
139
+                    $main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
140
+                } else {
141
+                    $main_question_list[$question_id]->results = 0;
142
+                }
143
+
144
+                $main_question_list[$question_id]->quantity = $quantity_exercises;
145
+            }
146
+        }
147
+    }
148 148
 }
149 149
 
150 150
 if (!$export_to_xls) {
151
-	Display :: display_header(get_lang("MySpace"));
152
-	echo '<div class="actions">';
153
-	if ($global) {
154
-		echo MySpace::getTopMenu();
155
-	} else {
156
-		echo '<div style="float:left; clear:left">
151
+    Display :: display_header(get_lang("MySpace"));
152
+    echo '<div class="actions">';
153
+    if ($global) {
154
+        echo MySpace::getTopMenu();
155
+    } else {
156
+        echo '<div style="float:left; clear:left">
157 157
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.
158 158
                     get_lang('StudentsTracking').'</a>&nbsp;|
159 159
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.
160 160
                     get_lang('CourseTracking').'</a>&nbsp;';
161
-		echo '</div>';
162
-	}
163
-	echo '</div>';
161
+        echo '</div>';
162
+    }
163
+    echo '</div>';
164 164
 
165
-	if (api_is_platform_admin()) {
166
-		echo MySpace::getAdminActions();
167
-	}
168
-	echo '<br />';
169
-	echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
165
+    if (api_is_platform_admin()) {
166
+        echo MySpace::getAdminActions();
167
+    }
168
+    echo '<br />';
169
+    echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
170 170
 
171
-	$form->display();
171
+    $form->display();
172 172
 
173
-	if (empty($course_code)) {
174
-		Display::display_warning_message(get_lang('PleaseSelectACourse'));
175
-	}
173
+    if (empty($course_code)) {
174
+        Display::display_warning_message(get_lang('PleaseSelectACourse'));
175
+    }
176 176
 }
177 177
 
178 178
 $course_average = array();
179 179
 $counter = 0;
180 180
 
181 181
 if (!empty($main_question_list) && is_array($main_question_list)) {
182
-	$html_result .= '<table  class="data_table">';
183
-	$html_result .= '<tr><th>'.get_lang('Question').
182
+    $html_result .= '<table  class="data_table">';
183
+    $html_result .= '<tr><th>'.get_lang('Question').
184 184
                     Display :: return_icon('info3.gif', get_lang('QuestionsAreTakenFromLPExercises'), array('align' => 'absmiddle', 'hspace' => '3px')).'</th>';
185
-	$html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
186
-	$html_result .= '<th>'.get_lang('Quantity').'</th>';
187
-
188
-	foreach ($main_question_list as $question) {
189
-		$total_student = 0;
190
-		$counter ++;
191
-		$s_css_class = 'row_even';
192
-		if ($counter % 2 ==0 ) {
193
-			$s_css_class = 'row_odd';
194
-		}
195
-		$html_result .= "<tr class='$s_css_class'>
185
+    $html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
186
+    $html_result .= '<th>'.get_lang('Quantity').'</th>';
187
+
188
+    foreach ($main_question_list as $question) {
189
+        $total_student = 0;
190
+        $counter ++;
191
+        $s_css_class = 'row_even';
192
+        if ($counter % 2 ==0 ) {
193
+            $s_css_class = 'row_odd';
194
+        }
195
+        $html_result .= "<tr class='$s_css_class'>
196 196
 							<td >";
197
-		$question_title = trim($question->question);
198
-		if (empty($question_title)) {
199
-			$html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
200
-		} else {
201
-			$html_result .= $question->question;
202
-		}
203
-
204
-		$html_result .= "</td>";
205
-		$html_result .= "<td>";
206
-		$html_result .= round($question->results, 2).' / '.$question->weighting;
207
-		$html_result .= "</td>";
208
-
209
-		$html_result .= "<td>";
210
-		$html_result .= $question->quantity;
211
-		$html_result .= "</td>";
212
-	}
213
-
214
-	$html_result .="</tr>";
215
-	$html_result .= '</table>';
197
+        $question_title = trim($question->question);
198
+        if (empty($question_title)) {
199
+            $html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
200
+        } else {
201
+            $html_result .= $question->question;
202
+        }
203
+
204
+        $html_result .= "</td>";
205
+        $html_result .= "<td>";
206
+        $html_result .= round($question->results, 2).' / '.$question->weighting;
207
+        $html_result .= "</td>";
208
+
209
+        $html_result .= "<td>";
210
+        $html_result .= $question->quantity;
211
+        $html_result .= "</td>";
212
+    }
213
+
214
+    $html_result .="</tr>";
215
+    $html_result .= '</table>';
216 216
 } else {
217
-	if (!empty($course_code)) {
218
-		Display::display_warning_message(get_lang('NoResults'));
219
-	}
217
+    if (!empty($course_code)) {
218
+        Display::display_warning_message(get_lang('NoResults'));
219
+    }
220 220
 }
221 221
 
222 222
 if (!$export_to_xls) {
223
-	echo $html_result;
223
+    echo $html_result;
224 224
 }
225 225
 
226 226
 Display :: display_footer();
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	$export_to_xls = true;
25 25
 }
26 26
 
27
-if (api_is_platform_admin() ) {
27
+if (api_is_platform_admin()) {
28 28
 	$global = true;
29 29
 } else {
30 30
 	$global = false;
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
 foreach ($temp_course_list  as $temp_course_item) {
54 54
 	$course_item = CourseManager ::get_course_information($temp_course_item['code']);
55
-	$course_select_list[$temp_course_item['code']]	= $course_item['title'];
55
+	$course_select_list[$temp_course_item['code']] = $course_item['title'];
56 56
 }
57 57
 
58 58
 //Get session list
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
     $course_code = 0;
91 91
 }
92 92
 
93
-$form->setDefaults(array('course_code'=>(string)$course_code));
93
+$form->setDefaults(array('course_code'=>(string) $course_code));
94 94
 
95 95
 $course_info = api_get_course_info($course_code);
96 96
 
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
 
126 126
 				foreach ($exercise_stats as $stats) {
127 127
 					if (!empty($stats['question_list'])) {
128
-						foreach($stats['question_list'] as $my_question_stat) {
128
+						foreach ($stats['question_list'] as $my_question_stat) {
129 129
 							if ($question_id == $my_question_stat['question_id']) {
130
-								$question_result =  $question_result + $my_question_stat['marks'];
130
+								$question_result = $question_result + $my_question_stat['marks'];
131 131
 								$quantity_exercises++;
132 132
 							}
133 133
 						}
@@ -187,9 +187,9 @@  discard block
 block discarded – undo
187 187
 
188 188
 	foreach ($main_question_list as $question) {
189 189
 		$total_student = 0;
190
-		$counter ++;
190
+		$counter++;
191 191
 		$s_css_class = 'row_even';
192
-		if ($counter % 2 ==0 ) {
192
+		if ($counter % 2 == 0) {
193 193
 			$s_css_class = 'row_odd';
194 194
 		}
195 195
 		$html_result .= "<tr class='$s_css_class'>
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		$html_result .= "</td>";
212 212
 	}
213 213
 
214
-	$html_result .="</tr>";
214
+	$html_result .= "</tr>";
215 215
 	$html_result .= '</table>';
216 216
 } else {
217 217
 	if (!empty($course_code)) {
Please login to merge, or discard this patch.
main/portfolio/share.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  * @license see /license.txt
6 6
  * @author Laurent Opprecht <[email protected]> for the Univesity of Geneva
7 7
  */
8
-require_once __DIR__ . '/../inc/global.inc.php';
8
+require_once __DIR__.'/../inc/global.inc.php';
9 9
 
10 10
 $has_access = api_protect_course_script();
11 11
 if (!$has_access) {
Please login to merge, or discard this patch.
main/install/index.php 2 patches
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -445,7 +445,10 @@
 block discarded – undo
445 445
     }
446 446
 }
447 447
     ?>
448
-    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES); ?>" />
448
+    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) {
449
+    echo api_htmlentities($proposedUpdatePath, ENT_QUOTES);
450
+}
451
+?>" />
449 452
     <input type="hidden" name="urlAppendPath"      value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES); ?>" />
450 453
     <input type="hidden" name="pathForm"           value="<?php echo api_htmlentities($pathForm, ENT_QUOTES); ?>" />
451 454
     <input type="hidden" name="urlForm"            value="<?php echo api_htmlentities($urlForm, ENT_QUOTES); ?>" />
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 \Patchwork\Utf8\Bootup::initAll();
106 106
 
107 107
 // Page encoding initialization.
108
-header('Content-Type: text/html; charset='. $charset);
108
+header('Content-Type: text/html; charset='.$charset);
109 109
 
110 110
 // Setting the error reporting levels.
111 111
 error_reporting(E_ALL);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
     // This is the main configuration file of the system before the upgrade.
216 216
     // Old configuration file.
217 217
     // Don't change to include_once
218
-    $oldConfigPath = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
218
+    $oldConfigPath = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
219 219
     if (file_exists($oldConfigPath)) {
220 220
         include $oldConfigPath;
221 221
     }
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
             //Blocking step6 button
346 346
             $("#button_step6").click(function() {
347 347
                 $("#button_step6").hide();
348
-                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait'));?>');
348
+                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait')); ?>');
349 349
                 $("#button_please_wait").show();
350 350
                 $("#button_please_wait").attr('disabled', true);
351 351
                 $("#is_executable").attr("value",'step6');
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 
413 413
 $instalation_type_label = '';
414 414
 if ($installType == 'new') {
415
-    $instalation_type_label  = get_lang('NewInstallation');
415
+    $instalation_type_label = get_lang('NewInstallation');
416 416
 } elseif ($installType == 'update') {
417 417
     $update_from_version = isset($update_from_version) ? $update_from_version : null;
418 418
     $instalation_type_label = get_lang('UpdateFromLMSVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
@@ -582,8 +582,8 @@  discard block
 block discarded – undo
582 582
 
583 583
     <?php
584 584
     if ($installType == 'new') {
585
-        echo get_lang('AdminLogin') . ' : <strong>' . $loginForm . '</strong><br />';
586
-        echo get_lang('AdminPass') . ' : <strong>' . $passForm . '</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
585
+        echo get_lang('AdminLogin').' : <strong>'.$loginForm.'</strong><br />';
586
+        echo get_lang('AdminPass').' : <strong>'.$passForm.'</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
587 587
     }
588 588
     $allowSelfRegistrationLiteral = ($allowSelfReg == 'true') ? get_lang('Yes') : ($allowSelfReg == 'approval' ? get_lang('Approval') : get_lang('No'));
589 589
     echo get_lang('AdminFirstName').' : '.$adminFirstName, '<br />', get_lang('AdminLastName').' : '.$adminLastName, '<br />';
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
     <?php echo get_lang('DBLogin').' : '.$dbUsernameForm; ?><br />
596 596
     <?php echo get_lang('DBPassword').' : '.str_repeat('*', api_strlen($dbPassForm)); ?><br />
597 597
     <?php echo get_lang('MainDB').' : <strong>'.$dbNameForm; ?></strong><br />
598
-    <?php echo get_lang('AllowSelfReg').' : '. $allowSelfRegistrationLiteral; ?><br />
598
+    <?php echo get_lang('AllowSelfReg').' : '.$allowSelfRegistrationLiteral; ?><br />
599 599
     <?php echo get_lang('EncryptMethodUserPass').' : ';
600 600
     echo $encryptPassForm;
601 601
     ?>
Please login to merge, or discard this patch.
main/install/install_files.inc.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 if (defined('SYSTEM_INSTALLATION')) {
18 18
 
19 19
     // Write the system config file
20
-    write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.php');
20
+    write_system_config_file(api_get_path(CONFIGURATION_PATH).'configuration.php');
21 21
 
22 22
     // Write a distribution file with the config as a backup for the admin
23 23
     //write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.dist.php');
@@ -27,33 +27,33 @@  discard block
 block discarded – undo
27 27
 
28 28
     // Copy distribution files with renaming for being the actual system configuration files.
29 29
     copy(
30
-        api_get_path(CONFIGURATION_PATH) . 'add_course.conf.dist.php',
31
-        api_get_path(CONFIGURATION_PATH) . 'add_course.conf.php'
30
+        api_get_path(CONFIGURATION_PATH).'add_course.conf.dist.php',
31
+        api_get_path(CONFIGURATION_PATH).'add_course.conf.php'
32 32
     );
33 33
     copy(
34
-        api_get_path(CONFIGURATION_PATH) . 'course_info.conf.dist.php',
35
-        api_get_path(CONFIGURATION_PATH) . 'course_info.conf.php'
34
+        api_get_path(CONFIGURATION_PATH).'course_info.conf.dist.php',
35
+        api_get_path(CONFIGURATION_PATH).'course_info.conf.php'
36 36
     );
37 37
     copy(
38
-        api_get_path(CONFIGURATION_PATH) . 'mail.conf.dist.php',
39
-        api_get_path(CONFIGURATION_PATH) . 'mail.conf.php'
38
+        api_get_path(CONFIGURATION_PATH).'mail.conf.dist.php',
39
+        api_get_path(CONFIGURATION_PATH).'mail.conf.php'
40 40
     );
41 41
     copy(
42
-        api_get_path(CONFIGURATION_PATH) . 'profile.conf.dist.php',
43
-        api_get_path(CONFIGURATION_PATH) . 'profile.conf.php'
42
+        api_get_path(CONFIGURATION_PATH).'profile.conf.dist.php',
43
+        api_get_path(CONFIGURATION_PATH).'profile.conf.php'
44 44
     );
45 45
     copy(
46
-        api_get_path(CONFIGURATION_PATH) . 'events.conf.dist.php',
47
-        api_get_path(CONFIGURATION_PATH) . 'events.conf.php'
46
+        api_get_path(CONFIGURATION_PATH).'events.conf.dist.php',
47
+        api_get_path(CONFIGURATION_PATH).'events.conf.php'
48 48
     );
49 49
     copy(
50
-        api_get_path(CONFIGURATION_PATH) . 'auth.conf.dist.php',
51
-        api_get_path(CONFIGURATION_PATH) . 'auth.conf.php'
50
+        api_get_path(CONFIGURATION_PATH).'auth.conf.dist.php',
51
+        api_get_path(CONFIGURATION_PATH).'auth.conf.php'
52 52
     );
53 53
     copy(
54
-        api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.dist.php',
55
-        api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.php'
54
+        api_get_path(CONFIGURATION_PATH).'portfolio.conf.dist.php',
55
+        api_get_path(CONFIGURATION_PATH).'portfolio.conf.php'
56 56
     );
57 57
 } else {
58
-    echo 'You are not allowed here !' . __FILE__;
58
+    echo 'You are not allowed here !'.__FILE__;
59 59
 }
Please login to merge, or discard this patch.
main/install/update-configuration.inc.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
39 39
             $found_version = true;
40 40
             $line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n";
41
-       } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
41
+        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
42 42
             $found_stable = true;
43 43
             $line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
44 44
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -10,11 +10,11 @@  discard block
 block discarded – undo
10 10
  */
11 11
 if (defined('SYSTEM_INSTALLATION')) {
12 12
 
13
-    error_log("Starting " . basename(__FILE__));
13
+    error_log("Starting ".basename(__FILE__));
14 14
     $perm = api_get_permissions_for_new_files();
15 15
 
16
-    $oldConfFile = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
17
-    $newConfFile = api_get_path(CONFIGURATION_PATH) . 'configuration.php';
16
+    $oldConfFile = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
17
+    $newConfFile = api_get_path(CONFIGURATION_PATH).'configuration.php';
18 18
 
19 19
     if (file_exists($oldConfFile)) {
20 20
         copy($oldConfFile, $newConfFile);
@@ -37,18 +37,18 @@  discard block
 block discarded – undo
37 37
         $ignore = false;
38 38
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
39 39
             $found_version = true;
40
-            $line = '$_configuration[\'system_version\'] = \'' . $GLOBALS['new_version'] . '\';' . "\r\n";
40
+            $line = '$_configuration[\'system_version\'] = \''.$GLOBALS['new_version'].'\';'."\r\n";
41 41
        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
42 42
             $found_stable = true;
43
-            $line = '$_configuration[\'system_stable\'] = ' . ($GLOBALS['new_version_stable'] ? 'true' : 'false') . ';' . "\r\n";
43
+            $line = '$_configuration[\'system_stable\'] = '.($GLOBALS['new_version_stable'] ? 'true' : 'false').';'."\r\n";
44 44
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
45 45
             $found_software_name = true;
46
-            $line = '$_configuration[\'software_name\'] = \'' . $GLOBALS['software_name'] . '\';' . "\r\n";
46
+            $line = '$_configuration[\'software_name\'] = \''.$GLOBALS['software_name'].'\';'."\r\n";
47 47
         } elseif (stripos($line, '$_configuration[\'software_url\']') !== false) {
48 48
             $found_software_url = true;
49
-            $line = '$_configuration[\'software_url\'] = \'' . $GLOBALS['software_url'] . '\';' . "\r\n";
49
+            $line = '$_configuration[\'software_url\'] = \''.$GLOBALS['software_url'].'\';'."\r\n";
50 50
         } elseif (stripos($line, '$userPasswordCrypted') !== false) {
51
-            $line = '$_configuration[\'password_encryption\'] = \'' .$userPasswordCrypted.'\';' . "\r\n";
51
+            $line = '$_configuration[\'password_encryption\'] = \''.$userPasswordCrypted.'\';'."\r\n";
52 52
         } elseif (stripos($line, '?>') !== false) {
53 53
             $ignore = true;
54 54
         }
@@ -58,21 +58,21 @@  discard block
 block discarded – undo
58 58
     }
59 59
 
60 60
     if (!$found_version) {
61
-        fwrite($fh, '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n");
61
+        fwrite($fh, '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n");
62 62
     }
63 63
     if (!$found_stable) {
64
-        fwrite($fh, '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n");
64
+        fwrite($fh, '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n");
65 65
     }
66 66
     if (!$found_software_name) {
67
-        fwrite($fh, '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n");
67
+        fwrite($fh, '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n");
68 68
     }
69 69
     if (!$found_software_url) {
70
-        fwrite($fh, '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n");
70
+        fwrite($fh, '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n");
71 71
     }
72 72
     fwrite($fh, '?>');
73 73
     fclose($fh);
74 74
 
75 75
     error_log("configuration.php file updated.");
76 76
 } else {
77
-    echo 'You are not allowed here !'. __FILE__;
77
+    echo 'You are not allowed here !'.__FILE__;
78 78
 }
Please login to merge, or discard this patch.
main/link/link_goto.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
 // Launch event
26 26
 Event::event_link($linkId);
27 27
 
28
-header("Cache-Control: no-store, no-cache, must-revalidate");   // HTTP/1.1
28
+header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
29 29
 header("Cache-Control: post-check=0, pre-check=0", false);
30
-header("Pragma: no-cache");                                     // HTTP/1.0
30
+header("Pragma: no-cache"); // HTTP/1.0
31 31
 header("Location: $linkUrl");
32 32
 exit;
Please login to merge, or discard this patch.
main/course_description/listing.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -18,27 +18,27 @@  discard block
 block discarded – undo
18 18
     }
19 19
     $categories[ADD_BLOCK] = get_lang('NewBloc');
20 20
 
21
-	$i=1;
22
-	echo '<div class="actions" style="margin-bottom:30px">';
23
-	ksort($categories);
24
-	foreach ($categories as $id => $title) {
25
-		if ($i==ADD_BLOCK) {
26
-			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
21
+    $i=1;
22
+    echo '<div class="actions" style="margin-bottom:30px">';
23
+    ksort($categories);
24
+    foreach ($categories as $id => $title) {
25
+        if ($i==ADD_BLOCK) {
26
+            echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
27 27
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
28
-			break;
29
-		} else {
30
-			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
28
+            break;
29
+        } else {
30
+            echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
31 31
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
32
-			$i++;
33
-		}
34
-	}
35
-	echo '</div>';
32
+            $i++;
33
+        }
34
+    }
35
+    echo '</div>';
36 36
 }
37 37
 $history = isset($history) ? $history : null;
38 38
 
39 39
 // display course description list
40 40
 if ($history) {
41
-	echo '<div>
41
+    echo '<div>
42 42
         <table width="100%">
43 43
             <tr>
44 44
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 $user_info = api_get_user_info();
50 50
 
51 51
 if (isset($descriptions) && count($descriptions) > 0) {
52
-	foreach ($descriptions as $id => $description) {
52
+    foreach ($descriptions as $id => $description) {
53 53
         if (!empty($description)) {
54 54
             $actions = '';
55 55
             if (api_is_allowed_to_edit(null,true) && !$history) {
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,18 +11,18 @@  discard block
 block discarded – undo
11 11
 api_protect_course_script(true);
12 12
 
13 13
 // display actions menu
14
-if (api_is_allowed_to_edit(null,true)) {
14
+if (api_is_allowed_to_edit(null, true)) {
15 15
     $categories = array();
16 16
     foreach ($default_description_titles as $id => $title) {
17 17
         $categories[$id] = $title;
18 18
     }
19 19
     $categories[ADD_BLOCK] = get_lang('NewBloc');
20 20
 
21
-	$i=1;
21
+	$i = 1;
22 22
 	echo '<div class="actions" style="margin-bottom:30px">';
23 23
 	ksort($categories);
24 24
 	foreach ($categories as $id => $title) {
25
-		if ($i==ADD_BLOCK) {
25
+		if ($i == ADD_BLOCK) {
26 26
 			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
27 27
                 Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
28 28
 			break;
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
             <tr>
44 44
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
45 45
                 <td align="right"><a href="index.php?action=listing">'.
46
-                Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
46
+                Display::return_icon('info.png', get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'), ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
47 47
 }
48 48
 
49 49
 $user_info = api_get_user_info();
@@ -52,21 +52,21 @@  discard block
 block discarded – undo
52 52
 	foreach ($descriptions as $id => $description) {
53 53
         if (!empty($description)) {
54 54
             $actions = '';
55
-            if (api_is_allowed_to_edit(null,true) && !$history) {
55
+            if (api_is_allowed_to_edit(null, true) && !$history) {
56 56
                 if (api_get_session_id() == $description['session_id']) {
57 57
                     $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
58 58
 
59 59
                     // delete
60
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding())).'\')) return false;">';
61
-                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
60
+                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding())).'\')) return false;">';
61
+                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
62 62
                     $actions .= '</a> ';
63 63
 
64 64
                     // edit
65 65
                     $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=edit&description_type='.$description['description_type'].'">';
66
-                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL);
66
+                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
67 67
                     $actions .= '</a> ';
68 68
                 } else {
69
-                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
69
+                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
70 70
                 }
71 71
             }
72 72
             echo Display::panel(
Please login to merge, or discard this patch.
main/course_description/edit.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -10,67 +10,67 @@  discard block
 block discarded – undo
10 10
 // protect a course script
11 11
 api_protect_course_script(true);
12 12
 if (empty($id)) {
13
-	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
14
-	if (empty($id)) {
15
-		// If the ID was not provided, find the first matching description item given the item type
16
-		$course_description = new CourseDescription();
17
-		$description = $course_description->get_data_by_description_type($description_type);
18
-		if (count($description) > 0) {
19
-			$id = $description['id'];
20
-		}
21
-		// If no corresponding description is found, edit a new one
22
-		unset($course_description);
23
-	}
13
+    $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
14
+    if (empty($id)) {
15
+        // If the ID was not provided, find the first matching description item given the item type
16
+        $course_description = new CourseDescription();
17
+        $description = $course_description->get_data_by_description_type($description_type);
18
+        if (count($description) > 0) {
19
+            $id = $description['id'];
20
+        }
21
+        // If no corresponding description is found, edit a new one
22
+        unset($course_description);
23
+    }
24 24
 }
25 25
 $original_id = $id;
26 26
 
27 27
 if (empty($error)) {
28
-	$token = Security::get_token();
28
+    $token = Security::get_token();
29 29
 }
30 30
 // display categories
31 31
 $categories = array();
32 32
 foreach ($default_description_titles as $id => $title) {
33
-	$categories[$id] = $title;
33
+    $categories[$id] = $title;
34 34
 }
35 35
 $categories[ADD_BLOCK] = get_lang('NewBloc');
36 36
 
37 37
 $i=1;
38 38
 echo '<div class="actions" style="margin-bottom:30px">';
39 39
 echo '<a href="index.php?'.api_get_cidreq().'">'.
40
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
41
-	'</a>';
40
+        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
41
+    '</a>';
42 42
 
43 43
 ksort($categories);
44 44
 foreach ($categories as $id => $title) {
45
-	if ($i==ADD_BLOCK) {
46
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
48
-		break;
49
-	} else {
50
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
52
-		$i++;
53
-	}
45
+    if ($i==ADD_BLOCK) {
46
+        echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
48
+        break;
49
+    } else {
50
+        echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
52
+        $i++;
53
+    }
54 54
 }
55 55
 echo '</div>';
56 56
 
57 57
 // error messages
58 58
 if (isset($error) && intval($error) == 1) {
59
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
59
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
60 60
 }
61 61
 
62 62
 // default header title form
63 63
 $description_type = intval($description_type);
64 64
 $header = $default_description_titles[$description_type];
65 65
 if ($description_type >= ADD_BLOCK) {
66
-	$header = $default_description_titles[ADD_BLOCK];
66
+    $header = $default_description_titles[ADD_BLOCK];
67 67
 }
68 68
 
69 69
 // display form
70 70
 $form = new FormValidator(
71
-	'course_description',
72
-	'POST',
73
-	'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
71
+    'course_description',
72
+    'POST',
73
+    'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
74 74
 );
75 75
 
76 76
 $form->addElement('header','',$header);
@@ -80,15 +80,15 @@  discard block
 block discarded – undo
80 80
 $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
81 81
 $form->applyFilter('title','html_filter');
82 82
 $form->addHtmlEditor(
83
-	'contentDescription',
84
-	get_lang('Content'),
85
-	true,
86
-	false,
87
-	array(
88
-		'ToolbarSet' => 'TrainingDescription',
89
-		'Width' => '100%',
90
-		'Height' => '200',
91
-	)
83
+    'contentDescription',
84
+    get_lang('Content'),
85
+    true,
86
+    false,
87
+    array(
88
+        'ToolbarSet' => 'TrainingDescription',
89
+        'Width' => '100%',
90
+        'Height' => '200',
91
+    )
92 92
 );
93 93
 $form->addButtonCreate(get_lang('Save'));
94 94
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 $form->setDefaults($default);
105 105
 
106 106
 if (isset ($question[$description_type])) {
107
-	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
108
-	$message .= $question[$description_type];
109
-	Display::display_normal_message($message, false);
107
+    $message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
108
+    $message .= $question[$description_type];
109
+    Display::display_normal_message($message, false);
110 110
 }
111 111
 $form->display();
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,21 +34,21 @@  discard block
 block discarded – undo
34 34
 }
35 35
 $categories[ADD_BLOCK] = get_lang('NewBloc');
36 36
 
37
-$i=1;
37
+$i = 1;
38 38
 echo '<div class="actions" style="margin-bottom:30px">';
39 39
 echo '<a href="index.php?'.api_get_cidreq().'">'.
40
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
40
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
41 41
 	'</a>';
42 42
 
43 43
 ksort($categories);
44 44
 foreach ($categories as $id => $title) {
45
-	if ($i==ADD_BLOCK) {
45
+	if ($i == ADD_BLOCK) {
46 46
 		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
47
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
48 48
 		break;
49 49
 	} else {
50 50
 		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
51
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
52 52
 		$i++;
53 53
 	}
54 54
 }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 // error messages
58 58
 if (isset($error) && intval($error) == 1) {
59
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
59
+	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
60 60
 }
61 61
 
62 62
 // default header title form
Please login to merge, or discard this patch.
main/course_description/course_description_controller.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
                 if (isset($_GET['id_session'])) {
157 157
                     $session_id = intval($_GET['id_session']);
158 158
                 }
159
-		        $course_description_data = $course_description->get_data_by_id(
159
+                $course_description_data = $course_description->get_data_by_id(
160 160
                     $id,
161 161
                     null,
162 162
                     $session_id
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                 $data['description_title'] = $course_description_data['description_title'];
166 166
                 $data['description_content'] = $course_description_data['description_content'];
167 167
                 $data['progress'] = $course_description_data['progress'];
168
-		        $data['descriptions'] = $course_description->get_data_by_description_type(
168
+                $data['descriptions'] = $course_description->get_data_by_description_type(
169 169
                     $description_type,
170 170
                     null,
171 171
                     $session_id
Please login to merge, or discard this patch.