Completed
Push — 1.11.x ( ae642b...8fe553 )
by José
74:31 queued 35:16
created
main/mySpace/coaches.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -16,10 +16,10 @@  discard block
 block discarded – undo
16 16
 $nameTools = get_lang('Tutors');
17 17
 
18 18
 api_block_anonymous_users();
19
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
19
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
20 20
 
21 21
 if (isset($_GET["id_student"])) {
22
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
22
+	$interbreadcrumb[] = array("url" => "student.php", "name" => get_lang('Students'));
23 23
 }
24 24
 
25 25
 Display :: display_header($nameTools);
@@ -27,14 +27,14 @@  discard block
 block discarded – undo
27 27
 api_display_tool_title($nameTools);
28 28
 
29 29
 // Database Table Definitions
30
-$tbl_course 						= Database :: get_main_table(TABLE_MAIN_COURSE);
31
-$tbl_course_user 					= Database :: get_main_table(TABLE_MAIN_COURSE_USER);
32
-$tbl_user 							= Database :: get_main_table(TABLE_MAIN_USER);
33
-$tbl_session 						= Database :: get_main_table(TABLE_MAIN_SESSION);
34
-$tbl_session_rel_course 			= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
35
-$tbl_session_rel_course_rel_user 	= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
36
-$tbl_session_rel_user 				= Database :: get_main_table(TABLE_MAIN_SESSION_USER);
37
-$tbl_track_login 					= Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
30
+$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
31
+$tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
32
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
33
+$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
34
+$tbl_session_rel_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
35
+$tbl_session_rel_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
36
+$tbl_session_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER);
37
+$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
38 38
 
