Completed
Push — 1.10.x ( f409b5...1f80a0 )
by Julito
112:29 queued 56:28
created
main/course_home/3column.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     $racine		= api_get_path(SYS_PATH).'/'.$currentCourseID.'/images/';
114 114
     $chemin		= $racine;
115 115
     $name		= $tool[1];
116
-    $image		= $tool[3];
116
+    $image = $tool[3];
117 117
 
118 118
     $content .= "<tr>\n".
119 119
         "<td colspan=\"4\">\n".
@@ -126,14 +126,14 @@  discard block
 block discarded – undo
126 126
         "</td>\n".
127 127
         "<td>\n".
128 128
         "<select name=\"image\">\n".
129
-        "<option selected>". $image. "</option>\n";
129
+        "<option selected>".$image."</option>\n";
130 130
 
131 131
     if ($dir = @opendir($chemin)) {
132 132
         while ($file = readdir($dir)) {
133 133
             if ($file == '..' || $file == '.') {
134 134
                 unset($file);
135 135
             }
136
-            $content .= "<option>". $file. "</option>\n";
136
+            $content .= "<option>".$file."</option>\n";
137 137
         }
138 138
         closedir($dir);
139 139
     }
@@ -142,15 +142,15 @@  discard block
 block discarded – undo
142 142
         "</td>\n".
143 143
         "</tr>\n".
144 144
         "<tr>\n".
145
-        "<td>". get_lang('NameOfTheLink'). " : </td>\n".
146
-        "<td><input type=\"text\" name=\"name\" value=\"". $name. "\"></td>\n".
145
+        "<td>".get_lang('NameOfTheLink')." : </td>\n".
146
+        "<td><input type=\"text\" name=\"name\" value=\"".$name."\"></td>\n".
147 147
         "</tr>\n".
148 148
         "<tr>\n".
149 149
         "<td>Lien :</td>\n".
150
-        "<td><input type=\"text\" name=\"link\" value=\"". $link. "\"></td>\n".
150
+        "<td><input type=\"text\" name=\"link\" value=\"".$link."\"></td>\n".
151 151
         "</tr>\n".
152 152
         "<tr>\n".
153
-        "<td colspan=\"2\"><input type=\"submit\" name=\"submit\" value=\"". get_lang('Ok'). "\"></td>\n".
153
+        "<td colspan=\"2\"><input type=\"submit\" name=\"submit\" value=\"".get_lang('Ok')."\"></td>\n".
154 154
         "</tr>\n".
155 155
         "</form>\n".
156 156
         "</table>\n".
@@ -208,21 +208,21 @@  discard block
 block discarded – undo
208 208
         "<tr><td colspan=\"6\"><font color=\"#F66105\">\n".get_lang('CourseAdminOnly')."</font>
209 209
         </td></tr>\n";
210 210
     $content .= "<tr>\n<td colspan=\"6\">";
211
-    $content .=CourseHome::show_tool_3column('courseAdmin');
211
+    $content .= CourseHome::show_tool_3column('courseAdmin');
212 212
     $content .= "</td>\n</tr>\n";
213 213
 }
214 214
 
215 215
 /*	TOOLS FOR PLATFORM ADMIN ONLY */
216 216
 if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coach()) {
217
-    $content .=  "<tr>"."<td colspan=\"6\">".
217
+    $content .= "<tr>"."<td colspan=\"6\">".
218 218
         "<hr noshade size=\"1\" />".
219 219
         "</td>"."</tr>\n".
220 220
         "<tr>\n"."<td colspan=\"6\">\n".
221
-        "<font color=\"#F66105\" >". get_lang('PlatformAdminOnly'). "</font>\n".
221
+        "<font color=\"#F66105\" >".get_lang('PlatformAdminOnly')."</font>\n".
222 222
         "</td>\n"."</tr>\n";
223
-    $content .=  "<tr>\n<td colspan=\"6\">";
223
+    $content .= "<tr>\n<td colspan=\"6\">";
224 224
     $content .= CourseHome::show_tool_3column('platformAdmin');
225
-    $content .=  "</td>\n</tr>\n";
225
+    $content .= "</td>\n</tr>\n";
226 226
 }
227 227
 
228
-$content .=  "</table>\n";
228
+$content .= "</table>\n";
Please login to merge, or discard this patch.
main/course_home/vertical_activity.php 2 patches
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.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
     // Show message to confirm that a tool it to be hidden from available tools
39 39
     // visibility 0,1->2
