@@ -18,14 +18,8 @@ |
||
18 | 18 | use Facebook\FacebookSession; |
19 | 19 | use Facebook\FacebookRedirectLoginHelper; |
20 | 20 | use Facebook\FacebookRequest; |
21 | -use Facebook\FacebookResponse; |
|
22 | 21 | use Facebook\FacebookSDKException; |
23 | 22 | use Facebook\FacebookRequestException; |
24 | -use Facebook\FacebookAuthorizationException; |
|
25 | -use Facebook\GraphObject; |
|
26 | -use Facebook\Entities\AccessToken; |
|
27 | -use Facebook\HttpClients\FacebookCurlHttpClient; |
|
28 | -use Facebook\HttpClients\FacebookHttpable; |
|
29 | 23 | |
30 | 24 | require_once dirname(__FILE__) . '/functions.inc.php'; |
31 | 25 |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | * Please edit the facebook.conf.php file to adapt it to your fb application parameter |
12 | 12 | */ |
13 | 13 | |
14 | -require_once dirname(__FILE__) . '/../../inc/global.inc.php'; |
|
15 | -require_once dirname(__FILE__) . '/facebook.init.php'; |
|
16 | -require_once dirname(__FILE__) . '/facebook-php-sdk/autoload.php'; |
|
14 | +require_once dirname(__FILE__).'/../../inc/global.inc.php'; |
|
15 | +require_once dirname(__FILE__).'/facebook.init.php'; |
|
16 | +require_once dirname(__FILE__).'/facebook-php-sdk/autoload.php'; |
|
17 | 17 | |
18 | 18 | use Facebook\FacebookSession; |
19 | 19 | use Facebook\FacebookRedirectLoginHelper; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | use Facebook\HttpClients\FacebookCurlHttpClient; |
28 | 28 | use Facebook\HttpClients\FacebookHttpable; |
29 | 29 | |
30 | -require_once dirname(__FILE__) . '/functions.inc.php'; |
|
30 | +require_once dirname(__FILE__).'/functions.inc.php'; |
|
31 | 31 | |
32 | 32 | // dont rename $facebook_config to $facebookConfig otherwise get a "Facebook\\FacebookSDKException" |
33 | 33 | FacebookSession::setDefaultApplication($facebook_config['appId'], $facebook_config['secret']); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $locale = $graphObject->getProperty('locale'); |
58 | 58 | $language = facebookPluginGetLanguage($locale); |
59 | 59 | if (!$language) { |
60 | - $language='en_US'; |
|
60 | + $language = 'en_US'; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | //Checks if user already exists in chamilo |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $_user['user_id'] = $chamilo_uid; |
86 | 86 | $_user['uidReset'] = true; |
87 | 87 | $_SESSION['_user'] = $_user; |
88 | - header('Location:' . api_get_path(WEB_PATH)); |
|
88 | + header('Location:'.api_get_path(WEB_PATH)); |
|
89 | 89 | exit(); |
90 | 90 | } else { |
91 | 91 | return false; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $_user['user_id'] = $chamilo_uid; |
99 | 99 | $_user['uidReset'] = true; |
100 | 100 | $_SESSION['_user'] = $_user; |
101 | - header('Location:' . api_get_path(WEB_PATH)); |
|
101 | + header('Location:'.api_get_path(WEB_PATH)); |
|
102 | 102 | exit(); |
103 | 103 | } |
104 | 104 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | { |
118 | 118 | global $facebook_config; |
119 | 119 | $helper = new FacebookRedirectLoginHelper($facebook_config['return_url']); |
120 | - $loginUrl = $helper->getLoginUrl( |
|
120 | + $loginUrl = $helper->getLoginUrl( |
|
121 | 121 | array('scope' => 'email') |
122 | 122 | ); |
123 | 123 |
@@ -1,8 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use ChamiloSession as Session; |
|
5 | - |
|
6 | 4 | /** |
7 | 5 | * Class ExerciseLib |
8 | 6 | * shows a question and its answers |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | if ($show_title) { |
66 | 66 | TestCategory::displayCategoryAndTitle($objQuestionTmp->id); |
67 | 67 | echo Display::div( |
68 | - $current_item . '. ' . $objQuestionTmp->selectTitle(), |
|
68 | + $current_item.'. '.$objQuestionTmp->selectTitle(), |
|
69 | 69 | array('class' => 'question_title') |
70 | 70 | ); |
71 | 71 | } |
@@ -161,8 +161,8 @@ discard block |
||
161 | 161 | $config = array( |
162 | 162 | 'ToolbarSet' => 'TestFreeAnswer' |
163 | 163 | ); |
164 | - $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config); |
|
165 | - $form->setDefaults(array("choice[" . $questionId . "]" => $fck_content)); |
|
164 | + $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config); |
|
165 | + $form->setDefaults(array("choice[".$questionId."]" => $fck_content)); |
|
166 | 166 | $s .= $form->returnForm(); |
167 | 167 | } elseif ($answerType == ORAL_EXPRESSION) { |
168 | 168 | // Add nanog |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | $config = array( |
192 | 192 | 'ToolbarSet' => 'TestFreeAnswer' |
193 | 193 | ); |
194 | - $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config); |
|
194 | + $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config); |
|
195 | 195 | //$form->setDefaults(array("choice[" . $questionId . "]" => $fck_content)); |
196 | 196 | $s .= $form->returnForm(); |
197 | 197 | } |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | |
273 | 273 | // Unique answer |
274 | 274 | if (in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION, UNIQUE_ANSWER_IMAGE])) { |
275 | - $input_id = 'choice-' . $questionId . '-' . $answerId; |
|
275 | + $input_id = 'choice-'.$questionId.'-'.$answerId; |
|
276 | 276 | if (isset($user_choice[0]['answer']) && $user_choice[0]['answer'] == $numAnswer) { |
277 | 277 | $attributes = array( |
278 | 278 | 'id' => $input_id, |
@@ -297,14 +297,14 @@ discard block |
||
297 | 297 | if ($answerType == UNIQUE_ANSWER_IMAGE) { |
298 | 298 | if ($show_comment) { |
299 | 299 | if (empty($comment)) { |
300 | - $s .= '<div id="answer' . $questionId . $numAnswer . '" ' |
|
300 | + $s .= '<div id="answer'.$questionId.$numAnswer.'" ' |
|
301 | 301 | . 'class="exercise-unique-answer-image" style="text-align: center">'; |
302 | 302 | } else { |
303 | - $s .= '<div id="answer' . $questionId . $numAnswer . '" ' |
|
303 | + $s .= '<div id="answer'.$questionId.$numAnswer.'" ' |
|
304 | 304 | . 'class="exercise-unique-answer-image col-xs-6 col-sm-12" style="text-align: center">'; |
305 | 305 | } |
306 | 306 | } else { |
307 | - $s .= '<div id="answer' . $questionId . $numAnswer . '" ' |
|
307 | + $s .= '<div id="answer'.$questionId.$numAnswer.'" ' |
|
308 | 308 | . 'class="exercise-unique-answer-image col-xs-6 col-md-3" style="text-align: center">'; |
309 | 309 | } |
310 | 310 | } |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $answer = Security::remove_XSS($answer, STUDENT); |
313 | 313 | $s .= Display::input( |
314 | 314 | 'hidden', |
315 | - 'choice2[' . $questionId . ']', |
|
315 | + 'choice2['.$questionId.']', |
|
316 | 316 | '0' |
317 | 317 | ); |
318 | 318 | |
@@ -320,13 +320,13 @@ discard block |
||
320 | 320 | |
321 | 321 | if ($answerType == UNIQUE_ANSWER_IMAGE) { |
322 | 322 | $attributes['style'] = 'display: none;'; |
323 | - $answer = '<div class="thumbnail">' . $answer . '</div>'; |
|
323 | + $answer = '<div class="thumbnail">'.$answer.'</div>'; |
|
324 | 324 | } |
325 | 325 | |
326 | 326 | $answer_input .= '<label class="radio">'; |
327 | 327 | $answer_input .= Display::input( |
328 | 328 | 'radio', |
329 | - 'choice[' . $questionId . ']', |
|
329 | + 'choice['.$questionId.']', |
|
330 | 330 | $numAnswer, |
331 | 331 | $attributes |
332 | 332 | ); |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $answerType == MULTIPLE_ANSWER_TRUE_FALSE || |
354 | 354 | $answerType == GLOBAL_MULTIPLE_ANSWER |
355 | 355 | ) { |
356 | - $input_id = 'choice-' . $questionId . '-' . $answerId; |
|
356 | + $input_id = 'choice-'.$questionId.'-'.$answerId; |
|
357 | 357 | $answer = Security::remove_XSS($answer, STUDENT); |
358 | 358 | |
359 | 359 | if (in_array($numAnswer, $user_choice_array)) { |
@@ -374,12 +374,12 @@ discard block |
||
374 | 374 | } |
375 | 375 | |
376 | 376 | if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) { |
377 | - $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />'; |
|
377 | + $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />'; |
|
378 | 378 | |
379 | 379 | $answer_input = '<label class="checkbox">'; |
380 | 380 | $answer_input .= Display::input( |
381 | 381 | 'checkbox', |
382 | - 'choice[' . $questionId . '][' . $numAnswer . ']', |
|
382 | + 'choice['.$questionId.']['.$numAnswer.']', |
|
383 | 383 | $numAnswer, |
384 | 384 | $attributes |
385 | 385 | ); |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | 'td', |
433 | 433 | Display::input( |
434 | 434 | 'radio', |
435 | - 'choice[' . $questionId . '][' . $numAnswer . ']', |
|
435 | + 'choice['.$questionId.']['.$numAnswer.']', |
|
436 | 436 | $id, |
437 | 437 | $attributes |
438 | 438 | ), |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | } |
451 | 451 | } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) { |
452 | 452 | // multiple answers |
453 | - $input_id = 'choice-' . $questionId . '-' . $answerId; |
|
453 | + $input_id = 'choice-'.$questionId.'-'.$answerId; |
|
454 | 454 | |
455 | 455 | if (in_array($numAnswer, $user_choice_array)) { |
456 | 456 | $attributes = array( |
@@ -470,11 +470,11 @@ discard block |
||
470 | 470 | } |
471 | 471 | |
472 | 472 | $answer = Security::remove_XSS($answer, STUDENT); |
473 | - $answer_input = '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />'; |
|
473 | + $answer_input = '<input type="hidden" name="choice2['.$questionId.']" value="0" />'; |
|
474 | 474 | $answer_input .= '<label class="checkbox">'; |
475 | 475 | $answer_input .= Display::input( |
476 | 476 | 'checkbox', |
477 | - 'choice[' . $questionId . '][' . $numAnswer . ']', |
|
477 | + 'choice['.$questionId.']['.$numAnswer.']', |
|
478 | 478 | 1, |
479 | 479 | $attributes |
480 | 480 | ); |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | } |
496 | 496 | |
497 | 497 | } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) { |
498 | - $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />'; |
|
498 | + $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />'; |
|
499 | 499 | |
500 | 500 | $my_choice = array(); |
501 | 501 | if (!empty($user_choice_array)) { |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | 'td', |
531 | 531 | Display::input( |
532 | 532 | 'radio', |
533 | - 'choice[' . $questionId . '][' . $numAnswer . ']', |
|
533 | + 'choice['.$questionId.']['.$numAnswer.']', |
|
534 | 534 | $key, |
535 | 535 | $attributes |
536 | 536 | ) |
@@ -626,8 +626,8 @@ discard block |
||
626 | 626 | $trackAttempts = Database::get_main_table( |
627 | 627 | TABLE_STATISTIC_TRACK_E_ATTEMPT |
628 | 628 | ); |
629 | - $sql = 'SELECT answer FROM ' . $trackAttempts . ' |
|
630 | - WHERE exe_id=' . $exe_id . ' AND question_id=' . $questionId; |
|
629 | + $sql = 'SELECT answer FROM '.$trackAttempts.' |
|
630 | + WHERE exe_id=' . $exe_id.' AND question_id='.$questionId; |
|
631 | 631 | $rsLastAttempt = Database::query($sql); |
632 | 632 | $rowLastAttempt = Database::fetch_array($rsLastAttempt); |
633 | 633 | $answer = $rowLastAttempt['answer']; |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | '', |
683 | 683 | $answerCorrected |
684 | 684 | ); |
685 | - $answerCorrected = '[' . $answerCorrected . ']'; |
|
685 | + $answerCorrected = '['.$answerCorrected.']'; |
|
686 | 686 | $studentAnswerList[] = $answerCorrected; |
687 | 687 | } |
688 | 688 | } |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | */ |
702 | 702 | $tabComments = api_preg_split( |
703 | 703 | '/\[[^]]+\]/', |
704 | - ' ' . $answer . ' ' |
|
704 | + ' '.$answer.' ' |
|
705 | 705 | ); |
706 | 706 | if (!empty($correctAnswerList) && !empty($studentAnswerList)) { |
707 | 707 | $answer = ""; |
@@ -718,7 +718,7 @@ discard block |
||
718 | 718 | $size |
719 | 719 | ); |
720 | 720 | |
721 | - $answer .= $tabComments[$i] . |
|
721 | + $answer .= $tabComments[$i]. |
|
722 | 722 | Display::input( |
723 | 723 | 'text', |
724 | 724 | "choice[$questionId][]", |
@@ -764,12 +764,12 @@ discard block |
||
764 | 764 | $s .= '<tr><td width="45%" valign="top">'; |
765 | 765 | $parsed_answer = $answer; |
766 | 766 | //left part questions |
767 | - $s .= '<p class="indent">' . $lines_count . '. ' . $parsed_answer . '</p></td>'; |
|
767 | + $s .= '<p class="indent">'.$lines_count.'. '.$parsed_answer.'</p></td>'; |
|
768 | 768 | //middle part (matches selects) |
769 | 769 | |
770 | 770 | $s .= '<td width="10%" valign="top" align="center" > |
771 | 771 | <div class="select-matching"> |
772 | - <select name="choice[' . $questionId . '][' . $numAnswer . ']">'; |
|
772 | + <select name="choice[' . $questionId.']['.$numAnswer.']">'; |
|
773 | 773 | |
774 | 774 | // fills the list-box |
775 | 775 | foreach ($select_items as $key => $val) { |
@@ -785,14 +785,14 @@ discard block |
||
785 | 785 | if (isset($user_choice_array_position[$numAnswer]) && $val['id'] == $user_choice_array_position[$numAnswer]) { |
786 | 786 | $selected = 'selected="selected"'; |
787 | 787 | } |
788 | - $s .= '<option value="' . $val['id'] . '" ' . $selected . '>' . $val['letter'] . '</option>'; |
|
788 | + $s .= '<option value="'.$val['id'].'" '.$selected.'>'.$val['letter'].'</option>'; |
|
789 | 789 | |
790 | 790 | } // end foreach() |
791 | 791 | |
792 | 792 | $s .= '</select></div></td><td width="5%" class="separate"> </td>'; |
793 | 793 | $s .= '<td width="40%" valign="top" >'; |
794 | 794 | if (isset($select_items[$lines_count])) { |
795 | - $s .= '<div class="text-right"><p class="indent">' . $select_items[$lines_count]['letter'].'. '. $select_items[$lines_count]['answer'].'</p></div>'; |
|
795 | + $s .= '<div class="text-right"><p class="indent">'.$select_items[$lines_count]['letter'].'. '.$select_items[$lines_count]['answer'].'</p></div>'; |
|
796 | 796 | } else { |
797 | 797 | $s .= ' '; |
798 | 798 | } |
@@ -807,7 +807,7 @@ discard block |
||
807 | 807 | $s .= '<tr> |
808 | 808 | <td colspan="2"></td> |
809 | 809 | <td valign="top">'; |
810 | - $s .= '<b>' . $select_items[$lines_count]['letter'] . '.</b> ' . $select_items[$lines_count]['answer']; |
|
810 | + $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer']; |
|
811 | 811 | $s .= "</td> |
812 | 812 | </tr>"; |
813 | 813 | $lines_count++; |
@@ -823,9 +823,9 @@ discard block |
||
823 | 823 | $data = $objAnswerTmp->getAnswerByAutoId($data['correct']); |
824 | 824 | $lines_count = $data['answer'];*/ |
825 | 825 | |
826 | - $windowId = $questionId . '_' . $lines_count; |
|
826 | + $windowId = $questionId.'_'.$lines_count; |
|
827 | 827 | |
828 | - $s .= '<li class="touch-items" id="' . $windowId . '">'; |
|
828 | + $s .= '<li class="touch-items" id="'.$windowId.'">'; |
|
829 | 829 | $s .= Display::div( |
830 | 830 | $parsed_answer, |
831 | 831 | [ |
@@ -883,7 +883,7 @@ discard block |
||
883 | 883 | Display::tag( |
884 | 884 | 'b', |
885 | 885 | $select_items[$lines_count]['letter'] |
886 | - ) . $select_items[$lines_count]['answer'], |
|
886 | + ).$select_items[$lines_count]['answer'], |
|
887 | 887 | [ |
888 | 888 | 'id' => "window_{$windowId}_answer", |
889 | 889 | 'style' => 'display: none;' |
@@ -1027,7 +1027,7 @@ discard block |
||
1027 | 1027 | |
1028 | 1028 | if ($show_comment) { |
1029 | 1029 | $s .= '</table>'; |
1030 | - } elseif( |
|
1030 | + } elseif ( |
|
1031 | 1031 | in_array( |
1032 | 1032 | $answerType, |
1033 | 1033 | [ |
@@ -1052,7 +1052,7 @@ discard block |
||
1052 | 1052 | |
1053 | 1053 | for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) { |
1054 | 1054 | $answerCorrect = $objAnswerTmp->isCorrect($answerId); |
1055 | - $windowId = $questionId . '_' . $counterAnswer; |
|
1055 | + $windowId = $questionId.'_'.$counterAnswer; |
|
1056 | 1056 | |
1057 | 1057 | if ($answerCorrect) { |
1058 | 1058 | $s .= Display::div( |
@@ -1097,7 +1097,7 @@ discard block |
||
1097 | 1097 | $course = api_get_course_info(); |
1098 | 1098 | $doc_id = DocumentManager::get_document_id( |
1099 | 1099 | $course, |
1100 | - '/images/' . $pictureName |
|
1100 | + '/images/'.$pictureName |
|
1101 | 1101 | ); |
1102 | 1102 | if (is_numeric($doc_id)) { |
1103 | 1103 | $images_folder_visibility = api_get_item_visibility( |
@@ -1122,7 +1122,7 @@ discard block |
||
1122 | 1122 | echo " |
1123 | 1123 | <script> |
1124 | 1124 | $(document).on('ready', function () { |
1125 | - new " . ($answerType == HOT_SPOT ? "HotspotQuestion" : "DelineationQuestion" ) . "({ |
|
1125 | + new " . ($answerType == HOT_SPOT ? "HotspotQuestion" : "DelineationQuestion")."({ |
|
1126 | 1126 | questionId: $questionId, |
1127 | 1127 | exerciseId: $exerciseId, |
1128 | 1128 | selector: '#hotspot-preview-$questionId', |
@@ -1156,7 +1156,7 @@ discard block |
||
1156 | 1156 | if ($answerType != HOT_SPOT_DELINEATION) { |
1157 | 1157 | $answerList = ' |
1158 | 1158 | <div class="well well-sm"> |
1159 | - <h5 class="page-header">' . get_lang('HotspotZones') . '</h5> |
|
1159 | + <h5 class="page-header">' . get_lang('HotspotZones').'</h5> |
|
1160 | 1160 | <ol> |
1161 | 1161 | '; |
1162 | 1162 | |
@@ -1181,7 +1181,7 @@ discard block |
||
1181 | 1181 | if (!$only_questions) { |
1182 | 1182 | if ($show_title) { |
1183 | 1183 | TestCategory::displayCategoryAndTitle($objQuestionTmp->id); |
1184 | - echo '<div class="question_title">' . $current_item . '. ' . $questionName . '</div>'; |
|
1184 | + echo '<div class="question_title">'.$current_item.'. '.$questionName.'</div>'; |
|
1185 | 1185 | } |
1186 | 1186 | //@todo I need to the get the feedback type |
1187 | 1187 | echo <<<HOTSPOT |
@@ -1199,7 +1199,7 @@ discard block |
||
1199 | 1199 | <div class=\"hotspot-image\"></div> |
1200 | 1200 | <script> |
1201 | 1201 | $(document).on('ready', function () { |
1202 | - new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion') . "({ |
|
1202 | + new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion')."({ |
|
1203 | 1203 | questionId: $questionId, |
1204 | 1204 | exerciseId: $exe_id, |
1205 | 1205 | selector: '#question_div_' + $questionId + ' .hotspot-image', |
@@ -1318,11 +1318,11 @@ discard block |
||
1318 | 1318 | $lp_id = intval($lp_id); |
1319 | 1319 | $lp_item_id = intval($lp_item_id); |
1320 | 1320 | return |
1321 | - api_get_course_int_id() . '_' . |
|
1322 | - api_get_session_id() . '_' . |
|
1323 | - $exercise_id . '_' . |
|
1324 | - api_get_user_id() . '_' . |
|
1325 | - $lp_id . '_' . |
|
1321 | + api_get_course_int_id().'_'. |
|
1322 | + api_get_session_id().'_'. |
|
1323 | + $exercise_id.'_'. |
|
1324 | + api_get_user_id().'_'. |
|
1325 | + $lp_id.'_'. |
|
1326 | 1326 | $lp_item_id; |
1327 | 1327 | } |
1328 | 1328 | |
@@ -1434,14 +1434,14 @@ discard block |
||
1434 | 1434 | $res = Database::query($sql); |
1435 | 1435 | $result = array(); |
1436 | 1436 | $apiIsAllowedToEdit = api_is_allowed_to_edit(); |
1437 | - $urlBase = api_get_path(WEB_CODE_PATH) . |
|
1438 | - 'exercice/hotpotatoes_exercise_report.php?action=delete&' . |
|
1439 | - api_get_cidreq() . '&id='; |
|
1437 | + $urlBase = api_get_path(WEB_CODE_PATH). |
|
1438 | + 'exercice/hotpotatoes_exercise_report.php?action=delete&'. |
|
1439 | + api_get_cidreq().'&id='; |
|
1440 | 1440 | while ($data = Database::fetch_array($res)) { |
1441 | 1441 | $actions = null; |
1442 | 1442 | |
1443 | 1443 | if ($apiIsAllowedToEdit) { |
1444 | - $url = $urlBase . $data['id'] . '&path=' . $data['exe_name']; |
|
1444 | + $url = $urlBase.$data['id'].'&path='.$data['exe_name']; |
|
1445 | 1445 | $actions = Display::url( |
1446 | 1446 | Display::return_icon('delete.png', get_lang('Delete')), |
1447 | 1447 | $url |
@@ -1457,7 +1457,7 @@ discard block |
||
1457 | 1457 | GroupManager::get_user_group_name($data['user_id']) |
1458 | 1458 | ), |
1459 | 1459 | 'exe_date' => $data['exe_date'], |
1460 | - 'score' => $data['exe_result'] . ' / ' . $data['exe_weighting'], |
|
1460 | + 'score' => $data['exe_result'].' / '.$data['exe_weighting'], |
|
1461 | 1461 | 'actions' => $actions, |
1462 | 1462 | ); |
1463 | 1463 | } |
@@ -1540,18 +1540,18 @@ discard block |
||
1540 | 1540 | $TBL_TRACK_HOTPOTATOES = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES); |
1541 | 1541 | $TBL_TRACK_ATTEMPT_RECORDING = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING); |
1542 | 1542 | |
1543 | - $session_id_and = ' AND te.session_id = ' . $sessionId . ' '; |
|
1543 | + $session_id_and = ' AND te.session_id = '.$sessionId.' '; |
|
1544 | 1544 | $exercise_id = intval($exercise_id); |
1545 | 1545 | |
1546 | 1546 | $exercise_where = ''; |
1547 | 1547 | if (!empty($exercise_id)) { |
1548 | - $exercise_where .= ' AND te.exe_exo_id = ' . $exercise_id . ' '; |
|
1548 | + $exercise_where .= ' AND te.exe_exo_id = '.$exercise_id.' '; |
|
1549 | 1549 | } |
1550 | 1550 | |
1551 | 1551 | $hotpotatoe_where = ''; |
1552 | 1552 | if (!empty($_GET['path'])) { |
1553 | 1553 | $hotpotatoe_path = Database::escape_string($_GET['path']); |
1554 | - $hotpotatoe_where .= ' AND exe_name = "' . $hotpotatoe_path . '" '; |
|
1554 | + $hotpotatoe_where .= ' AND exe_name = "'.$hotpotatoe_path.'" '; |
|
1555 | 1555 | } |
1556 | 1556 | |
1557 | 1557 | // sql for chamilo-type tests for teacher / tutor view |
@@ -1563,7 +1563,7 @@ discard block |
||
1563 | 1563 | WHERE |
1564 | 1564 | c_id = $course_id AND |
1565 | 1565 | exe_exo_id = $exercise_id AND |
1566 | - ttte.session_id = " . $sessionId . " |
|
1566 | + ttte.session_id = ".$sessionId." |
|
1567 | 1567 | )"; |
1568 | 1568 | |
1569 | 1569 | if ($is_allowedToEdit) { |
@@ -1586,9 +1586,9 @@ discard block |
||
1586 | 1586 | g.id as group_id |
1587 | 1587 | FROM $TBL_USER u |
1588 | 1588 | INNER JOIN $TBL_GROUP_REL_USER gru |
1589 | - ON (gru.user_id = u.user_id AND gru.c_id=" . $course_id . ") |
|
1589 | + ON (gru.user_id = u.user_id AND gru.c_id=".$course_id.") |
|
1590 | 1590 | INNER JOIN $TBL_GROUP g |
1591 | - ON (gru.group_id = g.id AND g.c_id=" . $course_id . ") |
|
1591 | + ON (gru.group_id = g.id AND g.c_id=".$course_id.") |
|
1592 | 1592 | )"; |
1593 | 1593 | } |
1594 | 1594 | |
@@ -1650,9 +1650,9 @@ discard block |
||
1650 | 1650 | g.id as group_id |
1651 | 1651 | FROM $TBL_USER u |
1652 | 1652 | LEFT OUTER JOIN $TBL_GROUP_REL_USER gru |
1653 | - ON ( gru.user_id = u.user_id AND gru.c_id=" . $course_id . " ) |
|
1653 | + ON ( gru.user_id = u.user_id AND gru.c_id=".$course_id." ) |
|
1654 | 1654 | LEFT OUTER JOIN $TBL_GROUP g |
1655 | - ON (gru.group_id = g.id AND g.c_id = " . $course_id . ") |
|
1655 | + ON (gru.group_id = g.id AND g.c_id = ".$course_id.") |
|
1656 | 1656 | )"; |
1657 | 1657 | } |
1658 | 1658 | |
@@ -1665,12 +1665,12 @@ discard block |
||
1665 | 1665 | ( |
1666 | 1666 | SELECT u.user_id, firstname, lastname, email, username, ' ' as group_name, '' as group_id, official_code |
1667 | 1667 | FROM $TBL_USER u |
1668 | - WHERE u.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ") |
|
1668 | + WHERE u.status NOT IN(".api_get_users_status_ignored_in_reports('string').") |
|
1669 | 1669 | )"; |
1670 | 1670 | } |
1671 | 1671 | |
1672 | 1672 | $sqlFromOption = " , $TBL_GROUP_REL_USER AS gru "; |
1673 | - $sqlWhereOption = " AND gru.c_id = " . $course_id ." AND gru.user_id = user.user_id "; |
|
1673 | + $sqlWhereOption = " AND gru.c_id = ".$course_id." AND gru.user_id = user.user_id "; |
|
1674 | 1674 | $first_and_last_name = api_is_western_name_order() ? "firstname, lastname" : "lastname, firstname"; |
1675 | 1675 | |
1676 | 1676 | if ($get_count) { |
@@ -1707,8 +1707,8 @@ discard block |
||
1707 | 1707 | ON (user.user_id = exe_user_id) |
1708 | 1708 | WHERE |
1709 | 1709 | te.status != 'incomplete' AND |
1710 | - te.c_id = " . $course_id . " $session_id_and AND |
|
1711 | - ce.active <>-1 AND ce.c_id = " . $course_id . " |
|
1710 | + te.c_id = ".$course_id." $session_id_and AND |
|
1711 | + ce.active <>-1 AND ce.c_id = ".$course_id." |
|
1712 | 1712 | $exercise_where |
1713 | 1713 | $extra_where_conditions |
1714 | 1714 | "; |
@@ -1735,12 +1735,12 @@ discard block |
||
1735 | 1735 | $sqlFromOption |
1736 | 1736 | WHERE |
1737 | 1737 | user.user_id=tth.exe_user_id |
1738 | - AND tth.c_id = " . $course_id . " |
|
1738 | + AND tth.c_id = ".$course_id." |
|
1739 | 1739 | $hotpotatoe_where |
1740 | 1740 | $sqlWhereOption |
1741 | - AND user.status NOT IN(" . api_get_users_status_ignored_in_reports( |
|
1741 | + AND user.status NOT IN(".api_get_users_status_ignored_in_reports( |
|
1742 | 1742 | 'string' |
1743 | - ) . ") |
|
1743 | + ).") |
|
1744 | 1744 | ORDER BY |
1745 | 1745 | tth.c_id ASC, |
1746 | 1746 | tth.exe_date DESC"; |
@@ -1813,12 +1813,12 @@ discard block |
||
1813 | 1813 | |
1814 | 1814 | if ($from_gradebook && ($is_allowedToEdit)) { |
1815 | 1815 | if (in_array( |
1816 | - $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'], |
|
1816 | + $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'], |
|
1817 | 1817 | $users_array_id |
1818 | 1818 | )) { |
1819 | 1819 | continue; |
1820 | 1820 | } |
1821 | - $users_array_id[] = $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname']; |
|
1821 | + $users_array_id[] = $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname']; |
|
1822 | 1822 | } |
1823 | 1823 | |
1824 | 1824 | $lp_obj = isset($results[$i]['orig_lp_id']) && isset($lp_list[$results[$i]['orig_lp_id']]) ? $lp_list[$results[$i]['orig_lp_id']] : null; |
@@ -1827,8 +1827,8 @@ discard block |
||
1827 | 1827 | if ($lp_obj) { |
1828 | 1828 | $url = api_get_path( |
1829 | 1829 | WEB_CODE_PATH |
1830 | - ) . 'newscorm/lp_controller.php?' . api_get_cidreq( |
|
1831 | - ) . '&action=view&lp_id=' . $results[$i]['orig_lp_id']; |
|
1830 | + ).'newscorm/lp_controller.php?'.api_get_cidreq( |
|
1831 | + ).'&action=view&lp_id='.$results[$i]['orig_lp_id']; |
|
1832 | 1832 | $lp_name = Display::url( |
1833 | 1833 | $lp_obj['lp_name'], |
1834 | 1834 | $url, |
@@ -1846,7 +1846,7 @@ discard block |
||
1846 | 1846 | ); |
1847 | 1847 | |
1848 | 1848 | foreach ($group_list as $id) { |
1849 | - $group_name_list .= $clean_group_list[$id] . '<br/>'; |
|
1849 | + $group_name_list .= $clean_group_list[$id].'<br/>'; |
|
1850 | 1850 | } |
1851 | 1851 | $results[$i]['group_name'] = $group_name_list; |
1852 | 1852 | } |
@@ -1902,8 +1902,8 @@ discard block |
||
1902 | 1902 | } |
1903 | 1903 | } |
1904 | 1904 | if ($revised) { |
1905 | - $actions .= "<a href='exercise_show.php?" . api_get_cidreq( |
|
1906 | - ) . "&action=edit&id=$id'>" . |
|
1905 | + $actions .= "<a href='exercise_show.php?".api_get_cidreq( |
|
1906 | + )."&action=edit&id=$id'>". |
|
1907 | 1907 | Display:: return_icon( |
1908 | 1908 | 'edit.png', |
1909 | 1909 | get_lang('Edit'), |
@@ -1912,8 +1912,8 @@ discard block |
||
1912 | 1912 | ); |
1913 | 1913 | $actions .= ' '; |
1914 | 1914 | } else { |
1915 | - $actions .= "<a href='exercise_show.php?" . api_get_cidreq( |
|
1916 | - ) . "&action=qualify&id=$id'>" . |
|
1915 | + $actions .= "<a href='exercise_show.php?".api_get_cidreq( |
|
1916 | + )."&action=qualify&id=$id'>". |
|
1917 | 1917 | Display:: return_icon( |
1918 | 1918 | 'quiz.gif', |
1919 | 1919 | get_lang('Qualify') |
@@ -1923,12 +1923,12 @@ discard block |
||
1923 | 1923 | $actions .= "</a>"; |
1924 | 1924 | |
1925 | 1925 | if ($filter == 2) { |
1926 | - $actions .= ' <a href="exercise_history.php?' . api_get_cidreq( |
|
1927 | - ) . '&exe_id=' . $id . '">' . |
|
1926 | + $actions .= ' <a href="exercise_history.php?'.api_get_cidreq( |
|
1927 | + ).'&exe_id='.$id.'">'. |
|
1928 | 1928 | Display:: return_icon( |
1929 | 1929 | 'history.gif', |
1930 | 1930 | get_lang('ViewHistoryChange') |
1931 | - ) . '</a>'; |
|
1931 | + ).'</a>'; |
|
1932 | 1932 | } |
1933 | 1933 | |
1934 | 1934 | //Admin can always delete the attempt |
@@ -1940,35 +1940,35 @@ discard block |
||
1940 | 1940 | date('Y-m-d h:i:s'), |
1941 | 1941 | false |
1942 | 1942 | ); |
1943 | - $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank"><img src="' . api_get_path( |
|
1943 | + $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip='.$ip.'" target="_blank"><img src="'.api_get_path( |
|
1944 | 1944 | WEB_CODE_PATH |
1945 | - ) . 'img/icons/22/info.png" title="' . $ip . '" /></a>'; |
|
1945 | + ).'img/icons/22/info.png" title="'.$ip.'" /></a>'; |
|
1946 | 1946 | |
1947 | - $delete_link = '<a href="exercise_report.php?' . api_get_cidreq( |
|
1948 | - ) . '&filter_by_user=' . intval( |
|
1947 | + $delete_link = '<a href="exercise_report.php?'.api_get_cidreq( |
|
1948 | + ).'&filter_by_user='.intval( |
|
1949 | 1949 | $_GET['filter_by_user'] |
1950 | - ) . '&filter=' . $filter . '&exerciseId=' . $exercise_id . '&delete=delete&did=' . $id . '" |
|
1950 | + ).'&filter='.$filter.'&exerciseId='.$exercise_id.'&delete=delete&did='.$id.'" |
|
1951 | 1951 | onclick="javascript:if(!confirm(\'' . sprintf( |
1952 | 1952 | get_lang('DeleteAttempt'), |
1953 | 1953 | $results[$i]['username'], |
1954 | 1954 | $dt |
1955 | - ) . '\')) return false;">' . Display:: return_icon( |
|
1955 | + ).'\')) return false;">'.Display:: return_icon( |
|
1956 | 1956 | 'delete.png', |
1957 | 1957 | get_lang('Delete') |
1958 | - ) . '</a>'; |
|
1958 | + ).'</a>'; |
|
1959 | 1959 | $delete_link = utf8_encode($delete_link); |
1960 | 1960 | |
1961 | 1961 | if (api_is_drh() && !api_is_platform_admin()) { |
1962 | 1962 | $delete_link = null; |
1963 | 1963 | } |
1964 | - $actions .= $delete_link . ' '; |
|
1964 | + $actions .= $delete_link.' '; |
|
1965 | 1965 | } |
1966 | 1966 | |
1967 | 1967 | } else { |
1968 | 1968 | $attempt_url = api_get_path( |
1969 | 1969 | WEB_CODE_PATH |
1970 | - ) . 'exercice/result.php?' . api_get_cidreq( |
|
1971 | - ) . '&id=' . $results[$i]['exe_id'] . '&id_session=' . $sessionId; |
|
1970 | + ).'exercice/result.php?'.api_get_cidreq( |
|
1971 | + ).'&id='.$results[$i]['exe_id'].'&id_session='.$sessionId; |
|
1972 | 1972 | $attempt_link = Display::url( |
1973 | 1973 | get_lang('Show'), |
1974 | 1974 | $attempt_url, |
@@ -2025,7 +2025,7 @@ discard block |
||
2025 | 2025 | $hp_result = round( |
2026 | 2026 | ($hpresults[$i][4] / ($hpresults[$i][5] != 0 ? $hpresults[$i][5] : 1)) * 100, |
2027 | 2027 | 2 |
2028 | - ) . '% (' . $hpresults[$i][4] . ' / ' . $hpresults[$i][5] . ')'; |
|
2028 | + ).'% ('.$hpresults[$i][4].' / '.$hpresults[$i][5].')'; |
|
2029 | 2029 | if ($is_allowedToEdit) { |
2030 | 2030 | $list_info[] = array( |
2031 | 2031 | $hpresults[$i][0], |
@@ -2098,13 +2098,13 @@ discard block |
||
2098 | 2098 | |
2099 | 2099 | $html = null; |
2100 | 2100 | if ($show_percentage) { |
2101 | - $parent = '(' . $score . ' / ' . $weight . ')'; |
|
2102 | - $html = $percentage . "% $parent"; |
|
2101 | + $parent = '('.$score.' / '.$weight.')'; |
|
2102 | + $html = $percentage."% $parent"; |
|
2103 | 2103 | if ($show_only_percentage) { |
2104 | - $html = $percentage . "% "; |
|
2104 | + $html = $percentage."% "; |
|
2105 | 2105 | } |
2106 | 2106 | } else { |
2107 | - $html = $score . ' / ' . $weight; |
|
2107 | + $html = $score.' / '.$weight; |
|
2108 | 2108 | } |
2109 | 2109 | $html = Display::span($html, array('class' => 'score_exercise')); |
2110 | 2110 | |
@@ -2198,7 +2198,7 @@ discard block |
||
2198 | 2198 | { |
2199 | 2199 | $return = '-'; |
2200 | 2200 | if ($value != '') { |
2201 | - $return = float_format($value * 100, 1) . ' %'; |
|
2201 | + $return = float_format($value * 100, 1).' %'; |
|
2202 | 2202 | } |
2203 | 2203 | return $return; |
2204 | 2204 | } |
@@ -2276,7 +2276,7 @@ discard block |
||
2276 | 2276 | } |
2277 | 2277 | |
2278 | 2278 | $needle_where = !empty($search) ? " AND title LIKE '?' " : ''; |
2279 | - $needle = !empty($search) ? "%" . $search . "%" : ''; |
|
2279 | + $needle = !empty($search) ? "%".$search."%" : ''; |
|
2280 | 2280 | |
2281 | 2281 | // Show courses by active status |
2282 | 2282 | $active_sql = ''; |
@@ -2291,7 +2291,7 @@ discard block |
||
2291 | 2291 | if ($search_all_sessions == true) { |
2292 | 2292 | $conditions = array( |
2293 | 2293 | 'where' => array( |
2294 | - $active_sql . ' c_id = ? ' . $needle_where . $time_conditions => array( |
|
2294 | + $active_sql.' c_id = ? '.$needle_where.$time_conditions => array( |
|
2295 | 2295 | $course_id, |
2296 | 2296 | $needle |
2297 | 2297 | ) |
@@ -2302,7 +2302,7 @@ discard block |
||
2302 | 2302 | if ($session_id == 0) { |
2303 | 2303 | $conditions = array( |
2304 | 2304 | 'where' => array( |
2305 | - $active_sql . ' session_id = ? AND c_id = ? ' . $needle_where . $time_conditions => array( |
|
2305 | + $active_sql.' session_id = ? AND c_id = ? '.$needle_where.$time_conditions => array( |
|
2306 | 2306 | $session_id, |
2307 | 2307 | $course_id, |
2308 | 2308 | $needle |
@@ -2313,7 +2313,7 @@ discard block |
||
2313 | 2313 | } else { |
2314 | 2314 | $conditions = array( |
2315 | 2315 | 'where' => array( |
2316 | - $active_sql . ' (session_id = 0 OR session_id = ? ) AND c_id = ? ' . $needle_where . $time_conditions => array( |
|
2316 | + $active_sql.' (session_id = 0 OR session_id = ? ) AND c_id = ? '.$needle_where.$time_conditions => array( |
|
2317 | 2317 | $session_id, |
2318 | 2318 | $course_id, |
2319 | 2319 | $needle |
@@ -2492,7 +2492,7 @@ discard block |
||
2492 | 2492 | |
2493 | 2493 | if ($return_string) { |
2494 | 2494 | if (!empty($position) && !empty($my_ranking)) { |
2495 | - $return_value = $position . '/' . count($my_ranking); |
|
2495 | + $return_value = $position.'/'.count($my_ranking); |
|
2496 | 2496 | } else { |
2497 | 2497 | $return_value = '-'; |
2498 | 2498 | } |
@@ -2572,7 +2572,7 @@ discard block |
||
2572 | 2572 | |
2573 | 2573 | if ($return_string) { |
2574 | 2574 | if (!empty($position) && !empty($my_ranking)) { |
2575 | - return $position . '/' . count($my_ranking); |
|
2575 | + return $position.'/'.count($my_ranking); |
|
2576 | 2576 | } |
2577 | 2577 | } |
2578 | 2578 | return $return_value; |
@@ -2972,7 +2972,7 @@ discard block |
||
2972 | 2972 | $courseCondition = " |
2973 | 2973 | INNER JOIN $courseUser cu |
2974 | 2974 | ON cu.c_id = c.id AND cu.user_id = exe_user_id"; |
2975 | - $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT; |
|
2975 | + $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT; |
|
2976 | 2976 | } else { |
2977 | 2977 | $courseCondition = " |
2978 | 2978 | INNER JOIN $courseUserSession cu |
@@ -3047,7 +3047,7 @@ discard block |
||
3047 | 3047 | $courseCondition = " |
3048 | 3048 | INNER JOIN $courseUser cu |
3049 | 3049 | ON cu.c_id = c.id AND cu.user_id = exe_user_id"; |
3050 | - $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT; |
|
3050 | + $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT; |
|
3051 | 3051 | } else { |
3052 | 3052 | $courseCondition = " |
3053 | 3053 | INNER JOIN $courseUserSession cu |
@@ -3139,7 +3139,7 @@ discard block |
||
3139 | 3139 | $courseCondition = " |
3140 | 3140 | INNER JOIN $courseUser cu |
3141 | 3141 | ON cu.c_id = c.id AND cu.user_id = exe_user_id"; |
3142 | - $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT; |
|
3142 | + $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT; |
|
3143 | 3143 | } else { |
3144 | 3144 | $courseCondition = " |
3145 | 3145 | INNER JOIN $courseUserSession cu |
@@ -3321,7 +3321,7 @@ discard block |
||
3321 | 3321 | } |
3322 | 3322 | } |
3323 | 3323 | // adds the correct word, followed by ] to close the blank |
3324 | - $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]'; |
|
3324 | + $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]'; |
|
3325 | 3325 | if (isset ($real_text[$i + 1])) { |
3326 | 3326 | $answer .= $real_text[$i + 1]; |
3327 | 3327 | } |
@@ -3380,13 +3380,13 @@ discard block |
||
3380 | 3380 | // check the default value of option |
3381 | 3381 | $tabSelected = array($in_default => " selected='selected' "); |
3382 | 3382 | $res = ""; |
3383 | - $res .= "<select name='$in_name' id='$in_name' onchange='" . $in_onchange . "' >"; |
|
3384 | - $res .= "<option value='-1'" . $tabSelected["-1"] . ">-- " . get_lang( |
|
3383 | + $res .= "<select name='$in_name' id='$in_name' onchange='".$in_onchange."' >"; |
|
3384 | + $res .= "<option value='-1'".$tabSelected["-1"].">-- ".get_lang( |
|
3385 | 3385 | 'AllGroups' |
3386 | - ) . " --</option>"; |
|
3387 | - $res .= "<option value='0'" . $tabSelected["0"] . ">- " . get_lang( |
|
3386 | + )." --</option>"; |
|
3387 | + $res .= "<option value='0'".$tabSelected["0"].">- ".get_lang( |
|
3388 | 3388 | 'NotInAGroup' |
3389 | - ) . " -</option>"; |
|
3389 | + )." -</option>"; |
|
3390 | 3390 | $tabGroups = GroupManager::get_group_list(); |
3391 | 3391 | $currentCatId = 0; |
3392 | 3392 | for ($i = 0; $i < count($tabGroups); $i++) { |
@@ -3394,10 +3394,10 @@ discard block |
||
3394 | 3394 | $tabGroups[$i]["id"] |
3395 | 3395 | ); |
3396 | 3396 | if ($tabCategory["id"] != $currentCatId) { |
3397 | - $res .= "<option value='-1' disabled='disabled'>" . $tabCategory["title"] . "</option>"; |
|
3397 | + $res .= "<option value='-1' disabled='disabled'>".$tabCategory["title"]."</option>"; |
|
3398 | 3398 | $currentCatId = $tabCategory["id"]; |
3399 | 3399 | } |
3400 | - $res .= "<option " . $tabSelected[$tabGroups[$i]["id"]] . "style='margin-left:40px' value='" . $tabGroups[$i]["id"] . "'>" . $tabGroups[$i]["name"] . "</option>"; |
|
3400 | + $res .= "<option ".$tabSelected[$tabGroups[$i]["id"]]."style='margin-left:40px' value='".$tabGroups[$i]["id"]."'>".$tabGroups[$i]["name"]."</option>"; |
|
3401 | 3401 | } |
3402 | 3402 | $res .= "</select>"; |
3403 | 3403 | return $res; |
@@ -3602,14 +3602,14 @@ discard block |
||
3602 | 3602 | if ($show_results) { |
3603 | 3603 | $comnt = Event::get_comments($exe_id, $questionId); |
3604 | 3604 | if (!empty($comnt)) { |
3605 | - echo '<b>' . get_lang('Feedback') . '</b>'; |
|
3606 | - echo '<div id="question_feedback">' . $comnt . '</div>'; |
|
3605 | + echo '<b>'.get_lang('Feedback').'</b>'; |
|
3606 | + echo '<div id="question_feedback">'.$comnt.'</div>'; |
|
3607 | 3607 | } |
3608 | 3608 | } |
3609 | 3609 | |
3610 | 3610 | if ($show_results) { |
3611 | 3611 | $score = array( |
3612 | - 'result' => get_lang('Score') . " : " . self::show_score( |
|
3612 | + 'result' => get_lang('Score')." : ".self::show_score( |
|
3613 | 3613 | $my_total_score, |
3614 | 3614 | $my_total_weight, |
3615 | 3615 | false, |
@@ -3683,13 +3683,13 @@ discard block |
||
3683 | 3683 | } |
3684 | 3684 | |
3685 | 3685 | if ($show_all_but_expected_answer) { |
3686 | - $exercise_content .= "<div class='normal-message'>" . get_lang( |
|
3686 | + $exercise_content .= "<div class='normal-message'>".get_lang( |
|
3687 | 3687 | "ExerciseWithFeedbackWithoutCorrectionComment" |
3688 | - ) . "</div>"; |
|
3688 | + )."</div>"; |
|
3689 | 3689 | } |
3690 | 3690 | // Remove audio auto play from questions on results page - refs BT#7939 |
3691 | 3691 | $exercise_content = preg_replace( |
3692 | - ['/autoplay[\=\".+\"]+/','/autostart[\=\".+\"]+/'], |
|
3692 | + ['/autoplay[\=\".+\"]+/', '/autostart[\=\".+\"]+/'], |
|
3693 | 3693 | '', |
3694 | 3694 | $exercise_content |
3695 | 3695 | ); |
@@ -3783,11 +3783,11 @@ discard block |
||
3783 | 3783 | $ribbon_total_success_or_error = ' ribbon-total-error'; |
3784 | 3784 | } |
3785 | 3785 | } |
3786 | - $ribbon .= '<div class="total ' . $ribbon_total_success_or_error . '">'; |
|
3786 | + $ribbon .= '<div class="total '.$ribbon_total_success_or_error.'">'; |
|
3787 | 3787 | } else { |
3788 | 3788 | $ribbon .= '<div class="total">'; |
3789 | 3789 | } |
3790 | - $ribbon .= '<h3>' . get_lang('YourTotalScore') . ": "; |
|
3790 | + $ribbon .= '<h3>'.get_lang('YourTotalScore').": "; |
|
3791 | 3791 | $ribbon .= self::show_score($score, $weight, false, true); |
3792 | 3792 | $ribbon .= '</h3>'; |
3793 | 3793 | $ribbon .= '</div>'; |
@@ -3,14 +3,8 @@ |
||
3 | 3 | |
4 | 4 | use Ddeboer\DataImport\Writer\ExcelWriter; |
5 | 5 | use Ddeboer\DataImport\Writer\CsvWriter; |
6 | -use Ddeboer\DataImport\Workflow; |
|
7 | - |
|
8 | -use Ddeboer\DataImport\Reader\CsvReader; |
|
9 | -use Ddeboer\DataImport\Reader\ArrayReader; |
|
10 | -use Ddeboer\DataImport\Writer\ArrayWriter; |
|
11 | 6 | use Chamilo\CoreBundle\Component\Editor\Connector; |
12 | 7 | use Chamilo\CoreBundle\Component\Filesystem\Data; |
13 | -use ChamiloSession as Session; |
|
14 | 8 | use MediaAlchemyst\Alchemyst; |
15 | 9 | use MediaAlchemyst\DriversContainer; |
16 | 10 | use Neutron\TemporaryFilesystem\Manager; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | foreach ($data as $row) { |
101 | 101 | $string = implode("</td><td>", $row); |
102 | - $string = '<tr><td>' . $string . '</td></tr>'; |
|
102 | + $string = '<tr><td>'.$string.'</td></tr>'; |
|
103 | 103 | if ($encoding != 'utf-8') { |
104 | 104 | $string = api_convert_encoding($string, $encoding, $systemEncoding); |
105 | 105 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | fwrite($handle, '<'.$wrapper_tagname.'>'); |
174 | 174 | } |
175 | 175 | $s = self::_export_complex_table_xml_helper($data); |
176 | - fwrite($handle,$s); |
|
176 | + fwrite($handle, $s); |
|
177 | 177 | if (!is_null($wrapper_tagname)) { |
178 | 178 | fwrite($handle, '</'.$wrapper_tagname.'>'."\n"); |
179 | 179 | } |
@@ -195,10 +195,10 @@ discard block |
||
195 | 195 | } |
196 | 196 | $string = ''; |
197 | 197 | foreach ($data as $row) { |
198 | - $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>'; |
|
198 | + $string .= "\n".str_repeat("\t", $level).'<'.$row['name'].'>'; |
|
199 | 199 | if (is_array($row['value'])) { |
200 | - $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n"; |
|
201 | - $string .= str_repeat("\t",$level).'</'.$row['name'].'>'; |
|
200 | + $string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n"; |
|
201 | + $string .= str_repeat("\t", $level).'</'.$row['name'].'>'; |
|
202 | 202 | } else { |
203 | 203 | $string .= $row['value']; |
204 | 204 | $string .= '</'.$row['name'].'>'; |
@@ -2,7 +2,6 @@ |
||
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | 4 | use ChamiloSession as Session; |
5 | - |
|
6 | 5 | use Chamilo\UserBundle\Entity\User; |
7 | 6 | |
8 | 7 | /** |
@@ -37,24 +37,24 @@ discard block |
||
37 | 37 | if ($by_username) { |
38 | 38 | $secret_word = self::get_secret_word($user['email']); |
39 | 39 | if ($reset) { |
40 | - $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $user['uid']; |
|
40 | + $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$user['uid']; |
|
41 | 41 | } else { |
42 | - $reset_link = get_lang('Pass') . " : $user[password]"; |
|
42 | + $reset_link = get_lang('Pass')." : $user[password]"; |
|
43 | 43 | } |
44 | - $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . ''; |
|
44 | + $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.''; |
|
45 | 45 | |
46 | 46 | if ($user_account_list) { |
47 | - $user_account_list = "\n-----------------------------------------------\n" . $user_account_list; |
|
47 | + $user_account_list = "\n-----------------------------------------------\n".$user_account_list; |
|
48 | 48 | } |
49 | 49 | } else { |
50 | 50 | foreach ($user as $this_user) { |
51 | 51 | $secret_word = self::get_secret_word($this_user['email']); |
52 | 52 | if ($reset) { |
53 | - $reset_link = $portal_url . "main/auth/lostPassword.php?reset=" . $secret_word . "&id=" . $this_user['uid']; |
|
53 | + $reset_link = $portal_url."main/auth/lostPassword.php?reset=".$secret_word."&id=".$this_user['uid']; |
|
54 | 54 | } else { |
55 | - $reset_link = get_lang('Pass') . " : $this_user[password]"; |
|
55 | + $reset_link = get_lang('Pass')." : $this_user[password]"; |
|
56 | 56 | } |
57 | - $user_account_list[] = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $this_user['loginName'] . "\n" . get_lang('ResetLink') . ' : ' . $reset_link . ''; |
|
57 | + $user_account_list[] = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$this_user['loginName']."\n".get_lang('ResetLink').' : '.$reset_link.''; |
|
58 | 58 | } |
59 | 59 | if ($user_account_list) { |
60 | 60 | $user_account_list = implode("\n-----------------------------------------------\n", $user_account_list); |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | if (!$by_username) { |
65 | 65 | $user = $user[0]; |
66 | 66 | } |
67 | - $reset_link = get_lang('Pass') . " : $user[password]"; |
|
68 | - $user_account_list = get_lang('YourRegistrationData') . " : \n" . get_lang('UserName') . ' : ' . $user['loginName'] . "\n" . $reset_link . ''; |
|
67 | + $reset_link = get_lang('Pass')." : $user[password]"; |
|
68 | + $user_account_list = get_lang('YourRegistrationData')." : \n".get_lang('UserName').' : '.$user['loginName']."\n".$reset_link.''; |
|
69 | 69 | } |
70 | 70 | return $user_account_list; |
71 | 71 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public static function send_password_to_user($user, $by_username = false) |
80 | 80 | { |
81 | - $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT |
|
81 | + $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT |
|
82 | 82 | |
83 | 83 | if ($by_username) { // Show only for lost password |
84 | 84 | $user_account_list = self::get_user_account_list($user, false, $by_username); // BODY |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
100 | - $email_body = get_lang('YourAccountParam') . " " . $portal_url . "\n\n$user_account_list"; |
|
100 | + $email_body = get_lang('YourAccountParam')." ".$portal_url."\n\n$user_account_list"; |
|
101 | 101 | // SEND MESSAGE |
102 | 102 | $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); |
103 | 103 | $email_admin = api_get_setting('emailAdministrator'); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public static function handle_encrypted_password($user, $by_username = false) |
133 | 133 | { |
134 | - $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT |
|
134 | + $email_subject = "[".api_get_setting('siteName')."] ".get_lang('LoginRequest'); // SUBJECT |
|
135 | 135 | |
136 | 136 | if ($by_username) { |
137 | 137 | // Show only for lost password |
@@ -141,11 +141,11 @@ discard block |
||
141 | 141 | $user_account_list = self::get_user_account_list($user, true); // BODY |
142 | 142 | $email_to = $user[0]['email']; |
143 | 143 | } |
144 | - $email_body = get_lang('DearUser') . " :\n" . get_lang('password_request') . "\n"; |
|
145 | - $email_body .= $user_account_list . "\n-----------------------------------------------\n\n"; |
|
144 | + $email_body = get_lang('DearUser')." :\n".get_lang('password_request')."\n"; |
|
145 | + $email_body .= $user_account_list."\n-----------------------------------------------\n\n"; |
|
146 | 146 | $email_body .= get_lang('PasswordEncryptedForSecurity'); |
147 | 147 | |
148 | - $email_body .= "\n\n" . get_lang('SignatureFormula') . ",\n" . api_get_setting('administratorName') . " " . api_get_setting('administratorSurname') . "\n" . get_lang('PlataformAdmin') . " - " . api_get_setting('siteName'); |
|
148 | + $email_body .= "\n\n".get_lang('SignatureFormula').",\n".api_get_setting('administratorName')." ".api_get_setting('administratorSurname')."\n".get_lang('PlataformAdmin')." - ".api_get_setting('siteName'); |
|
149 | 149 | |
150 | 150 | $sender_name = api_get_person_name( |
151 | 151 | api_get_setting('administratorName'), |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | username AS loginName, |
239 | 239 | password, |
240 | 240 | |
241 | - FROM " . $tbl_user . " |
|
241 | + FROM " . $tbl_user." |
|
242 | 242 | WHERE user_id = $id"; |
243 | 243 | $result = Database::query($sql); |
244 | 244 | $num_rows = Database::num_rows($result); |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | ON user.user_id = a.user_id |
292 | 292 | LEFT JOIN $track_e_login login |
293 | 293 | ON user.user_id = login.login_user_id |
294 | - WHERE user.user_id = '" . $_user['user_id'] . "' |
|
294 | + WHERE user.user_id = '".$_user['user_id']."' |
|
295 | 295 | ORDER BY login.login_date DESC LIMIT 1"; |
296 | 296 | |
297 | 297 | $result = Database::query($sql); |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | Session::write('is_platformAdmin', $is_platformAdmin); |
322 | 322 | Session::write('is_allowedCreateCourse', $is_allowedCreateCourse); |
323 | 323 | } else { |
324 | - header('location:' . api_get_path(WEB_PATH)); |
|
324 | + header('location:'.api_get_path(WEB_PATH)); |
|
325 | 325 | //exit("WARNING UNDEFINED UID !! "); |
326 | 326 | } |
327 | 327 | } else { // no uid => logout or Anonymous |
@@ -368,9 +368,9 @@ discard block |
||
368 | 368 | global $_course; |
369 | 369 | global $_real_cid; |
370 | 370 | |
371 | - global $is_courseAdmin; //course teacher |
|
372 | - global $is_courseTutor; //course teacher - some rights |
|
373 | - global $is_courseCoach; //course coach |
|
371 | + global $is_courseAdmin; //course teacher |
|
372 | + global $is_courseTutor; //course teacher - some rights |
|
373 | + global $is_courseCoach; //course coach |
|
374 | 374 | global $is_courseMember; //course student |
375 | 375 | global $is_sessionAdmin; |
376 | 376 | global $is_allowed_in_course; |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | |
428 | 428 | if (!empty($_GET['id_session'])) { |
429 | 429 | $_SESSION['id_session'] = intval($_GET['id_session']); |
430 | - $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"'; |
|
430 | + $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"'; |
|
431 | 431 | $rs = Database::query($sql); |
432 | 432 | list($_SESSION['session_name']) = Database::fetch_array($rs); |
433 | 433 | } else { |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | } |
444 | 444 | } else { |
445 | 445 | //exit("WARNING UNDEFINED CID !! "); |
446 | - header('location:' . api_get_path(WEB_PATH)); |
|
446 | + header('location:'.api_get_path(WEB_PATH)); |
|
447 | 447 | } |
448 | 448 | } else { |
449 | 449 | Session::erase('_cid'); |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | } else { |
471 | 471 | // Continue with the previous values |
472 | 472 | if (empty($_SESSION['_course']) OR empty($_SESSION['_cid'])) { //no previous values... |
473 | - $_cid = -1; //set default values that will be caracteristic of being unset |
|
473 | + $_cid = -1; //set default values that will be caracteristic of being unset |
|
474 | 474 | $_course = -1; |
475 | 475 | } else { |
476 | 476 | $_cid = $_SESSION['_cid']; |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | // Moreover, if we want to track a course with another session it can be usefull |
481 | 481 | if (!empty($_GET['id_session'])) { |
482 | 482 | $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
483 | - $sql = 'SELECT name FROM ' . $tbl_session . ' WHERE id="' . intval($_SESSION['id_session']) . '"'; |
|
483 | + $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_SESSION['id_session']).'"'; |
|
484 | 484 | $rs = Database::query($sql); |
485 | 485 | list($_SESSION['session_name']) = Database::fetch_array($rs); |
486 | 486 | $_SESSION['id_session'] = intval($_GET['id_session']); |
@@ -520,9 +520,9 @@ discard block |
||
520 | 520 | //But only if the login date is < than now + max_life_time |
521 | 521 | $sql = "SELECT course_access_id FROM $course_tracking_table |
522 | 522 | WHERE |
523 | - user_id = " . intval($_user ['user_id']) . " AND |
|
523 | + user_id = ".intval($_user ['user_id'])." AND |
|
524 | 524 | c_id = '".api_get_course_int_id()."' AND |
525 | - session_id = " . api_get_session_id() . " AND |
|
525 | + session_id = " . api_get_session_id()." AND |
|
526 | 526 | login_course_date > now() - INTERVAL $session_lifetime SECOND |
527 | 527 | ORDER BY login_course_date DESC LIMIT 0,1"; |
528 | 528 | $result = Database::query($sql); |
@@ -532,11 +532,11 @@ discard block |
||
532 | 532 | //We update the course tracking table |
533 | 533 | $sql = "UPDATE $course_tracking_table |
534 | 534 | SET logout_course_date = '$time', counter = counter+1 |
535 | - WHERE course_access_id = " . intval($i_course_access_id) . " AND session_id = " . api_get_session_id(); |
|
535 | + WHERE course_access_id = ".intval($i_course_access_id)." AND session_id = ".api_get_session_id(); |
|
536 | 536 | Database::query($sql); |
537 | 537 | } else { |
538 | - $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)" . |
|
539 | - "VALUES('" . api_get_course_int_id() . "', '" . $_user['user_id'] . "', '$time', '$time', '1','" . api_get_session_id() . "')"; |
|
538 | + $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)". |
|
539 | + "VALUES('".api_get_course_int_id()."', '".$_user['user_id']."', '$time', '$time', '1','".api_get_session_id()."')"; |
|
540 | 540 | Database::query($sql); |
541 | 541 | } |
542 | 542 | } |
@@ -564,8 +564,8 @@ discard block |
||
564 | 564 | $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER); |
565 | 565 | $sql = "SELECT * FROM $course_user_table |
566 | 566 | WHERE |
567 | - user_id = '" . $user_id . "' AND |
|
568 | - relation_type <> " . COURSE_RELATION_TYPE_RRHH . " AND |
|
567 | + user_id = '".$user_id."' AND |
|
568 | + relation_type <> " . COURSE_RELATION_TYPE_RRHH." AND |
|
569 | 569 | course_code = '$course_id'"; |
570 | 570 | $result = Database::query($sql); |
571 | 571 | |
@@ -585,8 +585,8 @@ discard block |
||
585 | 585 | $session_id |
586 | 586 | ); |
587 | 587 | if (!$user_is_subscribed) { |
588 | - $url = api_get_path(WEB_CODE_PATH) . 'course_info/legal.php?course_code=' . $_course['code'] . '&session_id=' . $session_id; |
|
589 | - header('Location: ' . $url); |
|
588 | + $url = api_get_path(WEB_CODE_PATH).'course_info/legal.php?course_code='.$_course['code'].'&session_id='.$session_id; |
|
589 | + header('Location: '.$url); |
|
590 | 590 | exit; |
591 | 591 | } |
592 | 592 | } |
@@ -627,11 +627,11 @@ discard block |
||
627 | 627 | } else { |
628 | 628 | //Im a coach or a student? |
629 | 629 | $sql = "SELECT user_id, status |
630 | - FROM " . $tbl_session_course_user . " |
|
630 | + FROM " . $tbl_session_course_user." |
|
631 | 631 | WHERE |
632 | 632 | c_id = '$_cid' AND |
633 | - user_id = '" . $user_id . "' AND |
|
634 | - session_id = '" . $session_id . "' |
|
633 | + user_id = '".$user_id."' AND |
|
634 | + session_id = '" . $session_id."' |
|
635 | 635 | LIMIT 1"; |
636 | 636 | $result = Database::query($sql); |
637 | 637 | |
@@ -777,7 +777,7 @@ discard block |
||
777 | 777 | if ($reset) { // session data refresh requested |
778 | 778 | if ($group_id && $_cid && !empty($_course['real_id'])) { // have keys to search data |
779 | 779 | $group_table = Database::get_course_table(TABLE_GROUP); |
780 | - $sql = "SELECT * FROM $group_table WHERE c_id = " . $_course['real_id'] . " AND id = '$group_id'"; |
|
780 | + $sql = "SELECT * FROM $group_table WHERE c_id = ".$_course['real_id']." AND id = '$group_id'"; |
|
781 | 781 | $result = Database::query($sql); |
782 | 782 | if (Database::num_rows($result) > 0) { // This group has recorded status related to this course |
783 | 783 | $gpData = Database::fetch_array($result); |
@@ -830,7 +830,7 @@ discard block |
||
830 | 830 | */ |
831 | 831 | public static function get_user_accounts_by_username($username) |
832 | 832 | { |
833 | - if (strpos($username,'@')){ |
|
833 | + if (strpos($username, '@')) { |
|
834 | 834 | $username = api_strtolower($username); |
835 | 835 | $email = true; |
836 | 836 | } else { |
@@ -1,9 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField; |
|
5 | -use Chamilo\UserBundle\Entity\User; |
|
6 | - |
|
7 | 4 | /** |
8 | 5 | * @package chamilo.webservices |
9 | 6 | */ |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | if ($debug) { |
78 | - error_log("checkip " . intval($check_ip)); |
|
78 | + error_log("checkip ".intval($check_ip)); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | if ($check_ip) { |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | '', |
132 | 132 | 'SOAP-ENC:Array', |
133 | 133 | array(), |
134 | - array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:portalItem[]')),'tns:portalItem' |
|
134 | + array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:portalItem[]')), 'tns:portalItem' |
|
135 | 135 | ); |
136 | 136 | |
137 | 137 | $server->wsdl->addComplexType( |
@@ -146,13 +146,13 @@ discard block |
||
146 | 146 | ); |
147 | 147 | |
148 | 148 | // Register the method to expose |
149 | -$server->register('WSGetPortals', // method name |
|
150 | - array('getPortals' => 'tns:getPortals'), // input parameters |
|
151 | - array('return' => 'tns:portalList'), // output parameters |
|
152 | - 'urn:WSAccessUrl', // namespace |
|
153 | - 'urn:WSAccessUrl#WSGetPortals', // soapaction |
|
154 | - 'rpc', // style |
|
155 | - 'encoded', // use |
|
149 | +$server->register('WSGetPortals', // method name |
|
150 | + array('getPortals' => 'tns:getPortals'), // input parameters |
|
151 | + array('return' => 'tns:portalList'), // output parameters |
|
152 | + 'urn:WSAccessUrl', // namespace |
|
153 | + 'urn:WSAccessUrl#WSGetPortals', // soapaction |
|
154 | + 'rpc', // style |
|
155 | + 'encoded', // use |
|
156 | 156 | 'This service adds a user to portal' // documentation |
157 | 157 | ); |
158 | 158 | |
@@ -193,13 +193,13 @@ discard block |
||
193 | 193 | ); |
194 | 194 | |
195 | 195 | // Register the method to expose |
196 | -$server->register('WSAddUserToPortal', // method name |
|
197 | - array('addUserToPortal' => 'tns:AddUserToPortal'), // input parameters |
|
198 | - array('return' => 'xsd:string'), // output parameters |
|
199 | - 'urn:WSAccessUrl', // namespace |
|
200 | - 'urn:WSAccessUrl#WSAddUserToPortal', // soapaction |
|
201 | - 'rpc', // style |
|
202 | - 'encoded', // use |
|
196 | +$server->register('WSAddUserToPortal', // method name |
|
197 | + array('addUserToPortal' => 'tns:AddUserToPortal'), // input parameters |
|
198 | + array('return' => 'xsd:string'), // output parameters |
|
199 | + 'urn:WSAccessUrl', // namespace |
|
200 | + 'urn:WSAccessUrl#WSAddUserToPortal', // soapaction |
|
201 | + 'rpc', // style |
|
202 | + 'encoded', // use |
|
203 | 203 | 'This service adds a user to portal' // documentation |
204 | 204 | ); |
205 | 205 | |
@@ -224,13 +224,13 @@ discard block |
||
224 | 224 | } |
225 | 225 | |
226 | 226 | // Register the method to expose |
227 | -$server->register('WSRemoveUserFromPortal', // method name |
|
228 | - array('removeUserFromPortal' => 'tns:AddUserToPortal'), // input parameters |
|
229 | - array('return' => 'xsd:string'), // output parameters |
|
230 | - 'urn:WSAccessUrl', // namespace |
|
231 | - 'urn:WSAccessUrl#WSRemoveUserFromPortal', // soapaction |
|
232 | - 'rpc', // style |
|
233 | - 'encoded', // use |
|
227 | +$server->register('WSRemoveUserFromPortal', // method name |
|
228 | + array('removeUserFromPortal' => 'tns:AddUserToPortal'), // input parameters |
|
229 | + array('return' => 'xsd:string'), // output parameters |
|
230 | + 'urn:WSAccessUrl', // namespace |
|
231 | + 'urn:WSAccessUrl#WSRemoveUserFromPortal', // soapaction |
|
232 | + 'rpc', // style |
|
233 | + 'encoded', // use |
|
234 | 234 | 'This service remove a user from a portal' // documentation |
235 | 235 | ); |
236 | 236 | |
@@ -267,13 +267,13 @@ discard block |
||
267 | 267 | ); |
268 | 268 | |
269 | 269 | // Register the method to expose |
270 | -$server->register('WSGetPortalListFromUser', // method name |
|
271 | - array('getPortalListFromUser' => 'tns:getPortalListFromUser'), // input parameters |
|
272 | - array('return' => 'tns:portalList'), // output parameters |
|
273 | - 'urn:WSAccessUrl', // namespace |
|
274 | - 'urn:WSAccessUrl#WSGetPortalListFromUser', // soapaction |
|
275 | - 'rpc', // style |
|
276 | - 'encoded', // use |
|
270 | +$server->register('WSGetPortalListFromUser', // method name |
|
271 | + array('getPortalListFromUser' => 'tns:getPortalListFromUser'), // input parameters |
|
272 | + array('return' => 'tns:portalList'), // output parameters |
|
273 | + 'urn:WSAccessUrl', // namespace |
|
274 | + 'urn:WSAccessUrl#WSGetPortalListFromUser', // soapaction |
|
275 | + 'rpc', // style |
|
276 | + 'encoded', // use |
|
277 | 277 | 'This service remove a user from a portal' // documentation |
278 | 278 | ); |
279 | 279 | |
@@ -311,13 +311,13 @@ discard block |
||
311 | 311 | ); |
312 | 312 | |
313 | 313 | // Register the method to expose |
314 | -$server->register('WSGetPortalListFromCourse', // method name |
|
315 | - array('getPortalListFromCourse' => 'tns:getPortalListFromCourse'), // input parameters |
|
316 | - array('return' => 'tns:portalList'), // output parameters |
|
317 | - 'urn:WSAccessUrl', // namespace |
|
318 | - 'urn:WSAccessUrl#getPortalListFromCourse', // soapaction |
|
319 | - 'rpc', // style |
|
320 | - 'encoded', // use |
|
314 | +$server->register('WSGetPortalListFromCourse', // method name |
|
315 | + array('getPortalListFromCourse' => 'tns:getPortalListFromCourse'), // input parameters |
|
316 | + array('return' => 'tns:portalList'), // output parameters |
|
317 | + 'urn:WSAccessUrl', // namespace |
|
318 | + 'urn:WSAccessUrl#getPortalListFromCourse', // soapaction |
|
319 | + 'rpc', // style |
|
320 | + 'encoded', // use |
|
321 | 321 | 'This service remove a user from a portal' // documentation |
322 | 322 | ); |
323 | 323 | |
@@ -361,13 +361,13 @@ discard block |
||
361 | 361 | ); |
362 | 362 | |
363 | 363 | // Register the method to expose |
364 | -$server->register('WSAddCourseToPortal', // method name |
|
365 | - array('addCourseToPortal' => 'tns:addCourseToPortal'), // input parameters |
|
366 | - array('return' => 'xsd:string'), // output parameters |
|
367 | - 'urn:WSAccessUrl', // namespace |
|
368 | - 'urn:WSAccessUrl#WSAddCourseToPortal', // soapaction |
|
369 | - 'rpc', // style |
|
370 | - 'encoded', // use |
|
364 | +$server->register('WSAddCourseToPortal', // method name |
|
365 | + array('addCourseToPortal' => 'tns:addCourseToPortal'), // input parameters |
|
366 | + array('return' => 'xsd:string'), // output parameters |
|
367 | + 'urn:WSAccessUrl', // namespace |
|
368 | + 'urn:WSAccessUrl#WSAddCourseToPortal', // soapaction |
|
369 | + 'rpc', // style |
|
370 | + 'encoded', // use |
|
371 | 371 | 'This service adds a course to portal' // documentation |
372 | 372 | ); |
373 | 373 | |
@@ -394,13 +394,13 @@ discard block |
||
394 | 394 | } |
395 | 395 | |
396 | 396 | // Register the method to expose |
397 | -$server->register('WSRemoveCourseFromPortal', // method name |
|
398 | - array('removeCourseFromPortal' => 'tns:addCourseToPortal'), // input parameters |
|
399 | - array('return' => 'xsd:string'), // output parameters |
|
400 | - 'urn:WSAccessUrl', // namespace |
|
401 | - 'urn:WSAccessUrl#WSRemoveCourseFromPortal', // soapaction |
|
402 | - 'rpc', // style |
|
403 | - 'encoded', // use |
|
397 | +$server->register('WSRemoveCourseFromPortal', // method name |
|
398 | + array('removeCourseFromPortal' => 'tns:addCourseToPortal'), // input parameters |
|
399 | + array('return' => 'xsd:string'), // output parameters |
|
400 | + 'urn:WSAccessUrl', // namespace |
|
401 | + 'urn:WSAccessUrl#WSRemoveCourseFromPortal', // soapaction |
|
402 | + 'rpc', // style |
|
403 | + 'encoded', // use |
|
404 | 404 | 'This service remove a course from a portal' // documentation |
405 | 405 | ); |
406 | 406 |
@@ -1,14 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use Chamilo\CoreBundle\Component\Editor\Connector; |
|
5 | 4 | use Chamilo\CoreBundle\Component\Filesystem\Data; |
6 | 5 | use ChamiloSession as Session; |
7 | -use MediaAlchemyst\Alchemyst; |
|
8 | -use MediaAlchemyst\DriversContainer; |
|
9 | -use Neutron\TemporaryFilesystem\Manager; |
|
10 | -use Neutron\TemporaryFilesystem\TemporaryFilesystem; |
|
11 | -use Symfony\Component\Filesystem\Filesystem; |
|
12 | 6 | |
13 | 7 | /** |
14 | 8 | * Class Wiki |
@@ -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 |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | |
4 | -use ChamiloSession as Session; |
|
5 | 4 | use Symfony\Component\Finder\Finder; |
6 | 5 | |
7 | 6 | require_once '../inc/global.inc.php'; |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use Symfony\Component\Finder\Finder; |
6 | 6 | |
7 | 7 | require_once '../inc/global.inc.php'; |
8 | -$current_course_tool = TOOL_STUDENTPUBLICATION; |
|
8 | +$current_course_tool = TOOL_STUDENTPUBLICATION; |
|
9 | 9 | |
10 | 10 | api_protect_course_script(true); |
11 | 11 | |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $zip = new PclZip($_FILES['file']['tmp_name']); |
71 | 71 | |
72 | 72 | // Check the zip content (real size and file extension) |
73 | - $zipFileList = (array)$zip->listContent(); |
|
73 | + $zipFileList = (array) $zip->listContent(); |
|
74 | 74 | |
75 | 75 | $realSize = 0; |
76 | 76 | foreach ($zipFileList as & $this_content) { |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use Chamilo\UserBundle\Entity\User; |
9 | 9 | use MediaAlchemyst\Alchemyst; |
10 | 10 | use Sunra\PhpSimple\HtmlDomParser; |
11 | -use Symfony\Component\Console; |
|
12 | 11 | use Symfony\Component\Console\Output\OutputInterface; |
13 | 12 | use Symfony\Component\Filesystem\Filesystem; |
14 | 13 | use Symfony\Component\Finder\Finder; |
@@ -3,11 +3,9 @@ |
||
3 | 3 | |
4 | 4 | namespace Chamilo\CoreBundle\Entity\Listener; |
5 | 5 | |
6 | -use Chamilo\CoreBundle\Entity\Tool; |
|
7 | 6 | use Chamilo\CourseBundle\ToolChain; |
8 | 7 | use Doctrine\ORM\Event\LifecycleEventArgs; |
9 | 8 | use Chamilo\CoreBundle\Entity\Course; |
10 | -use Doctrine\ORM\Mapping as ORM; |
|
11 | 9 | |
12 | 10 | /** |
13 | 11 | * Class CourseListener |