39 39
 /**
40 40
  * MAIN PART
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 }
215 215
 echo '</table>';
216 216
 
217
-if (isset($_POST['export'])){
217
+if (isset($_POST['export'])) {
218 218
 	export_csv($header, $data, 'coaches.csv');
219 219
 }
220 220
 
@@ -222,8 +222,8 @@  discard block
 block discarded – undo
222 222
 echo "
223 223
     <br /><br />
224 224
     <form method='post' action='coaches.php'>
225
-        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel') . "'>
226
-            " . get_lang('ExportExcel') . "
225
+        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel')."'>
226
+            " . get_lang('ExportExcel')."
227 227
         </button>
228 228
     <form>
229 229
 ";
Please login to merge, or discard this patch.
main/mySpace/user_import.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
 $tool_name = get_lang('ImportUserListXMLCSV');
16 16
 api_block_anonymous_users();
17 17
 
18
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
18
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
19 19
 $id_session = '';
20 20
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
21 21
  	$id_session = intval($_GET['id_session']);
22
-	$interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
23
-	$interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
22
+	$interbreadcrumb[] = array('url' => 'session.php', 'name' => get_lang('Sessions'));
23
+	$interbreadcrumb[] = array('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
24 24
 }
25 25
 
26 26
 // Set this option to true to enforce strict purification for usenames.
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
         if (count($errors) == 0) {
64 64
             if (!empty($id_session)) {
65
-                $tbl_session_rel_course	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
65
+                $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
66 66
                 // Selecting all the courses from the session id requested.
67 67
                 $sql = "SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'";
68 68
                 $result = Database::query($sql);
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 
104 104
 $form = new FormValidator('user_import');
105 105
 $form->addElement('hidden', 'formSent');
106
-$form->addElement('hidden', 'id_session',$id_session);
106
+$form->addElement('hidden', 'id_session', $id_session);
107 107
 $form->addElement('file', 'import_file', get_lang('ImportFileLocation'));
108 108
 $form->addRule('import_file', get_lang('ThisFieldIsRequired'), 'required');
109
-$allowed_file_types = array ('xml', 'csv');
109
+$allowed_file_types = array('xml', 'csv');
110 110
 $form->addRule('import_file', get_lang('InvalidExtension').' ('.implode(',', $allowed_file_types).')', 'filetype', $allowed_file_types);
111 111
 $form->addElement('radio', 'file_type', get_lang('FileType'), 'XML (<a href="../admin/example.xml" target="_blank">'.get_lang('ExampleXMLFile').'</a>)', 'xml');
112 112
 $form->addElement('radio', 'file_type', null, 'CSV (<a href="../admin/example.csv" target="_blank">'.get_lang('ExampleCSVFile').'</a>)', 'csv');
Please login to merge, or discard this patch.
main/mySpace/admin.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
 }
36 36
 $sql = "SELECT user.user_id,lastname,firstname,email
37 37
         FROM $tbl_user as user, $tbl_admin as admin
38
-        WHERE admin.user_id=user.user_id" . $order_clause;
38
+        WHERE admin.user_id=user.user_id".$order_clause;
39 39
 $result_admins = Database::query($sql);
40 40
 
41 41
 if (api_is_western_name_order()) {
42
-    echo '<table class="data_table"><tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
42
+    echo '<table class="data_table"><tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
43 43
 } else {
44
-    echo '<table class="data_table"><tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
44
+    echo '<table class="data_table"><tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
45 45
 }
46 46
 
47 47
 if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
             $css_class = "row_odd";
66 66
             if ($i % 20 == 0 && $i != 0) {
67 67
                 if (api_is_western_name_order()) {
68
-                    echo '<tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
68
+                    echo '<tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
69 69
                 } else {
70
-                    echo '<tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
70
+                    echo '<tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
71 71
                 }
72 72
             }
73 73
         } else {
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
         $i++;
78 78
 
79 79
         if (api_is_western_name_order()) {
80
-            echo "<tr class=" . $css_class . "><td>$firstname</td><td>$lastname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
80
+            echo "<tr class=".$css_class."><td>$firstname</td><td>$lastname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
81 81
         } else {
82
-            echo "<tr class=" . $css_class . "><td>$lastname</td><td>$firstname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
82
+            echo "<tr class=".$css_class."><td>$lastname</td><td>$firstname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
83 83
         }
84 84
 
85 85
         if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     }
94 94
 } else {
95 95
     // No results
96
-    echo '<tr><td colspan="3">' . get_lang('NoResults') . '</td></tr>';
96
+    echo '<tr><td colspan="3">'.get_lang('NoResults').'</td></tr>';
97 97
 }
98 98
 echo '</table>';
99 99
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 echo "
105 105
     <br /><br />
106 106
     <form method='post' action='admin.php'>
107
-        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel') . "'>
108
-            " . get_lang('ExportExcel') . "
107
+        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel')."'>
108
+            " . get_lang('ExportExcel')."
109 109
         </button>
110 110
     <form>
111 111
 ";
Please login to merge, or discard this patch.
main/mySpace/access_details.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
     </div><br />
139 139
     <div id="cev_cont_stats">
140 140
     <?php
141
-    if ($result_to_print != "")  {
141
+    if ($result_to_print != "") {
142 142
         $rst = get_stats($user_id, $courseId);
143 143
         $foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
144 144
         $foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
Please login to merge, or discard this patch.
main/wiki/diff.inc.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -137,19 +137,19 @@  discard block
 block discarded – undo
137 137
     switch ($type) {
138 138
         case DIFF_EQUAL:
139 139
             // return $line. ' : ' . ' = <span class="diffEqual" >' . $value . '</span><br />' . "\n" ;
140
-            return '<span class="diffEqual" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
140
+            return '<span class="diffEqual" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
141 141
             break;
142 142
         case DIFF_MOVED:
143 143
             //return $line. ' : ' . ' M <span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos ra�a  la sustitye la inverior
144
-            return '<span class="diffMoved" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
144
+            return '<span class="diffMoved" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
145 145
             break;
146 146
         case DIFF_ADDED:
147 147
             //return $line . ' : ' . ' + <span class="diffAdded" >' . $value . '</span><br />' . "\n" ;
148
-            return '<span class="diffAdded" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
148
+            return '<span class="diffAdded" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
149 149
             break;
150 150
         case DIFF_DELETED:
151 151
             //return $line . ' : ' . ' - <span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos ra�a  la sustitye la inverior
152
-            return '<span class="diffDeleted" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
152
+            return '<span class="diffDeleted" >'.$value.'</span><br />'."\n"; //juan carlos muestra solo color
153 153
             break;
154 154
     }
155 155
 }
@@ -169,19 +169,19 @@  discard block
 block discarded – undo
169 169
     switch ($type) {
170 170
         case DIFF_EQUAL:
171 171
             //return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;=</td><td><span class="diffEqual" >'                    . $value . '</span></td></tr>' . "\n"; //juan carlos comentado
172
-            return '<tr><td></td><td bgcolor="#FFFFFF">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
172
+            return '<tr><td></td><td bgcolor="#FFFFFF">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
173 173
             break;
174 174
         case DIFF_MOVED:
175 175
             // return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >'                    . $value . '</span></td></tr>' . "\n" //juan carlos comenta
176 176
 
177
-            return '<tr><td></td><td bgcolor="#FFFFAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
177
+            return '<tr><td></td><td bgcolor="#FFFFAA">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
178 178
             break;
179 179
         case DIFF_ADDED:
180 180
             // return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;+</td><td><span class="diffAdded" >'                    . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
181
-            return '<tr><td></td><td bgcolor="#CCFFCC">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
181
+            return '<tr><td></td><td bgcolor="#CCFFCC">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
182 182
             break;
183 183
         case DIFF_DELETED:
184 184
             // return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;-</td><td><span class="diffDeleted" >'                    . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
185
-            return '<tr><td></td><td bgcolor="#FFAAAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
185
+            return '<tr><td></td><td bgcolor="#FFAAAA">'.$value.'</td></tr>'."\n"; //juan carlos muestra solo color (no tambi�n la l�nea). Adem�s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est� definido en la hoja de estilos como background-color, aceptando s�lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem�s los cambios de otros objetos que no sean texto no se indican por ej. a�adir una imagen, por esta raz�n doy el color de fondo al td directamente.
186 186
     }
187 187
 }
Please login to merge, or discard this patch.
main/wiki/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 // section (for the tabs)
20 20
 $this_section = SECTION_COURSES;
21
-$current_course_tool  = TOOL_WIKI;
21
+$current_course_tool = TOOL_WIKI;
22 22
 
23 23
 $course_id = api_get_course_int_id();
24 24
 $session_id = api_get_session_id();
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 $groupId = api_get_group_id();
28 28
 
29 29
 // additional style information
30
-$htmlHeadXtra[] ='<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'wiki/css/default.css"/>';
30
+$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'wiki/css/default.css"/>';
31 31
 
32 32
 // javascript for advanced parameters menu
33 33
 $htmlHeadXtra[] = '<script>
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     //ensure this tool in groups whe it's private or deactivated
73 73
     if ($group_properties['wiki_state'] == 0) {
74 74
         api_not_allowed();
75
-    } elseif ($group_properties['wiki_state']==2) {
75
+    } elseif ($group_properties['wiki_state'] == 2) {
76 76
         if (!api_is_allowed_to_edit(false, true) and
77 77
             !GroupManager :: is_user_in_group(api_get_user_id(), api_get_group_id())
78 78
         ) {
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 $is_allowed_to_edit = api_is_allowed_to_edit(false, true);
85 85
 
86 86
 // The page we are dealing with
87
-$page = isset($_GET['title']) ? $_GET['title']: 'index';
87
+$page = isset($_GET['title']) ? $_GET['title'] : 'index';
88 88
 $action = isset($_GET['action']) ? Security::remove_XSS($_GET['action']) : 'showpage';
89 89
 $view = isset($_GET['view']) ? Security::remove_XSS($_GET['view']) : null;
90 90
 
Please login to merge, or discard this patch.
main/forum/download.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 $doc_url = str_replace(' ', '+', $doc_url);
32 32
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
33 33
 
34
-if (! isset($_course)) {
34
+if (!isset($_course)) {
35 35
     api_not_allowed(true);
36 36
 }
37 37
 
@@ -51,11 +51,11 @@  discard block
 block discarded – undo
51 51
     exit;
52 52
 }
53 53
 
54
-$tbl_forum_attachment  = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
54
+$tbl_forum_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
55 55
 $tbl_forum_post = Database::get_course_table(TABLE_FORUM_POST);
56 56
 
57 57
 $course_id = api_get_course_int_id();
58
-$courseInfo =     api_get_course_info_by_id($course_id);
58
+$courseInfo = api_get_course_info_by_id($course_id);
59 59
 
60 60
 // launch event
61 61
 Event::event_download($doc_url);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
     api_get_session_id()
86 86
 );
87 87
 
88
-if ($forum_thread_visibility==1 && $forum_forum_visibility==1) {
88
+if ($forum_thread_visibility == 1 && $forum_forum_visibility == 1) {
89 89
     if (Security::check_abs_path(
90 90
         $full_file_name,
91 91
         api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/upload/forum/')
Please login to merge, or discard this patch.
main/forum/iframe_thread.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
     echo "<tr>";
82 82
     echo "<td rowspan=\"2\" class=\"forum_message_left\">";
83 83
     $username = api_htmlentities(sprintf(get_lang('LoginX'), $row['username']), ENT_QUOTES);
84
-    if ($row['user_id']=='0') {
84
+    if ($row['user_id'] == '0') {
85 85
         $name = $row['poster_name'];
86 86
     } else {
87 87
         $name = api_get_person_name($row['firstname'], $row['lastname']);
Please login to merge, or discard this patch.
main/forum/viewforumcategory.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -52,17 +52,17 @@  discard block
 block discarded – undo
52 52
 $origin = '';
53 53
 
54 54
 if (isset($_GET['origin'])) {
55
-    $origin =  Security::remove_XSS($_GET['origin']);
55
+    $origin = Security::remove_XSS($_GET['origin']);
56 56
 }
57 57
 
58 58
 /* Header and Breadcrumbs */