40 40
     if (!empty($_GET['askDelete'])) {
41
-        $content .='<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
41
+        $content .= '<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
42 42
             <a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;
43 43
             <a href="'.api_get_self().'?delete=yes&id='.$id.'">'.get_lang('Yes').'</a>
44 44
         </div>';
@@ -56,14 +56,14 @@  discard block
 block discarded – undo
56 56
 
57 57
 // Start of tools for CourseAdmins (teachers/tutors)
58 58
 if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
59
-    $content .=  '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
59
+    $content .= '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
60 60
     <div class="normal-message" id="id_normal_message" style="display:none">';
61
-        $content .=  '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
62
-        $content .=  get_lang('PleaseStandBy');
61
+        $content .= '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
62
+        $content .= get_lang('PleaseStandBy');
63 63
 
64
-    $content .=  '</div>
64
+    $content .= '</div>
65 65
         <div class="confirmation-message" id="id_confirmation_message" style="display:none"></div></div>';
66
-    $content .=  '<div id="activity-3col">';
66
+    $content .= '<div id="activity-3col">';
67 67
 
68 68
     if (api_get_setting('show_session_data') == 'true' && $session_id > 0) {
69 69
         $content .= '<div class="courseadminview-activity-3col"><span class="viewcaption">'.get_lang('SessionData').'</span>
@@ -91,10 +91,10 @@  discard block
 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
-    $content .=  '<div class="Authoringview">';
97
+    $content .= '<div class="Authoringview">';
98 98
                 $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
99 99
                 $content .= CourseHome::show_tools_category($my_list);
100 100
     $content .= '</div>';
@@ -106,19 +106,19 @@  discard block
 block discarded – undo
106 106
         $content .= '<div class="course-student-view-activity-3col">';
107 107
         //ordering by get_lang name
108 108
         $order_tool_list = array();
109
-        foreach($my_list as $key=>$new_tool) {
109
+        foreach ($my_list as $key=>$new_tool) {
110 110
             $tool_name = CourseHome::translate_tool_name($new_tool);
111
-            $order_tool_list [$key]= $tool_name;
111
+            $order_tool_list [$key] = $tool_name;
112 112
         }
113 113
         natsort($order_tool_list);
114 114
         $my_temp_tool_array = array();
115
-        foreach($order_tool_list as $key=>$new_tool) {
115
+        foreach ($order_tool_list as $key=>$new_tool) {
116 116
             $my_temp_tool_array[] = $my_list[$key];
117 117
         }
118 118
         $my_list = $my_temp_tool_array;
119 119
 
120 120
         $i = 0;
121
-        foreach($my_list as $new_tool) {
121
+        foreach ($my_list as $new_tool) {
122 122
             if ($i >= 10) {
123 123
                 $my_list2[] = $new_tool;
124 124
             } else {
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
             }
127 127
             $i++;
128 128
         }
129
-        $content .=CourseHome::show_tools_category($my_list1);
130
-        $content .=CourseHome::show_tools_category($my_list2);
129
+        $content .= CourseHome::show_tools_category($my_list1);
130
+        $content .= CourseHome::show_tools_category($my_list2);
131 131
         $content .= '</div>';
132 132
     }
133 133
 }
Please login to merge, or discard this patch.
main/course_home/2column.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
         $msgDestroy = get_lang('DelLk').'<br />';
30 30
         $msgDestroy .= '<a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;';
31 31
         $msgDestroy .= '<a href="'.api_get_self().'?destroy=yes&amp;id='.$id.'">'.get_lang('Yes').'</a>';
32
-        $show_message .= Display :: return_message($msgDestroy, 'confirmation',false);
32
+        $show_message .= Display :: return_message($msgDestroy, 'confirmation', false);
33 33
     }
34 34
 
35 35
     /*
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     // Show message to confirm that a tool it to be hidden from available tools
64 64
     // visibility 0,1->2
65 65
     if (!empty($_GET['askDelete'])) {
66
-        $content .='<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
66
+        $content .= '<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
67 67
             <a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;
68 68
             <a href="'.api_get_self().'?delete=yes&id='.intval($_GET['id']).'">'.get_lang('Yes').'</a>
69 69
         </div>';
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 
80 80
 /*	TOOLS VISIBLE FOR EVERYBODY */
81 81
 
82
-$content .=  '<div class="everybodyview">';
83
-$content .=  '<table width="100%">';
82
+$content .= '<div class="everybodyview">';
83
+$content .= '<table width="100%">';
84 84
 $content .= CourseHome::show_tool_2column(TOOL_PUBLIC);
85 85
 $content .= '</table>';
86 86
 $content .= '</div>';
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
     /*	INACTIVE TOOLS - HIDDEN (GREY) LINKS */
101 101
 
102
-    $content .=	"<tr><td colspan=\"4\"><hr style='color:\"#4171B5\"' noshade=\"noshade\" size=\"1\" /></td></tr>\n".
102
+    $content .= "<tr><td colspan=\"4\"><hr style='color:\"#4171B5\"' noshade=\"noshade\" size=\"1\" /></td></tr>\n".
103 103
             "<tr>\n".
104 104
             "<td colspan=\"4\">\n".
105 105
             "<div style=\"margin-bottom: 10px;\"><font color=\"#808080\">\n".get_lang('InLnk')."</font></div>".
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 
109 109
     $content .= CourseHome::show_tool_2column(TOOL_PUBLIC_BUT_HIDDEN);
110 110
 
111
-    $content .=	"</table>";
112
-    $content .=	"</div> ";
111
+    $content .= "</table>";
112
+    $content .= "</div> ";
113 113
 }
114 114
 
115 115
 /*	Tools for platform admin only */
116 116
 
117 117
 if (api_is_platform_admin() && api_is_allowed_to_edit(null, true) && !api_is_coach()) {
118
-    $content .='<div class="platformadminview">
118
+    $content .= '<div class="platformadminview">
119 119
     <span class="viewcaption">'.get_lang('PlatformAdminOnly').'</span>
120 120
     <table width="100%">
121 121
         '.CourseHome::show_tool_2column(TOOL_PLATFORM_ADMIN).'
Please login to merge, or discard this patch.
main/course_home/course_home.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
             if (Database::num_rows($result) ==  0) {
229 229
                 $condition = '';
230 230
             } else {
231
-            	//great, there is an specific auto launch for this session we leave the $condition
231
+                //great, there is an specific auto launch for this session we leave the $condition
232 232
             }
233 233
         }
234 234
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
             $lp_data = Database::fetch_array($result,'ASSOC');
241 241
             if (!empty($lp_data['id'])) {
242 242
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
243
-                	$show_autolaunch_lp_warning = true;
243
+                    $show_autolaunch_lp_warning = true;
244 244
                 } else {
245 245
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
246 246
                     if (!isset($_SESSION[$session_key])) {
@@ -265,10 +265,10 @@  discard block
 block discarded – undo
265 265
 
266 266
 /*	Introduction section (editable by course admins) */
267 267
 $content = Display::return_introduction_section(TOOL_COURSE_HOMEPAGE, array(
268
-		'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
269
-		'CreateDocumentDir'    => 'document/',
270
-		'BaseHref'             => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
271
-	)
268
+        'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
269
+        'CreateDocumentDir'    => 'document/',
270
+        'BaseHref'             => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
271
+    )
272 272
 );
273 273
 
274 274
 /*	SWITCH TO A DIFFERENT HOMEPAGE VIEW
@@ -285,13 +285,13 @@  discard block
 block discarded – undo
285 285
 if (api_get_setting('homepage_view') == 'activity' ||
286 286
     api_get_setting('homepage_view') == 'activity_big'
287 287
 ) {
288
-	require 'activity.php';
288
+    require 'activity.php';
289 289
 } elseif (api_get_setting('homepage_view') == '2column') {
290
-	require '2column.php';
290
+    require '2column.php';
291 291
 } elseif (api_get_setting('homepage_view') == '3column') {
292
-	require '3column.php';
292
+    require '3column.php';
293 293
 } elseif (api_get_setting('homepage_view') == 'vertical_activity') {
294
-	require 'vertical_activity.php';
294
+    require 'vertical_activity.php';
295 295
 }
296 296
 
297 297
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 //unset($_SESSION['oLP']);
42 42
 //unset($_SESSION['lpobject']);
43 43
 
44
-$htmlHeadXtra[] ='<script>
44
+$htmlHeadXtra[] = '<script>
45 45
 /* option show/hide thematic-block */
46 46
 $(document).ready(function(){
47 47
     $("#thematic-show").click(function(){
@@ -219,13 +219,13 @@  discard block
 block discarded – undo
219 219
         $course_id = api_get_course_int_id();
220 220
         $condition = '';
221 221
         if (!empty($session_id)) {
222
-            $condition =  api_get_session_condition($session_id);
222
+            $condition = api_get_session_condition($session_id);
223 223
             $sql = "SELECT id FROM $lp_table
224 224
                     WHERE c_id = $course_id AND autolaunch = 1 $condition
225 225
                     LIMIT 1";
226 226
             $result = Database::query($sql);
227 227
             //If we found nothing in the session we just called the session_id =  0 autolaunch
228
-            if (Database::num_rows($result) ==  0) {
228
+            if (Database::num_rows($result) == 0) {
229 229
                 $condition = '';
230 230
             } else {
231 231
             	//great, there is an specific auto launch for this session we leave the $condition
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
236 236
                 WHERE c_id = $course_id AND autolaunch = 1 $condition
237 237
                 LIMIT 1";
238 238
         $result = Database::query($sql);
239
-        if (Database::num_rows($result) >  0) {
240
-            $lp_data = Database::fetch_array($result,'ASSOC');
239
+        if (Database::num_rows($result) > 0) {
240
+            $lp_data = Database::fetch_array($result, 'ASSOC');
241 241
             if (!empty($lp_data['id'])) {
242 242
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
243 243
                 	$show_autolaunch_lp_warning = true;
Please login to merge, or discard this patch.
main/course_home/activity.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     // Show message to confirm that a tool it to be hidden from available tools
23 23
     // visibility 0,1->2
24 24
     if (!empty($_GET['askDelete'])) {
25
-        $content .='<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
25
+        $content .= '<div id="toolhide">'.get_lang('DelLk').'<br />&nbsp;&nbsp;&nbsp;
26 26
             <a href="'.api_get_self().'">'.get_lang('No').'</a>&nbsp;|&nbsp;
27 27
             <a href="'.api_get_self().'?delete=yes&id='.$id.'">'.get_lang('Yes').'</a>
28 28
         </div>';
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
 
50 50
 // Start of tools for CourseAdmins (teachers/tutors)
51 51
 if ($session_id == 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) {
52
-    $content .=  '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
52
+    $content .= '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
53 53
 		<div class="normal-message" id="id_normal_message" style="display:none">';
54
-    $content .=  '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
55
-    $content .=  get_lang('PleaseStandBy');
56
-    $content .=  '</div>
54
+    $content .= '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
55
+    $content .= get_lang('PleaseStandBy');
56
+    $content .= '</div>
57 57
 		<div class="alert alert-success" id="id_confirmation_message" style="display:none"></div>
58 58
 	</div>';
59 59
 
@@ -73,18 +73,18 @@  discard block
 block discarded – undo
73 73
 
74 74
     $my_list = CourseHome::get_tools_category(TOOL_AUTHORING);
75 75
     $items = CourseHome::show_tools_category($my_list);
76
-    $content .= return_block(get_lang('Authoring'),  $items, 'course-tools-author');
76
+    $content .= return_block(get_lang('Authoring'), $items, 'course-tools-author');
77 77
 
78 78
     $my_list = CourseHome::get_tools_category(TOOL_INTERACTION);
79 79
     $list2 = CourseHome::get_tools_category(TOOL_COURSE_PLUGIN);
80 80
 
81
-    $my_list = array_merge($my_list,$list2);
82
-    $items =  CourseHome::show_tools_category($my_list);
83
-    $content .= return_block(get_lang('Interaction'),  $items, 'course-tools-interaction');
81
+    $my_list = array_merge($my_list, $list2);
82
+    $items = CourseHome::show_tools_category($my_list);
83
+    $content .= return_block(get_lang('Interaction'), $items, 'course-tools-interaction');
84 84
 
85 85
     $my_list = CourseHome::get_tools_category(TOOL_ADMIN_PLATFORM);
86 86
     $items = CourseHome::show_tools_category($my_list);
87
-    $content .= return_block(get_lang('Administration'),  $items , 'course-tools-administration');
87
+    $content .= return_block(get_lang('Administration'), $items, 'course-tools-administration');
88 88
 
89 89
 } elseif (api_is_coach()) {
90 90
     $content .= $pluginExtra;
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 			<span class="viewcaption">'.get_lang('SessionData').'</span>
95 95
 			<table class="course_activity_home">';
96 96
         $content .= CourseHome::show_session_data($session_id);
97
-        $content .=  '</table></div></div>';
97
+        $content .= '</table></div></div>';
98 98
     }
99 99
 
100
-    $content .=  '<div class="row">';
100
+    $content .= '<div class="row">';
101 101
     $my_list = CourseHome::get_tools_category(TOOL_STUDENT_VIEW);
102 102
     $content .= CourseHome::show_tools_category($my_list);
103 103
     $content .= '</div>';
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 {
180 180
     $html = '<div class="row">
181 181
                 <div class="col-xs-12 col-md-12">
182
-                    <div class="title-tools">' . $title . '</div>
182
+                    <div class="title-tools">' . $title.'</div>
183 183
                 </div>
184 184
             </div>
185 185
             <div class="row '.$class.'">'.$content.'</div>';
Please login to merge, or discard this patch.
main/glossary/index.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 Event::event_access_tool(TOOL_GLOSSARY);
35 35
 
36 36
 function sorter($item1, $item2) {
37
-	if ($item1[2] == $item2[2])
38
-		return 0;
39
-	return $item1[2] < $item2[2] ? -1 : 1;
37
+    if ($item1[2] == $item2[2])
38
+        return 0;
39
+    return $item1[2] < $item2[2] ? -1 : 1;
40 40
 }
41 41
 
42 42
 // Displaying the header
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         $list[] = array ($line[0], $line[1]);
81 81
     }
82 82
     $filename = 'glossary_course_'.api_get_course_id();
83
-	Export::arrayToCsv($list, $filename);
83
+    Export::arrayToCsv($list, $filename);
84 84
 }
85 85
 if (isset($_GET['action']) && $_GET['action'] == 'export_to_pdf') {
86 86
     GlossaryManager::export_to_pdf();
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 require_once '../inc/global.inc.php';
11 11
 
12
-$current_course_tool  = TOOL_GLOSSARY;
12
+$current_course_tool = TOOL_GLOSSARY;
13 13
 
14 14
 // The section (tabs).
15 15
 $this_section = SECTION_COURSES;
@@ -44,24 +44,24 @@  discard block
 block discarded – undo
44 44
 
45 45
 $tool = 'GlossaryManagement';
46 46
 
47
-$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('Glossary'));
47
+$interbreadcrumb[] = array("url"=>"index.php", "name"=> get_lang('Glossary'));
48 48
 
49 49
 if (!empty($action)) {
50 50
 
51 51
 }
52 52
 switch ($action) {
53 53
     case 'addglossary':
54
-        $tool_name =  get_lang('Add');
54
+        $tool_name = get_lang('Add');
55 55
         break;
56 56
     case 'edit_glossary':
57
-        $tool_name =  get_lang('Edit');
57
+        $tool_name = get_lang('Edit');
58 58
         break;
59 59
     case 'import':
60
-        $tool_name =  get_lang('ImportGlossary');
60
+        $tool_name = get_lang('ImportGlossary');
61 61
         break;
62 62
     case 'changeview':
63 63
     default:
64
-        $tool_name =  get_lang('List');
64
+        $tool_name = get_lang('List');
65 65
         break;
66 66
 }
67 67
 
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 
76 76
     usort($data, "sorter");
77 77
     $list = array();
78
-    $list[] = array('term','definition');
79
-    foreach($data as $line) {
80
-        $list[] = array ($line[0], $line[1]);
78
+    $list[] = array('term', 'definition');
79
+    foreach ($data as $line) {
80
+        $list[] = array($line[0], $line[1]);
81 81
     }
82 82
     $filename = 'glossary_course_'.api_get_course_id();
83 83
 	Export::arrayToCsv($list, $filename);
@@ -91,11 +91,11 @@  discard block
 block discarded – undo
91 91
 // Tool introduction
92 92
 Display::display_introduction_section(TOOL_GLOSSARY);
93 93
 
94
-if (isset($_GET['action']) && $_GET['action'] == 'changeview' && in_array($_GET['view'], array('list','table'))) {
94
+if (isset($_GET['action']) && $_GET['action'] == 'changeview' && in_array($_GET['view'], array('list', 'table'))) {
95 95
     $_SESSION['glossary_view'] = $_GET['view'];
96 96
 } else {
97 97
     if (!isset($_SESSION['glossary_view'])) {
98
-        $_SESSION['glossary_view'] = 'table';//Default option
98
+        $_SESSION['glossary_view'] = 'table'; //Default option
99 99
     }
100 100
 }
101 101
 
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
                 // Setting the form elements
144 144
                 $form->addElement('header', '', get_lang('TermEdit'));
145 145
                 $form->addElement('hidden', 'glossary_id');
146
-                $form->addElement('text', 'glossary_title', get_lang('TermName'),array('size'=>'80'));
146
+                $form->addElement('text', 'glossary_title', get_lang('TermName'), array('size'=>'80'));
147 147
                 //$form->applyFilter('glossary_title', 'html_filter');
148 148
                 $form->addElement('html_editor', 'glossary_comment', get_lang('TermDefinition'), null, array('ToolbarSet' => 'Glossary', 'Height' => '300'));
149
-                $element = $form->addElement('text', 'insert_date', get_lang('CreationDate'),array('size'=>'100'));
149
+                $element = $form->addElement('text', 'insert_date', get_lang('CreationDate'), array('size'=>'100'));
150 150
                 $element->freeze();
151
-                $element = $form->addElement('text', 'update_date', get_lang('UpdateDate'),array('size'=>'100'));
151
+                $element = $form->addElement('text', 'update_date', get_lang('UpdateDate'), array('size'=>'100'));
152 152
                 $element->freeze();
153 153
                 $form->addButtonUpdate(get_lang('TermUpdateButton'), 'SubmitGlossary');
154 154
 
@@ -156,16 +156,16 @@  discard block
 block discarded – undo
156 156
                 $glossary_data = GlossaryManager::get_glossary_information($_GET['glossary_id']);
157 157
 
158 158
                 // Date treatment for timezones
159
-                if (!empty($glossary_data['insert_date'])  && $glossary_data['insert_date'] != '0000-00-00 00:00:00:') {
159
+                if (!empty($glossary_data['insert_date']) && $glossary_data['insert_date'] != '0000-00-00 00:00:00:') {
160 160
                     $glossary_data['insert_date'] = api_get_local_time($glossary_data['insert_date']);
161 161
                 } else {
162
-                    $glossary_data['insert_date']  = '';
162
+                    $glossary_data['insert_date'] = '';
163 163
                 }
164 164
 
165
-                if (!empty($glossary_data['update_date'])  && $glossary_data['update_date'] != '0000-00-00 00:00:00:') {
165
+                if (!empty($glossary_data['update_date']) && $glossary_data['update_date'] != '0000-00-00 00:00:00:') {
166 166
                     $glossary_data['update_date'] = api_get_local_time($glossary_data['update_date']);
167 167
                 } else {
168
-                    $glossary_data['update_date']  = '';
168
+                    $glossary_data['update_date'] = '';
169 169
                 }
170 170
 
171 171
                 $form->setDefaults($glossary_data);
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
                 if (isset($_POST['replace']) && $_POST['replace']) {
226 226
                     foreach (GlossaryManager::get_glossary_terms() as $term) {
227 227
                         if (!GlossaryManager::delete_glossary($term['id'], false)) {
228
-                            Display::display_error_message(get_lang ("CannotDeleteGlossary") . ':' . $term['id']);
228
+                            Display::display_error_message(get_lang("CannotDeleteGlossary").':'.$term['id']);
229 229
                         }
230 230
                     }
231 231
                 }
@@ -248,10 +248,10 @@  discard block
 block discarded – undo
248 248
                         $bad++;
249 249
                 }
250 250
 
251
-                Display::display_confirmation_message(get_lang ("TermsImported") . ':' . $good);
251
+                Display::display_confirmation_message(get_lang("TermsImported").':'.$good);
252 252
 
253 253
                 if ($bad) {
254
-                    Display::display_error_message (get_lang ("TermsNotImported") . ':' . $bad);
254
+                    Display::display_error_message(get_lang("TermsNotImported").':'.$bad);
255 255
                 }
256 256
 
257 257
                 GlossaryManager::display_glossary();
Please login to merge, or discard this patch.
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,8 +34,9 @@  discard block
 block discarded – undo
34 34
 Event::event_access_tool(TOOL_GLOSSARY);
35 35
 
36 36
 function sorter($item1, $item2) {
37
-	if ($item1[2] == $item2[2])
38
-		return 0;
37
+	if ($item1[2] == $item2[2]) {
38
+			return 0;
39
+	}
39 40
 	return $item1[2] < $item2[2] ? -1 : 1;
40 41
 }
41 42
 
@@ -242,10 +243,11 @@  discard block
 block discarded – undo
242 243
                         false
243 244
                     );
244 245
 
245
-                    if ($result)
246
-                        $good++;
247
-                    else
248
-                        $bad++;
246
+                    if ($result) {
247
+                                            $good++;
248
+                    } else {
249
+                                            $bad++;
250
+                    }
249 251
                 }
250 252
 
251 253
                 Display::display_confirmation_message(get_lang ("TermsImported") . ':' . $good);
Please login to merge, or discard this patch.
main/glossary/glossary_ajax_request.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 if (isset($_POST['glossary_id']) &&
22 22
     $_POST['glossary_id'] == strval(intval($_POST['glossary_id']))
23 23
 ) {
24
-    $glossary_id= Security::remove_XSS($_POST['glossary_id']);
24
+    $glossary_id = Security::remove_XSS($_POST['glossary_id']);
25 25
     $glossary_description_by_id = GlossaryManager::get_glossary_term_by_glossary_id(
26 26
         $glossary_id
27 27
     );
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         $glossary_description_by_id
32 32
     );
33 33
     echo api_xml_http_response_encode($glossary_description_by_id);
34
-} elseif (isset($_POST['glossary_data']) && $_POST['glossary_data']=='true') {
34
+} elseif (isset($_POST['glossary_data']) && $_POST['glossary_data'] == 'true') {
35 35
     //get_glossary_terms
36 36
     $glossary_data = GlossaryManager::get_glossary_terms();
37 37
     $glossary_all_data = array();
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         $glossary_all_data = implode('[|.|_|.|-|.|]', $glossary_all_data);
43 43
         echo api_xml_http_response_encode($glossary_all_data);
44 44
     }
45
-} elseif(isset($_POST['glossary_name'])) {
45
+} elseif (isset($_POST['glossary_name'])) {
46 46
     $my_glossary_name = Security::remove_XSS($_POST['glossary_name']);
47 47
     $my_glossary_name = api_convert_encoding($my_glossary_name, $charset, 'UTF-8');
48 48
     $my_glossary_name = trim($my_glossary_name);
Please login to merge, or discard this patch.
main/inc/global.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
     $request_url_root = '';
156 156
     if (empty($_SERVER['HTTP_HOST'])) {
157 157
         if (empty($_SERVER['SERVER_NAME'])) {
158
-            $request_url_root = $protocol . 'localhost/';
158
+            $request_url_root = $protocol.'localhost/';
159 159
         } else {
160
-            $request_url_root = $protocol . $_SERVER['SERVER_NAME'] . '/';
160
+            $request_url_root = $protocol.$_SERVER['SERVER_NAME'].'/';
161 161
         }
162 162
     } else {
163 163
         $request_url_root = $protocol.$_SERVER['HTTP_HOST'].'/';
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
     }
447 447
 
448 448
     if (!empty($language_priority1) && api_get_language_from_type($language_priority1) !== false) {
449
-        $language_interface =  api_get_language_from_type($language_priority1);
449
+        $language_interface = api_get_language_from_type($language_priority1);
450 450
     } else {
451 451
         if (isset($_course['language'])) {
452 452
             $language_interface = $_course['language'];
Please login to merge, or discard this patch.
main/inc/global_error_message.inc.php 1 patch
Indentation   +89 added lines, -89 removed lines patch added patch discarded remove patch
@@ -56,40 +56,40 @@  discard block
 block discarded – undo
56 56
         $theme = 'chamilo';
57 57
     }
58 58
 
59
-	$css_path = 'app/Resources/public/css/';
60
-	$css_web_assets = 'web/assets/';
61
-	$css_web_path = 'web/css/';
59
+    $css_path = 'app/Resources/public/css/';
60
+    $css_web_assets = 'web/assets/';
61
+    $css_web_path = 'web/css/';
62 62
     $themePath = $css_path.'themes/'.$theme.'/default.css';
63 63
     $css_web_fontawesome = $css_web_assets.'fontawesome/css/font-awesome.css';
64
-	$bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css';
65
-	$css_base_file = $css_web_path.'base.css';
64
+    $bootstrap_file = $css_web_assets.'bootstrap/dist/css/bootstrap.min.css';
65
+    $css_base_file = $css_web_path.'base.css';
66 66
 
67 67
     $css_list = array($bootstrap_file, $css_base_file, $themePath);
68 68
 
69 69
     $web_img = 'main/img';
70
-	$root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
71
-	$root_rel = htmlentities($_SERVER['PHP_SELF']);
72
-	if (!empty($root_rel)) {
73
-		$pos = strrpos($root_rel, '/');
74
-		$root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1);
75
-		if (strpos($root_rel, '/main/') !== false) {
76
-			$pos = 0;
77
-			while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) {
78
-				$pos = $test_pos + 1;
79
-			}
80
-			$root_rel = substr($root_rel, 0, $pos);
81
-		} elseif (strpos($root_rel, '/courses/') !== false) {
82
-			$pos = 0;
83
-			while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) {
84
-				$pos = $test_pos + 1;
85
-			}
86
-			$root_rel = substr($root_rel, 0, $pos);
87
-		}
88
-	}
89
-
90
-	$installation_guide_url = $root_rel.'documentation/installation_guide.html';
91
-
92
-	$css_def = '';
70
+    $root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
71
+    $root_rel = htmlentities($_SERVER['PHP_SELF']);
72
+    if (!empty($root_rel)) {
73
+        $pos = strrpos($root_rel, '/');
74
+        $root_rel = substr($root_rel, 0, $pos - strlen($root_rel) + 1);
75
+        if (strpos($root_rel, '/main/') !== false) {
76
+            $pos = 0;
77
+            while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/main/')) !== false) {
78
+                $pos = $test_pos + 1;
79
+            }
80
+            $root_rel = substr($root_rel, 0, $pos);
81
+        } elseif (strpos($root_rel, '/courses/') !== false) {
82
+            $pos = 0;
83
+            while (($test_pos = strpos(substr($root_rel, $pos, strlen($root_rel)), '/courses/')) !== false) {
84
+                $pos = $test_pos + 1;
85
+            }
86
+            $root_rel = substr($root_rel, 0, $pos);
87
+        }
88
+    }
89
+
90
+    $installation_guide_url = $root_rel.'documentation/installation_guide.html';
91
+
92
+    $css_def = '';
93 93
     foreach ($css_list as $css_item) {
94 94
         $css_base_chamilo_file = $root_sys.$css_item;
95 95
         if (file_exists($css_base_chamilo_file)) {
@@ -97,33 +97,33 @@  discard block
 block discarded – undo
97 97
         }
98 98
     }
99 99
 
100
-	$global_error_message = array();
101
-
102
-	switch ($global_error_code) {
103
-		case 1:
104
-			$global_error_message['section'] = $SectionSystemRequirementsProblem;
105
-			$global_error_message['title'] = $IncorrectPhpVersionTitle;
106
-			$php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : '');
107
-			$php_version = empty($php_version) ? '' : '(PHP '.$php_version.')';
108
-			$IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription);
109
-			$IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription);
110
-			$pos = strpos($IncorrectPhpVersionDescription, '%s3');
111
-			if ($pos !== false) {
112
-				$length = strlen($IncorrectPhpVersionDescription);
113
-				$read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length);
114
-				$IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos);
115
-				$IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
116
-			}
117
-			$global_error_message['description'] = $IncorrectPhpVersionDescription;
118
-			break;
119
-		case 2:
120
-			$global_error_message['section'] = $SectionInstallation;
121
-			$global_error_message['title'] = $InstallationTitle;
122
-			if (($pos = strpos($InstallationDescription, '%s')) === false) {
123
-				$InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide';
124
-			}
125
-			$read_installation_guide = substr($InstallationDescription, $pos + 2);
126
-			$InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
100
+    $global_error_message = array();
101
+
102
+    switch ($global_error_code) {
103
+        case 1:
104
+            $global_error_message['section'] = $SectionSystemRequirementsProblem;
105
+            $global_error_message['title'] = $IncorrectPhpVersionTitle;
106
+            $php_version = function_exists('phpversion') ? phpversion() : (defined('PHP_VERSION') ? PHP_VERSION : '');
107
+            $php_version = empty($php_version) ? '' : '(PHP '.$php_version.')';
108
+            $IncorrectPhpVersionDescription = str_replace('%s1', $php_version, $IncorrectPhpVersionDescription);
109
+            $IncorrectPhpVersionDescription = str_replace('%s2', REQUIRED_PHP_VERSION, $IncorrectPhpVersionDescription);
110
+            $pos = strpos($IncorrectPhpVersionDescription, '%s3');
111
+            if ($pos !== false) {
112
+                $length = strlen($IncorrectPhpVersionDescription);
113
+                $read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length);
114
+                $IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos);
115
+                $IncorrectPhpVersionDescription .= '<br /><a class="btn btn-default" href="'.$installation_guide_url.'" target="_blank">'.$read_installation_guide.'</a>';
116
+            }
117
+            $global_error_message['description'] = $IncorrectPhpVersionDescription;
118
+            break;
119
+        case 2:
120
+            $global_error_message['section'] = $SectionInstallation;
121
+            $global_error_message['title'] = $InstallationTitle;
122
+            if (($pos = strpos($InstallationDescription, '%s')) === false) {
123
+                $InstallationDescription = 'Click to INSTALL Chamilo %s or read the installation guide';
124
+            }
125
+            $read_installation_guide = substr($InstallationDescription, $pos + 2);
126
+            $InstallationDescription = '<form action="'.$root_rel.'main/install/index.php" method="get">
127 127
 			<div class="row"><div class="col-md-12">
128 128
 
129 129
                     <div class="office">
@@ -135,38 +135,38 @@  discard block
 block discarded – undo
135 135
                           </p>
136 136
                     </div>
137 137
             </form>';
138
-			$global_error_message['description'] = $InstallationDescription;
139
-			break;
140
-		case 3:
141
-		case 4:
142
-		case 5:
143
-			$global_error_message['section'] = $SectionDatabaseUnavailable;
144
-			$global_error_message['title'] = $DatabaseUnavailableTitle;
145
-			$global_error_message['description'] = $DatabaseUnavailableDescription;
146
-			break;
147
-		case 6:
148
-			$global_error_message['section'] = $SectionProtection;
149
-			$global_error_message['title'] = $AlreadyInstalledTitle;
150
-			$global_error_message['description'] = $AlreadyInstalledDescription;
151
-			break;
152
-		default:
153
-			$global_error_message['section'] = $SectionTechnicalIssues;
154
-			$global_error_message['title'] = $TechnicalIssuesTitle;
155
-			$global_error_message['description'] = $TechnicalIssuesDescription;
156
-			break;
157
-	}
158
-
159
-	$show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2;
160
-	$global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : '';
161
-	$global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']);
162
-	$global_error_message['organisation'] = $Organisation;
163
-	$global_error_message['powered_by'] = $PoweredBy;
164
-	$global_error_message['encoding'] = 'UTF-8';
165
-	$global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png'));
138
+            $global_error_message['description'] = $InstallationDescription;
139
+            break;
140
+        case 3:
141
+        case 4:
142
+        case 5:
143
+            $global_error_message['section'] = $SectionDatabaseUnavailable;
144
+            $global_error_message['title'] = $DatabaseUnavailableTitle;
145
+            $global_error_message['description'] = $DatabaseUnavailableDescription;
146
+            break;
147
+        case 6:
148
+            $global_error_message['section'] = $SectionProtection;
149
+            $global_error_message['title'] = $AlreadyInstalledTitle;
150
+            $global_error_message['description'] = $AlreadyInstalledDescription;
151
+            break;
152
+        default:
153
+            $global_error_message['section'] = $SectionTechnicalIssues;
154
+            $global_error_message['title'] = $TechnicalIssuesTitle;
155
+            $global_error_message['description'] = $TechnicalIssuesDescription;
156
+            break;
157
+    }
158
+
159
+    $show_error_codes = defined('SHOW_ERROR_CODES') && SHOW_ERROR_CODES && $global_error_code != 2;
160
+    $global_error_message['code'] = $show_error_codes ? $ErrorCode.': '.$global_error_code.'<br /><br />' : '';
161
+    $global_error_message['details'] = empty($global_error_message['details']) ? '' : ($show_error_codes ? ': '.$global_error_message['details'] : $global_error_message['details']);
162
+    $global_error_message['organisation'] = $Organisation;
163
+    $global_error_message['powered_by'] = $PoweredBy;
164
+    $global_error_message['encoding'] = 'UTF-8';
165
+    $global_error_message['chamilo_logo'] = "data:image/png;base64,".base64_encode(file_get_contents($root_sys.'web/css/themes/'.$theme.'/images/header-logo.png'));
166 166
 
167 167
     $installChamiloImage = base64_encode(file_get_contents("$root_sys/main/img/install-chamilo.gif"));
168 168
 
169
-	$global_error_message_page =
169
+    $global_error_message_page =
170 170
 <<<EOM
171 171
 <!DOCTYPE html>
172 172
 <html>
@@ -236,9 +236,9 @@  discard block
 block discarded – undo
236 236
 		</body>
237 237
 </html>
238 238
 EOM;
239
-	foreach ($global_error_message as $key => $value) {
240
-		$global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
241
-	}
242
-	header('Content-Type: text/html; charset='.$global_error_message['encoding']);
243
-	die($global_error_message_page);
239
+    foreach ($global_error_message as $key => $value) {
240
+        $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
241
+    }
242
+    header('Content-Type: text/html; charset='.$global_error_message['encoding']);
243
+    die($global_error_message_page);
244 244
 }
Please login to merge, or discard this patch.