@@ -138,7 +138,7 @@ |
||
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 />'; |
@@ -137,19 +137,19 @@ discard block |
||
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 |
||
169 | 169 | switch ($type) { |
170 | 170 | case DIFF_EQUAL: |
171 | 171 | //return '<tr><td>' . $line. ' : ' . ' =</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. ' : ' . ' 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. ' : ' . ' +</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. ' : ' . ' -</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 | } |
@@ -18,7 +18,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -99,25 +99,25 @@ discard block |
||
99 | 99 | **/ |
100 | 100 | public function links_to($input) |
101 | 101 | { |
102 | - $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE); |
|
102 | + $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE); |
|
103 | 103 | $all_links = array(); |
104 | 104 | |
105 | 105 | foreach ($input_array as $key=>$value) { |
106 | - if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' && |
|
107 | - isset($input_array[$key+1]) && $input_array[$key+1] == ']]' |
|
106 | + if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' && |
|
107 | + isset($input_array[$key + 1]) && $input_array[$key + 1] == ']]' |
|
108 | 108 | ) { |
109 | 109 | if (api_strpos($value, "|") !== false) { |
110 | - $full_link_array=explode("|", $value); |
|
111 | - $link=trim($full_link_array[0]); |
|
112 | - $title=trim($full_link_array[1]); |
|
110 | + $full_link_array = explode("|", $value); |
|
111 | + $link = trim($full_link_array[0]); |
|
112 | + $title = trim($full_link_array[1]); |
|
113 | 113 | } else { |
114 | - $link=trim($value); |
|
115 | - $title=trim($value); |
|
114 | + $link = trim($value); |
|
115 | + $title = trim($value); |
|
116 | 116 | } |
117 | - unset($input_array[$key-1]); |
|
118 | - unset($input_array[$key+1]); |
|
117 | + unset($input_array[$key - 1]); |
|
118 | + unset($input_array[$key + 1]); |
|
119 | 119 | //replace blank spaces by _ within the links. But to remove links at the end add a blank space |
120 | - $all_links[]= Database::escape_string(str_replace(' ','_',$link)).' '; |
|
120 | + $all_links[] = Database::escape_string(str_replace(' ', '_', $link)).' '; |
|
121 | 121 | } |
122 | 122 | } |
123 | 123 | $output = implode($all_links); |
@@ -131,9 +131,9 @@ discard block |
||
131 | 131 | **/ |
132 | 132 | public function detect_external_link($input) |
133 | 133 | { |
134 | - $exlink='href='; |
|
135 | - $exlinkStyle='class="wiki_link_ext" href='; |
|
136 | - $output=str_replace($exlink, $exlinkStyle, $input); |
|
134 | + $exlink = 'href='; |
|
135 | + $exlinkStyle = 'class="wiki_link_ext" href='; |
|
136 | + $output = str_replace($exlink, $exlinkStyle, $input); |
|
137 | 137 | return $output; |
138 | 138 | } |
139 | 139 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | public function detect_anchor_link($input) |
145 | 145 | { |
146 | 146 | $anchorlink = 'href="#'; |
147 | - $anchorlinkStyle='class="wiki_anchor_link" href="#'; |
|
147 | + $anchorlinkStyle = 'class="wiki_anchor_link" href="#'; |
|
148 | 148 | $output = str_replace($anchorlink, $anchorlinkStyle, $input); |
149 | 149 | |
150 | 150 | return $output; |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | **/ |
170 | 170 | public function detect_ftp_link($input) |
171 | 171 | { |
172 | - $ftplink='href="ftp'; |
|
172 | + $ftplink = 'href="ftp'; |
|
173 | 173 | $ftplinkStyle = 'class="wiki_ftp_link" href="ftp'; |
174 | 174 | $output = str_replace($ftplink, $ftplinkStyle, $input); |
175 | 175 | |
@@ -214,21 +214,21 @@ discard block |
||
214 | 214 | { |
215 | 215 | $groupId = api_get_group_id(); |
216 | 216 | //now doubles brackets |
217 | - $input_array = preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE); |
|
217 | + $input_array = preg_split("/(\[\[|\]\])/", $input, -1, PREG_SPLIT_DELIM_CAPTURE); |
|
218 | 218 | |
219 | 219 | foreach ($input_array as $key => $value) { |
220 | 220 | //now doubles brackets |
221 | - if (isset($input_array[$key-1]) && $input_array[$key-1] == '[[' AND |
|
222 | - $input_array[$key+1] == ']]' |
|
221 | + if (isset($input_array[$key - 1]) && $input_array[$key - 1] == '[[' AND |
|
222 | + $input_array[$key + 1] == ']]' |
|
223 | 223 | ) { |
224 | 224 | // now full wikilink |
225 | - if (api_strpos($value, "|") !== false){ |
|
226 | - $full_link_array=explode("|", $value); |
|
227 | - $link=trim(strip_tags($full_link_array[0])); |
|
228 | - $title=trim($full_link_array[1]); |
|
225 | + if (api_strpos($value, "|") !== false) { |
|
226 | + $full_link_array = explode("|", $value); |
|
227 | + $link = trim(strip_tags($full_link_array[0])); |
|
228 | + $title = trim($full_link_array[1]); |
|
229 | 229 | } else { |
230 | - $link=trim(strip_tags($value)); |
|
231 | - $title=trim($value); |
|
230 | + $link = trim(strip_tags($value)); |
|
231 | + $title = trim($value); |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | //if wikilink is homepage |
@@ -240,17 +240,17 @@ discard block |
||
240 | 240 | } |
241 | 241 | |
242 | 242 | // note: checkreflink checks if the link is still free. If it is not used then it returns true, if it is used, then it returns false. Now the title may be different |
243 | - if (self::checktitle(strtolower(str_replace(' ','_',$link)))) { |
|
243 | + if (self::checktitle(strtolower(str_replace(' ', '_', $link)))) { |
|
244 | 244 | $link = api_html_entity_decode($link); |
245 | - $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>'; |
|
245 | + $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&title='.Security::remove_XSS($link).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>'; |
|
246 | 246 | } else { |
247 | - $input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&title='.urlencode(strtolower(str_replace(' ','_',$link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>'; |
|
247 | + $input_array[$key] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&title='.urlencode(strtolower(str_replace(' ', '_', $link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>'; |
|
248 | 248 | } |
249 | - unset($input_array[$key-1]); |
|
250 | - unset($input_array[$key+1]); |
|
249 | + unset($input_array[$key - 1]); |
|
250 | + unset($input_array[$key + 1]); |
|
251 | 251 | } |
252 | 252 | } |
253 | - $output = implode('',$input_array); |
|
253 | + $output = implode('', $input_array); |
|
254 | 254 | return $output; |
255 | 255 | } |
256 | 256 | |
@@ -292,11 +292,11 @@ discard block |
||
292 | 292 | // are not made here, but through the interce buttons |
293 | 293 | |
294 | 294 | // cleaning the variables |
295 | - if (api_get_setting('htmlpurifier_wiki') == 'true'){ |
|
295 | + if (api_get_setting('htmlpurifier_wiki') == 'true') { |
|
296 | 296 | //$purifier = new HTMLPurifier(); |
297 | 297 | $values['content'] = Security::remove_XSS($values['content']); |
298 | 298 | } |
299 | - $version = intval($values['version']) + 1 ; |
|
299 | + $version = intval($values['version']) + 1; |
|
300 | 300 | $linkTo = self::links_to($values['content']); //and check links content |
301 | 301 | |
302 | 302 | //cleaning config variables |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $_clean['startdate_assig'] = '0000-00-00 00:00:00'; |
320 | 320 | } |
321 | 321 | |
322 | - if (isset($values['initenddate']) && $values['initenddate']==1) { |
|
322 | + if (isset($values['initenddate']) && $values['initenddate'] == 1) { |
|
323 | 323 | $_clean['enddate_assig'] = $values['enddate_assig']; |
324 | 324 | } else { |
325 | 325 | $_clean['enddate_assig'] = '0000-00-00 00:00:00'; |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | } |
331 | 331 | |
332 | 332 | if (!empty($values['max_text']) || !empty($values['max_version'])) { |
333 | - $_clean['max_text'] = $values['max_text']; |
|
333 | + $_clean['max_text'] = $values['max_text']; |
|
334 | 334 | $_clean['max_version'] = $values['max_version']; |
335 | 335 | } |
336 | 336 | |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | $groupId |
380 | 380 | ); |
381 | 381 | |
382 | - if ($values['page_id']== 0) { |
|
382 | + if ($values['page_id'] == 0) { |
|
383 | 383 | $sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$id.'" |
384 | 384 | WHERE c_id = '.$course_id.' AND iid ="'.$id.'"'; |
385 | 385 | Database::query($sql); |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | $_course = $this->courseInfo; |
464 | 464 | $r_user_id = api_get_user_id(); |
465 | 465 | $r_dtime = api_get_utc_datetime(); |
466 | - $r_version = $r_version+1; |
|
466 | + $r_version = $r_version + 1; |
|
467 | 467 | $r_comment = get_lang('RestoredFromVersion').': '.$c_version; |
468 | 468 | $session_id = api_get_session_id(); |
469 | 469 | $course_id = api_get_course_int_id(); |
@@ -568,9 +568,9 @@ discard block |
||
568 | 568 | // Unlike ordinary pages of pages of assignments. |
569 | 569 | // Allow create a ordinary page although there is a assignment with the same name |
570 | 570 | if ($_clean['assignment'] == 2 || $_clean['assignment'] == 1) { |
571 | - $page = str_replace(' ','_',$values['title']."_uass".$assig_user_id); |
|
571 | + $page = str_replace(' ', '_', $values['title']."_uass".$assig_user_id); |
|
572 | 572 | } else { |
573 | - $page = str_replace(' ','_',$values['title']); |
|
573 | + $page = str_replace(' ', '_', $values['title']); |
|
574 | 574 | } |
575 | 575 | $_clean['reflink'] = $page; |
576 | 576 | $_clean['title'] = trim($values['title']); |
@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | |
607 | 607 | $groupId = api_get_group_id(); |
608 | 608 | |
609 | - $_clean['linksto'] = self::links_to($_clean['content']); //check wikilinks |
|
609 | + $_clean['linksto'] = self::links_to($_clean['content']); //check wikilinks |
|
610 | 610 | |
611 | 611 | // cleaning config variables |
612 | 612 | $_clean['task'] = isset($values['task']) ? $values['task'] : ''; |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | */ |
723 | 723 | public function setForm($form, $row = array()) |
724 | 724 | { |
725 | - $toolBar = api_is_allowed_to_edit(null,true) |
|
725 | + $toolBar = api_is_allowed_to_edit(null, true) |
|
726 | 726 | ? array('ToolbarSet' => 'Wiki', 'Width' => '100%', 'Height' => '400') |
727 | 727 | : array('ToolbarSet' => 'WikiStudent', 'Width' => '100%', 'Height' => '400', 'UserStatus' => 'student'); |
728 | 728 | |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | |
734 | 734 | $form->addElement('select', 'progress', get_lang('Progress'), $progress); |
735 | 735 | |
736 | - if ((api_is_allowed_to_edit(false,true) || |
|
736 | + if ((api_is_allowed_to_edit(false, true) || |
|
737 | 737 | api_is_platform_admin()) && |
738 | 738 | isset($row['reflink']) && $row['reflink'] != 'index' |
739 | 739 | ) { |
@@ -873,13 +873,13 @@ discard block |
||
873 | 873 | if ($newtitle) { |
874 | 874 | $pageMIX = $newtitle; //display the page after it is created |
875 | 875 | } else { |
876 | - $pageMIX = $page;//display current page |
|
876 | + $pageMIX = $page; //display current page |
|
877 | 877 | } |
878 | 878 | |
879 | 879 | $filter = null; |
880 | 880 | if (isset($_GET['view']) && $_GET['view']) { |
881 | 881 | $_clean['view'] = Database::escape_string($_GET['view']); |
882 | - $filter =' AND w.id="'.$_clean['view'].'"'; |
|
882 | + $filter = ' AND w.id="'.$_clean['view'].'"'; |
|
883 | 883 | } |
884 | 884 | |
885 | 885 | // First, check page visibility in the first page version |
@@ -921,14 +921,14 @@ discard block |
||
921 | 921 | } |
922 | 922 | |
923 | 923 | // if both are empty and we are displaying the index page then we display the default text. |
924 | - if ($row['content']=='' && $row['title']=='' && $page=='index') { |
|
924 | + if ($row['content'] == '' && $row['title'] == '' && $page == 'index') { |
|
925 | 925 | if (api_is_allowed_to_edit(false, true) || |
926 | 926 | api_is_platform_admin() || |
927 | 927 | GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id()) |
928 | 928 | ) { |
929 | 929 | //Table structure for better export to pdf |
930 | - $default_table_for_content_Start='<table align="center" border="0"><tr><td align="center">'; |
|
931 | - $default_table_for_content_End='</td></tr></table>'; |
|
930 | + $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">'; |
|
931 | + $default_table_for_content_End = '</td></tr></table>'; |
|
932 | 932 | $content = $default_table_for_content_Start. |
933 | 933 | sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)). |
934 | 934 | $default_table_for_content_End; |
@@ -943,23 +943,23 @@ discard block |
||
943 | 943 | |
944 | 944 | //assignment mode: identify page type |
945 | 945 | $icon_assignment = null; |
946 | - if ($row['assignment']==1) { |
|
947 | - $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL); |
|
948 | - } elseif($row['assignment']==2) { |
|
949 | - $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
946 | + if ($row['assignment'] == 1) { |
|
947 | + $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL); |
|
948 | + } elseif ($row['assignment'] == 2) { |
|
949 | + $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
950 | 950 | } |
951 | 951 | |
952 | 952 | //task mode |
953 | 953 | $icon_task = null; |
954 | 954 | if (!empty($row['task'])) { |
955 | - $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL); |
|
955 | + $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL); |
|
956 | 956 | } |
957 | 957 | |
958 | 958 | // Show page. Show page to all users if isn't hide page. Mode assignments: if student is the author, can view |
959 | 959 | if ($KeyVisibility == "1" || |
960 | 960 | api_is_allowed_to_edit(false, true) || |
961 | 961 | api_is_platform_admin() || |
962 | - ($row['assignment'] == 2 && $KeyVisibility=="0" && (api_get_user_id() == $row['user_id'])) |
|
962 | + ($row['assignment'] == 2 && $KeyVisibility == "0" && (api_get_user_id() == $row['user_id'])) |
|
963 | 963 | ) { |
964 | 964 | $actionsLeft = ''; |
965 | 965 | |
@@ -984,13 +984,13 @@ discard block |
||
984 | 984 | $protect_page = null; |
985 | 985 | $lock_unlock_protect = null; |
986 | 986 | // page action: protecting (locking) the page |
987 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
988 | - if (self::check_protect_page()==1) { |
|
987 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
988 | + if (self::check_protect_page() == 1) { |
|
989 | 989 | $protect_page = Display::return_icon('lock.png', get_lang('PageLockedExtra'), '', ICON_SIZE_MEDIUM); |
990 | - $lock_unlock_protect='unlock'; |
|
990 | + $lock_unlock_protect = 'unlock'; |
|
991 | 991 | } else { |
992 | 992 | $protect_page = Display::return_icon('unlock.png', get_lang('PageUnlockedExtra'), '', ICON_SIZE_MEDIUM); |
993 | - $lock_unlock_protect='lock'; |
|
993 | + $lock_unlock_protect = 'lock'; |
|
994 | 994 | } |
995 | 995 | } |
996 | 996 | |
@@ -1002,13 +1002,13 @@ discard block |
||
1002 | 1002 | $visibility_page = null; |
1003 | 1003 | $lock_unlock_visibility = null; |
1004 | 1004 | //page action: visibility |
1005 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
1005 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
1006 | 1006 | if (self::check_visibility_page() == 1) { |
1007 | - $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'),'', ICON_SIZE_MEDIUM); |
|
1007 | + $visibility_page = Display::return_icon('visible.png', get_lang('ShowPageExtra'), '', ICON_SIZE_MEDIUM); |
|
1008 | 1008 | $lock_unlock_visibility = 'invisible'; |
1009 | 1009 | |
1010 | 1010 | } else { |
1011 | - $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'),'', ICON_SIZE_MEDIUM); |
|
1011 | + $visibility_page = Display::return_icon('invisible.png', get_lang('HidePageExtra'), '', ICON_SIZE_MEDIUM); |
|
1012 | 1012 | $lock_unlock_visibility = 'visible'; |
1013 | 1013 | } |
1014 | 1014 | } |
@@ -1020,11 +1020,11 @@ discard block |
||
1020 | 1020 | |
1021 | 1021 | //page action: notification |
1022 | 1022 | if (api_is_allowed_to_session_edit()) { |
1023 | - if (self::check_notify_page($page)==1) { |
|
1024 | - $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_MEDIUM); |
|
1023 | + if (self::check_notify_page($page) == 1) { |
|
1024 | + $notify_page = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_MEDIUM); |
|
1025 | 1025 | $lock_unlock_notify_page = 'unlocknotify'; |
1026 | 1026 | } else { |
1027 | - $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_MEDIUM); |
|
1027 | + $notify_page = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_MEDIUM); |
|
1028 | 1028 | $lock_unlock_notify_page = 'locknotify'; |
1029 | 1029 | } |
1030 | 1030 | } |
@@ -1036,33 +1036,33 @@ discard block |
||
1036 | 1036 | ) { |
1037 | 1037 | // menu discuss page |
1038 | 1038 | $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=discuss&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('discuss').'>'. |
1039 | - Display::return_icon('discuss.png',get_lang('DiscussThisPage'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
1039 | + Display::return_icon('discuss.png', get_lang('DiscussThisPage'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
1040 | 1040 | } |
1041 | 1041 | |
1042 | 1042 | //menu history |
1043 | 1043 | $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=history&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('history').'>'. |
1044 | - Display::return_icon('history.png',get_lang('ShowPageHistory'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
1044 | + Display::return_icon('history.png', get_lang('ShowPageHistory'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
1045 | 1045 | //menu linkspages |
1046 | 1046 | $actionsRight .= '<a href="index.php?'.api_get_cidreq().'action=links&title='.api_htmlentities(urlencode($page)).'" '.self::is_active_navigation_tab('links').'>'. |
1047 | - Display::return_icon('what_link_here.png',get_lang('LinksPages'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
1047 | + Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
1048 | 1048 | |
1049 | 1049 | //menu delete wikipage |
1050 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
1050 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
1051 | 1051 | $actionsRight .= '<a href="index.php?action=delete&'.api_get_cidreq().'&title='.api_htmlentities(urlencode($page)).'"'.self::is_active_navigation_tab('delete').'>'. |
1052 | - Display::return_icon('delete.png',get_lang('DeleteThisPage'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
1052 | + Display::return_icon('delete.png', get_lang('DeleteThisPage'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
1053 | 1053 | } |
1054 | 1054 | |
1055 | 1055 | $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=showpage&actionpage='.$lock_unlock_notify_page.'&title='.api_htmlentities(urlencode($page)).'">'. |
1056 | 1056 | $notify_page.'</a>'; |
1057 | 1057 | |
1058 | 1058 | // Page action: copy last version to doc area |
1059 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
1059 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
1060 | 1060 | $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export2doc&wiki_id='.$row['id'].'">'. |
1061 | 1061 | Display::return_icon('export_to_documents.png', get_lang('ExportToDocArea'), '', ICON_SIZE_MEDIUM).'</a>'; |
1062 | 1062 | } |
1063 | 1063 | |
1064 | 1064 | $actionsRight .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf&wiki_id='.$row['id'].'">'. |
1065 | - Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
1065 | + Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
1066 | 1066 | |
1067 | 1067 | $unoconv = api_get_configuration_value('unoconv.binaries'); |
1068 | 1068 | if ($unoconv) { |
@@ -1118,7 +1118,7 @@ discard block |
||
1118 | 1118 | ) |
1119 | 1119 | ); |
1120 | 1120 | |
1121 | - $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress']*10).'% '.get_lang('Rating').': '.$row['score'].' '.get_lang('Words').': '.self::word_count($content).'</div>'; |
|
1121 | + $footerWiki = '<div id="wikifooter">'.get_lang('Progress').': '.($row['progress'] * 10).'% '.get_lang('Rating').': '.$row['score'].' '.get_lang('Words').': '.self::word_count($content).'</div>'; |
|
1122 | 1122 | |
1123 | 1123 | echo Display::panel($pageWiki, $pageTitle, $footerWiki); |
1124 | 1124 | } //end filter visibility |
@@ -1142,7 +1142,7 @@ discard block |
||
1142 | 1142 | |
1143 | 1143 | # strip all html tags |
1144 | 1144 | $wc = strip_tags($document); |
1145 | - $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8');// TODO:test also old html_entity_decode(utf8_encode($wc)) |
|
1145 | + $wc = html_entity_decode($wc, ENT_NOQUOTES, 'UTF-8'); // TODO:test also old html_entity_decode(utf8_encode($wc)) |
|
1146 | 1146 | |
1147 | 1147 | # remove 'words' that don't consist of alphanumerical characters or punctuation. And fix accents and some letters |
1148 | 1148 | $pattern = "#[^(\w|\d|\'|\"|\.|\!|\?|;|,|\\|\/|\-|:|\&|@|á|é|í|ó|ú|à|è|ì|ò|ù|ä|ë|ï|ö|ü|Á|É|Í|Ó|Ú|À|È|Ò|Ù|Ä|Ë|Ï|Ö|Ü|â|ê|î|ô|û|Â|Ê|Î|Ô|Û|ñ|Ñ|ç|Ç)]+#"; |
@@ -1175,15 +1175,15 @@ discard block |
||
1175 | 1175 | |
1176 | 1176 | $course_id = api_get_course_int_id(); |
1177 | 1177 | |
1178 | - $sql='SELECT id FROM '.$tbl_wiki.' |
|
1178 | + $sql = 'SELECT id FROM '.$tbl_wiki.' |
|
1179 | 1179 | WHERE |
1180 | 1180 | c_id = '.$course_id.' AND |
1181 | 1181 | title="'.Database::escape_string($title).'" AND |
1182 | 1182 | '.$groupfilter.$condition_session.' |
1183 | 1183 | ORDER BY id ASC'; |
1184 | - $result=Database::query($sql); |
|
1185 | - $cant=Database::num_rows($result); |
|
1186 | - if ($cant>0) { |
|
1184 | + $result = Database::query($sql); |
|
1185 | + $cant = Database::num_rows($result); |
|
1186 | + if ($cant > 0) { |
|
1187 | 1187 | return true; |
1188 | 1188 | } else { |
1189 | 1189 | return false; |
@@ -1265,20 +1265,20 @@ discard block |
||
1265 | 1265 | $page = $this->page; |
1266 | 1266 | |
1267 | 1267 | $course_id = api_get_course_int_id(); |
1268 | - $sql='SELECT * FROM '.$tbl_wiki.' |
|
1268 | + $sql = 'SELECT * FROM '.$tbl_wiki.' |
|
1269 | 1269 | WHERE |
1270 | 1270 | c_id = '.$course_id.' AND |
1271 | 1271 | reflink="'.Database::escape_string($page).'" AND |
1272 | 1272 | '.$groupfilter.$condition_session.' |
1273 | 1273 | ORDER BY id ASC'; |
1274 | 1274 | |
1275 | - $result=Database::query($sql); |
|
1276 | - $row=Database::fetch_array($result); |
|
1275 | + $result = Database::query($sql); |
|
1276 | + $row = Database::fetch_array($result); |
|
1277 | 1277 | $status_editlock = $row['editlock']; |
1278 | 1278 | $id = $row['id']; |
1279 | 1279 | |
1280 | 1280 | ///change status |
1281 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
1281 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
1282 | 1282 | if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lock' && $status_editlock == 0) { |
1283 | 1283 | $status_editlock = 1; |
1284 | 1284 | } |
@@ -1290,13 +1290,13 @@ discard block |
||
1290 | 1290 | WHERE c_id = '.$course_id.' AND id="'.$id.'"'; |
1291 | 1291 | Database::query($sql); |
1292 | 1292 | |
1293 | - $sql='SELECT * FROM '.$tbl_wiki.' |
|
1293 | + $sql = 'SELECT * FROM '.$tbl_wiki.' |
|
1294 | 1294 | WHERE |
1295 | 1295 | c_id = '.$course_id.' AND |
1296 | 1296 | reflink="'.Database::escape_string($page).'" AND |
1297 | 1297 | '.$groupfilter.$condition_session.' |
1298 | 1298 | ORDER BY id ASC'; |
1299 | - $result=Database::query($sql); |
|
1299 | + $result = Database::query($sql); |
|
1300 | 1300 | $row = Database::fetch_array($result); |
1301 | 1301 | } |
1302 | 1302 | |
@@ -1327,13 +1327,13 @@ discard block |
||
1327 | 1327 | $row = Database::fetch_array($result); |
1328 | 1328 | $status_visibility = $row['visibility']; |
1329 | 1329 | //change status |
1330 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
1331 | - if (isset($_GET['actionpage']) && $_GET['actionpage']=='visible' && $status_visibility==0) { |
|
1332 | - $status_visibility=1; |
|
1330 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
1331 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'visible' && $status_visibility == 0) { |
|
1332 | + $status_visibility = 1; |
|
1333 | 1333 | |
1334 | 1334 | } |
1335 | - if (isset($_GET['actionpage']) && $_GET['actionpage']=='invisible' && $status_visibility==1) { |
|
1336 | - $status_visibility=0; |
|
1335 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'invisible' && $status_visibility == 1) { |
|
1336 | + $status_visibility = 0; |
|
1337 | 1337 | } |
1338 | 1338 | |
1339 | 1339 | $sql = 'UPDATE '.$tbl_wiki.' SET visibility="'.Database::escape_string($status_visibility).'" |
@@ -1350,12 +1350,12 @@ discard block |
||
1350 | 1350 | reflink="'.Database::escape_string($page).'" AND |
1351 | 1351 | '.$groupfilter.$condition_session.' |
1352 | 1352 | ORDER BY id ASC'; |
1353 | - $result=Database::query($sql); |
|
1353 | + $result = Database::query($sql); |
|
1354 | 1354 | $row = Database::fetch_array($result); |
1355 | 1355 | } |
1356 | 1356 | |
1357 | 1357 | if (empty($row['id'])) { |
1358 | - $row['visibility']= 1; |
|
1358 | + $row['visibility'] = 1; |
|
1359 | 1359 | } |
1360 | 1360 | |
1361 | 1361 | //show status |
@@ -1382,18 +1382,18 @@ discard block |
||
1382 | 1382 | reflink="'.Database::escape_string($page).'" AND |
1383 | 1383 | '.$groupfilter.$condition_session.' |
1384 | 1384 | ORDER BY id ASC'; |
1385 | - $result=Database::query($sql); |
|
1386 | - $row=Database::fetch_array($result); |
|
1385 | + $result = Database::query($sql); |
|
1386 | + $row = Database::fetch_array($result); |
|
1387 | 1387 | |
1388 | 1388 | $status_visibility_disc = $row['visibility_disc']; |
1389 | 1389 | |
1390 | 1390 | //change status |
1391 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
1392 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='showdisc' && $status_visibility_disc==0) { |
|
1393 | - $status_visibility_disc=1; |
|
1391 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
1392 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'showdisc' && $status_visibility_disc == 0) { |
|
1393 | + $status_visibility_disc = 1; |
|
1394 | 1394 | } |
1395 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='hidedisc' && $status_visibility_disc==1) { |
|
1396 | - $status_visibility_disc=0; |
|
1395 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'hidedisc' && $status_visibility_disc == 1) { |
|
1396 | + $status_visibility_disc = 0; |
|
1397 | 1397 | } |
1398 | 1398 | |
1399 | 1399 | $sql = 'UPDATE '.$tbl_wiki.' SET visibility_disc="'.Database::escape_string($status_visibility_disc).'" |
@@ -1441,14 +1441,14 @@ discard block |
||
1441 | 1441 | $result = Database::query($sql); |
1442 | 1442 | $row = Database::fetch_array($result); |
1443 | 1443 | |
1444 | - $status_addlock_disc=$row['addlock_disc']; |
|
1444 | + $status_addlock_disc = $row['addlock_disc']; |
|
1445 | 1445 | |
1446 | 1446 | //change status |
1447 | 1447 | if (api_is_allowed_to_edit() || api_is_platform_admin()) { |
1448 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockdisc' && $status_addlock_disc==0) { |
|
1448 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockdisc' && $status_addlock_disc == 0) { |
|
1449 | 1449 | $status_addlock_disc = 1; |
1450 | 1450 | } |
1451 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockdisc' && $status_addlock_disc==1) { |
|
1451 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockdisc' && $status_addlock_disc == 1) { |
|
1452 | 1452 | $status_addlock_disc = 0; |
1453 | 1453 | } |
1454 | 1454 | |
@@ -1470,8 +1470,8 @@ discard block |
||
1470 | 1470 | reflink="'.Database::escape_string($page).'" AND |
1471 | 1471 | '.$groupfilter.$condition_session.' |
1472 | 1472 | ORDER BY id ASC'; |
1473 | - $result=Database::query($sql); |
|
1474 | - $row=Database::fetch_array($result); |
|
1473 | + $result = Database::query($sql); |
|
1474 | + $row = Database::fetch_array($result); |
|
1475 | 1475 | } |
1476 | 1476 | |
1477 | 1477 | return $row['addlock_disc']; |
@@ -1496,17 +1496,17 @@ discard block |
||
1496 | 1496 | reflink="'.Database::escape_string($page).'" AND |
1497 | 1497 | '.$groupfilter.$condition_session.' |
1498 | 1498 | ORDER BY id ASC'; |
1499 | - $result=Database::query($sql); |
|
1500 | - $row=Database::fetch_array($result); |
|
1501 | - $status_ratinglock_disc=$row['ratinglock_disc']; |
|
1499 | + $result = Database::query($sql); |
|
1500 | + $row = Database::fetch_array($result); |
|
1501 | + $status_ratinglock_disc = $row['ratinglock_disc']; |
|
1502 | 1502 | |
1503 | 1503 | //change status |
1504 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
1505 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockrating' && $status_ratinglock_disc==0) { |
|
1506 | - $status_ratinglock_disc=1; |
|
1504 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
1505 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'lockrating' && $status_ratinglock_disc == 0) { |
|
1506 | + $status_ratinglock_disc = 1; |
|
1507 | 1507 | } |
1508 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockrating' && $status_ratinglock_disc==1) { |
|
1509 | - $status_ratinglock_disc=0; |
|
1508 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlockrating' && $status_ratinglock_disc == 1) { |
|
1509 | + $status_ratinglock_disc = 0; |
|
1510 | 1510 | } |
1511 | 1511 | |
1512 | 1512 | $sql = 'UPDATE '.$tbl_wiki.' |
@@ -1522,14 +1522,14 @@ discard block |
||
1522 | 1522 | // these three lines remain necessary. They do that by changing the |
1523 | 1523 | // page state is made when you press the button and not have to wait |
1524 | 1524 | // to change his page |
1525 | - $sql='SELECT * FROM '.$tbl_wiki.' |
|
1525 | + $sql = 'SELECT * FROM '.$tbl_wiki.' |
|
1526 | 1526 | WHERE |
1527 | 1527 | c_id = '.$course_id.' AND |
1528 | 1528 | reflink="'.Database::escape_string($page).'" AND |
1529 | 1529 | '.$groupfilter.$condition_session.' |
1530 | 1530 | ORDER BY id ASC'; |
1531 | - $result=Database::query($sql); |
|
1532 | - $row=Database::fetch_array($result); |
|
1531 | + $result = Database::query($sql); |
|
1532 | + $row = Database::fetch_array($result); |
|
1533 | 1533 | } |
1534 | 1534 | |
1535 | 1535 | return $row['ratinglock_disc']; |
@@ -1554,24 +1554,24 @@ discard block |
||
1554 | 1554 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
1555 | 1555 | WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.' |
1556 | 1556 | ORDER BY id ASC'; |
1557 | - $result=Database::query($sql); |
|
1558 | - $row=Database::fetch_array($result); |
|
1557 | + $result = Database::query($sql); |
|
1558 | + $row = Database::fetch_array($result); |
|
1559 | 1559 | $id = $row['id']; |
1560 | - $sql='SELECT * FROM '.$tbl_wiki_mailcue.' |
|
1560 | + $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' |
|
1561 | 1561 | WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P"'; |
1562 | - $result=Database::query($sql); |
|
1563 | - $row=Database::fetch_array($result); |
|
1562 | + $result = Database::query($sql); |
|
1563 | + $row = Database::fetch_array($result); |
|
1564 | 1564 | |
1565 | 1565 | $idm = $row['id']; |
1566 | 1566 | |
1567 | 1567 | if (empty($idm)) { |
1568 | - $status_notify=0; |
|
1568 | + $status_notify = 0; |
|
1569 | 1569 | } else { |
1570 | - $status_notify=1; |
|
1570 | + $status_notify = 1; |
|
1571 | 1571 | } |
1572 | 1572 | |
1573 | 1573 | // Change status |
1574 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotify' && $status_notify==0) { |
|
1574 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotify' && $status_notify == 0) { |
|
1575 | 1575 | $sql = "SELECT id FROM $tbl_wiki_mailcue |
1576 | 1576 | WHERE c_id = $course_id AND id = $id AND user_id = $userId"; |
1577 | 1577 | $result = Database::query($sql); |
@@ -1580,18 +1580,18 @@ discard block |
||
1580 | 1580 | $exist = true; |
1581 | 1581 | } |
1582 | 1582 | if ($exist == false) { |
1583 | - $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES |
|
1583 | + $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES |
|
1584 | 1584 | ($course_id, '".$id."','".api_get_user_id()."','P','".$groupId."','".$session_id."')"; |
1585 | 1585 | Database::query($sql); |
1586 | 1586 | } |
1587 | - $status_notify=1; |
|
1587 | + $status_notify = 1; |
|
1588 | 1588 | } |
1589 | 1589 | |
1590 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotify' && $status_notify==1) { |
|
1590 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotify' && $status_notify == 1) { |
|
1591 | 1591 | $sql = 'DELETE FROM '.$tbl_wiki_mailcue.' |
1592 | 1592 | WHERE id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="P" AND c_id = '.$course_id; |
1593 | 1593 | Database::query($sql); |
1594 | - $status_notify=0; |
|
1594 | + $status_notify = 0; |
|
1595 | 1595 | } |
1596 | 1596 | |
1597 | 1597 | return $status_notify; |
@@ -1617,9 +1617,9 @@ discard block |
||
1617 | 1617 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
1618 | 1618 | WHERE c_id = '.$course_id.' AND reflink="'.$reflink.'" AND '.$groupfilter.$condition_session.' |
1619 | 1619 | ORDER BY id ASC'; |
1620 | - $result=Database::query($sql); |
|
1621 | - $row=Database::fetch_array($result); |
|
1622 | - $id=$row['id']; |
|
1620 | + $result = Database::query($sql); |
|
1621 | + $row = Database::fetch_array($result); |
|
1622 | + $id = $row['id']; |
|
1623 | 1623 | $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' |
1624 | 1624 | WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D"'; |
1625 | 1625 | $result = Database::query($sql); |
@@ -1627,23 +1627,23 @@ discard block |
||
1627 | 1627 | $idm = $row['id']; |
1628 | 1628 | |
1629 | 1629 | if (empty($idm)) { |
1630 | - $status_notify_disc=0; |
|
1630 | + $status_notify_disc = 0; |
|
1631 | 1631 | } else { |
1632 | - $status_notify_disc=1; |
|
1632 | + $status_notify_disc = 1; |
|
1633 | 1633 | } |
1634 | 1634 | |
1635 | 1635 | //change status |
1636 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifydisc' && $status_notify_disc==0) { |
|
1637 | - $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES |
|
1636 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifydisc' && $status_notify_disc == 0) { |
|
1637 | + $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES |
|
1638 | 1638 | ($course_id, '".$id."','".api_get_user_id()."','D','".$groupId."','".$session_id."')"; |
1639 | 1639 | Database::query($sql); |
1640 | - $status_notify_disc=1; |
|
1640 | + $status_notify_disc = 1; |
|
1641 | 1641 | } |
1642 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlocknotifydisc' && $status_notify_disc==1) { |
|
1642 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'unlocknotifydisc' && $status_notify_disc == 1) { |
|
1643 | 1643 | $sql = 'DELETE FROM '.$tbl_wiki_mailcue.' |
1644 | 1644 | WHERE c_id = '.$course_id.' AND id="'.$id.'" AND user_id="'.api_get_user_id().'" AND type="D" AND c_id = '.$course_id; |
1645 | 1645 | Database::query($sql); |
1646 | - $status_notify_disc=0; |
|
1646 | + $status_notify_disc = 0; |
|
1647 | 1647 | } |
1648 | 1648 | |
1649 | 1649 | return $status_notify_disc; |
@@ -1658,7 +1658,7 @@ discard block |
||
1658 | 1658 | $tbl_wiki_mailcue = $this->tbl_wiki_mailcue; |
1659 | 1659 | $course_id = api_get_course_int_id(); |
1660 | 1660 | $groupId = api_get_group_id(); |
1661 | - $session_id=api_get_session_id(); |
|
1661 | + $session_id = api_get_session_id(); |
|
1662 | 1662 | |
1663 | 1663 | $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' |
1664 | 1664 | WHERE |
@@ -1667,31 +1667,31 @@ discard block |
||
1667 | 1667 | type="F" AND |
1668 | 1668 | group_id="'.$groupId.'" AND |
1669 | 1669 | session_id="'.$session_id.'"'; |
1670 | - $result=Database::query($sql); |
|
1671 | - $row=Database::fetch_array($result); |
|
1670 | + $result = Database::query($sql); |
|
1671 | + $row = Database::fetch_array($result); |
|
1672 | 1672 | |
1673 | - $idm=$row['user_id']; |
|
1673 | + $idm = $row['user_id']; |
|
1674 | 1674 | |
1675 | 1675 | if (empty($idm)) { |
1676 | - $status_notify_all=0; |
|
1676 | + $status_notify_all = 0; |
|
1677 | 1677 | } else { |
1678 | - $status_notify_all=1; |
|
1678 | + $status_notify_all = 1; |
|
1679 | 1679 | } |
1680 | 1680 | |
1681 | 1681 | //change status |
1682 | - if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotifyall' && $status_notify_all==0) { |
|
1683 | - $sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES |
|
1682 | + if (isset($_GET['actionpage']) && $_GET['actionpage'] == 'locknotifyall' && $status_notify_all == 0) { |
|
1683 | + $sql = "INSERT INTO ".$tbl_wiki_mailcue." (c_id, user_id, type, group_id, session_id) VALUES |
|
1684 | 1684 | ($course_id, '".api_get_user_id()."','F','".$groupId."','".$session_id."')"; |
1685 | 1685 | Database::query($sql); |
1686 | - $status_notify_all=1; |
|
1686 | + $status_notify_all = 1; |
|
1687 | 1687 | } |
1688 | 1688 | |
1689 | 1689 | if (isset($_GET['actionpage']) && |
1690 | 1690 | isset($_GET['actionpage']) && |
1691 | - $_GET['actionpage'] =='unlocknotifyall' && |
|
1691 | + $_GET['actionpage'] == 'unlocknotifyall' && |
|
1692 | 1692 | $status_notify_all == 1 |
1693 | 1693 | ) { |
1694 | - $sql ='DELETE FROM '.$tbl_wiki_mailcue.' |
|
1694 | + $sql = 'DELETE FROM '.$tbl_wiki_mailcue.' |
|
1695 | 1695 | WHERE |
1696 | 1696 | c_id = '.$course_id.' AND |
1697 | 1697 | user_id="'.api_get_user_id().'" AND |
@@ -1700,7 +1700,7 @@ discard block |
||
1700 | 1700 | session_id="'.$session_id.'" AND |
1701 | 1701 | c_id = '.$course_id; |
1702 | 1702 | Database::query($sql); |
1703 | - $status_notify_all=0; |
|
1703 | + $status_notify_all = 0; |
|
1704 | 1704 | } |
1705 | 1705 | |
1706 | 1706 | //show status |
@@ -1710,7 +1710,7 @@ discard block |
||
1710 | 1710 | /** |
1711 | 1711 | * Sends pending e-mails |
1712 | 1712 | */ |
1713 | - public function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='') |
|
1713 | + public function check_emailcue($id_or_ref, $type, $lastime = '', $lastuser = '') |
|
1714 | 1714 | { |
1715 | 1715 | $tbl_wiki_mailcue = $this->tbl_wiki_mailcue; |
1716 | 1716 | $tbl_wiki = $this->tbl_wiki; |
@@ -1718,14 +1718,14 @@ discard block |
||
1718 | 1718 | $groupfilter = $this->groupfilter; |
1719 | 1719 | $_course = $this->courseInfo; |
1720 | 1720 | $groupId = api_get_group_id(); |
1721 | - $session_id=api_get_session_id(); |
|
1721 | + $session_id = api_get_session_id(); |
|
1722 | 1722 | $course_id = api_get_course_int_id(); |
1723 | 1723 | |
1724 | - $group_properties = GroupManager :: get_group_properties($groupId); |
|
1724 | + $group_properties = GroupManager :: get_group_properties($groupId); |
|
1725 | 1725 | $group_name = $group_properties['name']; |
1726 | 1726 | $allow_send_mail = false; //define the variable to below |
1727 | 1727 | $email_assignment = null; |
1728 | - if ($type=='P') { |
|
1728 | + if ($type == 'P') { |
|
1729 | 1729 | //if modifying a wiki page |
1730 | 1730 | //first, current author and time |
1731 | 1731 | //Who is the author? |
@@ -1736,22 +1736,22 @@ discard block |
||
1736 | 1736 | $year = substr($lastime, 0, 4); |
1737 | 1737 | $month = substr($lastime, 5, 2); |
1738 | 1738 | $day = substr($lastime, 8, 2); |
1739 | - $hours=substr($lastime, 11,2); |
|
1740 | - $minutes=substr($lastime, 14,2); |
|
1741 | - $seconds=substr($lastime, 17,2); |
|
1742 | - $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds; |
|
1739 | + $hours = substr($lastime, 11, 2); |
|
1740 | + $minutes = substr($lastime, 14, 2); |
|
1741 | + $seconds = substr($lastime, 17, 2); |
|
1742 | + $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds; |
|
1743 | 1743 | |
1744 | 1744 | //second, extract data from first reg |
1745 | 1745 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
1746 | 1746 | WHERE c_id = '.$course_id.' AND reflink="'.$id_or_ref.'" AND '.$groupfilter.$condition_session.' |
1747 | 1747 | ORDER BY id ASC'; |
1748 | - $result=Database::query($sql); |
|
1749 | - $row=Database::fetch_array($result); |
|
1748 | + $result = Database::query($sql); |
|
1749 | + $row = Database::fetch_array($result); |
|
1750 | 1750 | |
1751 | - $id=$row['id']; |
|
1752 | - $email_page_name=$row['title']; |
|
1753 | - if ($row['visibility']==1) { |
|
1754 | - $allow_send_mail=true; //if visibility off - notify off |
|
1751 | + $id = $row['id']; |
|
1752 | + $email_page_name = $row['title']; |
|
1753 | + if ($row['visibility'] == 1) { |
|
1754 | + $allow_send_mail = true; //if visibility off - notify off |
|
1755 | 1755 | $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' |
1756 | 1756 | WHERE |
1757 | 1757 | c_id = '.$course_id.' AND |
@@ -1761,10 +1761,10 @@ discard block |
||
1761 | 1761 | group_id="'.$groupId.'" AND |
1762 | 1762 | session_id="'.$session_id.'"'; |
1763 | 1763 | //type: P=page, D=discuss, F=full. |
1764 | - $result=Database::query($sql); |
|
1765 | - $emailtext=get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki'); |
|
1764 | + $result = Database::query($sql); |
|
1765 | + $emailtext = get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki'); |
|
1766 | 1766 | } |
1767 | - } elseif ($type=='D') { |
|
1767 | + } elseif ($type == 'D') { |
|
1768 | 1768 | //if added a post to discuss |
1769 | 1769 | |
1770 | 1770 | //first, current author and time |
@@ -1776,25 +1776,25 @@ discard block |
||
1776 | 1776 | $year = substr($lastime, 0, 4); |
1777 | 1777 | $month = substr($lastime, 5, 2); |
1778 | 1778 | $day = substr($lastime, 8, 2); |
1779 | - $hours=substr($lastime, 11,2); |
|
1780 | - $minutes=substr($lastime, 14,2); |
|
1781 | - $seconds=substr($lastime, 17,2); |
|
1782 | - $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds; |
|
1779 | + $hours = substr($lastime, 11, 2); |
|
1780 | + $minutes = substr($lastime, 14, 2); |
|
1781 | + $seconds = substr($lastime, 17, 2); |
|
1782 | + $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds; |
|
1783 | 1783 | |
1784 | 1784 | //second, extract data from first reg |
1785 | 1785 | |
1786 | - $id=$id_or_ref; //$id_or_ref is id from tblwiki |
|
1786 | + $id = $id_or_ref; //$id_or_ref is id from tblwiki |
|
1787 | 1787 | |
1788 | 1788 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
1789 | 1789 | WHERE c_id = '.$course_id.' AND id="'.$id.'" |
1790 | 1790 | ORDER BY id ASC'; |
1791 | 1791 | |
1792 | - $result=Database::query($sql); |
|
1793 | - $row=Database::fetch_array($result); |
|
1792 | + $result = Database::query($sql); |
|
1793 | + $row = Database::fetch_array($result); |
|
1794 | 1794 | |
1795 | - $email_page_name=$row['title']; |
|
1796 | - if ($row['visibility_disc']==1) { |
|
1797 | - $allow_send_mail=true; //if visibility off - notify off |
|
1795 | + $email_page_name = $row['title']; |
|
1796 | + if ($row['visibility_disc'] == 1) { |
|
1797 | + $allow_send_mail = true; //if visibility off - notify off |
|
1798 | 1798 | $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' |
1799 | 1799 | WHERE |
1800 | 1800 | c_id = '.$course_id.' AND |
@@ -1805,22 +1805,22 @@ discard block |
||
1805 | 1805 | session_id="'.$session_id.'"'; |
1806 | 1806 | //type: P=page, D=discuss, F=full |
1807 | 1807 | $result = Database::query($sql); |
1808 | - $emailtext=get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki'); |
|
1808 | + $emailtext = get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki'); |
|
1809 | 1809 | } |
1810 | - } elseif($type=='A') { |
|
1810 | + } elseif ($type == 'A') { |
|
1811 | 1811 | //for added pages |
1812 | - $id=0; //for tbl_wiki_mailcue |
|
1812 | + $id = 0; //for tbl_wiki_mailcue |
|
1813 | 1813 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
1814 | 1814 | WHERE c_id = '.$course_id.' |
1815 | 1815 | ORDER BY id DESC'; //the added is always the last |
1816 | 1816 | |
1817 | - $result=Database::query($sql); |
|
1818 | - $row=Database::fetch_array($result); |
|
1819 | - $email_page_name=$row['title']; |
|
1817 | + $result = Database::query($sql); |
|
1818 | + $row = Database::fetch_array($result); |
|
1819 | + $email_page_name = $row['title']; |
|
1820 | 1820 | |
1821 | 1821 | //Who is the author? |
1822 | 1822 | $userinfo = api_get_user_info($row['user_id']); |
1823 | - $email_user_author= get_lang('AddedBy').': '.$userinfo['complete_name']; |
|
1823 | + $email_user_author = get_lang('AddedBy').': '.$userinfo['complete_name']; |
|
1824 | 1824 | |
1825 | 1825 | //When ? |
1826 | 1826 | $year = substr($row['dtime'], 0, 4); |
@@ -1829,33 +1829,33 @@ discard block |
||
1829 | 1829 | $hours = substr($row['dtime'], 11, 2); |
1830 | 1830 | $minutes = substr($row['dtime'], 14, 2); |
1831 | 1831 | $seconds = substr($row['dtime'], 17, 2); |
1832 | - $email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds; |
|
1833 | - |
|
1834 | - if($row['assignment']==0) { |
|
1835 | - $allow_send_mail=true; |
|
1836 | - } elseif($row['assignment']==1) { |
|
1837 | - $email_assignment=get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')'; |
|
1838 | - $allow_send_mail=true; |
|
1839 | - } elseif($row['assignment']==2) { |
|
1840 | - $allow_send_mail=false; //Mode tasks: avoids notifications to all users about all users |
|
1832 | + $email_date_changes = $day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds; |
|
1833 | + |
|
1834 | + if ($row['assignment'] == 0) { |
|
1835 | + $allow_send_mail = true; |
|
1836 | + } elseif ($row['assignment'] == 1) { |
|
1837 | + $email_assignment = get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')'; |
|
1838 | + $allow_send_mail = true; |
|
1839 | + } elseif ($row['assignment'] == 2) { |
|
1840 | + $allow_send_mail = false; //Mode tasks: avoids notifications to all users about all users |
|
1841 | 1841 | } |
1842 | 1842 | |
1843 | 1843 | $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' |
1844 | 1844 | WHERE c_id = '.$course_id.' AND id="'.$id.'" AND type="F" AND group_id="'.$groupId.'" AND session_id="'.$session_id.'"'; |
1845 | 1845 | //type: P=page, D=discuss, F=full |
1846 | - $result=Database::query($sql); |
|
1846 | + $result = Database::query($sql); |
|
1847 | 1847 | |
1848 | - $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '. get_lang('Wiki'); |
|
1849 | - } elseif ($type=='E') { |
|
1850 | - $id=0; |
|
1851 | - $allow_send_mail=true; |
|
1848 | + $emailtext = get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '.get_lang('Wiki'); |
|
1849 | + } elseif ($type == 'E') { |
|
1850 | + $id = 0; |
|
1851 | + $allow_send_mail = true; |
|
1852 | 1852 | |
1853 | 1853 | //Who is the author? |
1854 | - $userinfo = api_get_user_info(api_get_user_id()); //current user |
|
1854 | + $userinfo = api_get_user_info(api_get_user_id()); //current user |
|
1855 | 1855 | $email_user_author = get_lang('DeletedBy').': '.$userinfo['complete_name']; |
1856 | 1856 | //When ? |
1857 | - $today = date('r'); //current time |
|
1858 | - $email_date_changes=$today; |
|
1857 | + $today = date('r'); //current time |
|
1858 | + $email_date_changes = $today; |
|
1859 | 1859 | |
1860 | 1860 | $sql = 'SELECT * FROM '.$tbl_wiki_mailcue.' |
1861 | 1861 | WHERE |
@@ -1869,16 +1869,16 @@ discard block |
||
1869 | 1869 | ///make and send email |
1870 | 1870 | if ($allow_send_mail) { |
1871 | 1871 | while ($row = Database::fetch_array($result)) { |
1872 | - $userinfo = api_get_user_info($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue |
|
1872 | + $userinfo = api_get_user_info($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue |
|
1873 | 1873 | $name_to = $userinfo['complete_name']; |
1874 | 1874 | $email_to = $userinfo['email']; |
1875 | 1875 | $sender_name = api_get_setting('emailAdministrator'); |
1876 | 1876 | $sender_email = api_get_setting('emailAdministrator'); |
1877 | 1877 | $email_subject = get_lang('EmailWikiChanges').' - '.$_course['official_code']; |
1878 | 1878 | $email_body = get_lang('DearUser').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).',<br /><br />'; |
1879 | - if($session_id==0){ |
|
1879 | + if ($session_id == 0) { |
|
1880 | 1880 | $email_body .= $emailtext.' <strong>'.$_course['name'].' - '.$group_name.'</strong><br /><br /><br />'; |
1881 | - }else{ |
|
1881 | + } else { |
|
1882 | 1882 | $email_body .= $emailtext.' <strong>'.$_course['name'].' ('.api_get_session_name(api_get_session_id()).') - '.$group_name.'</strong><br /><br /><br />'; |
1883 | 1883 | } |
1884 | 1884 | $email_body .= $email_user_author.' ('.$email_date_changes.')<br /><br /><br />'; |
@@ -1956,25 +1956,25 @@ discard block |
||
1956 | 1956 | $template); |
1957 | 1957 | |
1958 | 1958 | if (0 != $groupId) { |
1959 | - $groupPart = '_group' . $groupId; // and add groupId to put the same document title in different groups |
|
1960 | - $group_properties = GroupManager :: get_group_properties($groupId); |
|
1959 | + $groupPart = '_group'.$groupId; // and add groupId to put the same document title in different groups |
|
1960 | + $group_properties = GroupManager :: get_group_properties($groupId); |
|
1961 | 1961 | $groupPath = $group_properties['directory']; |
1962 | 1962 | } else { |
1963 | 1963 | $groupPart = ''; |
1964 | - $groupPath =''; |
|
1964 | + $groupPath = ''; |
|
1965 | 1965 | } |
1966 | 1966 | |
1967 | - $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path(). '/document'.$groupPath; |
|
1968 | - $exportFile = api_replace_dangerous_char($wikiTitle) . $groupPart; |
|
1967 | + $exportDir = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/document'.$groupPath; |
|
1968 | + $exportFile = api_replace_dangerous_char($wikiTitle).$groupPart; |
|
1969 | 1969 | $wikiContents = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $wikiContents)); |
1970 | 1970 | //TODO: put link instead of title |
1971 | 1971 | |
1972 | 1972 | $wikiContents = str_replace('{CONTENT}', $wikiContents, $template); |
1973 | 1973 | |
1974 | 1974 | // replace relative path by absolute path for courses, so you can see items into this page wiki (images, mp3, etc..) exported in documents |
1975 | - if (api_strpos($wikiContents,'../../courses/') !== false) { |
|
1975 | + if (api_strpos($wikiContents, '../../courses/') !== false) { |
|
1976 | 1976 | $web_course_path = api_get_path(WEB_COURSE_PATH); |
1977 | - $wikiContents = str_replace('../../courses/',$web_course_path,$wikiContents); |
|
1977 | + $wikiContents = str_replace('../../courses/', $web_course_path, $wikiContents); |
|
1978 | 1978 | } |
1979 | 1979 | |
1980 | 1980 | $i = 1; |
@@ -1983,8 +1983,8 @@ discard block |
||
1983 | 1983 | $i++; |
1984 | 1984 | } |
1985 | 1985 | |
1986 | - $wikiFileName = $exportFile . '_' . $i . '.html'; |
|
1987 | - $exportPath = $exportDir . '/' . $wikiFileName; |
|
1986 | + $wikiFileName = $exportFile.'_'.$i.'.html'; |
|
1987 | + $exportPath = $exportDir.'/'.$wikiFileName; |
|
1988 | 1988 | |
1989 | 1989 | file_put_contents($exportPath, $wikiContents); |
1990 | 1990 | $doc_id = add_document( |
@@ -2029,14 +2029,14 @@ discard block |
||
2029 | 2029 | $content_pdf = api_html_entity_decode($data['content'], ENT_QUOTES, api_get_system_encoding()); |
2030 | 2030 | |
2031 | 2031 | //clean wiki links |
2032 | - $content_pdf=trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf)); |
|
2032 | + $content_pdf = trim(preg_replace("/\[[\[]?([^\]|]*)[|]?([^|\]]*)\][\]]?/", "$1", $content_pdf)); |
|
2033 | 2033 | //TODO: It should be better to display the link insted of the tile but it is hard for [[title]] links |
2034 | 2034 | |
2035 | 2035 | $title_pdf = api_html_entity_decode($data['title'], ENT_QUOTES, api_get_system_encoding()); |
2036 | 2036 | $title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding()); |
2037 | 2037 | $content_pdf = api_utf8_encode($content_pdf, api_get_system_encoding()); |
2038 | 2038 | |
2039 | - $html=' |
|
2039 | + $html = ' |
|
2040 | 2040 | <!-- defines the headers/footers - this must occur before the headers/footers are set --> |
2041 | 2041 | |
2042 | 2042 | <!--mpdf |
@@ -2091,9 +2091,9 @@ discard block |
||
2091 | 2091 | $session_id = $this->session_id; |
2092 | 2092 | $groupId = api_get_group_id(); |
2093 | 2093 | |
2094 | - if ($groupId==0) { |
|
2094 | + if ($groupId == 0) { |
|
2095 | 2095 | //extract course members |
2096 | - if(!empty($session_id)) { |
|
2096 | + if (!empty($session_id)) { |
|
2097 | 2097 | $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), $session_id); |
2098 | 2098 | } else { |
2099 | 2099 | $a_users_to_add = CourseManager::get_user_list_from_course_code(api_get_course_id(), 0); |
@@ -2119,7 +2119,7 @@ discard block |
||
2119 | 2119 | $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username'], ENT_QUOTES)); |
2120 | 2120 | $name = $userinfo['complete_name']." - ".$username; |
2121 | 2121 | |
2122 | - $photo = '<img src="' . $userinfo['avatar'] . '" alt="' . $name . '" width="40" height="50" align="top" title="' . $name . '" />'; |
|
2122 | + $photo = '<img src="'.$userinfo['avatar'].'" alt="'.$name.'" width="40" height="50" align="top" title="'.$name.'" />'; |
|
2123 | 2123 | |
2124 | 2124 | // teacher assignment title |
2125 | 2125 | $title_orig = $values['title']; |
@@ -2147,24 +2147,24 @@ discard block |
||
2147 | 2147 | $userPicture = UserManager::getUserPicture($assig_user_id); |
2148 | 2148 | $username = api_htmlentities(sprintf(get_lang('LoginX'), $o_user_to_add['username'], ENT_QUOTES)); |
2149 | 2149 | $name = api_get_person_name($o_user_to_add['firstname'], $o_user_to_add['lastname'])." . ".$username; |
2150 | - $photo= '<img src="'.$userPicture.'" alt="'.$name.'" width="40" height="50" align="bottom" title="'.$name.'" />'; |
|
2150 | + $photo = '<img src="'.$userPicture.'" alt="'.$name.'" width="40" height="50" align="bottom" title="'.$name.'" />'; |
|
2151 | 2151 | |
2152 | 2152 | $is_tutor_of_group = GroupManager::is_tutor_of_group($assig_user_id, $groupId); //student is tutor |
2153 | 2153 | $is_tutor_and_member = GroupManager::is_tutor_of_group($assig_user_id, $groupId) && GroupManager::is_subscribed($assig_user_id, $groupId); |
2154 | 2154 | // student is tutor and member |
2155 | 2155 | |
2156 | 2156 | if ($is_tutor_and_member) { |
2157 | - $status_in_group=get_lang('GroupTutorAndMember'); |
|
2157 | + $status_in_group = get_lang('GroupTutorAndMember'); |
|
2158 | 2158 | } else { |
2159 | - if($is_tutor_of_group) { |
|
2160 | - $status_in_group=get_lang('GroupTutor'); |
|
2159 | + if ($is_tutor_of_group) { |
|
2160 | + $status_in_group = get_lang('GroupTutor'); |
|
2161 | 2161 | } else { |
2162 | - $status_in_group=" "; //get_lang('GroupStandardMember') |
|
2162 | + $status_in_group = " "; //get_lang('GroupStandardMember') |
|
2163 | 2163 | } |
2164 | 2164 | } |
2165 | 2165 | |
2166 | - if ($assignment_type==1) { |
|
2167 | - $values['title']= $title_orig; |
|
2166 | + if ($assignment_type == 1) { |
|
2167 | + $values['title'] = $title_orig; |
|
2168 | 2168 | $values['content'] = '<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6"> |
2169 | 2169 | <table border="0"> |
2170 | 2170 | <tr><td style="font-size:24px">'.get_lang('AssignmentWork').'</td></tr> |
@@ -2180,7 +2180,7 @@ discard block |
||
2180 | 2180 | ). |
2181 | 2181 | ' [['.$_POST['title']."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'</li>'; |
2182 | 2182 | //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name) |
2183 | - $values['assignment']=2; |
|
2183 | + $values['assignment'] = 2; |
|
2184 | 2184 | } |
2185 | 2185 | $this->assig_user_id = $assig_user_id; |
2186 | 2186 | self::save_new_wiki($values); |
@@ -2189,12 +2189,12 @@ discard block |
||
2189 | 2189 | |
2190 | 2190 | foreach ($a_users_to_add as $o_user_to_add) { |
2191 | 2191 | if ($o_user_to_add['user_id'] == $userId) { |
2192 | - $assig_user_id=$o_user_to_add['user_id']; |
|
2192 | + $assig_user_id = $o_user_to_add['user_id']; |
|
2193 | 2193 | if ($assignment_type == 1) { |
2194 | - $values['title']= $title_orig; |
|
2195 | - $values['comment']=get_lang('AssignmentDesc'); |
|
2194 | + $values['title'] = $title_orig; |
|
2195 | + $values['comment'] = get_lang('AssignmentDesc'); |
|
2196 | 2196 | sort($all_students_pages); |
2197 | - $values['content']=$content_orig_A.$content_orig_B.'<br/> |
|
2197 | + $values['content'] = $content_orig_A.$content_orig_B.'<br/> |
|
2198 | 2198 | <div align="center" style="font-size:18px; background-color: #F5F8FB; border:solid; border-color:#E6E6E6"> |
2199 | 2199 | '.get_lang('AssignmentLinkstoStudentsPage').' |
2200 | 2200 | </div><br/> |
@@ -2202,7 +2202,7 @@ discard block |
||
2202 | 2202 | <ol>'.implode($all_students_pages).'</ol> |
2203 | 2203 | </div> |
2204 | 2204 | <br/>'; |
2205 | - $values['assignment']=1; |
|
2205 | + $values['assignment'] = 1; |
|
2206 | 2206 | } |
2207 | 2207 | $this->assig_user_id = $assig_user_id; |
2208 | 2208 | self::save_new_wiki($values); |
@@ -2216,7 +2216,7 @@ discard block |
||
2216 | 2216 | * @param int Whether to search the contents (1) or just the titles (0) |
2217 | 2217 | * @param int |
2218 | 2218 | */ |
2219 | - public function display_wiki_search_results($search_term, $search_content=0, $all_vers=0) |
|
2219 | + public function display_wiki_search_results($search_term, $search_content = 0, $all_vers = 0) |
|
2220 | 2220 | { |
2221 | 2221 | $tbl_wiki = $this->tbl_wiki; |
2222 | 2222 | $condition_session = $this->condition_session; |
@@ -2228,9 +2228,9 @@ discard block |
||
2228 | 2228 | echo '</legend>'; |
2229 | 2229 | |
2230 | 2230 | //only by professors when page is hidden |
2231 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
2232 | - if ($all_vers=='1') { |
|
2233 | - if ($search_content=='1') { |
|
2231 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
2232 | + if ($all_vers == '1') { |
|
2233 | + if ($search_content == '1') { |
|
2234 | 2234 | $sql = "SELECT * FROM ".$tbl_wiki." |
2235 | 2235 | WHERE |
2236 | 2236 | c_id = $course_id AND |
@@ -2247,7 +2247,7 @@ discard block |
||
2247 | 2247 | //search all pages and all versions |
2248 | 2248 | } |
2249 | 2249 | } else { |
2250 | - if ($search_content=='1') { |
|
2250 | + if ($search_content == '1') { |
|
2251 | 2251 | $sql = "SELECT * FROM ".$tbl_wiki." s1 |
2252 | 2252 | WHERE |
2253 | 2253 | s1.c_id = $course_id AND |
@@ -2298,7 +2298,7 @@ discard block |
||
2298 | 2298 | //search all pages and all versions |
2299 | 2299 | } |
2300 | 2300 | } else { |
2301 | - if($search_content=='1') { |
|
2301 | + if ($search_content == '1') { |
|
2302 | 2302 | $sql = "SELECT * FROM ".$tbl_wiki." s1 |
2303 | 2303 | WHERE |
2304 | 2304 | s1.c_id = $course_id AND |
@@ -2346,17 +2346,17 @@ discard block |
||
2346 | 2346 | $seconds = substr($obj->dtime, 17, 2); |
2347 | 2347 | |
2348 | 2348 | //get type assignment icon |
2349 | - if($obj->assignment==1) { |
|
2350 | - $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); |
|
2351 | - } elseif ($obj->assignment==2) { |
|
2352 | - $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
2353 | - } elseif ($obj->assignment==0) { |
|
2349 | + if ($obj->assignment == 1) { |
|
2350 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL); |
|
2351 | + } elseif ($obj->assignment == 2) { |
|
2352 | + $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
2353 | + } elseif ($obj->assignment == 0) { |
|
2354 | 2354 | $ShowAssignment = Display::return_icon('px_transparent.gif'); |
2355 | 2355 | } |
2356 | 2356 | $row = array(); |
2357 | 2357 | $row[] = $ShowAssignment; |
2358 | 2358 | |
2359 | - if($all_vers=='1') { |
|
2359 | + if ($all_vers == '1') { |
|
2360 | 2360 | $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&view='.$obj->id.'&session_id='.api_htmlentities(urlencode($_GET['$session_id'])).'&group_id='.api_htmlentities(urlencode($_GET['group_id'])).'">'. |
2361 | 2361 | api_htmlentities($obj->title).'</a>'; |
2362 | 2362 | } else { |
@@ -2367,21 +2367,21 @@ discard block |
||
2367 | 2367 | $row[] = $obj->user_id != 0 ? UserManager::getUserProfileLink($userinfo) : get_lang('Anonymous').' ('.$obj->user_ip.')'; |
2368 | 2368 | $row[] = $year.'-'.$month.'-'.$day.' '.$hours.":".$minutes.":".$seconds; |
2369 | 2369 | |
2370 | - if ($all_vers=='1') { |
|
2370 | + if ($all_vers == '1') { |
|
2371 | 2371 | $row[] = $obj->version; |
2372 | 2372 | } else { |
2373 | 2373 | $showdelete = ''; |
2374 | - if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) { |
|
2375 | - $showdelete=' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
2376 | - Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL); |
|
2374 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
2375 | + $showdelete = ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
2376 | + Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL); |
|
2377 | 2377 | } |
2378 | 2378 | $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
2379 | - Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a> |
|
2379 | + Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a> |
|
2380 | 2380 | <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
2381 | - Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a> |
|
2381 | + Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a> |
|
2382 | 2382 | <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
2383 | - Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
2384 | - Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete; |
|
2383 | + Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
2384 | + Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete; |
|
2385 | 2385 | } |
2386 | 2386 | $rows[] = $row; |
2387 | 2387 | } |
@@ -2406,16 +2406,16 @@ discard block |
||
2406 | 2406 | 'all_vers' => $all_vers, |
2407 | 2407 | ) |
2408 | 2408 | ); |
2409 | - $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;')); |
|
2410 | - $table->set_header(1,get_lang('Title'), true); |
|
2409 | + $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;')); |
|
2410 | + $table->set_header(1, get_lang('Title'), true); |
|
2411 | 2411 | if ($all_vers == '1') { |
2412 | - $table->set_header(2,get_lang('Author'), true); |
|
2413 | - $table->set_header(3,get_lang('Date'), true); |
|
2414 | - $table->set_header(4,get_lang('Version'), true); |
|
2412 | + $table->set_header(2, get_lang('Author'), true); |
|
2413 | + $table->set_header(3, get_lang('Date'), true); |
|
2414 | + $table->set_header(4, get_lang('Version'), true); |
|
2415 | 2415 | } else { |
2416 | - $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true); |
|
2417 | - $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true); |
|
2418 | - $table->set_header(4,get_lang('Actions'), false, array ('style' => 'width:130px;')); |
|
2416 | + $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true); |
|
2417 | + $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true); |
|
2418 | + $table->set_header(4, get_lang('Actions'), false, array('style' => 'width:130px;')); |
|
2419 | 2419 | } |
2420 | 2420 | $table->display(); |
2421 | 2421 | } else { |
@@ -2428,14 +2428,14 @@ discard block |
||
2428 | 2428 | * @todo replace this function with the formvalidator datepicker |
2429 | 2429 | * |
2430 | 2430 | */ |
2431 | - public function draw_date_picker($prefix,$default='') |
|
2431 | + public function draw_date_picker($prefix, $default = '') |
|
2432 | 2432 | { |
2433 | 2433 | if (empty($default)) { |
2434 | 2434 | $default = date('Y-m-d H:i:s'); |
2435 | 2435 | } |
2436 | 2436 | $parts = explode(' ', $default); |
2437 | - list($d_year,$d_month,$d_day) = explode('-',$parts[0]); |
|
2438 | - list($d_hour,$d_minute) = explode(':',$parts[1]); |
|
2437 | + list($d_year, $d_month, $d_day) = explode('-', $parts[0]); |
|
2438 | + list($d_hour, $d_minute) = explode(':', $parts[1]); |
|
2439 | 2439 | |
2440 | 2440 | $month_list = array( |
2441 | 2441 | 1 => get_lang('JanuaryLong'), |
@@ -2452,9 +2452,9 @@ discard block |
||
2452 | 2452 | 12 => get_lang('DecemberLong'), |
2453 | 2453 | ); |
2454 | 2454 | |
2455 | - $minute = range(10,59); |
|
2456 | - array_unshift($minute,'00','01','02','03','04','05','06','07','08','09'); |
|
2457 | - $date_form = self::make_select($prefix.'_day', array_combine(range(1,31),range(1,31)), $d_day); |
|
2455 | + $minute = range(10, 59); |
|
2456 | + array_unshift($minute, '00', '01', '02', '03', '04', '05', '06', '07', '08', '09'); |
|
2457 | + $date_form = self::make_select($prefix.'_day', array_combine(range(1, 31), range(1, 31)), $d_day); |
|
2458 | 2458 | $date_form .= self::make_select($prefix.'_month', $month_list, $d_month); |
2459 | 2459 | $date_form .= self::make_select( |
2460 | 2460 | $prefix.'_year', |
@@ -2467,7 +2467,7 @@ discard block |
||
2467 | 2467 | ), |
2468 | 2468 | $d_year |
2469 | 2469 | ).' '; |
2470 | - $date_form .= self::make_select($prefix.'_hour', array_combine(range(0,23),range(0,23)), $d_hour).' : '; |
|
2470 | + $date_form .= self::make_select($prefix.'_hour', array_combine(range(0, 23), range(0, 23)), $d_hour).' : '; |
|
2471 | 2471 | $date_form .= self::make_select($prefix.'_minute', $minute, $d_minute); |
2472 | 2472 | |
2473 | 2473 | return $date_form; |
@@ -2477,11 +2477,11 @@ discard block |
||
2477 | 2477 | * Draws an HTML form select with the given options |
2478 | 2478 | * |
2479 | 2479 | */ |
2480 | - public function make_select($name,$values,$checked='') |
|
2480 | + public function make_select($name, $values, $checked = '') |
|
2481 | 2481 | { |
2482 | 2482 | $output = '<select name="'.$name.'" id="'.$name.'">'; |
2483 | - foreach($values as $key => $value) { |
|
2484 | - $output .= '<option value="'.$key.'" '.(($checked==$key)?'selected="selected"':'').'>'.$value.'</option>'; |
|
2483 | + foreach ($values as $key => $value) { |
|
2484 | + $output .= '<option value="'.$key.'" '.(($checked == $key) ? 'selected="selected"' : '').'>'.$value.'</option>'; |
|
2485 | 2485 | } |
2486 | 2486 | $output .= '</select>'; |
2487 | 2487 | return $output; |
@@ -2505,7 +2505,7 @@ discard block |
||
2505 | 2505 | */ |
2506 | 2506 | public function two_digits($number) |
2507 | 2507 | { |
2508 | - $number = (int)$number; |
|
2508 | + $number = (int) $number; |
|
2509 | 2509 | return ($number < 10) ? '0'.$number : $number; |
2510 | 2510 | } |
2511 | 2511 | |
@@ -2523,7 +2523,7 @@ discard block |
||
2523 | 2523 | WHERE c_id = '.$course_id.' AND id = '.$id.' '; |
2524 | 2524 | $result = Database::query($sql); |
2525 | 2525 | $data = array(); |
2526 | - while ($row=Database::fetch_array($result,'ASSOC')) { |
|
2526 | + while ($row = Database::fetch_array($result, 'ASSOC')) { |
|
2527 | 2527 | $data = $row; |
2528 | 2528 | } |
2529 | 2529 | return $data; |
@@ -2577,7 +2577,7 @@ discard block |
||
2577 | 2577 | $result = Database::query($sql); |
2578 | 2578 | $data = array(); |
2579 | 2579 | if (Database::num_rows($result)) { |
2580 | - $data = Database::fetch_array($result,'ASSOC'); |
|
2580 | + $data = Database::fetch_array($result, 'ASSOC'); |
|
2581 | 2581 | } |
2582 | 2582 | |
2583 | 2583 | return $data; |
@@ -2671,9 +2671,9 @@ discard block |
||
2671 | 2671 | $result = self::getAllWiki(); |
2672 | 2672 | if (!empty($result)) { |
2673 | 2673 | foreach ($result as $is_editing_block) { |
2674 | - $max_edit_time = 1200; // 20 minutes |
|
2675 | - $timestamp_edit = strtotime($is_editing_block['time_edit']); |
|
2676 | - $time_editing = time()-$timestamp_edit; |
|
2674 | + $max_edit_time = 1200; // 20 minutes |
|
2675 | + $timestamp_edit = strtotime($is_editing_block['time_edit']); |
|
2676 | + $time_editing = time() - $timestamp_edit; |
|
2677 | 2677 | |
2678 | 2678 | // First prevent concurrent users and double version |
2679 | 2679 | if ($is_editing_block['is_editing'] == $userId) { |
@@ -2682,7 +2682,7 @@ discard block |
||
2682 | 2682 | unset($_SESSION['_version']); |
2683 | 2683 | } |
2684 | 2684 | // Second checks if has exceeded the time that a page may be available or if a page was edited and saved by its author |
2685 | - if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action!='edit')) { |
|
2685 | + if ($time_editing > $max_edit_time || ($is_editing_block['is_editing'] == $userId && $action != 'edit')) { |
|
2686 | 2686 | self::updateWikiIsEditing($is_editing_block['is_editing']); |
2687 | 2687 | } |
2688 | 2688 | } |
@@ -2730,7 +2730,7 @@ discard block |
||
2730 | 2730 | FROM ".$tbl_wiki." |
2731 | 2731 | WHERE c_id = $course_id AND ".$groupfilter.$condition_session.""; |
2732 | 2732 | |
2733 | - $allpages=Database::query($sql); |
|
2733 | + $allpages = Database::query($sql); |
|
2734 | 2734 | while ($row = Database::fetch_array($allpages)) { |
2735 | 2735 | $total_versions = $row['TOTAL_VERS']; |
2736 | 2736 | $total_visits = intval($row['TOTAL_VISITS']); |
@@ -2740,30 +2740,30 @@ discard block |
||
2740 | 2740 | WHERE c_id = $course_id AND ".$groupfilter.$condition_session.""; |
2741 | 2741 | $allpages = Database::query($sql); |
2742 | 2742 | |
2743 | - while ($row=Database::fetch_array($allpages)) { |
|
2743 | + while ($row = Database::fetch_array($allpages)) { |
|
2744 | 2744 | $total_words = $total_words + self::word_count($row['content']); |
2745 | - $total_links = $total_links+substr_count($row['content'], "href="); |
|
2746 | - $total_links_anchors = $total_links_anchors+substr_count($row['content'], 'href="#'); |
|
2747 | - $total_links_mail = $total_links_mail+substr_count($row['content'], 'href="mailto'); |
|
2748 | - $total_links_ftp = $total_links_ftp+substr_count($row['content'], 'href="ftp'); |
|
2749 | - $total_links_irc = $total_links_irc+substr_count($row['content'], 'href="irc'); |
|
2750 | - $total_links_news = $total_links_news+substr_count($row['content'], 'href="news'); |
|
2751 | - $total_wlinks = $total_wlinks+substr_count($row['content'], "[["); |
|
2752 | - $total_images = $total_images+substr_count($row['content'], "<img"); |
|
2745 | + $total_links = $total_links + substr_count($row['content'], "href="); |
|
2746 | + $total_links_anchors = $total_links_anchors + substr_count($row['content'], 'href="#'); |
|
2747 | + $total_links_mail = $total_links_mail + substr_count($row['content'], 'href="mailto'); |
|
2748 | + $total_links_ftp = $total_links_ftp + substr_count($row['content'], 'href="ftp'); |
|
2749 | + $total_links_irc = $total_links_irc + substr_count($row['content'], 'href="irc'); |
|
2750 | + $total_links_news = $total_links_news + substr_count($row['content'], 'href="news'); |
|
2751 | + $total_wlinks = $total_wlinks + substr_count($row['content'], "[["); |
|
2752 | + $total_images = $total_images + substr_count($row['content'], "<img"); |
|
2753 | 2753 | $clean_total_flash = preg_replace('/player.swf/', ' ', $row['content']); |
2754 | - $total_flash = $total_flash+substr_count($clean_total_flash, '.swf"'); |
|
2754 | + $total_flash = $total_flash + substr_count($clean_total_flash, '.swf"'); |
|
2755 | 2755 | //.swf" end quotes prevent insert swf through flvplayer (is not counted) |
2756 | - $total_mp3 = $total_mp3+substr_count($row['content'], ".mp3"); |
|
2757 | - $total_flv_p = $total_flv_p+substr_count($row['content'], ".flv"); |
|
2758 | - $total_flv = $total_flv_p/5; |
|
2759 | - $total_youtube = $total_youtube+substr_count($row['content'], "http://www.youtube.com"); |
|
2760 | - $total_multimedia = $total_multimedia+substr_count($row['content'], "video/x-msvideo"); |
|
2761 | - $total_tables = $total_tables+substr_count($row['content'], "<table"); |
|
2756 | + $total_mp3 = $total_mp3 + substr_count($row['content'], ".mp3"); |
|
2757 | + $total_flv_p = $total_flv_p + substr_count($row['content'], ".flv"); |
|
2758 | + $total_flv = $total_flv_p / 5; |
|
2759 | + $total_youtube = $total_youtube + substr_count($row['content'], "http://www.youtube.com"); |
|
2760 | + $total_multimedia = $total_multimedia + substr_count($row['content'], "video/x-msvideo"); |
|
2761 | + $total_tables = $total_tables + substr_count($row['content'], "<table"); |
|
2762 | 2762 | } |
2763 | 2763 | |
2764 | 2764 | //check only last version of all pages (current page) |
2765 | 2765 | |
2766 | - $sql =' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV |
|
2766 | + $sql = ' SELECT *, COUNT(*) AS TOTAL_PAGES, SUM(hits) AS TOTAL_VISITS_LV |
|
2767 | 2767 | FROM '.$tbl_wiki.' s1 |
2768 | 2768 | WHERE s1.c_id = '.$course_id.' AND id=( |
2769 | 2769 | SELECT MAX(s2.id) |
@@ -2774,9 +2774,9 @@ discard block |
||
2774 | 2774 | '.$groupfilter.' AND |
2775 | 2775 | session_id='.$session_id.')'; |
2776 | 2776 | $allpages = Database::query($sql); |
2777 | - while ($row=Database::fetch_array($allpages)) { |
|
2778 | - $total_pages = $row['TOTAL_PAGES']; |
|
2779 | - $total_visits_lv = intval($row['TOTAL_VISITS_LV']); |
|
2777 | + while ($row = Database::fetch_array($allpages)) { |
|
2778 | + $total_pages = $row['TOTAL_PAGES']; |
|
2779 | + $total_visits_lv = intval($row['TOTAL_VISITS_LV']); |
|
2780 | 2780 | } |
2781 | 2781 | |
2782 | 2782 | $total_words_lv = 0; |
@@ -2808,29 +2808,29 @@ discard block |
||
2808 | 2808 | )'; |
2809 | 2809 | $allpages = Database::query($sql); |
2810 | 2810 | |
2811 | - while ($row=Database::fetch_array($allpages)) { |
|
2812 | - $total_words_lv = $total_words_lv+ self::word_count($row['content']); |
|
2813 | - $total_links_lv = $total_links_lv+substr_count($row['content'], "href="); |
|
2814 | - $total_links_anchors_lv = $total_links_anchors_lv+substr_count($row['content'], 'href="#'); |
|
2815 | - $total_links_mail_lv = $total_links_mail_lv+substr_count($row['content'], 'href="mailto'); |
|
2816 | - $total_links_ftp_lv = $total_links_ftp_lv+substr_count($row['content'], 'href="ftp'); |
|
2817 | - $total_links_irc_lv = $total_links_irc_lv+substr_count($row['content'], 'href="irc'); |
|
2818 | - $total_links_news_lv = $total_links_news_lv+substr_count($row['content'], 'href="news'); |
|
2819 | - $total_wlinks_lv = $total_wlinks_lv+substr_count($row['content'], "[["); |
|
2820 | - $total_images_lv = $total_images_lv+substr_count($row['content'], "<img"); |
|
2811 | + while ($row = Database::fetch_array($allpages)) { |
|
2812 | + $total_words_lv = $total_words_lv + self::word_count($row['content']); |
|
2813 | + $total_links_lv = $total_links_lv + substr_count($row['content'], "href="); |
|
2814 | + $total_links_anchors_lv = $total_links_anchors_lv + substr_count($row['content'], 'href="#'); |
|
2815 | + $total_links_mail_lv = $total_links_mail_lv + substr_count($row['content'], 'href="mailto'); |
|
2816 | + $total_links_ftp_lv = $total_links_ftp_lv + substr_count($row['content'], 'href="ftp'); |
|
2817 | + $total_links_irc_lv = $total_links_irc_lv + substr_count($row['content'], 'href="irc'); |
|
2818 | + $total_links_news_lv = $total_links_news_lv + substr_count($row['content'], 'href="news'); |
|
2819 | + $total_wlinks_lv = $total_wlinks_lv + substr_count($row['content'], "[["); |
|
2820 | + $total_images_lv = $total_images_lv + substr_count($row['content'], "<img"); |
|
2821 | 2821 | $clean_total_flash_lv = preg_replace('/player.swf/', ' ', $row['content']); |
2822 | - $total_flash_lv = $total_flash_lv+substr_count($clean_total_flash_lv, '.swf"'); |
|
2822 | + $total_flash_lv = $total_flash_lv + substr_count($clean_total_flash_lv, '.swf"'); |
|
2823 | 2823 | //.swf" end quotes prevent insert swf through flvplayer (is not counted) |
2824 | - $total_mp3_lv = $total_mp3_lv+substr_count($row['content'], ".mp3"); |
|
2825 | - $total_flv_p_lv = $total_flv_p_lv+substr_count($row['content'], ".flv"); |
|
2826 | - $total_flv_lv = $total_flv_p_lv/5; |
|
2827 | - $total_youtube_lv = $total_youtube_lv+substr_count($row['content'], "http://www.youtube.com"); |
|
2828 | - $total_multimedia_lv = $total_multimedia_lv+substr_count($row['content'], "video/x-msvideo"); |
|
2829 | - $total_tables_lv = $total_tables_lv+substr_count($row['content'], "<table"); |
|
2824 | + $total_mp3_lv = $total_mp3_lv + substr_count($row['content'], ".mp3"); |
|
2825 | + $total_flv_p_lv = $total_flv_p_lv + substr_count($row['content'], ".flv"); |
|
2826 | + $total_flv_lv = $total_flv_p_lv / 5; |
|
2827 | + $total_youtube_lv = $total_youtube_lv + substr_count($row['content'], "http://www.youtube.com"); |
|
2828 | + $total_multimedia_lv = $total_multimedia_lv + substr_count($row['content'], "video/x-msvideo"); |
|
2829 | + $total_tables_lv = $total_tables_lv + substr_count($row['content'], "<table"); |
|
2830 | 2830 | } |
2831 | 2831 | |
2832 | 2832 | //Total pages edited at this time |
2833 | - $total_editing_now=0; |
|
2833 | + $total_editing_now = 0; |
|
2834 | 2834 | $sql = 'SELECT *, COUNT(*) AS TOTAL_EDITING_NOW |
2835 | 2835 | FROM '.$tbl_wiki.' s1 |
2836 | 2836 | WHERE is_editing!=0 AND s1.c_id = '.$course_id.' AND |
@@ -2845,66 +2845,66 @@ discard block |
||
2845 | 2845 | )'; |
2846 | 2846 | |
2847 | 2847 | // Can not use group by because the mark is set in the latest version |
2848 | - $allpages=Database::query($sql); |
|
2849 | - while ($row=Database::fetch_array($allpages)) { |
|
2850 | - $total_editing_now = $row['TOTAL_EDITING_NOW']; |
|
2848 | + $allpages = Database::query($sql); |
|
2849 | + while ($row = Database::fetch_array($allpages)) { |
|
2850 | + $total_editing_now = $row['TOTAL_EDITING_NOW']; |
|
2851 | 2851 | } |
2852 | 2852 | |
2853 | 2853 | // Total hidden pages |
2854 | - $total_hidden=0; |
|
2854 | + $total_hidden = 0; |
|
2855 | 2855 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
2856 | 2856 | WHERE c_id = '.$course_id.' AND visibility=0 AND '.$groupfilter.$condition_session.' |
2857 | 2857 | GROUP BY reflink'; |
2858 | 2858 | // or group by page_id. As the mark of hidden places it in all versions of the page, I can use group by to see the first |
2859 | - $allpages=Database::query($sql); |
|
2860 | - while ($row=Database::fetch_array($allpages)) { |
|
2861 | - $total_hidden = $total_hidden+1; |
|
2859 | + $allpages = Database::query($sql); |
|
2860 | + while ($row = Database::fetch_array($allpages)) { |
|
2861 | + $total_hidden = $total_hidden + 1; |
|
2862 | 2862 | } |
2863 | 2863 | |
2864 | 2864 | //Total protect pages |
2865 | - $total_protected=0; |
|
2865 | + $total_protected = 0; |
|
2866 | 2866 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
2867 | 2867 | WHERE c_id = '.$course_id.' AND editlock=1 AND '.$groupfilter.$condition_session.' |
2868 | 2868 | GROUP BY reflink'; |
2869 | 2869 | // or group by page_id. As the mark of protected page is the first version of the page, I can use group by |
2870 | 2870 | |
2871 | - $allpages=Database::query($sql); |
|
2872 | - while ($row=Database::fetch_array($allpages)) { |
|
2873 | - $total_protected = $total_protected+1; |
|
2871 | + $allpages = Database::query($sql); |
|
2872 | + while ($row = Database::fetch_array($allpages)) { |
|
2873 | + $total_protected = $total_protected + 1; |
|
2874 | 2874 | } |
2875 | 2875 | |
2876 | 2876 | // Total empty versions. |
2877 | - $total_empty_content=0; |
|
2877 | + $total_empty_content = 0; |
|
2878 | 2878 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
2879 | 2879 | WHERE |
2880 | 2880 | c_id = '.$course_id.' AND |
2881 | 2881 | content="" AND |
2882 | 2882 | '.$groupfilter.$condition_session.''; |
2883 | 2883 | $allpages = Database::query($sql); |
2884 | - while ($row=Database::fetch_array($allpages)) { |
|
2885 | - $total_empty_content = $total_empty_content+1; |
|
2884 | + while ($row = Database::fetch_array($allpages)) { |
|
2885 | + $total_empty_content = $total_empty_content + 1; |
|
2886 | 2886 | } |
2887 | 2887 | |
2888 | 2888 | //Total empty pages (last version) |
2889 | 2889 | |
2890 | - $total_empty_content_lv=0; |
|
2890 | + $total_empty_content_lv = 0; |
|
2891 | 2891 | $sql = 'SELECT * FROM '.$tbl_wiki.' s1 |
2892 | 2892 | WHERE s1.c_id = '.$course_id.' AND content="" AND id=( |
2893 | 2893 | SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 |
2894 | 2894 | WHERE s1.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')'; |
2895 | - $allpages=Database::query($sql); |
|
2895 | + $allpages = Database::query($sql); |
|
2896 | 2896 | while ($row = Database::fetch_array($allpages)) { |
2897 | - $total_empty_content_lv = $total_empty_content_lv+1; |
|
2897 | + $total_empty_content_lv = $total_empty_content_lv + 1; |
|
2898 | 2898 | } |
2899 | 2899 | |
2900 | 2900 | // Total locked discuss pages |
2901 | - $total_lock_disc=0; |
|
2901 | + $total_lock_disc = 0; |
|
2902 | 2902 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
2903 | 2903 | WHERE c_id = '.$course_id.' AND addlock_disc=0 AND '.$groupfilter.$condition_session.' |
2904 | 2904 | GROUP BY reflink';//group by because mark lock in all vers, then always is ok |
2905 | - $allpages=Database::query($sql); |
|
2905 | + $allpages = Database::query($sql); |
|
2906 | 2906 | while ($row = Database::fetch_array($allpages)) { |
2907 | - $total_lock_disc = $total_lock_disc+1; |
|
2907 | + $total_lock_disc = $total_lock_disc + 1; |
|
2908 | 2908 | } |
2909 | 2909 | |
2910 | 2910 | // Total hidden discuss pages. |
@@ -2915,7 +2915,7 @@ discard block |
||
2915 | 2915 | //group by because mark lock in all vers, then always is ok |
2916 | 2916 | $allpages = Database::query($sql); |
2917 | 2917 | while ($row = Database::fetch_array($allpages)) { |
2918 | - $total_hidden_disc = $total_hidden_disc+1; |
|
2918 | + $total_hidden_disc = $total_hidden_disc + 1; |
|
2919 | 2919 | } |
2920 | 2920 | |
2921 | 2921 | //Total versions with any short comment by user or system |
@@ -2923,44 +2923,44 @@ discard block |
||
2923 | 2923 | $total_comment_version = 0; |
2924 | 2924 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
2925 | 2925 | WHERE c_id = '.$course_id.' AND comment!="" AND '.$groupfilter.$condition_session.''; |
2926 | - $allpages=Database::query($sql); |
|
2926 | + $allpages = Database::query($sql); |
|
2927 | 2927 | while ($row = Database::fetch_array($allpages)) { |
2928 | - $total_comment_version = $total_comment_version+1; |
|
2928 | + $total_comment_version = $total_comment_version + 1; |
|
2929 | 2929 | } |
2930 | 2930 | |
2931 | 2931 | // Total pages that can only be scored by teachers. |
2932 | 2932 | |
2933 | - $total_only_teachers_rating=0; |
|
2933 | + $total_only_teachers_rating = 0; |
|
2934 | 2934 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
2935 | 2935 | WHERE c_id = '.$course_id.' AND |
2936 | 2936 | ratinglock_disc = 0 AND |
2937 | 2937 | '.$groupfilter.$condition_session.' |
2938 | 2938 | GROUP BY reflink';//group by because mark lock in all vers, then always is ok |
2939 | - $allpages=Database::query($sql); |
|
2940 | - while ($row=Database::fetch_array($allpages)) { |
|
2941 | - $total_only_teachers_rating = $total_only_teachers_rating+1; |
|
2939 | + $allpages = Database::query($sql); |
|
2940 | + while ($row = Database::fetch_array($allpages)) { |
|
2941 | + $total_only_teachers_rating = $total_only_teachers_rating + 1; |
|
2942 | 2942 | } |
2943 | 2943 | |
2944 | 2944 | // Total pages scored by peers |
2945 | 2945 | // put always this line alfter check num all pages and num pages rated by teachers |
2946 | - $total_rating_by_peers=$total_pages-$total_only_teachers_rating; |
|
2946 | + $total_rating_by_peers = $total_pages - $total_only_teachers_rating; |
|
2947 | 2947 | |
2948 | 2948 | //Total pages identified as standard task |
2949 | 2949 | |
2950 | - $total_task=0; |
|
2951 | - $sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' |
|
2950 | + $total_task = 0; |
|
2951 | + $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' |
|
2952 | 2952 | WHERE '.$tbl_wiki_conf.'.c_id = '.$course_id.' AND |
2953 | 2953 | '.$tbl_wiki_conf.'.task!="" AND |
2954 | 2954 | '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND |
2955 | 2955 | '.$tbl_wiki.'.'.$groupfilter.$condition_session; |
2956 | 2956 | $allpages = Database::query($sql); |
2957 | - while ($row=Database::fetch_array($allpages)) { |
|
2958 | - $total_task=$total_task+1; |
|
2957 | + while ($row = Database::fetch_array($allpages)) { |
|
2958 | + $total_task = $total_task + 1; |
|
2959 | 2959 | } |
2960 | 2960 | |
2961 | 2961 | //Total pages identified as teacher page (wiki portfolio mode - individual assignment) |
2962 | 2962 | |
2963 | - $total_teacher_assignment=0; |
|
2963 | + $total_teacher_assignment = 0; |
|
2964 | 2964 | $sql = 'SELECT * FROM '.$tbl_wiki.' s1 |
2965 | 2965 | WHERE s1.c_id = '.$course_id.' AND assignment=1 AND id=( |
2966 | 2966 | SELECT MAX(s2.id) |
@@ -2970,20 +2970,20 @@ discard block |
||
2970 | 2970 | //mark all versions, but do not use group by reflink because y want the pages not versions |
2971 | 2971 | $allpages = Database::query($sql); |
2972 | 2972 | while ($row = Database::fetch_array($allpages)) { |
2973 | - $total_teacher_assignment=$total_teacher_assignment+1; |
|
2973 | + $total_teacher_assignment = $total_teacher_assignment + 1; |
|
2974 | 2974 | } |
2975 | 2975 | |
2976 | 2976 | //Total pages identifies as student page (wiki portfolio mode - individual assignment) |
2977 | 2977 | |
2978 | - $total_student_assignment=0; |
|
2978 | + $total_student_assignment = 0; |
|
2979 | 2979 | $sql = 'SELECT * FROM '.$tbl_wiki.' s1 |
2980 | 2980 | WHERE s1.c_id = '.$course_id.' AND assignment=2 AND |
2981 | 2981 | id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 |
2982 | 2982 | WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')'; |
2983 | 2983 | //mark all versions, but do not use group by reflink because y want the pages not versions |
2984 | - $allpages=Database::query($sql); |
|
2985 | - while ($row=Database::fetch_array($allpages)) { |
|
2986 | - $total_student_assignment = $total_student_assignment+1; |
|
2984 | + $allpages = Database::query($sql); |
|
2985 | + while ($row = Database::fetch_array($allpages)) { |
|
2986 | + $total_student_assignment = $total_student_assignment + 1; |
|
2987 | 2987 | } |
2988 | 2988 | |
2989 | 2989 | //Current Wiki status add new pages |
@@ -2992,36 +2992,36 @@ discard block |
||
2992 | 2992 | GROUP BY addlock';//group by because mark 0 in all vers, then always is ok |
2993 | 2993 | $allpages = Database::query($sql); |
2994 | 2994 | $wiki_add_lock = null; |
2995 | - while ($row=Database::fetch_array($allpages)) { |
|
2996 | - $wiki_add_lock=$row['addlock']; |
|
2995 | + while ($row = Database::fetch_array($allpages)) { |
|
2996 | + $wiki_add_lock = $row['addlock']; |
|
2997 | 2997 | } |
2998 | 2998 | |
2999 | - if ($wiki_add_lock==1) { |
|
3000 | - $status_add_new_pag=get_lang('Yes'); |
|
2999 | + if ($wiki_add_lock == 1) { |
|
3000 | + $status_add_new_pag = get_lang('Yes'); |
|
3001 | 3001 | } else { |
3002 | - $status_add_new_pag=get_lang('No'); |
|
3002 | + $status_add_new_pag = get_lang('No'); |
|
3003 | 3003 | } |
3004 | 3004 | |
3005 | 3005 | //Creation date of the oldest wiki page and version |
3006 | 3006 | |
3007 | - $first_wiki_date='0000-00-00 00:00:00'; |
|
3007 | + $first_wiki_date = '0000-00-00 00:00:00'; |
|
3008 | 3008 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
3009 | 3009 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
3010 | 3010 | ORDER BY dtime ASC LIMIT 1'; |
3011 | - $allpages=Database::query($sql); |
|
3012 | - while ($row=Database::fetch_array($allpages)) { |
|
3013 | - $first_wiki_date=$row['dtime']; |
|
3011 | + $allpages = Database::query($sql); |
|
3012 | + while ($row = Database::fetch_array($allpages)) { |
|
3013 | + $first_wiki_date = $row['dtime']; |
|
3014 | 3014 | } |
3015 | 3015 | |
3016 | 3016 | // Date of publication of the latest wiki version. |
3017 | 3017 | |
3018 | - $last_wiki_date='0000-00-00 00:00:00'; |
|
3018 | + $last_wiki_date = '0000-00-00 00:00:00'; |
|
3019 | 3019 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
3020 | 3020 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
3021 | 3021 | ORDER BY dtime DESC LIMIT 1'; |
3022 | - $allpages=Database::query($sql); |
|
3023 | - while ($row=Database::fetch_array($allpages)) { |
|
3024 | - $last_wiki_date=$row['dtime']; |
|
3022 | + $allpages = Database::query($sql); |
|
3023 | + while ($row = Database::fetch_array($allpages)) { |
|
3024 | + $last_wiki_date = $row['dtime']; |
|
3025 | 3025 | } |
3026 | 3026 | |
3027 | 3027 | // Average score of all wiki pages. (If a page has not scored zero rated) |
@@ -3033,18 +3033,18 @@ discard block |
||
3033 | 3033 | // Do not use "count" because using "group by", would give a wrong value |
3034 | 3034 | $allpages = Database::query($sql); |
3035 | 3035 | $total_score = 0; |
3036 | - while ($row=Database::fetch_array($allpages)) { |
|
3037 | - $total_score = $total_score+$row['TOTAL_SCORE']; |
|
3036 | + while ($row = Database::fetch_array($allpages)) { |
|
3037 | + $total_score = $total_score + $row['TOTAL_SCORE']; |
|
3038 | 3038 | } |
3039 | 3039 | |
3040 | 3040 | if (!empty($total_pages)) { |
3041 | - $media_score = $total_score/$total_pages; |
|
3041 | + $media_score = $total_score / $total_pages; |
|
3042 | 3042 | //put always this line alfter check num all pages |
3043 | 3043 | } |
3044 | 3044 | |
3045 | 3045 | // Average user progress in his pages. |
3046 | 3046 | |
3047 | - $media_progress=0; |
|
3047 | + $media_progress = 0; |
|
3048 | 3048 | $sql = 'SELECT *, SUM(progress) AS TOTAL_PROGRESS |
3049 | 3049 | FROM '.$tbl_wiki.' s1 |
3050 | 3050 | WHERE s1.c_id = '.$course_id.' AND id= |
@@ -3058,24 +3058,24 @@ discard block |
||
3058 | 3058 | // As the value is only the latest version I can not use group by |
3059 | 3059 | $allpages = Database::query($sql); |
3060 | 3060 | while ($row = Database::fetch_array($allpages)) { |
3061 | - $total_progress = $row['TOTAL_PROGRESS']; |
|
3061 | + $total_progress = $row['TOTAL_PROGRESS']; |
|
3062 | 3062 | } |
3063 | 3063 | |
3064 | 3064 | if (!empty($total_pages)) { |
3065 | - $media_progress=$total_progress/$total_pages; |
|
3065 | + $media_progress = $total_progress / $total_pages; |
|
3066 | 3066 | //put always this line alfter check num all pages |
3067 | 3067 | } |
3068 | 3068 | |
3069 | 3069 | //Total users that have participated in the Wiki |
3070 | 3070 | |
3071 | - $total_users=0; |
|
3071 | + $total_users = 0; |
|
3072 | 3072 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
3073 | 3073 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
3074 | 3074 | GROUP BY user_id'; |
3075 | 3075 | //as the mark of user it in all versions of the page, I can use group by to see the first |
3076 | - $allpages=Database::query($sql); |
|
3077 | - while ($row=Database::fetch_array($allpages)) { |
|
3078 | - $total_users = $total_users+1; |
|
3076 | + $allpages = Database::query($sql); |
|
3077 | + while ($row = Database::fetch_array($allpages)) { |
|
3078 | + $total_users = $total_users + 1; |
|
3079 | 3079 | } |
3080 | 3080 | |
3081 | 3081 | // Total of different IP addresses that have participated in the wiki |
@@ -3083,9 +3083,9 @@ discard block |
||
3083 | 3083 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
3084 | 3084 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
3085 | 3085 | GROUP BY user_ip'; |
3086 | - $allpages=Database::query($sql); |
|
3087 | - while ($row=Database::fetch_array($allpages)) { |
|
3088 | - $total_ip = $total_ip+1; |
|
3086 | + $allpages = Database::query($sql); |
|
3087 | + while ($row = Database::fetch_array($allpages)) { |
|
3088 | + $total_ip = $total_ip + 1; |
|
3089 | 3089 | } |
3090 | 3090 | |
3091 | 3091 | echo '<table class="data_table">'; |
@@ -3284,11 +3284,11 @@ discard block |
||
3284 | 3284 | } else { |
3285 | 3285 | $row[] = get_lang('Anonymous').' ('.$obj->user_ip.')'; |
3286 | 3286 | } |
3287 | - $row[] ='<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>'; |
|
3287 | + $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=usercontrib&user_id='.urlencode($obj->user_id).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.$obj->NUM_EDIT.'</a>'; |
|
3288 | 3288 | $rows[] = $row; |
3289 | 3289 | } |
3290 | 3290 | |
3291 | - $table = new SortableTableFromArrayConfig($rows,1,10,'MostActiveUsersA_table','','','DESC'); |
|
3291 | + $table = new SortableTableFromArrayConfig($rows, 1, 10, 'MostActiveUsersA_table', '', '', 'DESC'); |
|
3292 | 3292 | $table->set_additional_parameters( |
3293 | 3293 | array( |
3294 | 3294 | 'cidReq' => Security::remove_XSS($_GET['cidReq']), |
@@ -3297,8 +3297,8 @@ discard block |
||
3297 | 3297 | 'group_id' => Security::remove_XSS($_GET['group_id']) |
3298 | 3298 | ) |
3299 | 3299 | ); |
3300 | - $table->set_header(0,get_lang('Author'), true); |
|
3301 | - $table->set_header(1,get_lang('Contributions'), true,array ('style' => 'width:30px;')); |
|
3300 | + $table->set_header(0, get_lang('Author'), true); |
|
3301 | + $table->set_header(1, get_lang('Contributions'), true, array('style' => 'width:30px;')); |
|
3302 | 3302 | $table->display(); |
3303 | 3303 | } |
3304 | 3304 | } |
@@ -3314,8 +3314,8 @@ discard block |
||
3314 | 3314 | $groupfilter = $this->groupfilter; |
3315 | 3315 | $tbl_wiki_discuss = $this->tbl_wiki_discuss; |
3316 | 3316 | |
3317 | - if (api_get_session_id()!=0 && |
|
3318 | - api_is_allowed_to_session_edit(false,true)==false |
|
3317 | + if (api_get_session_id() != 0 && |
|
3318 | + api_is_allowed_to_session_edit(false, true) == false |
|
3319 | 3319 | ) { |
3320 | 3320 | api_not_allowed(); |
3321 | 3321 | } |
@@ -3378,9 +3378,9 @@ discard block |
||
3378 | 3378 | //mode assignment: previous to show page type |
3379 | 3379 | $icon_assignment = null; |
3380 | 3380 | if ($row['assignment'] == 1) { |
3381 | - $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL); |
|
3381 | + $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL); |
|
3382 | 3382 | } elseif ($row['assignment'] == 2) { |
3383 | - $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL); |
|
3383 | + $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL); |
|
3384 | 3384 | } |
3385 | 3385 | |
3386 | 3386 | $countWPost = null; |
@@ -3391,23 +3391,23 @@ discard block |
||
3391 | 3391 | // Show discussion to students if isn't hidden. |
3392 | 3392 | // Show page to all teachers if is hidden. |
3393 | 3393 | // Mode assignments: If is hidden, show pages to student only if student is the author |
3394 | - if ($row['visibility_disc']==1 || |
|
3395 | - api_is_allowed_to_edit(false,true) || |
|
3394 | + if ($row['visibility_disc'] == 1 || |
|
3395 | + api_is_allowed_to_edit(false, true) || |
|
3396 | 3396 | api_is_platform_admin() || |
3397 | - ($row['assignment']==2 && $row['visibility_disc']==0 && (api_get_user_id()==$row['user_id'])) |
|
3397 | + ($row['assignment'] == 2 && $row['visibility_disc'] == 0 && (api_get_user_id() == $row['user_id'])) |
|
3398 | 3398 | ) { |
3399 | 3399 | echo '<div id="wikititle">'; |
3400 | 3400 | |
3401 | 3401 | // discussion action: protecting (locking) the discussion |
3402 | 3402 | $addlock_disc = null; |
3403 | 3403 | $lock_unlock_disc = null; |
3404 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
3404 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
3405 | 3405 | if (self::check_addlock_discuss() == 1) { |
3406 | - $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'),'',ICON_SIZE_SMALL); |
|
3407 | - $lock_unlock_disc ='unlockdisc'; |
|
3406 | + $addlock_disc = Display::return_icon('unlock.png', get_lang('UnlockDiscussExtra'), '', ICON_SIZE_SMALL); |
|
3407 | + $lock_unlock_disc = 'unlockdisc'; |
|
3408 | 3408 | } else { |
3409 | - $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'),'',ICON_SIZE_SMALL); |
|
3410 | - $lock_unlock_disc ='lockdisc'; |
|
3409 | + $addlock_disc = Display::return_icon('lock.png', get_lang('LockDiscussExtra'), '', ICON_SIZE_SMALL); |
|
3410 | + $lock_unlock_disc = 'lockdisc'; |
|
3411 | 3411 | } |
3412 | 3412 | } |
3413 | 3413 | echo '<span style="float:right">'; |
@@ -3417,13 +3417,13 @@ discard block |
||
3417 | 3417 | // discussion action: visibility. Show discussion to students if isn't hidden. Show page to all teachers if is hidden. |
3418 | 3418 | $visibility_disc = null; |
3419 | 3419 | $hide_show_disc = null; |
3420 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
3421 | - if (self::check_visibility_discuss()==1) { |
|
3420 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
3421 | + if (self::check_visibility_discuss() == 1) { |
|
3422 | 3422 | /// TODO: Fix Mode assignments: If is hidden, show discussion to student only if student is the author |
3423 | - $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'),'',ICON_SIZE_SMALL); |
|
3423 | + $visibility_disc = Display::return_icon('visible.png', get_lang('ShowDiscussExtra'), '', ICON_SIZE_SMALL); |
|
3424 | 3424 | $hide_show_disc = 'hidedisc'; |
3425 | 3425 | } else { |
3426 | - $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'),'',ICON_SIZE_SMALL); |
|
3426 | + $visibility_disc = Display::return_icon('invisible.png', get_lang('HideDiscussExtra'), '', ICON_SIZE_SMALL); |
|
3427 | 3427 | $hide_show_disc = 'showdisc'; |
3428 | 3428 | } |
3429 | 3429 | } |
@@ -3434,12 +3434,12 @@ discard block |
||
3434 | 3434 | //discussion action: check add rating lock. Show/Hide list to rating for all student |
3435 | 3435 | $lock_unlock_rating_disc = null; |
3436 | 3436 | $ratinglock_disc = null; |
3437 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
3437 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
3438 | 3438 | if (self::check_ratinglock_discuss() == 1) { |
3439 | - $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'),'',ICON_SIZE_SMALL); |
|
3439 | + $ratinglock_disc = Display::return_icon('star.png', get_lang('UnlockRatingDiscussExtra'), '', ICON_SIZE_SMALL); |
|
3440 | 3440 | $lock_unlock_rating_disc = 'unlockrating'; |
3441 | 3441 | } else { |
3442 | - $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'),'',ICON_SIZE_SMALL); |
|
3442 | + $ratinglock_disc = Display::return_icon('star_na.png', get_lang('LockRatingDiscussExtra'), '', ICON_SIZE_SMALL); |
|
3443 | 3443 | $lock_unlock_rating_disc = 'lockrating'; |
3444 | 3444 | } |
3445 | 3445 | } |
@@ -3450,11 +3450,11 @@ discard block |
||
3450 | 3450 | |
3451 | 3451 | //discussion action: email notification |
3452 | 3452 | if (self::check_notify_discuss($page) == 1) { |
3453 | - $notify_disc= Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'),'',ICON_SIZE_SMALL); |
|
3454 | - $lock_unlock_notify_disc='unlocknotifydisc'; |
|
3453 | + $notify_disc = Display::return_icon('messagebox_info.png', get_lang('NotifyDiscussByEmail'), '', ICON_SIZE_SMALL); |
|
3454 | + $lock_unlock_notify_disc = 'unlocknotifydisc'; |
|
3455 | 3455 | } else { |
3456 | - $notify_disc= Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'),'',ICON_SIZE_SMALL); |
|
3457 | - $lock_unlock_notify_disc='locknotifydisc'; |
|
3456 | + $notify_disc = Display::return_icon('mail.png', get_lang('CancelNotifyDiscussByEmail'), '', ICON_SIZE_SMALL); |
|
3457 | + $lock_unlock_notify_disc = 'locknotifydisc'; |
|
3458 | 3458 | } |
3459 | 3459 | echo '<span style="float:right">'; |
3460 | 3460 | echo '<a href="index.php?action=discuss&actionpage='.$lock_unlock_notify_disc.'&title='.api_htmlentities(urlencode($page)).'">'.$notify_disc.'</a>'; |
@@ -3466,22 +3466,22 @@ discard block |
||
3466 | 3466 | |
3467 | 3467 | echo '</div>'; |
3468 | 3468 | |
3469 | - if ($row['addlock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
3469 | + if ($row['addlock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
3470 | 3470 | //show comments but students can't add theirs |
3471 | 3471 | ?> |
3472 | 3472 | <form name="form1" method="post" action=""> |
3473 | 3473 | <table> |
3474 | 3474 | <tr> |
3475 | - <td valign="top" ><?php echo get_lang('Comments');?>:</td> |
|
3476 | - <?php echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">';//prevent double post ?> |
|
3475 | + <td valign="top" ><?php echo get_lang('Comments'); ?>:</td> |
|
3476 | + <?php echo '<input type="hidden" name="wpost_id" value="'.md5(uniqid(rand(), true)).'">'; //prevent double post ?> |
|
3477 | 3477 | <td><textarea name="comment" cols="80" rows="5" id="comment"></textarea></td> |
3478 | 3478 | </tr> |
3479 | 3479 | <tr> |
3480 | 3480 | <?php |
3481 | 3481 | //check if rating is allowed |
3482 | - if ($row['ratinglock_disc']==1 || api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
3482 | + if ($row['ratinglock_disc'] == 1 || api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
3483 | 3483 | ?> |
3484 | - <td><?php echo get_lang('Rating');?>: </td> |
|
3484 | + <td><?php echo get_lang('Rating'); ?>: </td> |
|
3485 | 3485 | <td valign="top"><select name="rating" id="rating"> |
3486 | 3486 | <option value="-" selected>-</option> |
3487 | 3487 | <option value="0">0</option> |
@@ -3498,7 +3498,7 @@ discard block |
||
3498 | 3498 | </select></td> |
3499 | 3499 | <?php |
3500 | 3500 | } else { |
3501 | - echo '<input type=hidden name="rating" value="-">';// must pass a default value to avoid rate automatically |
|
3501 | + echo '<input type=hidden name="rating" value="-">'; // must pass a default value to avoid rate automatically |
|
3502 | 3502 | } |
3503 | 3503 | ?> |
3504 | 3504 | </tr> |
@@ -3538,12 +3538,12 @@ discard block |
||
3538 | 3538 | $sql = "SELECT * FROM $tbl_wiki_discuss |
3539 | 3539 | WHERE c_id = $course_id AND publication_id='".$id."' AND NOT p_score='-'"; |
3540 | 3540 | $result3 = Database::query($sql); |
3541 | - $countWPost_score= Database::num_rows($result3); |
|
3541 | + $countWPost_score = Database::num_rows($result3); |
|
3542 | 3542 | |
3543 | - echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score;// |
|
3543 | + echo ' - '.get_lang('NumCommentsScore').': '.$countWPost_score; // |
|
3544 | 3544 | |
3545 | - if ($countWPost_score!=0) { |
|
3546 | - $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score,2).' / 10'; |
|
3545 | + if ($countWPost_score != 0) { |
|
3546 | + $avg_WPost_score = round($row2['sumWPost'] / $countWPost_score, 2).' / 10'; |
|
3547 | 3547 | } else { |
3548 | 3548 | $avg_WPost_score = $countWPost_score; |
3549 | 3549 | } |
@@ -3561,16 +3561,16 @@ discard block |
||
3561 | 3561 | |
3562 | 3562 | echo '<hr noshade size="1">'; |
3563 | 3563 | |
3564 | - while ($row=Database::fetch_array($result)) { |
|
3564 | + while ($row = Database::fetch_array($result)) { |
|
3565 | 3565 | $userinfo = api_get_user_info($row['userc_id']); |
3566 | - if (($userinfo['status'])=="5") { |
|
3567 | - $author_status=get_lang('Student'); |
|
3566 | + if (($userinfo['status']) == "5") { |
|
3567 | + $author_status = get_lang('Student'); |
|
3568 | 3568 | } else { |
3569 | - $author_status=get_lang('Teacher'); |
|
3569 | + $author_status = get_lang('Teacher'); |
|
3570 | 3570 | } |
3571 | 3571 | |
3572 | 3572 | $name = $userinfo['complete_name']; |
3573 | - $author_photo= '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'" width="40" height="50" align="top" title="'.api_htmlentities($name).'" />'; |
|
3573 | + $author_photo = '<img src="'.$userinfo['avatar'].'" alt="'.api_htmlentities($name).'" width="40" height="50" align="top" title="'.api_htmlentities($name).'" />'; |
|
3574 | 3574 | |
3575 | 3575 | //stars |
3576 | 3576 | $p_score = $row['p_score']; |
@@ -3649,7 +3649,7 @@ discard block |
||
3649 | 3649 | } |
3650 | 3650 | echo '</div>'; |
3651 | 3651 | |
3652 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
3652 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
3653 | 3653 | $sql = 'SELECT * |
3654 | 3654 | FROM '.$tbl_wiki.' s1 |
3655 | 3655 | WHERE s1.c_id = '.$course_id.' AND id=( |
@@ -3675,26 +3675,26 @@ discard block |
||
3675 | 3675 | $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES); |
3676 | 3676 | |
3677 | 3677 | //get type assignment icon |
3678 | - if ($obj->assignment==1) { |
|
3679 | - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); |
|
3680 | - } elseif ($obj->assignment==2) { |
|
3681 | - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
3682 | - } elseif ($obj->assignment==0) { |
|
3678 | + if ($obj->assignment == 1) { |
|
3679 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL); |
|
3680 | + } elseif ($obj->assignment == 2) { |
|
3681 | + $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
3682 | + } elseif ($obj->assignment == 0) { |
|
3683 | 3683 | $ShowAssignment = Display::return_icon('px_transparent.gif'); |
3684 | 3684 | } |
3685 | 3685 | |
3686 | 3686 | //get icon task |
3687 | 3687 | if (!empty($obj->task)) { |
3688 | - $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL); |
|
3688 | + $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL); |
|
3689 | 3689 | } else { |
3690 | - $icon_task= Display::return_icon('px_transparent.gif'); |
|
3690 | + $icon_task = Display::return_icon('px_transparent.gif'); |
|
3691 | 3691 | } |
3692 | 3692 | |
3693 | 3693 | $row = array(); |
3694 | 3694 | $row[] = $ShowAssignment.$icon_task; |
3695 | 3695 | $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'"> |
3696 | 3696 | '.api_htmlentities($obj->title).'</a>'; |
3697 | - if ($obj->user_id <>0) { |
|
3697 | + if ($obj->user_id <> 0) { |
|
3698 | 3698 | $row[] = UserManager::getUserProfileLink($userinfo); |
3699 | 3699 | } |
3700 | 3700 | else { |
@@ -3702,29 +3702,29 @@ discard block |
||
3702 | 3702 | } |
3703 | 3703 | $row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get()); |
3704 | 3704 | $showdelete = ''; |
3705 | - if (api_is_allowed_to_edit(false,true)|| api_is_platform_admin()) { |
|
3706 | - $showdelete =' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
3707 | - Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL); |
|
3705 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
3706 | + $showdelete = ' <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=delete&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
3707 | + Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL); |
|
3708 | 3708 | } |
3709 | - if (api_is_allowed_to_session_edit(false,true) ) { |
|
3709 | + if (api_is_allowed_to_session_edit(false, true)) { |
|
3710 | 3710 | $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=edit&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
3711 | - Display::return_icon('edit.png', get_lang('EditPage'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
3712 | - Display::return_icon('discuss.png', get_lang('Discuss'),'',ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
3713 | - Display::return_icon('history.png', get_lang('History'),'',ICON_SIZE_SMALL).'</a> |
|
3711 | + Display::return_icon('edit.png', get_lang('EditPage'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=discuss&title='.api_htmlentities(urlencode($obj->reflink)).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
3712 | + Display::return_icon('discuss.png', get_lang('Discuss'), '', ICON_SIZE_SMALL).'</a> <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=history&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
3713 | + Display::return_icon('history.png', get_lang('History'), '', ICON_SIZE_SMALL).'</a> |
|
3714 | 3714 | <a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=links&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
3715 | - Display::return_icon('what_link_here.png', get_lang('LinksPages'),'',ICON_SIZE_SMALL).'</a>'.$showdelete; |
|
3715 | + Display::return_icon('what_link_here.png', get_lang('LinksPages'), '', ICON_SIZE_SMALL).'</a>'.$showdelete; |
|
3716 | 3716 | } |
3717 | 3717 | $rows[] = $row; |
3718 | 3718 | } |
3719 | 3719 | |
3720 | - $table = new SortableTableFromArrayConfig($rows,1,10,'AllPages_table','','','ASC'); |
|
3721 | - $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action),'group_id'=>Security::remove_XSS($_GET['group_id']))); |
|
3722 | - $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;')); |
|
3723 | - $table->set_header(1,get_lang('Title'), true); |
|
3724 | - $table->set_header(2,get_lang('Author').' ('.get_lang('LastVersion').')', true); |
|
3725 | - $table->set_header(3,get_lang('Date').' ('.get_lang('LastVersion').')', true); |
|
3726 | - if (api_is_allowed_to_session_edit(false,true) ) { |
|
3727 | - $table->set_header(4,get_lang('Actions'), true, array ('style' => 'width:130px;')); |
|
3720 | + $table = new SortableTableFromArrayConfig($rows, 1, 10, 'AllPages_table', '', '', 'ASC'); |
|
3721 | + $table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']), 'action'=>Security::remove_XSS($action), 'group_id'=>Security::remove_XSS($_GET['group_id']))); |
|
3722 | + $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;')); |
|
3723 | + $table->set_header(1, get_lang('Title'), true); |
|
3724 | + $table->set_header(2, get_lang('Author').' ('.get_lang('LastVersion').')', true); |
|
3725 | + $table->set_header(3, get_lang('Date').' ('.get_lang('LastVersion').')', true); |
|
3726 | + if (api_is_allowed_to_session_edit(false, true)) { |
|
3727 | + $table->set_header(4, get_lang('Actions'), true, array('style' => 'width:130px;')); |
|
3728 | 3728 | } |
3729 | 3729 | $table->display(); |
3730 | 3730 | } |
@@ -3744,13 +3744,13 @@ discard block |
||
3744 | 3744 | $groupfilter = $this->groupfilter; |
3745 | 3745 | $tbl_wiki_conf = $this->tbl_wiki_conf; |
3746 | 3746 | |
3747 | - if (api_is_allowed_to_session_edit(false,true) ) { |
|
3748 | - if (self::check_notify_all()==1) { |
|
3749 | - $notify_all= Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges'); |
|
3750 | - $lock_unlock_notify_all='unlocknotifyall'; |
|
3747 | + if (api_is_allowed_to_session_edit(false, true)) { |
|
3748 | + if (self::check_notify_all() == 1) { |
|
3749 | + $notify_all = Display::return_icon('messagebox_info.png', get_lang('NotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotNotifyChanges'); |
|
3750 | + $lock_unlock_notify_all = 'unlocknotifyall'; |
|
3751 | 3751 | } else { |
3752 | - $notify_all=Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'),'',ICON_SIZE_SMALL).' '.get_lang('NotifyChanges'); |
|
3753 | - $lock_unlock_notify_all='locknotifyall'; |
|
3752 | + $notify_all = Display::return_icon('mail.png', get_lang('CancelNotifyByEmail'), '', ICON_SIZE_SMALL).' '.get_lang('NotifyChanges'); |
|
3753 | + $lock_unlock_notify_all = 'locknotifyall'; |
|
3754 | 3754 | } |
3755 | 3755 | } |
3756 | 3756 | |
@@ -3758,7 +3758,7 @@ discard block |
||
3758 | 3758 | echo '<a href="index.php?action=recentchanges&actionpage='.$lock_unlock_notify_all.'&title='.api_htmlentities(urlencode($page)).'">'.$notify_all.'</a>'; |
3759 | 3759 | echo '</span>'.get_lang('RecentChanges').'</div>'; |
3760 | 3760 | |
3761 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
3761 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
3762 | 3762 | $sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' |
3763 | 3763 | WHERE '.$tbl_wiki_conf.'.c_id= '.$course_id.' AND |
3764 | 3764 | '.$tbl_wiki.'.c_id= '.$course_id.' AND |
@@ -3786,19 +3786,19 @@ discard block |
||
3786 | 3786 | $userinfo = api_get_user_info($obj->user_id); |
3787 | 3787 | |
3788 | 3788 | //get type assignment icon |
3789 | - if ($obj->assignment==1) { |
|
3790 | - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); |
|
3791 | - } elseif ($obj->assignment==2) { |
|
3792 | - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
3793 | - } elseif ($obj->assignment==0) { |
|
3794 | - $ShowAssignment=Display::return_icon('px_transparent.gif'); |
|
3789 | + if ($obj->assignment == 1) { |
|
3790 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL); |
|
3791 | + } elseif ($obj->assignment == 2) { |
|
3792 | + $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
3793 | + } elseif ($obj->assignment == 0) { |
|
3794 | + $ShowAssignment = Display::return_icon('px_transparent.gif'); |
|
3795 | 3795 | } |
3796 | 3796 | |
3797 | 3797 | // Get icon task |
3798 | 3798 | if (!empty($obj->task)) { |
3799 | - $icon_task=Display::return_icon('wiki_task.png', get_lang('StandardTask'),'',ICON_SIZE_SMALL); |
|
3799 | + $icon_task = Display::return_icon('wiki_task.png', get_lang('StandardTask'), '', ICON_SIZE_SMALL); |
|
3800 | 3800 | } else { |
3801 | - $icon_task=Display::return_icon('px_transparent.gif'); |
|
3801 | + $icon_task = Display::return_icon('px_transparent.gif'); |
|
3802 | 3802 | } |
3803 | 3803 | |
3804 | 3804 | $row = array(); |
@@ -3806,8 +3806,8 @@ discard block |
||
3806 | 3806 | $row[] = $ShowAssignment.$icon_task; |
3807 | 3807 | $row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&view='.$obj->id.'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'">'. |
3808 | 3808 | api_htmlentities($obj->title).'</a>'; |
3809 | - $row[] = $obj->version>1 ? get_lang('EditedBy') : get_lang('AddedBy'); |
|
3810 | - if ($obj->user_id <> 0 ) { |
|
3809 | + $row[] = $obj->version > 1 ? get_lang('EditedBy') : get_lang('AddedBy'); |
|
3810 | + if ($obj->user_id <> 0) { |
|
3811 | 3811 | $row[] = UserManager::getUserProfileLink($userinfo); |
3812 | 3812 | } else { |
3813 | 3813 | $row[] = get_lang('Anonymous').' ('.api_htmlentities($obj->user_ip).')'; |
@@ -3815,7 +3815,7 @@ discard block |
||
3815 | 3815 | $rows[] = $row; |
3816 | 3816 | } |
3817 | 3817 | |
3818 | - $table = new SortableTableFromArrayConfig($rows,0,10,'RecentPages_table','','','DESC'); |
|
3818 | + $table = new SortableTableFromArrayConfig($rows, 0, 10, 'RecentPages_table', '', '', 'DESC'); |
|
3819 | 3819 | $table->set_additional_parameters( |
3820 | 3820 | array( |
3821 | 3821 | 'cidReq' =>api_get_course_id(), |
@@ -3824,11 +3824,11 @@ discard block |
||
3824 | 3824 | 'group_id' => api_get_group_id() |
3825 | 3825 | ) |
3826 | 3826 | ); |
3827 | - $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;')); |
|
3828 | - $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;')); |
|
3829 | - $table->set_header(2,get_lang('Title'), true); |
|
3830 | - $table->set_header(3,get_lang('Actions'), true, array ('style' => 'width:80px;')); |
|
3831 | - $table->set_header(4,get_lang('Author'), true); |
|
3827 | + $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;')); |
|
3828 | + $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;')); |
|
3829 | + $table->set_header(2, get_lang('Title'), true); |
|
3830 | + $table->set_header(3, get_lang('Actions'), true, array('style' => 'width:80px;')); |
|
3831 | + $table->set_header(4, get_lang('Author'), true); |
|
3832 | 3832 | $table->display(); |
3833 | 3833 | } |
3834 | 3834 | } |
@@ -3860,17 +3860,17 @@ discard block |
||
3860 | 3860 | |
3861 | 3861 | //get type assignment icon |
3862 | 3862 | $ShowAssignment = ''; |
3863 | - if ($row['assignment']==1) { |
|
3864 | - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); |
|
3865 | - } elseif ($row['assignment']==2) { |
|
3866 | - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
3867 | - } elseif ($row['assignment']==0) { |
|
3868 | - $ShowAssignment=Display::return_icon('px_transparent.gif'); |
|
3863 | + if ($row['assignment'] == 1) { |
|
3864 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL); |
|
3865 | + } elseif ($row['assignment'] == 2) { |
|
3866 | + $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
3867 | + } elseif ($row['assignment'] == 0) { |
|
3868 | + $ShowAssignment = Display::return_icon('px_transparent.gif'); |
|
3869 | 3869 | } |
3870 | 3870 | |
3871 | 3871 | //fix Title to reflink (link Main Page) |
3872 | - if ($page==get_lang('DefaultTitle')) { |
|
3873 | - $page='index'; |
|
3872 | + if ($page == get_lang('DefaultTitle')) { |
|
3873 | + $page = 'index'; |
|
3874 | 3874 | } |
3875 | 3875 | |
3876 | 3876 | echo '<div id="wikititle">'; |
@@ -3881,11 +3881,11 @@ discard block |
||
3881 | 3881 | //fix index to title Main page into linksto |
3882 | 3882 | |
3883 | 3883 | if ($page == 'index') { |
3884 | - $page = str_replace(' ','_',get_lang('DefaultTitle')); |
|
3884 | + $page = str_replace(' ', '_', get_lang('DefaultTitle')); |
|
3885 | 3885 | } |
3886 | 3886 | |
3887 | 3887 | //table |
3888 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
3888 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
3889 | 3889 | //only by professors if page is hidden |
3890 | 3890 | $sql = "SELECT * FROM ".$tbl_wiki." s1 |
3891 | 3891 | WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string($page)."%' AND id=( |
@@ -3912,25 +3912,25 @@ discard block |
||
3912 | 3912 | //get time |
3913 | 3913 | $year = substr($obj->dtime, 0, 4); |
3914 | 3914 | $month = substr($obj->dtime, 5, 2); |
3915 | - $day = substr($obj->dtime, 8, 2); |
|
3916 | - $hours = substr($obj->dtime, 11,2); |
|
3917 | - $minutes = substr($obj->dtime, 14,2); |
|
3918 | - $seconds = substr($obj->dtime, 17,2); |
|
3915 | + $day = substr($obj->dtime, 8, 2); |
|
3916 | + $hours = substr($obj->dtime, 11, 2); |
|
3917 | + $minutes = substr($obj->dtime, 14, 2); |
|
3918 | + $seconds = substr($obj->dtime, 17, 2); |
|
3919 | 3919 | |
3920 | 3920 | //get type assignment icon |
3921 | - if ($obj->assignment==1) { |
|
3922 | - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); |
|
3923 | - } elseif ($obj->assignment==2) { |
|
3924 | - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
3925 | - } elseif ($obj->assignment==0) { |
|
3926 | - $ShowAssignment=Display::return_icon('px_transparent.gif'); |
|
3921 | + if ($obj->assignment == 1) { |
|
3922 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL); |
|
3923 | + } elseif ($obj->assignment == 2) { |
|
3924 | + $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
3925 | + } elseif ($obj->assignment == 0) { |
|
3926 | + $ShowAssignment = Display::return_icon('px_transparent.gif'); |
|
3927 | 3927 | } |
3928 | 3928 | |
3929 | 3929 | $row = array(); |
3930 | - $row[] =$ShowAssignment; |
|
3930 | + $row[] = $ShowAssignment; |
|
3931 | 3931 | $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode($obj->reflink)).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
3932 | 3932 | api_htmlentities($obj->title).'</a>'; |
3933 | - if ($obj->user_id <>0) { |
|
3933 | + if ($obj->user_id <> 0) { |
|
3934 | 3934 | $row[] = UserManager::getUserProfileLink($userinfo); |
3935 | 3935 | } |
3936 | 3936 | else { |
@@ -4039,7 +4039,7 @@ discard block |
||
4039 | 4039 | '&session_id='.$this->session_id.'&group_id='.$this->group_id.'"> |
4040 | 4040 | </a></div>'; |
4041 | 4041 | |
4042 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
4042 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
4043 | 4043 | //only by professors if page is hidden |
4044 | 4044 | $sql = 'SELECT * FROM '.$tbl_wiki.' |
4045 | 4045 | WHERE |
@@ -4064,19 +4064,19 @@ discard block |
||
4064 | 4064 | // Get time |
4065 | 4065 | $year = substr($obj->dtime, 0, 4); |
4066 | 4066 | $month = substr($obj->dtime, 5, 2); |
4067 | - $day = substr($obj->dtime, 8, 2); |
|
4068 | - $hours = substr($obj->dtime, 11,2); |
|
4069 | - $minutes = substr($obj->dtime, 14,2); |
|
4070 | - $seconds = substr($obj->dtime, 17,2); |
|
4067 | + $day = substr($obj->dtime, 8, 2); |
|
4068 | + $hours = substr($obj->dtime, 11, 2); |
|
4069 | + $minutes = substr($obj->dtime, 14, 2); |
|
4070 | + $seconds = substr($obj->dtime, 17, 2); |
|
4071 | 4071 | |
4072 | 4072 | //get type assignment icon |
4073 | 4073 | $ShowAssignment = ''; |
4074 | - if ($obj->assignment==1) { |
|
4075 | - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL); |
|
4076 | - } elseif ($obj->assignment==2) { |
|
4077 | - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
4078 | - } elseif ($obj->assignment==0) { |
|
4079 | - $ShowAssignment= Display::return_icon('px_transparent.gif'); |
|
4074 | + if ($obj->assignment == 1) { |
|
4075 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL); |
|
4076 | + } elseif ($obj->assignment == 2) { |
|
4077 | + $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
4078 | + } elseif ($obj->assignment == 0) { |
|
4079 | + $ShowAssignment = Display::return_icon('px_transparent.gif'); |
|
4080 | 4080 | } |
4081 | 4081 | |
4082 | 4082 | $row = array(); |
@@ -4092,7 +4092,7 @@ discard block |
||
4092 | 4092 | |
4093 | 4093 | } |
4094 | 4094 | |
4095 | - $table = new SortableTableFromArrayConfig($rows,2,10,'UsersContributions_table','','','ASC'); |
|
4095 | + $table = new SortableTableFromArrayConfig($rows, 2, 10, 'UsersContributions_table', '', '', 'ASC'); |
|
4096 | 4096 | $table->set_additional_parameters( |
4097 | 4097 | array( |
4098 | 4098 | 'cidReq' => Security::remove_XSS($_GET['cidReq']), |
@@ -4102,13 +4102,13 @@ discard block |
||
4102 | 4102 | 'group_id' => intval($_GET['group_id']), |
4103 | 4103 | ) |
4104 | 4104 | ); |
4105 | - $table->set_header(0,get_lang('Date'), true, array ('style' => 'width:200px;')); |
|
4106 | - $table->set_header(1,get_lang('Type'), true, array ('style' => 'width:30px;')); |
|
4107 | - $table->set_header(2,get_lang('Title'), true, array ('style' => 'width:200px;')); |
|
4108 | - $table->set_header(3,get_lang('Version'), true, array ('style' => 'width:30px;')); |
|
4109 | - $table->set_header(4,get_lang('Comment'), true, array ('style' => 'width:200px;')); |
|
4110 | - $table->set_header(5,get_lang('Progress'), true, array ('style' => 'width:30px;')); |
|
4111 | - $table->set_header(6,get_lang('Rating'), true, array ('style' => 'width:30px;')); |
|
4105 | + $table->set_header(0, get_lang('Date'), true, array('style' => 'width:200px;')); |
|
4106 | + $table->set_header(1, get_lang('Type'), true, array('style' => 'width:30px;')); |
|
4107 | + $table->set_header(2, get_lang('Title'), true, array('style' => 'width:200px;')); |
|
4108 | + $table->set_header(3, get_lang('Version'), true, array('style' => 'width:30px;')); |
|
4109 | + $table->set_header(4, get_lang('Comment'), true, array('style' => 'width:200px;')); |
|
4110 | + $table->set_header(5, get_lang('Progress'), true, array('style' => 'width:30px;')); |
|
4111 | + $table->set_header(6, get_lang('Rating'), true, array('style' => 'width:30px;')); |
|
4112 | 4112 | $table->display(); |
4113 | 4113 | } |
4114 | 4114 | } |
@@ -4126,7 +4126,7 @@ discard block |
||
4126 | 4126 | |
4127 | 4127 | echo '<div class="actions">'.get_lang('MostChangedPages').'</div>'; |
4128 | 4128 | |
4129 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
4129 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
4130 | 4130 | $sql = 'SELECT *, MAX(version) AS MAX FROM '.$tbl_wiki.' |
4131 | 4131 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
4132 | 4132 | GROUP BY reflink';//TODO:check MAX and group by return last version |
@@ -4144,12 +4144,12 @@ discard block |
||
4144 | 4144 | while ($obj = Database::fetch_object($allpages)) { |
4145 | 4145 | //get type assignment icon |
4146 | 4146 | $ShowAssignment = ''; |
4147 | - if ($obj->assignment==1) { |
|
4148 | - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); |
|
4149 | - } elseif ($obj->assignment==2) { |
|
4150 | - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
4151 | - } elseif ($obj->assignment==0) { |
|
4152 | - $ShowAssignment= Display::return_icon('px_transparent.gif'); |
|
4147 | + if ($obj->assignment == 1) { |
|
4148 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL); |
|
4149 | + } elseif ($obj->assignment == 2) { |
|
4150 | + $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
4151 | + } elseif ($obj->assignment == 0) { |
|
4152 | + $ShowAssignment = Display::return_icon('px_transparent.gif'); |
|
4153 | 4153 | } |
4154 | 4154 | |
4155 | 4155 | $row = array(); |
@@ -4177,9 +4177,9 @@ discard block |
||
4177 | 4177 | 'group_id' => intval($_GET['group_id']), |
4178 | 4178 | ) |
4179 | 4179 | ); |
4180 | - $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;')); |
|
4181 | - $table->set_header(1,get_lang('Title'), true); |
|
4182 | - $table->set_header(2,get_lang('Changes'), true); |
|
4180 | + $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;')); |
|
4181 | + $table->set_header(1, get_lang('Title'), true); |
|
4182 | + $table->set_header(2, get_lang('Changes'), true); |
|
4183 | 4183 | $table->display(); |
4184 | 4184 | } |
4185 | 4185 | } |
@@ -4204,7 +4204,7 @@ discard block |
||
4204 | 4204 | /* Only teachers and platform admin can edit the index page. |
4205 | 4205 | Only teachers and platform admin can edit an assignment teacher*/ |
4206 | 4206 | if (($current_row['reflink'] == 'index' || $current_row['reflink'] == '' || $current_row['assignment'] == 1) && |
4207 | - (!api_is_allowed_to_edit(false,true) && $this->group_id == 0) |
|
4207 | + (!api_is_allowed_to_edit(false, true) && $this->group_id == 0) |
|
4208 | 4208 | ) { |
4209 | 4209 | self::setMessage( |
4210 | 4210 | Display::display_normal_message(get_lang('OnlyEditPagesCourseManager'), false, true) |
@@ -4214,7 +4214,7 @@ discard block |
||
4214 | 4214 | // check if is a wiki group |
4215 | 4215 | if ($current_row['group_id'] != 0) { |
4216 | 4216 | //Only teacher, platform admin and group members can edit a wiki group |
4217 | - if (api_is_allowed_to_edit(false,true) || |
|
4217 | + if (api_is_allowed_to_edit(false, true) || |
|
4218 | 4218 | api_is_platform_admin() || |
4219 | 4219 | GroupManager :: is_user_in_group($userId, $this->group_id) |
4220 | 4220 | ) { |
@@ -4232,9 +4232,9 @@ discard block |
||
4232 | 4232 | //$icon_assignment = null; |
4233 | 4233 | if ($current_row['assignment'] == 1) { |
4234 | 4234 | self::setMessage(Display::display_normal_message(get_lang('EditAssignmentWarning'), false, true)); |
4235 | - } elseif($current_row['assignment']==2) { |
|
4236 | - if (($userId == $current_row['user_id'])==false) { |
|
4237 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
4235 | + } elseif ($current_row['assignment'] == 2) { |
|
4236 | + if (($userId == $current_row['user_id']) == false) { |
|
4237 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
4238 | 4238 | $PassEdit = true; |
4239 | 4239 | } else { |
4240 | 4240 | self::setMessage(Display::display_warning_message(get_lang('LockByTeacher'), false, true)); |
@@ -4248,11 +4248,11 @@ discard block |
||
4248 | 4248 | //show editor if edit is allowed |
4249 | 4249 | if ($PassEdit) { |
4250 | 4250 | if ($current_row['editlock'] == 1 && |
4251 | - (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false) |
|
4251 | + (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false) |
|
4252 | 4252 | ) { |
4253 | 4253 | self::setMessage(Display::display_normal_message(get_lang('PageLockedExtra'), false, true)); |
4254 | 4254 | } else { |
4255 | - if ($last_row['is_editing']!=0 && $last_row['is_editing'] != $userId) { |
|
4255 | + if ($last_row['is_editing'] != 0 && $last_row['is_editing'] != $userId) { |
|
4256 | 4256 | // Checking for concurrent users |
4257 | 4257 | $timestamp_edit = strtotime($last_row['time_edit']); |
4258 | 4258 | $time_editing = time() - $timestamp_edit; |
@@ -4261,7 +4261,7 @@ discard block |
||
4261 | 4261 | $userinfo = api_get_user_info($last_row['is_editing']); |
4262 | 4262 | $is_being_edited = get_lang('ThisPageisBeginEditedBy').' <a href='.$userinfo['profile_url'].'>'. |
4263 | 4263 | Display::tag('span', $userinfo['complete_name_with_username']). |
4264 | - get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes'); |
|
4264 | + get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes'); |
|
4265 | 4265 | self::setMessage(Display::display_normal_message($is_being_edited, false, true)); |
4266 | 4266 | } else { |
4267 | 4267 | self::setMessage(Display::display_confirmation_message( |
@@ -4369,9 +4369,9 @@ discard block |
||
4369 | 4369 | GROUP BY reflink |
4370 | 4370 | ORDER BY reflink ASC'; |
4371 | 4371 | $allpages = Database::query($sql); |
4372 | - while ($row=Database::fetch_array($allpages)) { |
|
4373 | - if ($row['reflink']=='index') { |
|
4374 | - $row['reflink']=str_replace(' ', '_', get_lang('DefaultTitle')); |
|
4372 | + while ($row = Database::fetch_array($allpages)) { |
|
4373 | + if ($row['reflink'] == 'index') { |
|
4374 | + $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle')); |
|
4375 | 4375 | } |
4376 | 4376 | $pages[] = $row['reflink']; |
4377 | 4377 | } |
@@ -4389,16 +4389,16 @@ discard block |
||
4389 | 4389 | |
4390 | 4390 | $allpages = Database::query($sql); |
4391 | 4391 | |
4392 | - while ($row=Database::fetch_array($allpages)) { |
|
4392 | + while ($row = Database::fetch_array($allpages)) { |
|
4393 | 4393 | //remove self reference |
4394 | - $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"])); |
|
4394 | + $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"])); |
|
4395 | 4395 | $refs = explode(" ", trim($row["linksto"])); |
4396 | 4396 | |
4397 | 4397 | // Find linksto into reflink. If found ->page is linked |
4398 | 4398 | foreach ($refs as $v) { |
4399 | 4399 | if (in_array($v, $pages)) { |
4400 | - if (trim($v)!="") { |
|
4401 | - $linked[]=$v; |
|
4400 | + if (trim($v) != "") { |
|
4401 | + $linked[] = $v; |
|
4402 | 4402 | } |
4403 | 4403 | } |
4404 | 4404 | } |
@@ -4410,12 +4410,12 @@ discard block |
||
4410 | 4410 | $rows = array(); |
4411 | 4411 | foreach ($linked as $linked_show) { |
4412 | 4412 | $row = array(); |
4413 | - $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_',' ',$linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
4414 | - str_replace('_',' ',$linked_show).'</a>'; |
|
4413 | + $row[] = '<a href="'.api_get_self().'?cidReq='.$_course['code'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_', ' ', $linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'. |
|
4414 | + str_replace('_', ' ', $linked_show).'</a>'; |
|
4415 | 4415 | $rows[] = $row; |
4416 | 4416 | } |
4417 | 4417 | |
4418 | - $table = new SortableTableFromArrayConfig($rows,0,10,'LinkedPages_table','','','DESC'); |
|
4418 | + $table = new SortableTableFromArrayConfig($rows, 0, 10, 'LinkedPages_table', '', '', 'DESC'); |
|
4419 | 4419 | $table->set_additional_parameters( |
4420 | 4420 | array( |
4421 | 4421 | 'cidReq' => Security::remove_XSS($_GET['cidReq']), |
@@ -4424,7 +4424,7 @@ discard block |
||
4424 | 4424 | 'group_id' => intval($_GET['group_id']), |
4425 | 4425 | ) |
4426 | 4426 | ); |
4427 | - $table->set_header(0,get_lang('Title'), true); |
|
4427 | + $table->set_header(0, get_lang('Title'), true); |
|
4428 | 4428 | $table->display(); |
4429 | 4429 | } |
4430 | 4430 | |
@@ -4449,8 +4449,8 @@ discard block |
||
4449 | 4449 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
4450 | 4450 | GROUP BY reflink |
4451 | 4451 | ORDER BY reflink ASC'; |
4452 | - $allpages=Database::query($sql); |
|
4453 | - while ($row=Database::fetch_array($allpages)) { |
|
4452 | + $allpages = Database::query($sql); |
|
4453 | + while ($row = Database::fetch_array($allpages)) { |
|
4454 | 4454 | $pages[] = $row['reflink']; |
4455 | 4455 | } |
4456 | 4456 | |
@@ -4465,14 +4465,14 @@ discard block |
||
4465 | 4465 | )'; |
4466 | 4466 | $allpages = Database::query($sql); |
4467 | 4467 | $array_refs_linked = array(); |
4468 | - while ($row=Database::fetch_array($allpages)) { |
|
4469 | - $row['linksto']= str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference |
|
4468 | + while ($row = Database::fetch_array($allpages)) { |
|
4469 | + $row['linksto'] = str_replace($row["reflink"], " ", trim($row["linksto"])); //remove self reference |
|
4470 | 4470 | $refs = explode(" ", trim($row["linksto"])); |
4471 | - foreach ($refs as $ref_linked){ |
|
4472 | - if ($ref_linked==str_replace(' ','_',get_lang('DefaultTitle'))) { |
|
4473 | - $ref_linked='index'; |
|
4471 | + foreach ($refs as $ref_linked) { |
|
4472 | + if ($ref_linked == str_replace(' ', '_', get_lang('DefaultTitle'))) { |
|
4473 | + $ref_linked = 'index'; |
|
4474 | 4474 | } |
4475 | - $array_refs_linked[]= $ref_linked; |
|
4475 | + $array_refs_linked[] = $ref_linked; |
|
4476 | 4476 | } |
4477 | 4477 | } |
4478 | 4478 | |
@@ -4494,20 +4494,20 @@ discard block |
||
4494 | 4494 | '.$groupfilter.$condition_session.' AND |
4495 | 4495 | reflink="'.Database::escape_string($orphaned_show).'" |
4496 | 4496 | GROUP BY reflink'; |
4497 | - $allpages=Database::query($sql); |
|
4498 | - while ($row=Database::fetch_array($allpages)) { |
|
4499 | - $orphaned_title=$row['title']; |
|
4500 | - $orphaned_visibility=$row['visibility']; |
|
4501 | - if ($row['assignment']==1) { |
|
4502 | - $ShowAssignment=Display::return_icon('wiki_assignment.png','','',ICON_SIZE_SMALL); |
|
4503 | - } elseif ($row['assignment']==2) { |
|
4504 | - $ShowAssignment=Display::return_icon('wiki_work.png','','',ICON_SIZE_SMALL); |
|
4505 | - } elseif ($row['assignment']==0) { |
|
4506 | - $ShowAssignment= Display::return_icon('px_transparent.gif'); |
|
4497 | + $allpages = Database::query($sql); |
|
4498 | + while ($row = Database::fetch_array($allpages)) { |
|
4499 | + $orphaned_title = $row['title']; |
|
4500 | + $orphaned_visibility = $row['visibility']; |
|
4501 | + if ($row['assignment'] == 1) { |
|
4502 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', '', '', ICON_SIZE_SMALL); |
|
4503 | + } elseif ($row['assignment'] == 2) { |
|
4504 | + $ShowAssignment = Display::return_icon('wiki_work.png', '', '', ICON_SIZE_SMALL); |
|
4505 | + } elseif ($row['assignment'] == 0) { |
|
4506 | + $ShowAssignment = Display::return_icon('px_transparent.gif'); |
|
4507 | 4507 | } |
4508 | 4508 | } |
4509 | 4509 | |
4510 | - if (!api_is_allowed_to_edit(false,true) || !api_is_platform_admin() && $orphaned_visibility==0){ |
|
4510 | + if (!api_is_allowed_to_edit(false, true) || !api_is_platform_admin() && $orphaned_visibility == 0) { |
|
4511 | 4511 | continue; |
4512 | 4512 | } |
4513 | 4513 | |
@@ -4519,7 +4519,7 @@ discard block |
||
4519 | 4519 | $rows[] = $row; |
4520 | 4520 | } |
4521 | 4521 | |
4522 | - $table = new SortableTableFromArrayConfig($rows,1, 10, 'OrphanedPages_table','','','DESC'); |
|
4522 | + $table = new SortableTableFromArrayConfig($rows, 1, 10, 'OrphanedPages_table', '', '', 'DESC'); |
|
4523 | 4523 | $table->set_additional_parameters( |
4524 | 4524 | array( |
4525 | 4525 | 'cidReq' => Security::remove_XSS($_GET['cidReq']), |
@@ -4528,8 +4528,8 @@ discard block |
||
4528 | 4528 | 'group_id' => intval($_GET['group_id']), |
4529 | 4529 | ) |
4530 | 4530 | ); |
4531 | - $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;')); |
|
4532 | - $table->set_header(1,get_lang('Title'), true); |
|
4531 | + $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;')); |
|
4532 | + $table->set_header(1, get_lang('Title'), true); |
|
4533 | 4533 | $table->display(); |
4534 | 4534 | } |
4535 | 4535 | |
@@ -4551,11 +4551,11 @@ discard block |
||
4551 | 4551 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
4552 | 4552 | GROUP BY reflink |
4553 | 4553 | ORDER BY reflink ASC'; |
4554 | - $allpages=Database::query($sql); |
|
4554 | + $allpages = Database::query($sql); |
|
4555 | 4555 | |
4556 | - while ($row=Database::fetch_array($allpages)) { |
|
4557 | - if ($row['reflink']=='index'){ |
|
4558 | - $row['reflink']=str_replace(' ','_',get_lang('DefaultTitle')); |
|
4556 | + while ($row = Database::fetch_array($allpages)) { |
|
4557 | + if ($row['reflink'] == 'index') { |
|
4558 | + $row['reflink'] = str_replace(' ', '_', get_lang('DefaultTitle')); |
|
4559 | 4559 | } |
4560 | 4560 | $pages[] = $row['reflink']; |
4561 | 4561 | } |
@@ -4569,31 +4569,31 @@ discard block |
||
4569 | 4569 | |
4570 | 4570 | $allpages = Database::query($sql); |
4571 | 4571 | |
4572 | - while ($row=Database::fetch_array($allpages)) { |
|
4572 | + while ($row = Database::fetch_array($allpages)) { |
|
4573 | 4573 | $refs = explode(" ", trim($row["linksto"])); |
4574 | 4574 | // Find linksto into reflink. If not found ->page is wanted |
4575 | 4575 | foreach ($refs as $v) { |
4576 | 4576 | |
4577 | 4577 | if (!in_array($v, $pages)) { |
4578 | - if (trim($v)!="") { |
|
4579 | - $wanted[]=$v; |
|
4578 | + if (trim($v) != "") { |
|
4579 | + $wanted[] = $v; |
|
4580 | 4580 | } |
4581 | 4581 | } |
4582 | 4582 | } |
4583 | 4583 | } |
4584 | 4584 | |
4585 | - $wanted = array_unique($wanted);//make a unique list |
|
4585 | + $wanted = array_unique($wanted); //make a unique list |
|
4586 | 4586 | |
4587 | 4587 | //show table |
4588 | 4588 | $rows = array(); |
4589 | 4589 | foreach ($wanted as $wanted_show) { |
4590 | 4590 | $row = array(); |
4591 | 4591 | $wanted_show = Security::remove_XSS($wanted_show); |
4592 | - $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_',' ',$wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_',' ',$wanted_show).'</a>';//meter un remove xss en lugar de htmlentities |
|
4592 | + $row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_', ' ', $wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_', ' ', $wanted_show).'</a>'; //meter un remove xss en lugar de htmlentities |
|
4593 | 4593 | $rows[] = $row; |
4594 | 4594 | } |
4595 | 4595 | |
4596 | - $table = new SortableTableFromArrayConfig($rows,0,10,'WantedPages_table','','','DESC'); |
|
4596 | + $table = new SortableTableFromArrayConfig($rows, 0, 10, 'WantedPages_table', '', '', 'DESC'); |
|
4597 | 4597 | $table->set_additional_parameters( |
4598 | 4598 | array( |
4599 | 4599 | 'cidReq' => Security::remove_XSS($_GET['cidReq']), |
@@ -4602,7 +4602,7 @@ discard block |
||
4602 | 4602 | 'group_id' => intval($_GET['group_id']), |
4603 | 4603 | ) |
4604 | 4604 | ); |
4605 | - $table->set_header(0,get_lang('Title'), true); |
|
4605 | + $table->set_header(0, get_lang('Title'), true); |
|
4606 | 4606 | $table->display(); |
4607 | 4607 | } |
4608 | 4608 | |
@@ -4619,7 +4619,7 @@ discard block |
||
4619 | 4619 | |
4620 | 4620 | echo '<div class="actions">'.get_lang('MostVisitedPages').'</div>'; |
4621 | 4621 | |
4622 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
4622 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { //only by professors if page is hidden |
|
4623 | 4623 | $sql = 'SELECT *, SUM(hits) AS tsum FROM '.$tbl_wiki.' |
4624 | 4624 | WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' |
4625 | 4625 | GROUP BY reflink'; |
@@ -4640,11 +4640,11 @@ discard block |
||
4640 | 4640 | while ($obj = Database::fetch_object($allpages)) { |
4641 | 4641 | //get type assignment icon |
4642 | 4642 | $ShowAssignment = ''; |
4643 | - if ($obj->assignment==1) { |
|
4644 | - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); |
|
4645 | - } elseif ($obj->assignment==2) { |
|
4646 | - $ShowAssignment=$ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); |
|
4647 | - } elseif ($obj->assignment==0) { |
|
4643 | + if ($obj->assignment == 1) { |
|
4644 | + $ShowAssignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'), '', ICON_SIZE_SMALL); |
|
4645 | + } elseif ($obj->assignment == 2) { |
|
4646 | + $ShowAssignment = $ShowAssignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWork'), '', ICON_SIZE_SMALL); |
|
4647 | + } elseif ($obj->assignment == 0) { |
|
4648 | 4648 | $ShowAssignment = Display::return_icon('px_transparent.gif'); |
4649 | 4649 | } |
4650 | 4650 | |
@@ -4673,7 +4673,7 @@ discard block |
||
4673 | 4673 | 'group_id' => intval($_GET['group_id']), |
4674 | 4674 | ) |
4675 | 4675 | ); |
4676 | - $table->set_header(0,get_lang('Type'), true, array ('style' => 'width:30px;')); |
|
4676 | + $table->set_header(0, get_lang('Type'), true, array('style' => 'width:30px;')); |
|
4677 | 4677 | $table->set_header(1, get_lang('Title'), true); |
4678 | 4678 | $table->set_header(2, get_lang('Visits'), true); |
4679 | 4679 | $table->display(); |
@@ -4698,8 +4698,8 @@ discard block |
||
4698 | 4698 | |
4699 | 4699 | if (api_is_allowed_to_session_edit(false, true) && api_is_allowed_to_edit()) { |
4700 | 4700 | // menu add page |
4701 | - $actionsLeft .= '<a href="index.php?cidReq=' . $_course['id'] . '&action=addnew&session_id=' . $session_id . '&group_id=' . $groupId . '"' . self::is_active_navigation_tab('addnew').'>' |
|
4702 | - . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM) . '</a>'; |
|
4701 | + $actionsLeft .= '<a href="index.php?cidReq='.$_course['id'].'&action=addnew&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('addnew').'>' |
|
4702 | + . Display::return_icon('add.png', get_lang('AddNew'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
4703 | 4703 | } |
4704 | 4704 | |
4705 | 4705 | $lock_unlock_addnew = null; |
@@ -4707,12 +4707,12 @@ discard block |
||
4707 | 4707 | |
4708 | 4708 | if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
4709 | 4709 | // page action: enable or disable the adding of new pages |
4710 | - if (self::check_addnewpagelock()==0) { |
|
4710 | + if (self::check_addnewpagelock() == 0) { |
|
4711 | 4711 | $protect_addnewpage = Display::return_icon('off.png', get_lang('AddOptionProtected')); |
4712 | - $lock_unlock_addnew ='unlockaddnew'; |
|
4712 | + $lock_unlock_addnew = 'unlockaddnew'; |
|
4713 | 4713 | } else { |
4714 | 4714 | $protect_addnewpage = Display::return_icon('on.png', get_lang('AddOptionUnprotected')); |
4715 | - $lock_unlock_addnew ='lockaddnew'; |
|
4715 | + $lock_unlock_addnew = 'lockaddnew'; |
|
4716 | 4716 | } |
4717 | 4717 | } |
4718 | 4718 | |
@@ -4732,7 +4732,7 @@ discard block |
||
4732 | 4732 | get_lang('RecentChanges').'</a>'; |
4733 | 4733 | |
4734 | 4734 | |
4735 | - echo Display::toolbarAction('toolbar-wiki', array( 0 => $actionsLeft)); |
|
4735 | + echo Display::toolbarAction('toolbar-wiki', array(0 => $actionsLeft)); |
|
4736 | 4736 | } |
4737 | 4737 | |
4738 | 4738 | /** |
@@ -4750,7 +4750,7 @@ discard block |
||
4750 | 4750 | return; |
4751 | 4751 | } |
4752 | 4752 | |
4753 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
4753 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
4754 | 4754 | self::setMessage('<div id="wikititle">'.get_lang('DeletePageHistory').'</div>'); |
4755 | 4755 | |
4756 | 4756 | if ($page == "index") { |
@@ -4792,7 +4792,7 @@ discard block |
||
4792 | 4792 | $userId = api_get_user_id(); |
4793 | 4793 | |
4794 | 4794 | if (api_get_session_id() != 0 && |
4795 | - api_is_allowed_to_session_edit(false,true) == false |
|
4795 | + api_is_allowed_to_session_edit(false, true) == false |
|
4796 | 4796 | ) { |
4797 | 4797 | api_not_allowed(); |
4798 | 4798 | } |
@@ -4815,12 +4815,12 @@ discard block |
||
4815 | 4815 | Display::display_error_message(get_lang('MustSelectPage'), false, true) |
4816 | 4816 | ); |
4817 | 4817 | return; |
4818 | - } elseif ($row['content']=='' && $row['title']=='' && $page=='index') { |
|
4818 | + } elseif ($row['content'] == '' && $row['title'] == '' && $page == 'index') { |
|
4819 | 4819 | |
4820 | 4820 | // Table structure for better export to pdf |
4821 | 4821 | $default_table_for_content_Start = '<table align="center" border="0"><tr><td align="center">'; |
4822 | 4822 | $default_table_for_content_End = '</td></tr></table>'; |
4823 | - $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'),api_get_path(WEB_IMG_PATH)).$default_table_for_content_End; |
|
4823 | + $content = $default_table_for_content_Start.sprintf(get_lang('DefaultContent'), api_get_path(WEB_IMG_PATH)).$default_table_for_content_End; |
|
4824 | 4824 | $title = get_lang('DefaultTitle'); |
4825 | 4825 | $page_id = 0; |
4826 | 4826 | } else { |
@@ -4845,7 +4845,7 @@ discard block |
||
4845 | 4845 | // Check if is a wiki group |
4846 | 4846 | if (!empty($groupId)) { |
4847 | 4847 | //Only teacher, platform admin and group members can edit a wiki group |
4848 | - if (api_is_allowed_to_edit(false,true) || |
|
4848 | + if (api_is_allowed_to_edit(false, true) || |
|
4849 | 4849 | api_is_platform_admin() || |
4850 | 4850 | GroupManager :: is_user_in_group($userId, $groupId) |
4851 | 4851 | ) { |
@@ -4858,7 +4858,7 @@ discard block |
||
4858 | 4858 | ); |
4859 | 4859 | } |
4860 | 4860 | } else { |
4861 | - $PassEdit=true; |
|
4861 | + $PassEdit = true; |
|
4862 | 4862 | } |
4863 | 4863 | |
4864 | 4864 | $icon_assignment = null; |
@@ -4868,10 +4868,10 @@ discard block |
||
4868 | 4868 | Display::return_message(get_lang('EditAssignmentWarning')) |
4869 | 4869 | ); |
4870 | 4870 | |
4871 | - $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL); |
|
4871 | + $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL); |
|
4872 | 4872 | } elseif ($row['assignment'] == 2) { |
4873 | - $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL); |
|
4874 | - if (($userId == $row['user_id'])==false) { |
|
4873 | + $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL); |
|
4874 | + if (($userId == $row['user_id']) == false) { |
|
4875 | 4875 | if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
4876 | 4876 | $PassEdit = true; |
4877 | 4877 | } else { |
@@ -4891,7 +4891,7 @@ discard block |
||
4891 | 4891 | if ($PassEdit) { |
4892 | 4892 | //show editor if edit is allowed |
4893 | 4893 | if ($row['editlock'] == 1 && |
4894 | - (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin()==false) |
|
4894 | + (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false) |
|
4895 | 4895 | ) { |
4896 | 4896 | Display::addFlash( |
4897 | 4897 | Display::return_message( |
@@ -4902,8 +4902,8 @@ discard block |
||
4902 | 4902 | // Check tasks |
4903 | 4903 | |
4904 | 4904 | if (!empty($row['startdate_assig']) && |
4905 | - $row['startdate_assig']!='0000-00-00 00:00:00' && |
|
4906 | - time()<strtotime($row['startdate_assig']) |
|
4905 | + $row['startdate_assig'] != '0000-00-00 00:00:00' && |
|
4906 | + time() < strtotime($row['startdate_assig']) |
|
4907 | 4907 | ) { |
4908 | 4908 | $message = get_lang('TheTaskDoesNotBeginUntil').': '.api_get_local_time($row['startdate_assig'], null, date_default_timezone_get()); |
4909 | 4909 | |
@@ -4920,10 +4920,10 @@ discard block |
||
4920 | 4920 | } |
4921 | 4921 | |
4922 | 4922 | if (!empty($row['enddate_assig']) && |
4923 | - $row['enddate_assig']!='0000-00-00 00:00:00' && |
|
4923 | + $row['enddate_assig'] != '0000-00-00 00:00:00' && |
|
4924 | 4924 | time() > strtotime($row['enddate_assig']) && |
4925 | - $row['enddate_assig']!='0000-00-00 00:00:00' && |
|
4926 | - $row['delayedsubmit']==0 |
|
4925 | + $row['enddate_assig'] != '0000-00-00 00:00:00' && |
|
4926 | + $row['delayedsubmit'] == 0 |
|
4927 | 4927 | ) { |
4928 | 4928 | $message = get_lang('TheDeadlineHasBeenCompleted').': '.api_get_local_time($row['enddate_assig'], null, date_default_timezone_get()); |
4929 | 4929 | Display::addFlash( |
@@ -4932,25 +4932,25 @@ discard block |
||
4932 | 4932 | 'warning' |
4933 | 4933 | ) |
4934 | 4934 | ); |
4935 | - if (!api_is_allowed_to_edit(false,true)) { |
|
4935 | + if (!api_is_allowed_to_edit(false, true)) { |
|
4936 | 4936 | $this->redirectHome(); |
4937 | 4937 | } |
4938 | 4938 | } |
4939 | 4939 | |
4940 | - if (!empty($row['max_version']) && $row['version']>=$row['max_version']) { |
|
4941 | - $message=get_lang('HasReachedMaxiNumVersions'); |
|
4940 | + if (!empty($row['max_version']) && $row['version'] >= $row['max_version']) { |
|
4941 | + $message = get_lang('HasReachedMaxiNumVersions'); |
|
4942 | 4942 | Display::addFlash( |
4943 | 4943 | Display::return_message( |
4944 | 4944 | $message, |
4945 | 4945 | 'warning' |
4946 | 4946 | ) |
4947 | 4947 | ); |
4948 | - if (!api_is_allowed_to_edit(false,true)) { |
|
4948 | + if (!api_is_allowed_to_edit(false, true)) { |
|
4949 | 4949 | $this->redirectHome(); |
4950 | 4950 | } |
4951 | 4951 | } |
4952 | 4952 | |
4953 | - if (!empty($row['max_text']) && $row['max_text']<=self::word_count($row['content'])) { |
|
4953 | + if (!empty($row['max_text']) && $row['max_text'] <= self::word_count($row['content'])) { |
|
4954 | 4954 | $message = get_lang('HasReachedMaxNumWords'); |
4955 | 4955 | Display::addFlash( |
4956 | 4956 | Display::return_message( |
@@ -4958,50 +4958,50 @@ discard block |
||
4958 | 4958 | 'warning' |
4959 | 4959 | ) |
4960 | 4960 | ); |
4961 | - if (!api_is_allowed_to_edit(false,true)) { |
|
4961 | + if (!api_is_allowed_to_edit(false, true)) { |
|
4962 | 4962 | $this->redirectHome(); |
4963 | 4963 | } |
4964 | 4964 | } |
4965 | 4965 | |
4966 | 4966 | if (!empty($row['task'])) { |
4967 | 4967 | //previous change 0 by text |
4968 | - if ($row['startdate_assig']=='0000-00-00 00:00:00') { |
|
4969 | - $message_task_startdate =get_lang('No'); |
|
4968 | + if ($row['startdate_assig'] == '0000-00-00 00:00:00') { |
|
4969 | + $message_task_startdate = get_lang('No'); |
|
4970 | 4970 | } else { |
4971 | 4971 | $message_task_startdate = api_get_local_time($row['startdate_assig'], null, date_default_timezone_get()); |
4972 | 4972 | } |
4973 | 4973 | |
4974 | - if ($row['enddate_assig']=='0000-00-00 00:00:00') { |
|
4974 | + if ($row['enddate_assig'] == '0000-00-00 00:00:00') { |
|
4975 | 4975 | $message_task_enddate = get_lang('No'); |
4976 | 4976 | } else { |
4977 | 4977 | $message_task_enddate = api_get_local_time($row['enddate_assig'], null, date_default_timezone_get()); |
4978 | 4978 | } |
4979 | 4979 | |
4980 | - if ($row['delayedsubmit']==0) { |
|
4981 | - $message_task_delayedsubmit=get_lang('No'); |
|
4980 | + if ($row['delayedsubmit'] == 0) { |
|
4981 | + $message_task_delayedsubmit = get_lang('No'); |
|
4982 | 4982 | } else { |
4983 | - $message_task_delayedsubmit=get_lang('Yes'); |
|
4983 | + $message_task_delayedsubmit = get_lang('Yes'); |
|
4984 | 4984 | } |
4985 | 4985 | |
4986 | - if ($row['max_version']==0) { |
|
4987 | - $message_task_max_version=get_lang('No'); |
|
4986 | + if ($row['max_version'] == 0) { |
|
4987 | + $message_task_max_version = get_lang('No'); |
|
4988 | 4988 | } else { |
4989 | - $message_task_max_version=$row['max_version']; |
|
4989 | + $message_task_max_version = $row['max_version']; |
|
4990 | 4990 | } |
4991 | 4991 | |
4992 | - if ($row['max_text']==0) { |
|
4993 | - $message_task_max_text=get_lang('No'); |
|
4992 | + if ($row['max_text'] == 0) { |
|
4993 | + $message_task_max_text = get_lang('No'); |
|
4994 | 4994 | } else { |
4995 | - $message_task_max_text=$row['max_text']; |
|
4995 | + $message_task_max_text = $row['max_text']; |
|
4996 | 4996 | } |
4997 | 4997 | |
4998 | 4998 | // Comp message |
4999 | - $message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>'; |
|
5000 | - $message_task.='<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>'; |
|
5001 | - $message_task.='<p>'.get_lang('EndDate').': '.$message_task_enddate; |
|
5002 | - $message_task.=' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>'; |
|
5003 | - $message_task.='<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version; |
|
5004 | - $message_task.=' '.get_lang('NMaxWords').': '.$message_task_max_text; |
|
4999 | + $message_task = '<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>'; |
|
5000 | + $message_task .= '<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>'; |
|
5001 | + $message_task .= '<p>'.get_lang('EndDate').': '.$message_task_enddate; |
|
5002 | + $message_task .= ' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>'; |
|
5003 | + $message_task .= '<p>'.get_lang('OtherSettings').': '.get_lang('NMaxVersion').': '.$message_task_max_version; |
|
5004 | + $message_task .= ' '.get_lang('NMaxWords').': '.$message_task_max_text; |
|
5005 | 5005 | // Display message |
5006 | 5006 | Display::addFlash( |
5007 | 5007 | Display::return_message( |
@@ -5012,11 +5012,11 @@ discard block |
||
5012 | 5012 | |
5013 | 5013 | $feedback_message = ''; |
5014 | 5014 | if ($row['progress'] == $row['fprogress1'] && !empty($row['fprogress1'])) { |
5015 | - $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>'; |
|
5015 | + $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback1']).'</p>'; |
|
5016 | 5016 | } elseif ($row['progress'] == $row['fprogress2'] && !empty($row['fprogress2'])) { |
5017 | - $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>'; |
|
5017 | + $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback2']).'</p>'; |
|
5018 | 5018 | } elseif ($row['progress'] == $row['fprogress3'] && !empty($row['fprogress3'])) { |
5019 | - $feedback_message='<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>'; |
|
5019 | + $feedback_message = '<b>'.get_lang('Feedback').'</b><p>'.api_htmlentities($row['feedback3']).'</p>'; |
|
5020 | 5020 | } |
5021 | 5021 | |
5022 | 5022 | if (!empty($feedback_message)) { |
@@ -5041,14 +5041,14 @@ discard block |
||
5041 | 5041 | WHERE c_id = '.$course_id.' AND id="'.$row['id'].'"'; |
5042 | 5042 | Database::query($sql); |
5043 | 5043 | } elseif ($row['is_editing'] != $userId) { |
5044 | - $timestamp_edit=strtotime($row['time_edit']); |
|
5044 | + $timestamp_edit = strtotime($row['time_edit']); |
|
5045 | 5045 | $time_editing = time() - $timestamp_edit; |
5046 | 5046 | $max_edit_time = 1200; // 20 minutes |
5047 | 5047 | $rest_time = $max_edit_time - $time_editing; |
5048 | 5048 | |
5049 | 5049 | $userinfo = api_get_user_info($row['is_editing']); |
5050 | 5050 | $is_being_edited = get_lang('ThisPageisBeginEditedBy').' '.UserManager::getUserProfileLink($userinfo).' |
5051 | - '.get_lang('ThisPageisBeginEditedTryLater').' '.date( "i",$rest_time).' '.get_lang('MinMinutes').''; |
|
5051 | + '.get_lang('ThisPageisBeginEditedTryLater').' '.date("i", $rest_time).' '.get_lang('MinMinutes').''; |
|
5052 | 5052 | |
5053 | 5053 | Display::addFlash( |
5054 | 5054 | Display::return_message( |
@@ -5062,7 +5062,7 @@ discard block |
||
5062 | 5062 | // Form. |
5063 | 5063 | $url = api_get_self().'?action=edit&title='.urlencode($page).'&session_id='.api_get_session_id().'&group_id='.api_get_group_id().'&'.api_get_cidreq(); |
5064 | 5064 | $form = new FormValidator('wiki', 'post', $url); |
5065 | - $form->addElement('header', $icon_assignment.str_repeat(' ',3).api_htmlentities($title)); |
|
5065 | + $form->addElement('header', $icon_assignment.str_repeat(' ', 3).api_htmlentities($title)); |
|
5066 | 5066 | self::setForm($form, $row); |
5067 | 5067 | $form->addElement('hidden', 'title'); |
5068 | 5068 | $form->addElement('button', 'SaveWikiChange', get_lang('Save')); |
@@ -5085,7 +5085,7 @@ discard block |
||
5085 | 5085 | ); |
5086 | 5086 | } elseif (!self::double_post($_POST['wpost_id'])) { |
5087 | 5087 | //double post |
5088 | - } elseif ($_POST['version']!='' && $_SESSION['_version'] !=0 && $_POST['version'] != $_SESSION['_version']) { |
|
5088 | + } elseif ($_POST['version'] != '' && $_SESSION['_version'] != 0 && $_POST['version'] != $_SESSION['_version']) { |
|
5089 | 5089 | //prevent concurrent users and double version |
5090 | 5090 | Display::addFlash( |
5091 | 5091 | Display::return_message( |
@@ -5147,7 +5147,7 @@ discard block |
||
5147 | 5147 | $KeyAssignment = null; |
5148 | 5148 | $KeyTitle = null; |
5149 | 5149 | $KeyUserId = null; |
5150 | - while ($row=Database::fetch_array($result)) { |
|
5150 | + while ($row = Database::fetch_array($result)) { |
|
5151 | 5151 | $KeyVisibility = $row['visibility']; |
5152 | 5152 | $KeyAssignment = $row['assignment']; |
5153 | 5153 | $KeyTitle = $row['title']; |
@@ -5156,7 +5156,7 @@ discard block |
||
5156 | 5156 | $icon_assignment = null; |
5157 | 5157 | if ($KeyAssignment == 1) { |
5158 | 5158 | $icon_assignment = Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'), '', ICON_SIZE_SMALL); |
5159 | - } elseif($KeyAssignment == 2) { |
|
5159 | + } elseif ($KeyAssignment == 2) { |
|
5160 | 5160 | $icon_assignment = Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'), '', ICON_SIZE_SMALL); |
5161 | 5161 | } |
5162 | 5162 | |
@@ -5164,10 +5164,10 @@ discard block |
||
5164 | 5164 | |
5165 | 5165 | //if the page is hidden and is a job only sees its author and professor |
5166 | 5166 | if ($KeyVisibility == 1 || |
5167 | - api_is_allowed_to_edit(false,true) || |
|
5167 | + api_is_allowed_to_edit(false, true) || |
|
5168 | 5168 | api_is_platform_admin() || |
5169 | 5169 | ( |
5170 | - $KeyAssignment==2 && $KeyVisibility==0 && |
|
5170 | + $KeyAssignment == 2 && $KeyVisibility == 0 && |
|
5171 | 5171 | ($userId == $KeyUserId) |
5172 | 5172 | ) |
5173 | 5173 | ) { |
@@ -5197,7 +5197,7 @@ discard block |
||
5197 | 5197 | get_lang('ShowDifferences').' '.get_lang('WordsDiff').'</button>'; |
5198 | 5198 | echo '<br/><br/>'; |
5199 | 5199 | |
5200 | - $counter=0; |
|
5200 | + $counter = 0; |
|
5201 | 5201 | $total_versions = Database::num_rows($result); |
5202 | 5202 | |
5203 | 5203 | while ($row = Database::fetch_array($result)) { |
@@ -5205,10 +5205,10 @@ discard block |
||
5205 | 5205 | $username = api_htmlentities(sprintf(get_lang('LoginX'), $userinfo['username']), ENT_QUOTES); |
5206 | 5206 | |
5207 | 5207 | echo '<li style="margin-bottom: 5px;">'; |
5208 | - ($counter==0) ? $oldstyle='style="visibility: hidden;"':$oldstyle=''; |
|
5209 | - ($counter==0) ? $newchecked=' checked': $newchecked=''; |
|
5210 | - ($counter==$total_versions-1) ? $newstyle='style="visibility: hidden;"':$newstyle=''; |
|
5211 | - ($counter==1) ? $oldchecked=' checked':$oldchecked=''; |
|
5208 | + ($counter == 0) ? $oldstyle = 'style="visibility: hidden;"' : $oldstyle = ''; |
|
5209 | + ($counter == 0) ? $newchecked = ' checked' : $newchecked = ''; |
|
5210 | + ($counter == $total_versions - 1) ? $newstyle = 'style="visibility: hidden;"' : $newstyle = ''; |
|
5211 | + ($counter == 1) ? $oldchecked = ' checked' : $oldchecked = ''; |
|
5212 | 5212 | echo '<input name="old" value="'.$row['id'].'" type="radio" '.$oldstyle.' '.$oldchecked.'/> '; |
5213 | 5213 | echo '<input name="new" value="'.$row['id'].'" type="radio" '.$newstyle.' '.$newchecked.'/> '; |
5214 | 5214 | echo '<a href="'.api_get_self().'?action=showpage&title='.api_htmlentities(urlencode($page)).'&view='.$row['id'].'">'; |
@@ -5226,7 +5226,7 @@ discard block |
||
5226 | 5226 | $comment = $row['comment']; |
5227 | 5227 | if (!empty($comment)) { |
5228 | 5228 | echo get_lang('Comments').': '.api_htmlentities(api_substr($row['comment'], 0, 100)); |
5229 | - if (api_strlen($row['comment'])>100) { |
|
5229 | + if (api_strlen($row['comment']) > 100) { |
|
5230 | 5230 | echo '... '; |
5231 | 5231 | } |
5232 | 5232 | } else { |
@@ -5251,8 +5251,8 @@ discard block |
||
5251 | 5251 | |
5252 | 5252 | $sql_new = "SELECT * FROM $tbl_wiki |
5253 | 5253 | WHERE c_id = $course_id AND id='".Database::escape_string($_POST['new'])."'"; |
5254 | - $result_new=Database::query($sql_new); |
|
5255 | - $version_new=Database::fetch_array($result_new); |
|
5254 | + $result_new = Database::query($sql_new); |
|
5255 | + $version_new = Database::fetch_array($result_new); |
|
5256 | 5256 | $oldTime = isset($version_old['dtime']) ? $version_old['dtime'] : null; |
5257 | 5257 | $oldContent = isset($version_old['content']) ? $version_old['content'] : null; |
5258 | 5258 | |
@@ -5279,9 +5279,9 @@ discard block |
||
5279 | 5279 | |
5280 | 5280 | |
5281 | 5281 | if (isset($_POST['HistoryDifferences'])) { |
5282 | - echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line' ).'</table>'; // format_line mode is better for words |
|
5282 | + echo '<table>'.diff($oldContent, $version_new['content'], true, 'format_table_line').'</table>'; // format_line mode is better for words |
|
5283 | 5283 | echo '<br />'; |
5284 | - echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n"; |
|
5284 | + echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n"; |
|
5285 | 5285 | echo '<table><tr>'; |
5286 | 5286 | echo '<td>'; |
5287 | 5287 | echo '</td><td>'; |
@@ -5300,7 +5300,7 @@ discard block |
||
5300 | 5300 | $renderer = new Text_Diff_Renderer_inline(); |
5301 | 5301 | echo '<style>del{background:#fcc}ins{background:#cfc}</style>'.$renderer->render($diff); // Code inline |
5302 | 5302 | echo '<br />'; |
5303 | - echo '<strong>'.get_lang('Legend').'</strong><div class="diff">' . "\n"; |
|
5303 | + echo '<strong>'.get_lang('Legend').'</strong><div class="diff">'."\n"; |
|
5304 | 5304 | echo '<table><tr>'; |
5305 | 5305 | echo '<td>'; |
5306 | 5306 | echo '</td><td>'; |
@@ -5348,7 +5348,7 @@ discard block |
||
5348 | 5348 | echo '<td style="vertical-align:top">'; |
5349 | 5349 | echo '<ul>'; |
5350 | 5350 | // Submenu Statistics |
5351 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
5351 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
5352 | 5352 | echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=statistics&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('Statistics').'</a></li>'; |
5353 | 5353 | } |
5354 | 5354 | echo ' </ul>'; |
@@ -5421,7 +5421,7 @@ discard block |
||
5421 | 5421 | break; |
5422 | 5422 | case 'deletewiki': |
5423 | 5423 | $title = '<div class="actions">'.get_lang('DeleteWiki').'</div>'; |
5424 | - if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { |
|
5424 | + if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) { |
|
5425 | 5425 | $message = get_lang('ConfirmDeleteWiki'); |
5426 | 5426 | $message .= '<p> |
5427 | 5427 | <a href="index.php?'.api_get_cidreq().'">'.get_lang('No').'</a> |
@@ -5452,14 +5452,14 @@ discard block |
||
5452 | 5452 | self::getLinks($page); |
5453 | 5453 | break; |
5454 | 5454 | case 'addnew': |
5455 | - if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) { |
|
5455 | + if (api_get_session_id() != 0 && api_is_allowed_to_session_edit(false, true) == false) { |
|
5456 | 5456 | api_not_allowed(); |
5457 | 5457 | } |
5458 | 5458 | echo '<div class="actions">'.get_lang('AddNew').'</div>'; |
5459 | 5459 | echo '<br/>'; |
5460 | 5460 | //first, check if page index was created. chektitle=false |
5461 | 5461 | if (self::checktitle('index')) { |
5462 | - if (api_is_allowed_to_edit(false,true) || |
|
5462 | + if (api_is_allowed_to_edit(false, true) || |
|
5463 | 5463 | api_is_platform_admin() || |
5464 | 5464 | GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id()) |
5465 | 5465 | ) { |
@@ -5467,10 +5467,10 @@ discard block |
||
5467 | 5467 | } else { |
5468 | 5468 | self::setMessage(Display::display_normal_message(get_lang('WikiStandBy'), false, true)); |
5469 | 5469 | } |
5470 | - } elseif (self::check_addnewpagelock()==0 && (api_is_allowed_to_edit(false, true)==false || api_is_platform_admin()==false)) { |
|
5470 | + } elseif (self::check_addnewpagelock() == 0 && (api_is_allowed_to_edit(false, true) == false || api_is_platform_admin() == false)) { |
|
5471 | 5471 | self::setMessage(Display::display_error_message(get_lang('AddPagesLocked'), false, true)); |
5472 | 5472 | } else { |
5473 | - if (api_is_allowed_to_edit(false,true) || |
|
5473 | + if (api_is_allowed_to_edit(false, true) || |
|
5474 | 5474 | api_is_platform_admin() || |
5475 | 5475 | GroupManager::is_user_in_group(api_get_user_id(), api_get_group_id()) || |
5476 | 5476 | $_GET['group_id'] == 0 |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | if (!empty($gradebook) && $gradebook == 'view') { |
66 | 66 | $interbreadcrumb[] = array( |
67 | - 'url' => '../gradebook/' . $_SESSION['gradebook_dest'], |
|
67 | + 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], |
|
68 | 68 | 'name' => get_lang('ToolGradebook'), |
69 | 69 | ); |
70 | 70 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | switch ($_GET['content']) { |
80 | 80 | case 'forum': |
81 | 81 | $interbreadcrumb[] = array( |
82 | - 'url' => 'index.php?search=' . $search_forum . '&' . api_get_cidreq(), |
|
82 | + 'url' => 'index.php?search='.$search_forum.'&'.api_get_cidreq(), |
|
83 | 83 | 'name' => get_lang('Forum'), |
84 | 84 | ); |
85 | 85 | $interbreadcrumb[] = array( |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | break; |
90 | 90 | case 'forumcategory': |
91 | 91 | $interbreadcrumb[] = array( |
92 | - 'url' => 'index.php?search=' . $search_forum . '&' . api_get_cidreq(), |
|
92 | + 'url' => 'index.php?search='.$search_forum.'&'.api_get_cidreq(), |
|
93 | 93 | 'name' => get_lang('Forum'), |
94 | 94 | ); |
95 | 95 | $interbreadcrumb[] = array( |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | . "&gradebook=&action=add_item&type=step&lp_id=$lp_id#resource_tab-5\">" |
186 | 186 | . Display::return_icon( |
187 | 187 | 'back.png', |
188 | - get_lang("BackTo") . ' ' . get_lang("LearningPaths"), |
|
188 | + get_lang("BackTo").' '.get_lang("LearningPaths"), |
|
189 | 189 | '', |
190 | 190 | ICON_SIZE_MEDIUM |
191 | 191 | ) |
@@ -197,8 +197,8 @@ discard block |
||
197 | 197 | |
198 | 198 | if (api_is_allowed_to_edit(false, true)) { |
199 | 199 | echo '<a href="' |
200 | - . api_get_self() . '?' . api_get_cidreq() |
|
201 | - . '&action=add&content=forumcategory&lp_id=' . $lp_id . '"> ' . |
|
200 | + . api_get_self().'?'.api_get_cidreq() |
|
201 | + . '&action=add&content=forumcategory&lp_id='.$lp_id.'"> '. |
|
202 | 202 | Display::return_icon( |
203 | 203 | 'new_folder.png', get_lang('AddForumCategory'), '', ICON_SIZE_MEDIUM |
204 | 204 | ) |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | ); |
249 | 249 | |
250 | 250 | if (empty($sessionId) && !empty($forumCategory['session_name'])) { |
251 | - $session_displayed = ' (' . Security::remove_XSS($forumCategory['session_name']) . ')'; |
|
251 | + $session_displayed = ' ('.Security::remove_XSS($forumCategory['session_name']).')'; |
|
252 | 252 | } else { |
253 | 253 | $session_displayed = ''; |
254 | 254 | } |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $html = ''; |
261 | 261 | $iconsEdit = ''; |
262 | 262 | $idCategory = $forumCategory['cat_id']; |
263 | - $urlCategory = 'viewforumcategory.php?' . api_get_cidreq() . '&forumcategory=' . intval($idCategory); |
|
263 | + $urlCategory = 'viewforumcategory.php?'.api_get_cidreq().'&forumcategory='.intval($idCategory); |
|
264 | 264 | $titleCategory = Display::tag( |
265 | 265 | 'a', |
266 | 266 | $forumCategory['cat_title'], |
@@ -278,9 +278,9 @@ discard block |
||
278 | 278 | !($forumCategory['session_id'] == 0 && |
279 | 279 | intval($sessionId) != 0) |
280 | 280 | ) { |
281 | - $iconsEdit .= '<a href="' . api_get_self() . '?' . api_get_cidreq() |
|
282 | - . '&action=edit&content=forumcategory&id=' . intval($idCategory) |
|
283 | - . '">' . Display::return_icon( |
|
281 | + $iconsEdit .= '<a href="'.api_get_self().'?'.api_get_cidreq() |
|
282 | + . '&action=edit&content=forumcategory&id='.intval($idCategory) |
|
283 | + . '">'.Display::return_icon( |
|
284 | 284 | 'edit.png', |
285 | 285 | get_lang('Edit'), |
286 | 286 | array(), |
@@ -288,8 +288,8 @@ discard block |
||
288 | 288 | ) |
289 | 289 | . '</a>'; |
290 | 290 | |
291 | - $iconsEdit .='<a href="' . api_get_self() . '?' . api_get_cidreq() |
|
292 | - . '&action=delete&content=forumcategory&id=' . intval($idCategory) |
|
291 | + $iconsEdit .= '<a href="'.api_get_self().'?'.api_get_cidreq() |
|
292 | + . '&action=delete&content=forumcategory&id='.intval($idCategory) |
|
293 | 293 | . "\" onclick=\"javascript:if(!confirm('" |
294 | 294 | . addslashes(api_htmlentities( |
295 | 295 | get_lang('DeleteForumCategory'), |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | ICON_SIZE_SMALL |
304 | 304 | ) |
305 | 305 | . '</a>'; |
306 | - $iconsEdit .= return_visible_invisible_icon( |
|
306 | + $iconsEdit .= return_visible_invisible_icon( |
|
307 | 307 | 'forumcategory', |
308 | 308 | strval(intval($idCategory)), |
309 | 309 | strval(intval($forumCategory['visibility'])) |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | array(), |
338 | 338 | ICON_SIZE_MEDIUM |
339 | 339 | ); |
340 | - $html .= '<h3>' . $icoCategory . $titleCategory . '</h3>'; |
|
340 | + $html .= '<h3>'.$icoCategory.$titleCategory.'</h3>'; |
|
341 | 341 | |
342 | 342 | if ($descriptionCategory != '' && trim($descriptionCategory) != ' ') { |
343 | 343 | $html .= '<div class="forum-description">'.$descriptionCategory.'</div>'; |
@@ -470,15 +470,15 @@ discard block |
||
470 | 470 | 30 |
471 | 471 | ); |
472 | 472 | $forum_title_group_addition = ' (<a href="../group/group_space.php?' |
473 | - . api_get_cidreq() . '&gidReq=' . $forum['forum_of_group'] |
|
474 | - . '" class="forum_group_link">' . get_lang('GoTo') . ' ' . $group_title . '</a>)' |
|
473 | + . api_get_cidreq().'&gidReq='.$forum['forum_of_group'] |
|
474 | + . '" class="forum_group_link">'.get_lang('GoTo').' '.$group_title.'</a>)' |
|
475 | 475 | . $session_img; |
476 | 476 | } else { |
477 | 477 | $forum_title_group_addition = ''; |
478 | 478 | } |
479 | 479 | |
480 | 480 | if (empty($sessionId) && !empty($forum['session_name'])) { |
481 | - $session_displayed = ' (' . $forum['session_name'] . ')'; |
|
481 | + $session_displayed = ' ('.$forum['session_name'].')'; |
|
482 | 482 | } else { |
483 | 483 | $session_displayed = ''; |
484 | 484 | } |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | $html .= '<div class="row">'; |
491 | 491 | $html .= '<div class="col-md-6">'; |
492 | 492 | $html .= '<div class="col-md-3">'; |
493 | - $html .= '<div class="number-post">'.$forum_image.'<p>'.$number_threads.' ' . get_lang('ForumThreads') . '</p>' |
|
493 | + $html .= '<div class="number-post">'.$forum_image.'<p>'.$number_threads.' '.get_lang('ForumThreads').'</p>' |
|
494 | 494 | . '</div>'; |
495 | 495 | $html .= '</div>'; |
496 | 496 | |
@@ -505,15 +505,15 @@ discard block |
||
505 | 505 | $linkForum .= Display::tag( |
506 | 506 | 'a', |
507 | 507 | $forum['forum_title'], |
508 | - array ( |
|
509 | - 'href' => 'viewforum.php?' . api_get_cidreq() |
|
510 | - . '&gidReq=' . intval($groupid) |
|
511 | - . '&forum=' . intval($forum['forum_id']), |
|
512 | - 'class' => return_visible_invisible( strval( intval($forum['visibility']) ) ) |
|
508 | + array( |
|
509 | + 'href' => 'viewforum.php?'.api_get_cidreq() |
|
510 | + . '&gidReq='.intval($groupid) |
|
511 | + . '&forum='.intval($forum['forum_id']), |
|
512 | + 'class' => return_visible_invisible(strval(intval($forum['visibility']))) |
|
513 | 513 | ) |
514 | 514 | ); |
515 | 515 | |
516 | - $html .= '<h3 class="title">' . $iconForum . $linkForum . '</h3>'; |
|
516 | + $html .= '<h3 class="title">'.$iconForum.$linkForum.'</h3>'; |
|
517 | 517 | |
518 | 518 | $html .= Display::tag( |
519 | 519 | 'p', |
@@ -525,13 +525,13 @@ discard block |
||
525 | 525 | $html .= '</div>'; |
526 | 526 | $html .= '</div>'; |
527 | 527 | |
528 | - $iconEmpty=''; |
|
528 | + $iconEmpty = ''; |
|
529 | 529 | |
530 | 530 | // The number of topics and posts. |
531 | 531 | if ($forum['forum_of_group'] !== '0') { |
532 | - $newPost=''; |
|
532 | + $newPost = ''; |
|
533 | 533 | if (is_array($mywhatsnew_post_info) && !empty($mywhatsnew_post_info)) { |
534 | - $newPost = ' ' . Display::return_icon( |
|
534 | + $newPost = ' '.Display::return_icon( |
|
535 | 535 | 'alert.png', |
536 | 536 | get_lang('Forum'), |
537 | 537 | null, |
@@ -542,7 +542,7 @@ discard block |
||
542 | 542 | } |
543 | 543 | } else { |
544 | 544 | if (is_array($mywhatsnew_post_info) && !empty($mywhatsnew_post_info)) { |
545 | - $newPost = ' ' . Display::return_icon( |
|
545 | + $newPost = ' '.Display::return_icon( |
|
546 | 546 | 'alert.png', |
547 | 547 | get_lang('Forum'), |
548 | 548 | null, |
@@ -584,9 +584,9 @@ discard block |
||
584 | 584 | null, |
585 | 585 | ICON_SIZE_TINY |
586 | 586 | ) |
587 | - . ' ' . |
|
587 | + . ' '. |
|
588 | 588 | api_convert_and_format_date($forum['last_post_date']) |
589 | - . '<br /> ' . get_lang('By') . ' ' . |
|
589 | + . '<br /> '.get_lang('By').' '. |
|
590 | 590 | display_user_link( |
591 | 591 | $poster_id, |
592 | 592 | $name, |
@@ -601,13 +601,13 @@ discard block |
||
601 | 601 | api_is_allowed_to_edit(false, true) && |
602 | 602 | !($forum['session_id'] == 0 && intval($sessionId) != 0) |
603 | 603 | ) { |
604 | - $html .= '<a href="'.api_get_self() . '?' . api_get_cidreq() |
|
605 | - . '&action=edit&content=forum&id=' . $forum['forum_id'] . '">' |
|
604 | + $html .= '<a href="'.api_get_self().'?'.api_get_cidreq() |
|
605 | + . '&action=edit&content=forum&id='.$forum['forum_id'].'">' |
|
606 | 606 | . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) |
607 | 607 | . '</a>'; |
608 | - $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() |
|
609 | - . '&action=delete&content=forum&id=' . $forum['forum_id'] |
|
610 | - . "\" onclick=\"javascript:if(!confirm('" . addslashes( |
|
608 | + $html .= '<a href="'.api_get_self().'?'.api_get_cidreq() |
|
609 | + . '&action=delete&content=forum&id='.$forum['forum_id'] |
|
610 | + . "\" onclick=\"javascript:if(!confirm('".addslashes( |
|
611 | 611 | api_htmlentities(get_lang('DeleteForum'), ENT_QUOTES) |
612 | 612 | ) |
613 | 613 | . "')) return false;\">" |
@@ -645,8 +645,8 @@ discard block |
||
645 | 645 | !api_is_anonymous() && |
646 | 646 | api_is_allowed_to_session_edit(false, true) |
647 | 647 | ) { |
648 | - $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() |
|
649 | - . '&action=notify&content=forum&id=' . $forum['forum_id'] . '">' |
|
648 | + $html .= '<a href="'.api_get_self().'?'.api_get_cidreq() |
|
649 | + . '&action=notify&content=forum&id='.$forum['forum_id'].'">' |
|
650 | 650 | . Display::return_icon($iconnotify, get_lang('NotifyMe'), null, ICON_SIZE_SMALL) |
651 | 651 | . '</a>'; |
652 | 652 | } |
@@ -663,7 +663,7 @@ discard block |
||
663 | 663 | } |
664 | 664 | } |
665 | 665 | } else { |
666 | - echo '<div class="alert alert-warning">' . get_lang('NoForumInThisCategory') . '</div>' |
|
666 | + echo '<div class="alert alert-warning">'.get_lang('NoForumInThisCategory').'</div>' |
|
667 | 667 | . (api_is_allowed_to_edit(false, true) ? '<div>' : '</div>') |
668 | 668 | . '</div>'; |
669 | 669 | } |
@@ -31,7 +31,7 @@ discard block |
||
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 |
||
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 |
||
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/') |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @package chamilo.forum |
22 | 22 | */ |
23 | 23 | |
24 | -$forumUrl = api_get_path(WEB_CODE_PATH) . 'forum/'; |
|
24 | +$forumUrl = api_get_path(WEB_CODE_PATH).'forum/'; |
|
25 | 25 | $_user = api_get_user_info(); |
26 | 26 | $sortDirection = isset($_GET['posts_order']) && $_GET['posts_order'] === 'desc' ? 'DESC' : 'ASC'; |
27 | 27 | $rows = getPosts($_GET['thread'], $sortDirection, true); |
@@ -42,13 +42,13 @@ discard block |
||
42 | 42 | // Are we in a lp ? |
43 | 43 | $origin = ''; |
44 | 44 | if (isset($_GET['origin'])) { |
45 | - $origin = Security::remove_XSS($_GET['origin']); |
|
45 | + $origin = Security::remove_XSS($_GET['origin']); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | // Delete attachment file. |
49 | 49 | if ( |
50 | 50 | isset($_GET['action']) && |
51 | - $_GET['action']=='delete_attach' && |
|
51 | + $_GET['action'] == 'delete_attach' && |
|
52 | 52 | isset($_GET['id_attach']) |
53 | 53 | ) { |
54 | 54 | delete_attachment(0, $_GET['id_attach']); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | // Displaying the thread (structure) |
61 | 61 | |
62 | -$thread_structure = "<div class=\"structure\">" .get_lang('Structure')."</div>"; |
|
62 | +$thread_structure = "<div class=\"structure\">".get_lang('Structure')."</div>"; |
|
63 | 63 | $counter = 0; |
64 | 64 | $count = 0; |
65 | 65 | $prev_next_array = array(); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | foreach ($rows as $post) { |
72 | 72 | $counter++; |
73 | 73 | $indent = $post['indent_cnt'] * '20'; |
74 | - $thread_structure .= "<div style=\"margin-left: " . $indent . "px;\">"; |
|
74 | + $thread_structure .= "<div style=\"margin-left: ".$indent."px;\">"; |
|
75 | 75 | |
76 | 76 | if ( |
77 | 77 | !empty($whatsnew_post_info[$forumId][$post['thread_id']]) && |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $counter == 1 AND !isset($_GET['post']) |
90 | 90 | ) |
91 | 91 | ) { |
92 | - $thread_structure .= '<strong>' .prepare4display($post['post_title']) . '</strong></div>'; |
|
92 | + $thread_structure .= '<strong>'.prepare4display($post['post_title']).'</strong></div>'; |
|
93 | 93 | $prev_next_array[] = $post['post_id']; |
94 | 94 | } else { |
95 | 95 | if ($post['visible'] == '0') { |
@@ -98,10 +98,10 @@ discard block |
||
98 | 98 | $class = ''; |
99 | 99 | } |
100 | 100 | $count_loop = ($count == 0) ? '&id=1' : ''; |
101 | - $thread_structure .= "<a href=\"viewthread.php?" . api_get_cidreq() . |
|
102 | - "&forum=" . $forumId . "&thread=" . $threadId . |
|
103 | - "&post=" . $post['post_id'] . "&origin=$origin$count_loop\"" . |
|
104 | - "$class>" . prepare4display($post['post_title']) . "</a></div>"; |
|
101 | + $thread_structure .= "<a href=\"viewthread.php?".api_get_cidreq(). |
|
102 | + "&forum=".$forumId."&thread=".$threadId. |
|
103 | + "&post=".$post['post_id']."&origin=$origin$count_loop\"". |
|
104 | + "$class>".prepare4display($post['post_title'])."</a></div>"; |
|
105 | 105 | $prev_next_array[] = $post['post_id']; |
106 | 106 | } |
107 | 107 | $count++; |
@@ -148,43 +148,43 @@ discard block |
||
148 | 148 | $class_next = ''; |
149 | 149 | |
150 | 150 | // Links |
151 | -$first_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() . |
|
152 | - '&forum=' . $forumId . '&thread=' . $threadId . |
|
153 | - '&gradebook=' . $gradebook . '&id=1&post=' . $prev_next_array[0]; |
|
154 | -$last_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() . |
|
155 | - '&forum=' . $forumId . '&thread=' . $threadId . |
|
156 | - '&gradebook=' . $gradebook . '&post=' . $prev_next_array[$max-1]; |
|
157 | -$prev_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() . |
|
158 | - '&forum=' . $forumId . '&thread=' . $threadId . |
|
159 | - '&gradebook=' . $gradebook . '&post=' . $prev_next_array[$prev_id]; |
|
160 | -$next_href = $forumUrl . 'viewthread.php?' . api_get_cidreq() . |
|
161 | - '&forum=' . $forumId . '&thread=' . $threadId . |
|
162 | - '&post=' . $prev_next_array[$next_id]; |
|
151 | +$first_href = $forumUrl.'viewthread.php?'.api_get_cidreq(). |
|
152 | + '&forum='.$forumId.'&thread='.$threadId. |
|
153 | + '&gradebook='.$gradebook.'&id=1&post='.$prev_next_array[0]; |
|
154 | +$last_href = $forumUrl.'viewthread.php?'.api_get_cidreq(). |
|
155 | + '&forum='.$forumId.'&thread='.$threadId. |
|
156 | + '&gradebook='.$gradebook.'&post='.$prev_next_array[$max - 1]; |
|
157 | +$prev_href = $forumUrl.'viewthread.php?'.api_get_cidreq(). |
|
158 | + '&forum='.$forumId.'&thread='.$threadId. |
|
159 | + '&gradebook='.$gradebook.'&post='.$prev_next_array[$prev_id]; |
|
160 | +$next_href = $forumUrl.'viewthread.php?'.api_get_cidreq(). |
|
161 | + '&forum='.$forumId.'&thread='.$threadId. |
|
162 | + '&post='.$prev_next_array[$next_id]; |
|
163 | 163 | |
164 | 164 | echo '<center style="margin-top: 10px; margin-bottom: 10px;">'; |
165 | 165 | // Go to: first and previous |
166 | 166 | if (((int) $current_id) > 0) { |
167 | - echo '<a href="' . $first_href . '" ' . $class . ' title=' . |
|
168 | - $first_message . '>' . $first_img . ' ' . $first_message .'</a>'; |
|
169 | - echo '<a href="' . $prev_href . '" ' . $class_prev . ' title=' . |
|
170 | - $prev_message . '>' . $prev_img . ' ' . $prev_message . '</a>'; |
|
167 | + echo '<a href="'.$first_href.'" '.$class.' title='. |
|
168 | + $first_message.'>'.$first_img.' '.$first_message.'</a>'; |
|
169 | + echo '<a href="'.$prev_href.'" '.$class_prev.' title='. |
|
170 | + $prev_message.'>'.$prev_img.' '.$prev_message.'</a>'; |
|
171 | 171 | } else { |
172 | - echo '<b><span class="invisible">' . |
|
173 | - $first_img . ' ' . $first_message . '</b></span>'; |
|
174 | - echo '<b><span class="invisible">' . |
|
175 | - $prev_img . ' ' . $prev_message . '</b></span>'; |
|
172 | + echo '<b><span class="invisible">'. |
|
173 | + $first_img.' '.$first_message.'</b></span>'; |
|
174 | + echo '<b><span class="invisible">'. |
|
175 | + $prev_img.' '.$prev_message.'</b></span>'; |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | // Current counter |
179 | -echo ' [ ' . ($current_id + 1) . ' / ' . $max . ' ] '; |
|
179 | +echo ' [ '.($current_id + 1).' / '.$max.' ] '; |
|
180 | 180 | |
181 | 181 | // Go to: next and last |
182 | 182 | if (($current_id + 1) < $max) { |
183 | - echo '<a href="' . $next_href . '" ' . $class_next . ' title=' . $next_message . '>' . $next_message . ' ' . $next_img . '</a>'; |
|
184 | - echo '<a href="' . $last_href . '" ' . $class . ' title=' . $last_message . '>' . $last_message . ' ' . $last_img . '</a>'; |
|
183 | + echo '<a href="'.$next_href.'" '.$class_next.' title='.$next_message.'>'.$next_message.' '.$next_img.'</a>'; |
|
184 | + echo '<a href="'.$last_href.'" '.$class.' title='.$last_message.'>'.$last_message.' '.$last_img.'</a>'; |
|
185 | 185 | } else { |
186 | - echo '<b><span class="invisible">' . $next_message . ' ' . $next_img . '</b></span>'; |
|
187 | - echo '<b><span class="invisible">' . $last_message . ' ' . $last_img . '</b></span>'; |
|
186 | + echo '<b><span class="invisible">'.$next_message.' '.$next_img.'</b></span>'; |
|
187 | + echo '<b><span class="invisible">'.$last_message.' '.$last_img.'</b></span>'; |
|
188 | 188 | } |
189 | 189 | echo '</center>'; |
190 | 190 | |
@@ -218,18 +218,18 @@ discard block |
||
218 | 218 | } |
219 | 219 | |
220 | 220 | if (api_get_course_setting('allow_user_image_forum')) { |
221 | - echo '<br />' . display_user_image($rows[$display_post_id]['user_id'], $name, $origin) . '<br />'; |
|
221 | + echo '<br />'.display_user_image($rows[$display_post_id]['user_id'], $name, $origin).'<br />'; |
|
222 | 222 | } |
223 | 223 | echo display_user_link( |
224 | 224 | $rows[$display_post_id]['user_id'], |
225 | 225 | $name, |
226 | 226 | $origin, |
227 | 227 | $username |
228 | -) . "<br />"; |
|
228 | +)."<br />"; |
|
229 | 229 | |
230 | 230 | echo api_convert_and_format_date( |
231 | 231 | $rows[$display_post_id]['post_date'] |
232 | -) . '<br /><br />'; |
|
232 | +).'<br /><br />'; |
|
233 | 233 | // Get attach id |
234 | 234 | $attachment_list = get_attachment($display_post_id); |
235 | 235 | $id_attach = !empty($attachment_list) ? $attachment_list['id'] : ''; |
@@ -248,16 +248,16 @@ discard block |
||
248 | 248 | ) |
249 | 249 | ) { |
250 | 250 | if ($locked == false) { |
251 | - echo "<a href=\"editpost.php?" . api_get_cidreq() . |
|
252 | - "&forum=" . $forumId . "&thread=" . $threadId . |
|
253 | - "&post=" . $rows[$display_post_id]['post_id'] . |
|
254 | - "&id_attach=" . $id_attach . "\">" . |
|
251 | + echo "<a href=\"editpost.php?".api_get_cidreq(). |
|
252 | + "&forum=".$forumId."&thread=".$threadId. |
|
253 | + "&post=".$rows[$display_post_id]['post_id']. |
|
254 | + "&id_attach=".$id_attach."\">". |
|
255 | 255 | Display::return_icon( |
256 | 256 | 'edit.png', |
257 | 257 | get_lang('Edit'), |
258 | 258 | array(), |
259 | 259 | ICON_SIZE_SMALL |
260 | - ) . '</a>'; |
|
260 | + ).'</a>'; |
|
261 | 261 | } |
262 | 262 | } |
263 | 263 | |
@@ -273,22 +273,22 @@ discard block |
||
273 | 273 | sort($id_posts, SORT_NUMERIC); |
274 | 274 | reset($id_posts); |
275 | 275 | // The post minor |
276 | - $post_minor = (int)$id_posts[0]; |
|
276 | + $post_minor = (int) $id_posts[0]; |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | if ( |
280 | 280 | GroupManager::is_tutor_of_group(api_get_user_id(), $groupId) || |
281 | 281 | api_is_allowed_to_edit(false, true) && |
282 | - !(api_is_course_coach() &&$current_forum['session_id'] != $sessionId) |
|
282 | + !(api_is_course_coach() && $current_forum['session_id'] != $sessionId) |
|
283 | 283 | ) { |
284 | 284 | if ($locked == false) { |
285 | - echo "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . |
|
286 | - "&forum=" . $forumId . "&thread=" . $threadId . |
|
287 | - "&action=delete&content=post&id=" . |
|
288 | - $rows[$display_post_id]['post_id'] . |
|
289 | - "\" onclick=\"javascript:if(!confirm('" . |
|
290 | - addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES)) . |
|
291 | - "')) return false;\">" . Display::return_icon( |
|
285 | + echo "<a href=\"".api_get_self()."?".api_get_cidreq(). |
|
286 | + "&forum=".$forumId."&thread=".$threadId. |
|
287 | + "&action=delete&content=post&id=". |
|
288 | + $rows[$display_post_id]['post_id']. |
|
289 | + "\" onclick=\"javascript:if(!confirm('". |
|
290 | + addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES)). |
|
291 | + "')) return false;\">".Display::return_icon( |
|
292 | 292 | 'delete.png', |
293 | 293 | get_lang('Delete'), |
294 | 294 | array(), |
@@ -308,16 +308,16 @@ discard block |
||
308 | 308 | ); |
309 | 309 | |
310 | 310 | if (!isset($_GET['id']) && $post_id > $post_minor) { |
311 | - echo "<a href=\"viewthread.php?" . api_get_cidreq() . |
|
312 | - "&forum=" . $forumId . "&thread=" . $threadId . |
|
313 | - "&origin=" . $origin . "&action=move&post=" . |
|
314 | - $rows[$display_post_id]['post_id'] . "\">" . |
|
311 | + echo "<a href=\"viewthread.php?".api_get_cidreq(). |
|
312 | + "&forum=".$forumId."&thread=".$threadId. |
|
313 | + "&origin=".$origin."&action=move&post=". |
|
314 | + $rows[$display_post_id]['post_id']."\">". |
|
315 | 315 | Display::return_icon( |
316 | 316 | 'move.png', |
317 | 317 | get_lang('MovePost'), |
318 | 318 | array(), |
319 | 319 | ICON_SIZE_SMALL |
320 | - ) . "</a>"; |
|
320 | + )."</a>"; |
|
321 | 321 | |
322 | 322 | } |
323 | 323 | } |
@@ -340,16 +340,16 @@ discard block |
||
340 | 340 | ); |
341 | 341 | |
342 | 342 | if ($locked == false) { |
343 | - echo "<a href=\"forumqualify.php?" . api_get_cidreq() . |
|
344 | - "&forum=" . $forumId . "&thread=" . $threadId . |
|
345 | - "&action=list&post=" . $rows[$display_post_id]['post_id'] . |
|
346 | - "&user=" . $rows[$display_post_id]['user_id'] . "&user_id=" . |
|
347 | - $rows[$display_post_id]['user_id'] . "&origin=" . $origin . |
|
348 | - "&idtextqualify=" . $current_qualify_thread . |
|
349 | - "\" >" . Display::return_icon( |
|
343 | + echo "<a href=\"forumqualify.php?".api_get_cidreq(). |
|
344 | + "&forum=".$forumId."&thread=".$threadId. |
|
345 | + "&action=list&post=".$rows[$display_post_id]['post_id']. |
|
346 | + "&user=".$rows[$display_post_id]['user_id']."&user_id=". |
|
347 | + $rows[$display_post_id]['user_id']."&origin=".$origin. |
|
348 | + "&idtextqualify=".$current_qualify_thread. |
|
349 | + "\" >".Display::return_icon( |
|
350 | 350 | 'quiz.gif', |
351 | 351 | get_lang('Qualify') |
352 | - ) . "</a>"; |
|
352 | + )."</a>"; |
|
353 | 353 | } |
354 | 354 | } |
355 | 355 | } |
@@ -361,33 +361,33 @@ discard block |
||
361 | 361 | ($current_forum['allow_anonymous'] == 1 && !$_user['user_id']) |
362 | 362 | ) { |
363 | 363 | if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) { |
364 | - echo '<a href="reply.php?' . api_get_cidreq() . |
|
365 | - '&forum=' . $forumId . '&thread=' . $threadId . |
|
366 | - '&post=' . $rows[$display_post_id]['post_id'] . |
|
367 | - '&action=replymessage&origin=' . $origin . '">' . |
|
364 | + echo '<a href="reply.php?'.api_get_cidreq(). |
|
365 | + '&forum='.$forumId.'&thread='.$threadId. |
|
366 | + '&post='.$rows[$display_post_id]['post_id']. |
|
367 | + '&action=replymessage&origin='.$origin.'">'. |
|
368 | 368 | Display::return_icon( |
369 | 369 | 'message_reply_forum.png', |
370 | 370 | get_lang('ReplyToMessage') |
371 | - ) . "</a>"; |
|
372 | - echo '<a href="reply.php?' . api_get_cidreq() . |
|
373 | - '&forum=' . $forumId . '&thread=' . $threadId . |
|
374 | - '&post=' . $rows[$display_post_id]['post_id'] . |
|
375 | - '&action=quote&origin=' . $origin . '">' . |
|
371 | + )."</a>"; |
|
372 | + echo '<a href="reply.php?'.api_get_cidreq(). |
|
373 | + '&forum='.$forumId.'&thread='.$threadId. |
|
374 | + '&post='.$rows[$display_post_id]['post_id']. |
|
375 | + '&action=quote&origin='.$origin.'">'. |
|
376 | 376 | Display::return_icon( |
377 | 377 | 'quote.gif', |
378 | 378 | get_lang('QuoteMessage') |
379 | - ) . "</a>"; |
|
379 | + )."</a>"; |
|
380 | 380 | } |
381 | 381 | } |
382 | 382 | } else { |
383 | 383 | if ($current_forum_category && $current_forum_category['locked'] == 1) { |
384 | - echo get_lang('ForumcategoryLocked') . '<br />'; |
|
384 | + echo get_lang('ForumcategoryLocked').'<br />'; |
|
385 | 385 | } |
386 | 386 | if ($current_forum['locked'] == 1) { |
387 | - echo get_lang('ForumLocked') . '<br />'; |
|
387 | + echo get_lang('ForumLocked').'<br />'; |
|
388 | 388 | } |
389 | 389 | if ($current_thread['locked'] == 1) { |
390 | - echo get_lang('ThreadLocked') . '<br />'; |
|
390 | + echo get_lang('ThreadLocked').'<br />'; |
|
391 | 391 | } |
392 | 392 | } |
393 | 393 | |
@@ -406,17 +406,17 @@ discard block |
||
406 | 406 | $rows[$display_post_id]['post_notification'] == '1' AND |
407 | 407 | $rows[$display_post_id]['poster_id'] == $_user['user_id'] |
408 | 408 | ) { |
409 | - $post_image .= Display::return_icon('forumnotification.gif',get_lang('YouWillBeNotified')); |
|
409 | + $post_image .= Display::return_icon('forumnotification.gif', get_lang('YouWillBeNotified')); |
|
410 | 410 | } |
411 | 411 | // The post title |
412 | -echo "<td class=\"$titleclass\">" . |
|
413 | - prepare4display($rows[$display_post_id]['post_title']) . "</td>"; |
|
412 | +echo "<td class=\"$titleclass\">". |
|
413 | + prepare4display($rows[$display_post_id]['post_title'])."</td>"; |
|
414 | 414 | echo "</tr>"; |
415 | 415 | |
416 | 416 | // The post message |
417 | 417 | echo "<tr>"; |
418 | -echo "<td class=\"$messageclass\">" . |
|
419 | - prepare4display($rows[$display_post_id]['post_text']) . "</td>"; |
|
418 | +echo "<td class=\"$messageclass\">". |
|
419 | + prepare4display($rows[$display_post_id]['post_text'])."</td>"; |
|
420 | 420 | echo "</tr>"; |
421 | 421 | |
422 | 422 | // The check if there is an attachment |
@@ -429,24 +429,24 @@ discard block |
||
429 | 429 | echo Display::return_icon('attachment.gif', get_lang('Attachment')); |
430 | 430 | echo '<a href="download.php?file='; |
431 | 431 | echo $realname; |
432 | - echo ' "> ' . $user_filename . ' </a>'; |
|
433 | - echo '<span class="forum_attach_comment">' . |
|
434 | - Security::remove_XSS($attachment['comment'], STUDENT) . '</span>'; |
|
432 | + echo ' "> '.$user_filename.' </a>'; |
|
433 | + echo '<span class="forum_attach_comment">'. |
|
434 | + Security::remove_XSS($attachment['comment'], STUDENT).'</span>'; |
|
435 | 435 | |
436 | 436 | if ( |
437 | - ($current_forum['allow_edit'] == 1 &&$rows[$display_post_id]['user_id'] == $_user['user_id']) || |
|
437 | + ($current_forum['allow_edit'] == 1 && $rows[$display_post_id]['user_id'] == $_user['user_id']) || |
|
438 | 438 | (api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)) |
439 | 439 | ) { |
440 | - echo ' <a href="' . api_get_self() . '?' . |
|
441 | - api_get_cidreq() . '&origin=' . |
|
442 | - Security::remove_XSS($_GET['origin']) . |
|
443 | - '&action=delete_attach&id_attach=' . |
|
444 | - $attachment['id'] . '&forum=' . $forumId . |
|
445 | - '&thread=' . $threadId . |
|
446 | - '" onclick="javascript:if(!confirm(\'' . |
|
440 | + echo ' <a href="'.api_get_self().'?'. |
|
441 | + api_get_cidreq().'&origin='. |
|
442 | + Security::remove_XSS($_GET['origin']). |
|
443 | + '&action=delete_attach&id_attach='. |
|
444 | + $attachment['id'].'&forum='.$forumId. |
|
445 | + '&thread='.$threadId. |
|
446 | + '" onclick="javascript:if(!confirm(\''. |
|
447 | 447 | addslashes(api_htmlentities( |
448 | 448 | get_lang('ConfirmYourChoice'), ENT_QUOTES) |
449 | - ) . '\')) return false;">' . Display::return_icon( |
|
449 | + ).'\')) return false;">'.Display::return_icon( |
|
450 | 450 | 'delete.gif', |
451 | 451 | get_lang('Delete') |
452 | 452 | ).'</a><br />'; |
@@ -81,7 +81,7 @@ |
||
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']); |
@@ -52,17 +52,17 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
244 | 244 | ); |
245 | 245 | |
246 | 246 | |
247 | - if ($descriptionCategory != '' && trim($descriptionCategory)!= ' ') |
|
247 | + if ($descriptionCategory != '' && trim($descriptionCategory) != ' ') |
|
248 | 248 | { |
249 | 249 | $html .= '<div class="forum-description">'.$descriptionCategory.'</div>'; |
250 | 250 | } |
@@ -284,7 +284,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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>'; |