59 59
 $gradebook = null;
60 60
 if (isset($_SESSION['gradebook'])) {
61
-    $gradebook=	$_SESSION['gradebook'];
61
+    $gradebook = $_SESSION['gradebook'];
62 62
 }
63 63
 
64 64
 if (!empty($gradebook) && $gradebook == 'view') {
65
-    $interbreadcrumb[] = array (
65
+    $interbreadcrumb[] = array(
66 66
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
67 67
         'name' => get_lang('ToolGradebook')
68 68
     );
@@ -72,16 +72,16 @@  discard block
 block discarded – undo
72 72
 
73 73
 $current_forum_category = get_forum_categories($_GET['forumcategory']);
74 74
 $interbreadcrumb[] = array(
75
-    'url' => 'index.php?gradebook=' . $gradebook . '&search='
75
+    'url' => 'index.php?gradebook='.$gradebook.'&search='
76 76
         . Security::remove_XSS(urlencode(isset($_GET['search']) ? $_GET['search'] : '')),
77 77
     'name' => get_lang('Forum')
78 78
 );
79 79
 
80 80
 if (!empty($_GET['action']) && !empty($_GET['content'])) {
81
-    if ($_GET['action']=='add' && $_GET['content']=='forum' ) {
81
+    if ($_GET['action'] == 'add' && $_GET['content'] == 'forum') {
82 82
         $interbreadcrumb[] = array(
83 83
             'url' => 'viewforumcategory.php?forumcategory='
84
-                . $current_forum_category['cat_id'] . '&origin=' . $origin,
84
+                . $current_forum_category['cat_id'].'&origin='.$origin,
85 85
             'name' => $current_forum_category['cat_title']
86 86
         );
87 87
         $interbreadcrumb[] = array(
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     );
97 97
 }
98 98
 
99
-if ($origin=='learnpath') {
99
+if ($origin == 'learnpath') {
100 100
     Display::display_reduced_header();
101 101
 } else {
102 102
     Display::display_header(null);
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 // then the user is not allowed here.
112 112
 if (
113 113
     !api_is_allowed_to_edit(false, true) AND
114
-    ( $current_forum_category && $current_forum_category['visibility'] == 0)
114
+    ($current_forum_category && $current_forum_category['visibility'] == 0)
115 115
 ) {
116 116
     api_not_allowed();
117 117
 }
@@ -121,10 +121,10 @@  discard block
 block discarded – undo
121 121
 $html .= '<div class="actions">';
122 122
 $html .= '<a href="index.php?gradebook='.$gradebook.'&'.api_get_cidreq().'">'.
123 123
     Display::return_icon('back.png', get_lang('BackToForumOverview'), '', ICON_SIZE_MEDIUM).'</a>';
124
-if (api_is_allowed_to_edit(false,true)) {
125
-    $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory='
126
-        . $current_forum_category['cat_id'] . '&action=add&content=forum"> '
127
-        . Display::return_icon('new_forum.png', get_lang('AddForum'), '', ICON_SIZE_MEDIUM) . '</a>';
124
+if (api_is_allowed_to_edit(false, true)) {
125
+    $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&forumcategory='
126
+        . $current_forum_category['cat_id'].'&action=add&content=forum"> '
127
+        . Display::return_icon('new_forum.png', get_lang('AddForum'), '', ICON_SIZE_MEDIUM).'</a>';
128 128
 }
129 129
 $html .= search_link();
130 130
 $html .= '</div>';
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
     $forum_categories_list = '';
185 185
     $forumId = $forum_category['cat_id'];
186 186
     $forumTitle = $forum_category['cat_title'];
187
-    $linkForumCategory = 'viewforumcategory.php?' . api_get_cidreq() . '&forumcategory=' . strval(intval($forumId));
187
+    $linkForumCategory = 'viewforumcategory.php?'.api_get_cidreq().'&forumcategory='.strval(intval($forumId));
188 188
     $descriptionCategory = $forum_category['cat_comment'];
189 189
     $icoCategory = Display::return_icon(
190 190
         'forum_blue.png',
@@ -195,16 +195,16 @@  discard block
 block discarded – undo
195 195
 
196 196
     if (api_is_allowed_to_edit(false, true) && !($forum_category['session_id'] == 0 && $sessionId != 0)) {
197 197
 
198
-        $iconsEdit = '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory='
199
-            . Security::remove_XSS($_GET['forumcategory']) . '&action=edit&content=forumcategory&id='
200
-            . '' . $forumId . '">'
201
-            . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
202
-        $iconsEdit .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory='
198
+        $iconsEdit = '<a href="'.api_get_self().'?'.api_get_cidreq().'&forumcategory='
199
+            . Security::remove_XSS($_GET['forumcategory']).'&action=edit&content=forumcategory&id='
200
+            . ''.$forumId.'">'
201
+            . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
202
+        $iconsEdit .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&forumcategory='
203 203
             . Security::remove_XSS($_GET['forumcategory'])
204
-            . '&action=delete&content=forumcategory&id=' . $forumId
204
+            . '&action=delete&content=forumcategory&id='.$forumId
205 205
             . "\" onclick=\"javascript:if(!confirm('"
206 206
             . addslashes(api_htmlentities(get_lang('DeleteForumCategory'), ENT_QUOTES))
207
-            . "')) return false;\">" . Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)
207
+            . "')) return false;\">".Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)
208 208
             . '</a>';
209 209
         $iconsEdit .= return_visible_invisible_icon(
210 210
             'forumcategory', $forum_category['cat_id'],
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
     );
245 245
 
246 246
 
247
-    if ($descriptionCategory != '' && trim($descriptionCategory)!= '&nbsp;')
247
+    if ($descriptionCategory != '' && trim($descriptionCategory) != '&nbsp;')
248 248
     {
249 249
         $html .= '<div class="forum-description">'.$descriptionCategory.'</div>';
250 250
     }
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
             // SHOULD WE SHOW THIS PARTICULAR FORUM
285 285
             // you are teacher => show forum
286 286
 
287
-            if (api_is_allowed_to_edit(false,true)) {
287
+            if (api_is_allowed_to_edit(false, true)) {
288 288
                 //echo 'teacher';
289 289
                 $show_forum = true;
290 290
             } else {
@@ -351,9 +351,9 @@  discard block
 block discarded – undo
351 351
                         ? $all_groups[$forum['forum_of_group']]['id']
352 352
                         : null;
353 353
                     $group_title = api_substr($my_all_groups_forum_name, 0, 30);
354
-                    $forum_title_group_addition = ' (<a href="../group/group_space.php?' . api_get_cidreq()
355
-                        . '&gidReq=' . $my_all_groups_forum_id . '" class="forum_group_link">'
356
-                        . get_lang('GoTo') . ' ' . $group_title . '</a>)';
354
+                    $forum_title_group_addition = ' (<a href="../group/group_space.php?'.api_get_cidreq()
355
+                        . '&gidReq='.$my_all_groups_forum_id.'" class="forum_group_link">'
356
+                        . get_lang('GoTo').' '.$group_title.'</a>)';
357 357
                 } else {
358 358
                     $forum_title_group_addition = '';
359 359
                 }
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
                 $html .= '<div class="row">';
372 372
                 $html .= '<div class="col-md-6">';
373 373
                 $html .= '<div class="col-md-3">';
374
-                $html .= '<div class="number-post">'.$forum_image .'<p>' . $my_number_threads . ' ' . get_lang('ForumThreads') . '</p></div>';
374
+                $html .= '<div class="number-post">'.$forum_image.'<p>'.$my_number_threads.' '.get_lang('ForumThreads').'</p></div>';
375 375
                 $html .= '</div>';
376 376
 
377 377
                 $html .= '<div class="col-md-9">';
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
                     'a',
387 387
                     $forum['forum_title'].$session_displayed,
388 388
                     array(
389
-                        'href' => 'viewforum.php?' . api_get_cidreq()
389
+                        'href' => 'viewforum.php?'.api_get_cidreq()
390 390
                             . "&gidReq={$forum['forum_of_group']}&forum={$forum['forum_id']}&origin=$origin&search="
391 391
                             . Security::remove_XSS(urlencode(isset($_GET['search']) ? $_GET['search'] : '')),
392 392
                         'class' => return_visible_invisible($forum['visibility'])
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
                 );
395 395
                 $html .= Display::tag(
396 396
                     'h3',
397
-                    $linkForum . ' ' . $forum_title_group_addition,
397
+                    $linkForum.' '.$forum_title_group_addition,
398 398
                     array(
399 399
                         'class' => 'title'
400 400
                     )
@@ -410,19 +410,19 @@  discard block
 block discarded – undo
410 410
                 $html .= '</div>';
411 411
                 $html .= '<div class="col-md-6">';
412 412
 
413
-                $iconEmpty='';
413
+                $iconEmpty = '';
414 414
 
415 415
                 // The number of topics and posts.
416 416
                 if ($forum['forum_of_group'] !== '0') {
417 417
                     $newPost = '';
418 418
                     if (is_array($my_whatsnew_post_info) && !empty($my_whatsnew_post_info)) {
419
-                        $newPost = ' ' . Display::return_icon('alert.png', get_lang('Forum'), null, ICON_SIZE_SMALL);
419
+                        $newPost = ' '.Display::return_icon('alert.png', get_lang('Forum'), null, ICON_SIZE_SMALL);
420 420
                     } else {
421 421
                         $newPost = $iconEmpty;
422 422
                     }
423 423
                 } else {
424 424
                     if (is_array($my_whatsnew_post_info) && !empty($my_whatsnew_post_info)) {
425
-                        $newPost = ' ' . Display::return_icon('alert.png', get_lang('Forum'), null, ICON_SIZE_SMALL);
425
+                        $newPost = ' '.Display::return_icon('alert.png', get_lang('Forum'), null, ICON_SIZE_SMALL);
426 426
                     } else {
427 427
                         $newPost = $iconEmpty;
428 428
                     }
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 
431 431
                 $html .= '<div class="row">';
432 432
                 $html .= '<div class="col-md-2">';
433
-                $html .= $newPost . '</div>';
433
+                $html .= $newPost.'</div>';
434 434
 
435 435
                 // the last post in the forum
436 436
                 if ($forum['last_poster_name'] != '') {
@@ -442,9 +442,9 @@  discard block
 block discarded – undo
442 442
                 }
443 443
                 $html .= '<div class="col-md-6">';
444 444
                 if (!empty($forum['last_post_id'])) {
445
-                    $html .= Display::return_icon('post-item.png', null, null, ICON_SIZE_TINY) . ' ';
445
+                    $html .= Display::return_icon('post-item.png', null, null, ICON_SIZE_TINY).' ';
446 446
                     $html .= api_convert_and_format_date($forum['last_post_date'])
447
-                        . ' ' . get_lang('By') . ' '
447
+                        . ' '.get_lang('By').' '
448 448
                         . display_user_link($poster_id, $name);
449 449
                 }
450 450
                 $html .= '</div>';
@@ -454,13 +454,13 @@  discard block
 block discarded – undo
454 454
                     api_is_allowed_to_edit(false, true) &&
455 455
                     !($forum['session_id'] == 0 && $sessionId != 0)
456 456
                 ) {
457
-                    $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory='
457
+                    $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&forumcategory='
458 458
                         . Security::remove_XSS($_GET['forumcategory'])
459
-                        . '&action=edit&content=forum&id=' . $forum['forum_id'] . '">'
460
-                        . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
461
-                    $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory='
459
+                        . '&action=edit&content=forum&id='.$forum['forum_id'].'">'
460
+                        . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
461
+                    $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&forumcategory='
462 462
                         . Security::remove_XSS($_GET['forumcategory'])
463
-                        . '&action=delete&content=forum&id=' . $forum['forum_id']
463
+                        . '&action=delete&content=forum&id='.$forum['forum_id']
464 464
                         . "\" onclick=\"javascript:if(!confirm('"
465 465
                         . addslashes(api_htmlentities(get_lang('DeleteForum'), ENT_QUOTES))
466 466
                         . "')) return false;\">"
@@ -484,15 +484,15 @@  discard block
 block discarded – undo
484 484
                 $iconnotify = 'notification_mail_na.png';
485 485
 
486 486
                 if (is_array(isset($_SESSION['forum_notification']['forum']) ? $_SESSION['forum_notification']['forum'] : null)) {
487
-                    if (in_array($forum['forum_id'],$_SESSION['forum_notification']['forum'])) {
487
+                    if (in_array($forum['forum_id'], $_SESSION['forum_notification']['forum'])) {
488 488
                         $iconnotify = 'notification_mail.png';
489 489
                     }
490 490
                 }
491 491
 
492 492
                 if (!api_is_anonymous()) {
493
-                    $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&forumcategory='
494
-                        . Security::remove_XSS($_GET['forumcategory']) . '&action=notify&content=forum&id='
495
-                        . $forum['forum_id'] . '">' . Display::return_icon($iconnotify, get_lang('NotifyMe')) . '</a>';
493
+                    $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&forumcategory='
494
+                        . Security::remove_XSS($_GET['forumcategory']).'&action=notify&content=forum&id='
495
+                        . $forum['forum_id'].'">'.Display::return_icon($iconnotify, get_lang('NotifyMe')).'</a>';
496 496
                 }
497 497
                 $html .= '</div>';
498 498
                 $html .= '</div>';
Please login to merge, or discard this patch.