chamilo /
chamilo-lms
@@ -73,7 +73,6 @@ |
||
| 73 | 73 | * Export the given HTML to PDF, using a global template |
| 74 | 74 | * |
| 75 | 75 | * @uses export/table_pdf.tpl |
| 76 | - |
|
| 77 | 76 | * @param $content |
| 78 | 77 | * @param bool|false $saveToFile |
| 79 | 78 | * @param bool|false $returnHtml |
@@ -536,8 +536,9 @@ |
||
| 536 | 536 | } |
| 537 | 537 | } else { |
| 538 | 538 | $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path |
| 539 | - if (file_exists($store_path)) |
|
| 540 | - $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
|
| 539 | + if (file_exists($store_path)) { |
|
| 540 | + $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
|
| 541 | + } |
|
| 541 | 542 | } |
| 542 | 543 | return $web_path; |
| 543 | 544 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * @param string pdf name |
| 193 | 193 | * @param string course code (if you are using html that are located in the document tool you must provide this) |
| 194 | 194 | * @param bool Whether to print the header, footer and watermark (true) or just the content (false) |
| 195 | - * @return bool |
|
| 195 | + * @return false|null |
|
| 196 | 196 | */ |
| 197 | 197 | public function html_to_pdf( |
| 198 | 198 | $html_file_array, |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | } |
| 767 | 767 | |
| 768 | 768 | /** |
| 769 | - * @param array $header html content |
|
| 769 | + * @param string $header html content |
|
| 770 | 770 | */ |
| 771 | 771 | public function set_custom_header($header) |
| 772 | 772 | { |
@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | } |
| 775 | 775 | |
| 776 | 776 | /** |
| 777 | - * @param array $footer html content |
|
| 777 | + * @param string $footer html content |
|
| 778 | 778 | */ |
| 779 | 779 | public function set_custom_footer($footer) |
| 780 | 780 | { |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | /* More info @ http://mpdf1.com/manual/index.php?tid=184&searchstring=mPDF |
| 34 | 34 | * mPDF ([ string $mode [, mixed $format [, float $default_font_size [, string $default_font [, float $margin_left , float $margin_right , float $margin_top , float $margin_bottom , float $margin_header , float $margin_footer [, string $orientation ]]]]]]) |
| 35 | 35 | */ |
| 36 | - if (!in_array($orientation, array('P','L'))) { |
|
| 36 | + if (!in_array($orientation, array('P', 'L'))) { |
|
| 37 | 37 | $orientation = 'P'; |
| 38 | 38 | } |
| 39 | 39 | //$this->pdf = $pdf = new mPDF('UTF-8', $pageFormat, '', '', 30, 20, 27, 25, 16, 13, $orientation); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $visualTheme = api_get_visual_theme(); |
| 101 | 101 | $img = api_get_path(SYS_CSS_PATH).'themes/'.$visualTheme.'/images/pdf_logo_header.png'; |
| 102 | 102 | if (file_exists($img)) { |
| 103 | - $img = api_get_path(WEB_CSS_PATH) . 'themes/' . $visualTheme . '/images/pdf_logo_header.png'; |
|
| 103 | + $img = api_get_path(WEB_CSS_PATH).'themes/'.$visualTheme.'/images/pdf_logo_header.png'; |
|
| 104 | 104 | $organization = "<img src='$img'>"; |
| 105 | 105 | } |
| 106 | 106 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | // then print the title in the PDF |
| 238 | 238 | if (is_array($file) && isset($file['title'])) { |
| 239 | 239 | $html_title = $file['title']; |
| 240 | - $file = $file['path']; |
|
| 240 | + $file = $file['path']; |
|
| 241 | 241 | } else { |
| 242 | 242 | //we suppose we've only been sent a file path |
| 243 | 243 | $html_title = basename($file); |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | //it's not a chapter but the file exists, print its title |
| 269 | 269 | if ($print_title) { |
| 270 | 270 | $this->pdf->WriteHTML( |
| 271 | - '<html><body><h3>' . $html_title . '</h3></body></html>' |
|
| 271 | + '<html><body><h3>'.$html_title.'</h3></body></html>' |
|
| 272 | 272 | ); |
| 273 | 273 | } |
| 274 | 274 | |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | |
| 283 | 283 | if ($extension === 'html') { |
| 284 | 284 | $filename = basename($filename, '.html'); |
| 285 | - } elseif($extension === 'htm'){ |
|
| 285 | + } elseif ($extension === 'htm') { |
|
| 286 | 286 | $filename = basename($filename, '.htm'); |
| 287 | 287 | } |
| 288 | 288 | |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | $document_html = str_replace('href="./css/frames.css"', $absolute_css_path, $document_html); |
| 295 | 295 | |
| 296 | 296 | if (!empty($course_data['path'])) { |
| 297 | - $document_html= str_replace('../', '', $document_html); |
|
| 297 | + $document_html = str_replace('../', '', $document_html); |
|
| 298 | 298 | $document_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document/'; |
| 299 | 299 | |
| 300 | 300 | $doc = new DOMDocument(); |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | if (!empty($document_html)) { |
| 373 | 373 | $this->pdf->WriteHTML($document_html.$page_break); |
| 374 | 374 | } |
| 375 | - } elseif (in_array($extension, array('jpg','jpeg','png','gif'))) { |
|
| 375 | + } elseif (in_array($extension, array('jpg', 'jpeg', 'png', 'gif'))) { |
|
| 376 | 376 | //Images |
| 377 | 377 | $image = Display::img($file); |
| 378 | 378 | $this->pdf->WriteHTML('<html><body>'.$image.'</body></html>'.$page_break); |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | |
| 436 | 436 | //absolute path for frames.css //TODO: necessary? |
| 437 | 437 | $absolute_css_path = api_get_path(WEB_CSS_PATH).api_get_setting('stylesheets').'/frames.css'; |
| 438 | - $document_html = str_replace('href="./css/frames.css"','href="'.$absolute_css_path.'"', $document_html); |
|
| 438 | + $document_html = str_replace('href="./css/frames.css"', 'href="'.$absolute_css_path.'"', $document_html); |
|
| 439 | 439 | |
| 440 | 440 | $document_html = str_replace('../../', '', $document_html); |
| 441 | 441 | $document_html = str_replace('../', '', $document_html); |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | $old_src_fixed = str_replace(api_get_path(REL_COURSE_PATH).$course_data['path'].'/document/', '', $old_src); |
| 464 | 464 | $old_src_fixed = str_replace('courses/'.$course_data['path'].'/document/', '', $old_src_fixed); |
| 465 | 465 | $new_path = $document_path.$old_src_fixed; |
| 466 | - $document_html= str_replace($old_src, $new_path, $document_html); |
|
| 466 | + $document_html = str_replace($old_src, $new_path, $document_html); |
|
| 467 | 467 | |
| 468 | 468 | } |
| 469 | 469 | } |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | //$document_html= str_replace('temp_template_path', 'src="/main/default_course_document/', $document_html);// restore src templates |
| 483 | 483 | |
| 484 | 484 | api_set_encoding_html($document_html, 'UTF-8'); // The library mPDF expects UTF-8 encoded input data. |
| 485 | - $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8'); // TODO: Maybe it is better idea the title to be passed through |
|
| 485 | + $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8'); // TODO: Maybe it is better idea the title to be passed through |
|
| 486 | 486 | // $_GET[] too, as it is done with file name. |
| 487 | 487 | // At the moment the title is retrieved from the html document itself. |
| 488 | 488 | |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | //$this->pdf->Output($output_file, $outputMode); // F to save the pdf in a file |
| 505 | 505 | |
| 506 | 506 | if ($outputMode == 'F') { |
| 507 | - $output_file = api_get_path(SYS_ARCHIVE_PATH) . $output_file; |
|
| 507 | + $output_file = api_get_path(SYS_ARCHIVE_PATH).$output_file; |
|
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | if ($saveInFile) { |
@@ -537,14 +537,14 @@ discard block |
||
| 537 | 537 | $web_path = false; |
| 538 | 538 | if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') { |
| 539 | 539 | $course_info = api_get_course_info($course_code); |
| 540 | - $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path |
|
| 540 | + $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path |
|
| 541 | 541 | if (file_exists($store_path)) { |
| 542 | - $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
|
| 542 | + $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
|
| 543 | 543 | } |
| 544 | 544 | } else { |
| 545 | - $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path |
|
| 545 | + $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path |
|
| 546 | 546 | if (file_exists($store_path)) |
| 547 | - $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
|
| 547 | + $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
|
| 548 | 548 | } |
| 549 | 549 | return $web_path; |
| 550 | 550 | } |
@@ -584,10 +584,10 @@ discard block |
||
| 584 | 584 | { |
| 585 | 585 | if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') { |
| 586 | 586 | $course_info = api_get_course_info($course_code); |
| 587 | - $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path |
|
| 587 | + $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path |
|
| 588 | 588 | $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/pdf_watermark.png'; |
| 589 | 589 | } else { |
| 590 | - $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images'; // course path |
|
| 590 | + $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images'; // course path |
|
| 591 | 591 | $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
| 592 | 592 | } |
| 593 | 593 | $course_image = $store_path.'/'.api_get_current_access_url_id().'_pdf_watermark.png'; |
@@ -620,9 +620,9 @@ discard block |
||
| 620 | 620 | */ |
| 621 | 621 | public function set_footer() |
| 622 | 622 | { |
| 623 | - $this->pdf->defaultfooterfontsize = 12; // in pts |
|
| 624 | - $this->pdf->defaultfooterfontstyle = 'B'; // blank, B, I, or BI |
|
| 625 | - $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer |
|
| 623 | + $this->pdf->defaultfooterfontsize = 12; // in pts |
|
| 624 | + $this->pdf->defaultfooterfontstyle = 'B'; // blank, B, I, or BI |
|
| 625 | + $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer |
|
| 626 | 626 | $platform_name = api_get_setting('Institution'); |
| 627 | 627 | $left_content = $platform_name; |
| 628 | 628 | $center_content = ''; |
@@ -689,9 +689,9 @@ discard block |
||
| 689 | 689 | */ |
| 690 | 690 | public function set_header($course_data) |
| 691 | 691 | { |
| 692 | - $this->pdf->defaultheaderfontsize = 10; // in pts |
|
| 693 | - $this->pdf->defaultheaderfontstyle = 'BI'; // blank, B, I, or BI |
|
| 694 | - $this->pdf->defaultheaderline = 1; // 1 to include line below header/above footer |
|
| 692 | + $this->pdf->defaultheaderfontsize = 10; // in pts |
|
| 693 | + $this->pdf->defaultheaderfontstyle = 'BI'; // blank, B, I, or BI |
|
| 694 | + $this->pdf->defaultheaderline = 1; // 1 to include line below header/above footer |
|
| 695 | 695 | |
| 696 | 696 | if (!empty($course_data['code'])) { |
| 697 | 697 | $teacher_list = CourseManager::get_teacher_list_from_course_code($course_data['code']); |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | $teachers = ''; |
| 700 | 700 | if (!empty($teacher_list)) { |
| 701 | 701 | foreach ($teacher_list as $teacher) { |
| 702 | - $teachers[]= $teacher['firstname'].' '.$teacher['lastname']; |
|
| 702 | + $teachers[] = $teacher['firstname'].' '.$teacher['lastname']; |
|
| 703 | 703 | } |
| 704 | 704 | if (count($teachers) > 1) { |
| 705 | 705 | $teachers = get_lang('Teachers').': '.implode(', ', $teachers); |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | 'line' => 1, |
| 767 | 767 | ), |
| 768 | 768 | ); |
| 769 | - $this->pdf->SetHeader($header);// ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title); |
|
| 769 | + $this->pdf->SetHeader($header); // ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title); |
|
| 770 | 770 | } |
| 771 | 771 | } |
| 772 | 772 | |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | $this->pdf->directionality = api_get_text_direction(); |
| 812 | 812 | $this->pdf->useOnlyCoreFonts = true; |
| 813 | 813 | // Use different Odd/Even headers and footers and mirror margins |
| 814 | - $this->pdf->mirrorMargins = 1; |
|
| 814 | + $this->pdf->mirrorMargins = 1; |
|
| 815 | 815 | |
| 816 | 816 | // Add decoration only if not stated otherwise |
| 817 | 817 | if ($complete) { |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | $watermark_text = api_get_setting('pdf_export_watermark_text'); |
| 840 | 840 | } |
| 841 | 841 | if (!empty($watermark_text)) { |
| 842 | - $this->pdf->SetWatermarkText(strcode2utf($watermark_text),0.1); |
|
| 842 | + $this->pdf->SetWatermarkText(strcode2utf($watermark_text), 0.1); |
|
| 843 | 843 | $this->pdf->showWatermarkText = true; |
| 844 | 844 | } |
| 845 | 845 | } |
@@ -847,8 +847,8 @@ discard block |
||
| 847 | 847 | if (empty($this->custom_header)) { |
| 848 | 848 | self::set_header($course_data); |
| 849 | 849 | } else { |
| 850 | - $this->pdf->SetHTMLHeader($this->custom_header,'E'); |
|
| 851 | - $this->pdf->SetHTMLHeader($this->custom_header,'O'); |
|
| 850 | + $this->pdf->SetHTMLHeader($this->custom_header, 'E'); |
|
| 851 | + $this->pdf->SetHTMLHeader($this->custom_header, 'O'); |
|
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | if (empty($this->custom_footer)) { |
@@ -41,9 +41,9 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | function _createElements() |
| 43 | 43 | { |
| 44 | - $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')')); |
|
| 44 | + $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array('onclick' => 'javascript:receivers_hide(\'receivers_to\')')); |
|
| 45 | 45 | $this->_elements[0]->setChecked(true); |
| 46 | - $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')')); |
|
| 46 | + $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array('onclick' => 'javascript:receivers_show(\'receivers_to\')')); |
|
| 47 | 47 | $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers); |
| 48 | 48 | $this->_elements[2]->setSelected($this->receivers_selected); |
| 49 | 49 | } |
@@ -10,68 +10,68 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | class HTML_QuickForm_receivers extends HTML_QuickForm_group |
| 12 | 12 | { |
| 13 | - /** |
|
| 14 | - * Array of all receivers |
|
| 15 | - */ |
|
| 16 | - var $receivers; |
|
| 17 | - /** |
|
| 18 | - * Array of selected receivers |
|
| 19 | - */ |
|
| 20 | - var $receivers_selected; |
|
| 13 | + /** |
|
| 14 | + * Array of all receivers |
|
| 15 | + */ |
|
| 16 | + var $receivers; |
|
| 17 | + /** |
|
| 18 | + * Array of selected receivers |
|
| 19 | + */ |
|
| 20 | + var $receivers_selected; |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * Constructor |
|
| 24 | - * @param string $elementName |
|
| 25 | - * @param string $elementLabel |
|
| 26 | - * @param array $attributes This should contain the keys 'receivers' and |
|
| 27 | - * 'receivers_selected' |
|
| 28 | - */ |
|
| 29 | - public function __construct($elementName = null, $elementLabel = null, $attributes = null) |
|
| 30 | - { |
|
| 31 | - $this->receivers = $attributes['receivers']; |
|
| 32 | - $this->receivers_selected = $attributes['receivers_selected']; |
|
| 33 | - unset($attributes['receivers']); |
|
| 34 | - unset($attributes['receivers_selected']); |
|
| 35 | - parent::__construct($elementName, $elementLabel, $attributes); |
|
| 36 | - $this->_persistantFreeze = true; |
|
| 37 | - $this->_appendName = true; |
|
| 38 | - $this->_type = 'receivers'; |
|
| 39 | - } |
|
| 22 | + /** |
|
| 23 | + * Constructor |
|
| 24 | + * @param string $elementName |
|
| 25 | + * @param string $elementLabel |
|
| 26 | + * @param array $attributes This should contain the keys 'receivers' and |
|
| 27 | + * 'receivers_selected' |
|
| 28 | + */ |
|
| 29 | + public function __construct($elementName = null, $elementLabel = null, $attributes = null) |
|
| 30 | + { |
|
| 31 | + $this->receivers = $attributes['receivers']; |
|
| 32 | + $this->receivers_selected = $attributes['receivers_selected']; |
|
| 33 | + unset($attributes['receivers']); |
|
| 34 | + unset($attributes['receivers_selected']); |
|
| 35 | + parent::__construct($elementName, $elementLabel, $attributes); |
|
| 36 | + $this->_persistantFreeze = true; |
|
| 37 | + $this->_appendName = true; |
|
| 38 | + $this->_type = 'receivers'; |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Create the form elements to build this element group |
|
| 43 | - */ |
|
| 44 | - function _createElements() |
|
| 45 | - { |
|
| 46 | - $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')')); |
|
| 47 | - $this->_elements[0]->setChecked(true); |
|
| 48 | - $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')')); |
|
| 49 | - $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers); |
|
| 50 | - $this->_elements[2]->setSelected($this->receivers_selected); |
|
| 51 | - } |
|
| 41 | + /** |
|
| 42 | + * Create the form elements to build this element group |
|
| 43 | + */ |
|
| 44 | + function _createElements() |
|
| 45 | + { |
|
| 46 | + $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')')); |
|
| 47 | + $this->_elements[0]->setChecked(true); |
|
| 48 | + $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')')); |
|
| 49 | + $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers); |
|
| 50 | + $this->_elements[2]->setSelected($this->receivers_selected); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * HTML representation |
|
| 55 | - */ |
|
| 56 | - public function toHtml() |
|
| 57 | - { |
|
| 58 | - include_once ('HTML/QuickForm/Renderer/Default.php'); |
|
| 59 | - $this->_separator = '<br/>'; |
|
| 60 | - $renderer = & new HTML_QuickForm_Renderer_Default(); |
|
| 61 | - $renderer->setElementTemplate('{element}'); |
|
| 62 | - $select_boxes = $this->_elements[2]; |
|
| 63 | - $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>'); |
|
| 64 | - parent :: accept($renderer); |
|
| 65 | - $js = $this->getElementJS(); |
|
| 66 | - return $renderer->toHtml().$js; |
|
| 67 | - } |
|
| 53 | + /** |
|
| 54 | + * HTML representation |
|
| 55 | + */ |
|
| 56 | + public function toHtml() |
|
| 57 | + { |
|
| 58 | + include_once ('HTML/QuickForm/Renderer/Default.php'); |
|
| 59 | + $this->_separator = '<br/>'; |
|
| 60 | + $renderer = & new HTML_QuickForm_Renderer_Default(); |
|
| 61 | + $renderer->setElementTemplate('{element}'); |
|
| 62 | + $select_boxes = $this->_elements[2]; |
|
| 63 | + $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>'); |
|
| 64 | + parent :: accept($renderer); |
|
| 65 | + $js = $this->getElementJS(); |
|
| 66 | + return $renderer->toHtml().$js; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Get the necessary javascript |
|
| 71 | - */ |
|
| 69 | + /** |
|
| 70 | + * Get the necessary javascript |
|
| 71 | + */ |
|
| 72 | 72 | public function getElementJS() |
| 73 | - { |
|
| 74 | - $js = "<script type=\"text/javascript\"> |
|
| 73 | + { |
|
| 74 | + $js = "<script type=\"text/javascript\"> |
|
| 75 | 75 | /* <![CDATA[ */ |
| 76 | 76 | receivers_hide('receivers_to'); |
| 77 | 77 | function receivers_show(item) { |
@@ -84,13 +84,13 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | /* ]]> */ |
| 86 | 86 | </script>\n"; |
| 87 | - return $js; |
|
| 88 | - } |
|
| 89 | - /** |
|
| 90 | - * accept renderer |
|
| 91 | - */ |
|
| 92 | - function accept(& $renderer, $required = false, $error = null) |
|
| 93 | - { |
|
| 94 | - $renderer->renderElement($this, $required, $error); |
|
| 95 | - } |
|
| 87 | + return $js; |
|
| 88 | + } |
|
| 89 | + /** |
|
| 90 | + * accept renderer |
|
| 91 | + */ |
|
| 92 | + function accept(& $renderer, $required = false, $error = null) |
|
| 93 | + { |
|
| 94 | + $renderer->renderElement($this, $required, $error); |
|
| 95 | + } |
|
| 96 | 96 | } |
| 97 | 97 | \ No newline at end of file |
@@ -7,8 +7,8 @@ discard block |
||
| 7 | 7 | class DateRangePicker extends HTML_QuickForm_text |
| 8 | 8 | { |
| 9 | 9 | /** |
| 10 | - * Constructor |
|
| 11 | - */ |
|
| 10 | + * Constructor |
|
| 11 | + */ |
|
| 12 | 12 | public function __construct($elementName = null, $elementLabel = null, $attributes = null) |
| 13 | 13 | { |
| 14 | 14 | if (!isset($attributes['id'])) { |
@@ -144,10 +144,10 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | /** |
| 147 | - * @param array $dates result of parseDateRange() |
|
| 148 | - * |
|
| 149 | - * @return bool |
|
| 150 | - */ |
|
| 147 | + * @param array $dates result of parseDateRange() |
|
| 148 | + * |
|
| 149 | + * @return bool |
|
| 150 | + */ |
|
| 151 | 151 | public function validateDates($dates, $format = null) |
| 152 | 152 | { |
| 153 | 153 | if (empty($dates['start']) || empty($dates['end'])) { |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | $timePicker = 'true'; |
| 91 | - $timePickerValue = $this->getAttribute('timePicker'); |
|
| 91 | + $timePickerValue = $this->getAttribute('timePicker'); |
|
| 92 | 92 | if (!empty($timePickerValue)) { |
| 93 | 93 | $timePicker = $timePickerValue; |
| 94 | 94 | } |
@@ -74,9 +74,9 @@ |
||
| 74 | 74 | $styleCss = $this->editor->getConfigAttribute('style'); |
| 75 | 75 | |
| 76 | 76 | if ($styleCss) { |
| 77 | - $style = true; |
|
| 77 | + $style = true; |
|
| 78 | 78 | } else { |
| 79 | - $style = false; |
|
| 79 | + $style = false; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | return $this->buildEditor($style); |
@@ -6,24 +6,24 @@ |
||
| 6 | 6 | */ |
| 7 | 7 | class HTML_QuickForm_Rule_UsernameAvailable extends HTML_QuickForm_Rule |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Function to check if a username is available |
|
| 11 | - * @see HTML_QuickForm_Rule |
|
| 12 | - * @param string $username Wanted username |
|
| 13 | - * @param string $current_username |
|
| 14 | - * @return boolean True if username is available |
|
| 15 | - */ |
|
| 16 | - function validate($username, $current_username = null) { |
|
| 17 | - $user_table = Database::get_main_table(TABLE_MAIN_USER); |
|
| 9 | + /** |
|
| 10 | + * Function to check if a username is available |
|
| 11 | + * @see HTML_QuickForm_Rule |
|
| 12 | + * @param string $username Wanted username |
|
| 13 | + * @param string $current_username |
|
| 14 | + * @return boolean True if username is available |
|
| 15 | + */ |
|
| 16 | + function validate($username, $current_username = null) { |
|
| 17 | + $user_table = Database::get_main_table(TABLE_MAIN_USER); |
|
| 18 | 18 | $username = Database::escape_string($username); |
| 19 | 19 | $current_username = Database::escape_string($current_username); |
| 20 | 20 | |
| 21 | - $sql = "SELECT * FROM $user_table WHERE username = '$username'"; |
|
| 22 | - if (!is_null($current_username)) { |
|
| 23 | - $sql .= " AND username != '$current_username'"; |
|
| 24 | - } |
|
| 25 | - $res = Database::query($sql); |
|
| 26 | - $number = Database::num_rows($res); |
|
| 27 | - return $number == 0; |
|
| 28 | - } |
|
| 21 | + $sql = "SELECT * FROM $user_table WHERE username = '$username'"; |
|
| 22 | + if (!is_null($current_username)) { |
|
| 23 | + $sql .= " AND username != '$current_username'"; |
|
| 24 | + } |
|
| 25 | + $res = Database::query($sql); |
|
| 26 | + $number = Database::num_rows($res); |
|
| 27 | + return $number == 0; |
|
| 28 | + } |
|
| 29 | 29 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function validate($html, $mode = NO_HTML) |
| 18 | 18 | { |
| 19 | - $allowed_tags = self::get_allowed_tags ($mode, $fullpage); |
|
| 19 | + $allowed_tags = self::get_allowed_tags($mode, $fullpage); |
|
| 20 | 20 | $cleaned_html = kses($html, $allowed_tags); |
| 21 | 21 | return $html == $cleaned_html; |
| 22 | 22 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | // Include the allowed tags. |
| 34 | 34 | //include(dirname(__FILE__).'/allowed_tags.inc.php'); |
| 35 | 35 | global $allowed_tags_student, $allowed_tags_student_full_page, $allowed_tags_teacher, $allowed_tags_teacher_full_page; |
| 36 | - switch($mode) |
|
| 36 | + switch ($mode) |
|
| 37 | 37 | { |
| 38 | 38 | case NO_HTML: |
| 39 | 39 | return array(); |
@@ -25,8 +25,6 @@ |
||
| 25 | 25 | * Get allowed tags |
| 26 | 26 | * @param int $mode NO_HTML, STUDENT_HTML, TEACHER_HTML, |
| 27 | 27 | * STUDENT_HTML_FULLPAGE or TEACHER_HTML_FULLPAGE |
| 28 | - * @param boolean $fullpage If true, the allowed tags for full-page editing |
|
| 29 | - * are returned. |
|
| 30 | 28 | */ |
| 31 | 29 | static function get_allowed_tags($mode) |
| 32 | 30 | { |
@@ -27,10 +27,10 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | function validate($value, $options = null) |
| 29 | 29 | { |
| 30 | - if(is_array($value)) |
|
| 31 | - { |
|
| 32 | - $value = implode(null,$value); |
|
| 33 | - } |
|
| 30 | + if(is_array($value)) |
|
| 31 | + { |
|
| 32 | + $value = implode(null,$value); |
|
| 33 | + } |
|
| 34 | 34 | if ((string)$value == '') { |
| 35 | 35 | return false; |
| 36 | 36 | } |
@@ -27,11 +27,11 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | function validate($value, $options = null) |
| 29 | 29 | { |
| 30 | - if(is_array($value)) |
|
| 30 | + if (is_array($value)) |
|
| 31 | 31 | { |
| 32 | - $value = implode(null,$value); |
|
| 32 | + $value = implode(null, $value); |
|
| 33 | 33 | } |
| 34 | - if ((string)$value == '') { |
|
| 34 | + if ((string) $value == '') { |
|
| 35 | 35 | return false; |
| 36 | 36 | } |
| 37 | 37 | return true; |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | // If the mail only need to be send once (we know that thanks to the events.conf), we log it in the table |
| 126 | 126 | if ($event_config[$event_name]["sending_mail_once"]) { |
| 127 | - $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . ' (user_from, user_to, event_type_name) |
|
| 127 | + $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).' (user_from, user_to, event_type_name) |
|
| 128 | 128 | VALUES ('.$event_data["user_id"].', '.$id.' ,"'.Database::escape_string($event_name).'") |
| 129 | 129 | '; |
| 130 | 130 | Database::query($sql); |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | // Second, we send to people linked to the event |
| 136 | 136 | // So, we get everyone |
| 137 | 137 | $sql = 'SELECT u.user_id, u.language, u.email, u.firstname, u.lastname |
| 138 | - FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER) . ' ue |
|
| 138 | + FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER).' ue |
|
| 139 | 139 | INNER JOIN '.Database::get_main_table(TABLE_MAIN_USER).' u ON u.user_id = ue.user_id |
| 140 | - WHERE event_type_name = "' . $event_name . '"'; |
|
| 140 | + WHERE event_type_name = "' . $event_name.'"'; |
|
| 141 | 141 | $result = Database::store_result(Database::query($sql), 'ASSOC'); |
| 142 | 142 | // for each of the linked users |
| 143 | 143 | foreach ($result as $key => $value) { |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | // If the mail only need to be send once (we know that thanks to the events.conf, we log it in the table |
| 179 | 179 | if ($event_config[$event_name]["sending_mail_once"]) { |
| 180 | - $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . ' |
|
| 180 | + $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).' |
|
| 181 | 181 | (user_from, user_to, event_type_name) |
| 182 | 182 | VALUES ('.$event_data["user_id"].', '.$value["user_id"].' , "'.Database::escape_string($event_name).'"); |
| 183 | 183 | '; |
@@ -202,16 +202,16 @@ discard block |
||
| 202 | 202 | $current_language = api_get_interface_language(); |
| 203 | 203 | |
| 204 | 204 | $sql = 'SELECT COUNT(*) as total |
| 205 | - FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em |
|
| 206 | - INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l |
|
| 205 | + FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em |
|
| 206 | + INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l |
|
| 207 | 207 | ON em.language_id = l.id |
| 208 | 208 | WHERE |
| 209 | - em.event_type_name = "' . $event_name . '" and |
|
| 209 | + em.event_type_name = "' . $event_name.'" and |
|
| 210 | 210 | l.dokeos_folder = "'.$current_language.'" and |
| 211 | 211 | em.activated = 1'; |
| 212 | 212 | |
| 213 | 213 | $exists = Database::store_result(Database::query($sql), 'ASSOC'); |
| 214 | - if ($exists[0]["total"]) { |
|
| 214 | + if ($exists[0]["total"]) { |
|
| 215 | 215 | return true; |
| 216 | 216 | } else { |
| 217 | 217 | return false; |
@@ -228,12 +228,12 @@ discard block |
||
| 228 | 228 | private static function getMessage($event_name, $language) |
| 229 | 229 | { |
| 230 | 230 | $sql = 'SELECT message, subject, l.dokeos_folder |
| 231 | - FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em |
|
| 232 | - INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l |
|
| 231 | + FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em |
|
| 232 | + INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l |
|
| 233 | 233 | ON em.language_id = l.id |
| 234 | 234 | WHERE |
| 235 | - em.event_type_name = "' . $event_name . '" AND |
|
| 236 | - (l.dokeos_folder = "' . $language . '" OR l.dokeos_folder = "english") AND |
|
| 235 | + em.event_type_name = "' . $event_name.'" AND |
|
| 236 | + (l.dokeos_folder = "' . $language.'" OR l.dokeos_folder = "english") AND |
|
| 237 | 237 | em.message <> "" |
| 238 | 238 | '; |
| 239 | 239 | return Database::store_result(Database::query($sql), 'ASSOC'); |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | private static function formatMessage(&$message, &$subject, $event_config, $event_name, &$event_data) |
| 275 | 275 | { |
| 276 | 276 | foreach ($event_config[$event_name]["available_keyvars"] as $key => $word) { |
| 277 | - $message = str_replace('((' . $key . '))', $event_data[$word], $message); |
|
| 278 | - $subject = str_replace('((' . $key . '))', $event_data[$word], $subject); |
|
| 277 | + $message = str_replace('(('.$key.'))', $event_data[$word], $message); |
|
| 278 | + $subject = str_replace('(('.$key.'))', $event_data[$word], $subject); |
|
| 279 | 279 | } |
| 280 | 280 | } |
| 281 | 281 | } |
@@ -2097,7 +2097,9 @@ |
||
| 2097 | 2097 | FROM $tbl_course course |
| 2098 | 2098 | WHERE course.code IN (".implode(',',$courses_code).")"; |
| 2099 | 2099 | |
| 2100 | - if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC'; |
|
| 2100 | + if (!in_array($direction, array('ASC','DESC'))) { |
|
| 2101 | + $direction = 'ASC'; |
|
| 2102 | + } |
|
| 2101 | 2103 | |
| 2102 | 2104 | $column = intval($column); |
| 2103 | 2105 | $from = intval($from); |
@@ -679,7 +679,6 @@ discard block |
||
| 679 | 679 | * @param int $sessionId The session ID |
| 680 | 680 | * @param int $courseId The course ID |
| 681 | 681 | * @param int $exerciseId The quiz ID |
| 682 | - * @param int $answer Answer status (0 = incorrect, 1 = correct, 2 = both) |
|
| 683 | 682 | * @return string HTML array of results formatted for gridJS |
| 684 | 683 | * @author César Perales <[email protected]>, Beeznest Team |
| 685 | 684 | */ |
@@ -898,6 +897,7 @@ discard block |
||
| 898 | 897 | * @param int Number of items to select |
| 899 | 898 | * @param string Column to order on |
| 900 | 899 | * @param string Order direction |
| 900 | + * @param integer $number_of_items |
|
| 901 | 901 | * @return array Results |
| 902 | 902 | */ |
| 903 | 903 | public static function get_course_data_tracking_overview($from, $number_of_items, $column, $direction) |
@@ -1235,6 +1235,7 @@ discard block |
||
| 1235 | 1235 | * @param int Number of items to select |
| 1236 | 1236 | * @param string Column to order on |
| 1237 | 1237 | * @param string Order direction |
| 1238 | + * @param integer $number_of_items |
|
| 1238 | 1239 | * @return array Results |
| 1239 | 1240 | */ |
| 1240 | 1241 | public static function get_session_data_tracking_overview($from, $number_of_items, $column, $direction) |
@@ -1255,7 +1256,6 @@ discard block |
||
| 1255 | 1256 | /** |
| 1256 | 1257 | * Fills in session reporting data |
| 1257 | 1258 | * |
| 1258 | - * @param integer $user_id the id of the user |
|
| 1259 | 1259 | * @param array $url_params additonal url parameters |
| 1260 | 1260 | * @param array $row the row information (the other columns) |
| 1261 | 1261 | * @return string html code |
@@ -1888,6 +1888,7 @@ discard block |
||
| 1888 | 1888 | * @author Patrick Cool <[email protected]>, Ghent University, Belgium |
| 1889 | 1889 | * @version Dokeos 1.8.6 |
| 1890 | 1890 | * @since October 2008 |
| 1891 | + * @param integer $number_of_items |
|
| 1891 | 1892 | */ |
| 1892 | 1893 | public static function get_user_data_tracking_overview($from, $number_of_items, $column, $direction) |
| 1893 | 1894 | { |
@@ -1990,7 +1991,6 @@ discard block |
||
| 1990 | 1991 | /** |
| 1991 | 1992 | * Checks if there are repeted users in a given array |
| 1992 | 1993 | * @param array $usernames list of the usernames in the uploaded file |
| 1993 | - * @param array $user_array['username'] and $user_array['sufix'] where sufix is the number part in a login i.e -> jmontoya2 |
|
| 1994 | 1994 | * @return array with the $usernames array and the $user_array array |
| 1995 | 1995 | * @author Julio Montoya |
| 1996 | 1996 | */ |
@@ -2165,6 +2165,7 @@ discard block |
||
| 2165 | 2165 | |
| 2166 | 2166 | /** |
| 2167 | 2167 | * Adds missing user-information (which isn't required, like password, etc). |
| 2168 | + * @return integer |
|
| 2168 | 2169 | */ |
| 2169 | 2170 | function complete_missing_data($user) { |
| 2170 | 2171 | // 1. Generate a password if it is necessary. |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | $session_id = intval($session_id); |
| 135 | 135 | |
| 136 | 136 | $sql = 'SELECT login_course_date, logout_course_date |
| 137 | - FROM ' . $tbl_track_course . ' |
|
| 137 | + FROM ' . $tbl_track_course.' |
|
| 138 | 138 | WHERE |
| 139 | 139 | user_id = '.$user_id.' AND |
| 140 | 140 | c_id = '.$courseId.' AND |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | foreach ($course_list as $course_item) { |
| 174 | 174 | $courseInfo = api_get_course_info($course_item['code']); |
| 175 | 175 | $courseId = $courseInfo['real_id']; |
| 176 | - $new_course_list[] = '"'.$courseId.'"'; |
|
| 176 | + $new_course_list[] = '"'.$courseId.'"'; |
|
| 177 | 177 | } |
| 178 | 178 | $course_list = implode(', ', $new_course_list); |
| 179 | 179 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | return false; |
| 182 | 182 | } |
| 183 | 183 | $sql = 'SELECT login_course_date, logout_course_date, c_id |
| 184 | - FROM ' . $tbl_track_course . ' |
|
| 184 | + FROM ' . $tbl_track_course.' |
|
| 185 | 185 | WHERE |
| 186 | 186 | user_id = '.$user_id.' AND |
| 187 | 187 | c_id IN ('.$course_list.') AND |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | // student score |
| 260 | 260 | $avg_score = Tracking :: get_avg_student_score($user_id, $courseCode); |
| 261 | 261 | if (is_numeric($avg_score)) { |
| 262 | - $avg_score = round($avg_score,2); |
|
| 262 | + $avg_score = round($avg_score, 2); |
|
| 263 | 263 | } else { |
| 264 | 264 | $$avg_score = '-'; |
| 265 | 265 | } |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | |
| 296 | 296 | $t_head = ' <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">'; |
| 297 | 297 | //$t_head .= ' <caption>'.get_lang('CourseInformation').'</caption>'; |
| 298 | - $t_head .= '<tr>'; |
|
| 298 | + $t_head .= '<tr>'; |
|
| 299 | 299 | $t_head .= ' <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>'; |
| 300 | 300 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>'; |
| 301 | 301 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>'; |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | |
| 314 | 314 | $addparams = array('view' => 'admin', 'display' => 'user'); |
| 315 | 315 | |
| 316 | - $table = new SortableTable('tracking_user_overview', array('MySpace','get_number_of_users_tracking_overview'), array('MySpace','get_user_data_tracking_overview'), 0); |
|
| 316 | + $table = new SortableTable('tracking_user_overview', array('MySpace', 'get_number_of_users_tracking_overview'), array('MySpace', 'get_user_data_tracking_overview'), 0); |
|
| 317 | 317 | $table->additional_parameters = $addparams; |
| 318 | 318 | |
| 319 | 319 | $table->set_header(0, get_lang('OfficialCode'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | } |
| 327 | 327 | $table->set_header(3, get_lang('LoginName'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); |
| 328 | 328 | $table->set_header(4, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;')); |
| 329 | - $table->set_column_filter(4, array('MySpace','course_info_tracking_filter')); |
|
| 329 | + $table->set_column_filter(4, array('MySpace', 'course_info_tracking_filter')); |
|
| 330 | 330 | $table->display(); |
| 331 | 331 | } |
| 332 | 332 | |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | $table -> set_header(7, get_lang('Sessions'), false); |
| 387 | 387 | |
| 388 | 388 | if ($is_western_name_order) { |
| 389 | - $csv_header[] = array ( |
|
| 389 | + $csv_header[] = array( |
|
| 390 | 390 | get_lang('FirstName'), |
| 391 | 391 | get_lang('LastName'), |
| 392 | 392 | get_lang('TimeSpentOnThePlatform'), |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | get_lang('NumberOfSessions') |
| 397 | 397 | ); |
| 398 | 398 | } else { |
| 399 | - $csv_header[] = array ( |
|
| 399 | + $csv_header[] = array( |
|
| 400 | 400 | get_lang('LastName'), |
| 401 | 401 | get_lang('FirstName'), |
| 402 | 402 | get_lang('TimeSpentOnThePlatform'), |
@@ -536,9 +536,9 @@ discard block |
||
| 536 | 536 | |
| 537 | 537 | if ($tracking_column != 3) { |
| 538 | 538 | if ($tracking_direction == 'DESC') { |
| 539 | - usort($all_datas, array('MySpace','rsort_users')); |
|
| 539 | + usort($all_datas, array('MySpace', 'rsort_users')); |
|
| 540 | 540 | } else { |
| 541 | - usort($all_datas, array('MySpace','sort_users')); |
|
| 541 | + usort($all_datas, array('MySpace', 'sort_users')); |
|
| 542 | 542 | } |
| 543 | 543 | } |
| 544 | 544 | |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | /** |
| 598 | 598 | * Column config |
| 599 | 599 | */ |
| 600 | - $column_model = array( |
|
| 600 | + $column_model = array( |
|
| 601 | 601 | array( |
| 602 | 602 | 'name' => 'username', |
| 603 | 603 | 'index' => 'username', |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | |
| 639 | 639 | $action_links = ''; |
| 640 | 640 | // jqgrid will use this URL to do the selects |
| 641 | - $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from; |
|
| 641 | + $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from; |
|
| 642 | 642 | |
| 643 | 643 | //Table Id |
| 644 | 644 | $tableId = 'lpProgress'; |
@@ -660,11 +660,11 @@ discard block |
||
| 660 | 660 | true |
| 661 | 661 | ); |
| 662 | 662 | |
| 663 | - $return = '<script>$(function() {'. $table . |
|
| 663 | + $return = '<script>$(function() {'.$table. |
|
| 664 | 664 | 'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
| 665 | 665 | jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{ |
| 666 | 666 | caption:"", |
| 667 | - title:"' . get_lang('ExportExcel') . '", |
|
| 667 | + title:"' . get_lang('ExportExcel').'", |
|
| 668 | 668 | onClickButton : function () { |
| 669 | 669 | jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"}); |
| 670 | 670 | } |
@@ -714,7 +714,7 @@ discard block |
||
| 714 | 714 | /** |
| 715 | 715 | * Column config |
| 716 | 716 | */ |
| 717 | - $column_model = array( |
|
| 717 | + $column_model = array( |
|
| 718 | 718 | array('name'=>'session', 'index'=>'session', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), |
| 719 | 719 | array('name'=>'exercise_id', 'index'=>'exercise_id', 'align'=>'left', 'search' => 'true'), |
| 720 | 720 | array('name'=>'quiz_title', 'index'=>'quiz_title', 'align'=>'left', 'search' => 'true'), |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | //get dynamic column names |
| 732 | 732 | |
| 733 | 733 | // jqgrid will use this URL to do the selects |
| 734 | - $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&exercise_id=' . $exerciseId . '&date_to=' . $date_to . '&date_from=' . $date_from; |
|
| 734 | + $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id='.$sessionId.'&course_id='.$courseId.'&exercise_id='.$exerciseId.'&date_to='.$date_to.'&date_from='.$date_from; |
|
| 735 | 735 | |
| 736 | 736 | // Autowidth |
| 737 | 737 | $extra_params['autowidth'] = 'true'; |
@@ -742,11 +742,11 @@ discard block |
||
| 742 | 742 | $tableId = 'exerciseProgressOverview'; |
| 743 | 743 | $table = Display::grid_js($tableId, $url, $columns, $column_model, $extra_params, array(), '', true); |
| 744 | 744 | |
| 745 | - $return = '<script>$(function() {'. $table . |
|
| 745 | + $return = '<script>$(function() {'.$table. |
|
| 746 | 746 | 'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
| 747 | 747 | jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{ |
| 748 | 748 | caption:"", |
| 749 | - title:"' . get_lang('ExportExcel') . '", |
|
| 749 | + title:"' . get_lang('ExportExcel').'", |
|
| 750 | 750 | onClickButton : function () { |
| 751 | 751 | jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"}); |
| 752 | 752 | } |
@@ -806,7 +806,7 @@ discard block |
||
| 806 | 806 | // adding the fields that are checked to the session |
| 807 | 807 | $message = ''; |
| 808 | 808 | foreach ($values as $field_ids => $value) { |
| 809 | - if ($value == 1 && strstr($field_ids,'extra_export_field')) { |
|
| 809 | + if ($value == 1 && strstr($field_ids, 'extra_export_field')) { |
|
| 810 | 810 | $_SESSION['additional_export_fields'][] = str_replace('extra_export_field', '', $field_ids); |
| 811 | 811 | } |
| 812 | 812 | } |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | // Displaying a feedback message |
| 822 | 822 | if (!empty($_SESSION['additional_export_fields'])) { |
| 823 | 823 | Display::display_confirmation_message(get_lang('FollowingFieldsWillAlsoBeExported').': <br /><ul>'.$message.'</ul>', false); |
| 824 | - } else { |
|
| 824 | + } else { |
|
| 825 | 825 | Display::display_confirmation_message(get_lang('NoAdditionalFieldsWillBeExported'), false); |
| 826 | 826 | } |
| 827 | 827 | } else { |
@@ -849,7 +849,7 @@ discard block |
||
| 849 | 849 | { |
| 850 | 850 | $t_head = ' <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">'; |
| 851 | 851 | //$t_head .= ' <caption>'.get_lang('CourseInformation').'</caption>'; |
| 852 | - $t_head .= '<tr>'; |
|
| 852 | + $t_head .= '<tr>'; |
|
| 853 | 853 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>'; |
| 854 | 854 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>'; |
| 855 | 855 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgCourseScore'), 6, true).'</span></th>'; |
@@ -866,13 +866,13 @@ discard block |
||
| 866 | 866 | |
| 867 | 867 | $addparams = array('view' => 'admin', 'display' => 'courseoverview'); |
| 868 | 868 | |
| 869 | - $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace','get_course_data_tracking_overview'), 1); |
|
| 869 | + $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace', 'get_course_data_tracking_overview'), 1); |
|
| 870 | 870 | $table->additional_parameters = $addparams; |
| 871 | 871 | |
| 872 | 872 | $table->set_header(0, '', false, null, array('style' => 'display: none')); |
| 873 | 873 | $table->set_header(1, get_lang('Course'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); |
| 874 | 874 | $table->set_header(2, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;')); |
| 875 | - $table->set_column_filter(2, array('MySpace','course_tracking_filter')); |
|
| 875 | + $table->set_column_filter(2, array('MySpace', 'course_tracking_filter')); |
|
| 876 | 876 | $table->display(); |
| 877 | 877 | } |
| 878 | 878 | |
@@ -910,7 +910,7 @@ discard block |
||
| 910 | 910 | $sql .= " ORDER BY col$column $direction "; |
| 911 | 911 | $sql .= " LIMIT $from,$number_of_items"; |
| 912 | 912 | $result = Database::query($sql); |
| 913 | - $return = array (); |
|
| 913 | + $return = array(); |
|
| 914 | 914 | while ($course = Database::fetch_row($result)) { |
| 915 | 915 | $return[] = $course; |
| 916 | 916 | } |
@@ -963,18 +963,18 @@ discard block |
||
| 963 | 963 | $progress += $progress_tmp[0]; |
| 964 | 964 | $nb_progress_lp += $progress_tmp[1]; |
| 965 | 965 | $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true); |
| 966 | - if(is_array($score_tmp)) { |
|
| 966 | + if (is_array($score_tmp)) { |
|
| 967 | 967 | $score += $score_tmp[0]; |
| 968 | 968 | $nb_score_lp += $score_tmp[1]; |
| 969 | 969 | } |
| 970 | 970 | $nb_messages += Tracking::count_student_messages($row->user_id, $course_code); |
| 971 | 971 | $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code); |
| 972 | 972 | $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false); |
| 973 | - if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned |
|
| 973 | + if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned |
|
| 974 | 974 | $last_login_date = $last_login_date_tmp; |
| 975 | - } else if($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned. |
|
| 975 | + } else if ($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned. |
|
| 976 | 976 | // Find the max and assign it to first_login_date |
| 977 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 977 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 978 | 978 | $last_login_date = $last_login_date_tmp; |
| 979 | 979 | } |
| 980 | 980 | } |
@@ -1112,7 +1112,7 @@ discard block |
||
| 1112 | 1112 | $progress += $progress_tmp[0]; |
| 1113 | 1113 | $nb_progress_lp += $progress_tmp[1]; |
| 1114 | 1114 | $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true); |
| 1115 | - if(is_array($score_tmp)) { |
|
| 1115 | + if (is_array($score_tmp)) { |
|
| 1116 | 1116 | $score += $score_tmp[0]; |
| 1117 | 1117 | $nb_score_lp += $score_tmp[1]; |
| 1118 | 1118 | } |
@@ -1120,11 +1120,11 @@ discard block |
||
| 1120 | 1120 | $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code); |
| 1121 | 1121 | |
| 1122 | 1122 | $last_login_date_tmp = Tracking::get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false); |
| 1123 | - if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
| 1123 | + if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
| 1124 | 1124 | $last_login_date = $last_login_date_tmp; |
| 1125 | - } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
| 1125 | + } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
| 1126 | 1126 | // Find the max and assign it to first_login_date |
| 1127 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 1127 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 1128 | 1128 | $last_login_date = $last_login_date_tmp; |
| 1129 | 1129 | } |
| 1130 | 1130 | } |
@@ -1134,22 +1134,22 @@ discard block |
||
| 1134 | 1134 | $total_score_possible += $exercise_results_tmp['score_possible']; |
| 1135 | 1135 | $total_questions_answered += $exercise_results_tmp['questions_answered']; |
| 1136 | 1136 | } |
| 1137 | - if($nb_progress_lp > 0) { |
|
| 1137 | + if ($nb_progress_lp > 0) { |
|
| 1138 | 1138 | $avg_progress = round($progress / $nb_progress_lp, 2); |
| 1139 | 1139 | } else { |
| 1140 | 1140 | $avg_progress = 0; |
| 1141 | 1141 | } |
| 1142 | - if($nb_score_lp > 0) { |
|
| 1142 | + if ($nb_score_lp > 0) { |
|
| 1143 | 1143 | $avg_score = round($score / $nb_score_lp, 2); |
| 1144 | 1144 | } else { |
| 1145 | 1145 | $avg_score = '-'; |
| 1146 | 1146 | } |
| 1147 | - if($last_login_date) { |
|
| 1147 | + if ($last_login_date) { |
|
| 1148 | 1148 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); |
| 1149 | 1149 | } else { |
| 1150 | 1150 | $last_login_date = '-'; |
| 1151 | 1151 | } |
| 1152 | - if($total_score_possible > 0) { |
|
| 1152 | + if ($total_score_possible > 0) { |
|
| 1153 | 1153 | $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2); |
| 1154 | 1154 | } else { |
| 1155 | 1155 | $total_score_percentage = 0; |
@@ -1185,7 +1185,7 @@ discard block |
||
| 1185 | 1185 | { |
| 1186 | 1186 | $t_head = ' <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">'; |
| 1187 | 1187 | //$t_head .= ' <caption>'.get_lang('CourseInformation').'</caption>'; |
| 1188 | - $t_head .= '<tr>'; |
|
| 1188 | + $t_head .= '<tr>'; |
|
| 1189 | 1189 | $t_head .= ' <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>'; |
| 1190 | 1190 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>'; |
| 1191 | 1191 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>'; |
@@ -1203,7 +1203,7 @@ discard block |
||
| 1203 | 1203 | |
| 1204 | 1204 | $addparams = array('view' => 'admin', 'display' => 'sessionoverview'); |
| 1205 | 1205 | |
| 1206 | - $table = new SortableTable('tracking_session_overview', array('MySpace','get_total_number_sessions'), array('MySpace','get_session_data_tracking_overview'), 1); |
|
| 1206 | + $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_sessions'), array('MySpace', 'get_session_data_tracking_overview'), 1); |
|
| 1207 | 1207 | $table->additional_parameters = $addparams; |
| 1208 | 1208 | |
| 1209 | 1209 | $table->set_header(0, '', false, null, array('style' => 'display: none')); |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | $sql .= " ORDER BY col$column $direction "; |
| 1246 | 1246 | $sql .= " LIMIT $from,$number_of_items"; |
| 1247 | 1247 | $result = Database::query($sql); |
| 1248 | - $return = array (); |
|
| 1248 | + $return = array(); |
|
| 1249 | 1249 | while ($session = Database::fetch_row($result)) { |
| 1250 | 1250 | $return[] = $session; |
| 1251 | 1251 | } |
@@ -1334,10 +1334,10 @@ discard block |
||
| 1334 | 1334 | if ($last_login_date_tmp != false && $last_login_date == false) { |
| 1335 | 1335 | // TODO: To be cleaned. |
| 1336 | 1336 | $last_login_date = $last_login_date_tmp; |
| 1337 | - } else if($last_login_date_tmp != false && $last_login_date != false) { |
|
| 1337 | + } else if ($last_login_date_tmp != false && $last_login_date != false) { |
|
| 1338 | 1338 | // TODO: Repeated previous condition! To be cleaned. |
| 1339 | 1339 | // Find the max and assign it to first_login_date |
| 1340 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 1340 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 1341 | 1341 | $last_login_date = $last_login_date_tmp; |
| 1342 | 1342 | } |
| 1343 | 1343 | } |
@@ -1347,27 +1347,27 @@ discard block |
||
| 1347 | 1347 | $total_score_possible += $exercise_results_tmp['score_possible']; |
| 1348 | 1348 | $total_questions_answered += $exercise_results_tmp['questions_answered']; |
| 1349 | 1349 | } |
| 1350 | - if($nb_progress_lp > 0) { |
|
| 1350 | + if ($nb_progress_lp > 0) { |
|
| 1351 | 1351 | $avg_progress = round($progress / $nb_progress_lp, 2); |
| 1352 | 1352 | } else { |
| 1353 | 1353 | $avg_progress = 0; |
| 1354 | 1354 | } |
| 1355 | - if($nb_score_lp > 0) { |
|
| 1355 | + if ($nb_score_lp > 0) { |
|
| 1356 | 1356 | $avg_score = round($score / $nb_score_lp, 2); |
| 1357 | 1357 | } else { |
| 1358 | 1358 | $avg_score = '-'; |
| 1359 | 1359 | } |
| 1360 | - if($last_login_date) { |
|
| 1360 | + if ($last_login_date) { |
|
| 1361 | 1361 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); |
| 1362 | 1362 | } else { |
| 1363 | 1363 | $last_login_date = '-'; |
| 1364 | 1364 | } |
| 1365 | - if($total_score_possible > 0) { |
|
| 1365 | + if ($total_score_possible > 0) { |
|
| 1366 | 1366 | $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2); |
| 1367 | 1367 | } else { |
| 1368 | 1368 | $total_score_percentage = 0; |
| 1369 | 1369 | } |
| 1370 | - if($total_score_percentage > 0) { |
|
| 1370 | + if ($total_score_percentage > 0) { |
|
| 1371 | 1371 | $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)'; |
| 1372 | 1372 | } else { |
| 1373 | 1373 | $total_score = '-'; |
@@ -1478,7 +1478,7 @@ discard block |
||
| 1478 | 1478 | $total_score_obtained = 0; |
| 1479 | 1479 | $total_score_possible = 0; |
| 1480 | 1480 | $total_questions_answered = 0; |
| 1481 | - while($row_user = Database::fetch_object($result_users)) { |
|
| 1481 | + while ($row_user = Database::fetch_object($result_users)) { |
|
| 1482 | 1482 | // get time spent in the course and session |
| 1483 | 1483 | $time_spent += Tracking::get_time_spent_on_the_course($row_user->user_id, $courseId, $session_id); |
| 1484 | 1484 | $progress_tmp = Tracking::get_avg_student_progress($row_user->user_id, $row->code, array(), $session_id, true); |
@@ -1507,11 +1507,11 @@ discard block |
||
| 1507 | 1507 | $session_id, |
| 1508 | 1508 | false |
| 1509 | 1509 | ); |
| 1510 | - if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
| 1510 | + if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
| 1511 | 1511 | $last_login_date = $last_login_date_tmp; |
| 1512 | - } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
| 1512 | + } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
| 1513 | 1513 | // Find the max and assign it to first_login_date |
| 1514 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 1514 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
| 1515 | 1515 | $last_login_date = $last_login_date_tmp; |
| 1516 | 1516 | } |
| 1517 | 1517 | } |
@@ -1521,27 +1521,27 @@ discard block |
||
| 1521 | 1521 | $total_score_possible += $exercise_results_tmp['score_possible']; |
| 1522 | 1522 | $total_questions_answered += $exercise_results_tmp['questions_answered']; |
| 1523 | 1523 | } |
| 1524 | - if($nb_progress_lp > 0) { |
|
| 1524 | + if ($nb_progress_lp > 0) { |
|
| 1525 | 1525 | $avg_progress = round($progress / $nb_progress_lp, 2); |
| 1526 | 1526 | } else { |
| 1527 | 1527 | $avg_progress = 0; |
| 1528 | 1528 | } |
| 1529 | - if($nb_score_lp > 0) { |
|
| 1529 | + if ($nb_score_lp > 0) { |
|
| 1530 | 1530 | $avg_score = round($score / $nb_score_lp, 2); |
| 1531 | 1531 | } else { |
| 1532 | 1532 | $avg_score = '-'; |
| 1533 | 1533 | } |
| 1534 | - if($last_login_date) { |
|
| 1534 | + if ($last_login_date) { |
|
| 1535 | 1535 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); |
| 1536 | 1536 | } else { |
| 1537 | 1537 | $last_login_date = '-'; |
| 1538 | 1538 | } |
| 1539 | - if($total_score_possible > 0) { |
|
| 1539 | + if ($total_score_possible > 0) { |
|
| 1540 | 1540 | $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2); |
| 1541 | 1541 | } else { |
| 1542 | 1542 | $total_score_percentage = 0; |
| 1543 | 1543 | } |
| 1544 | - if($total_score_percentage > 0) { |
|
| 1544 | + if ($total_score_percentage > 0) { |
|
| 1545 | 1545 | $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)'; |
| 1546 | 1546 | } else { |
| 1547 | 1547 | $total_score = '-'; |
@@ -1601,7 +1601,7 @@ discard block |
||
| 1601 | 1601 | while ($row = Database::fetch_array($result)) { |
| 1602 | 1602 | $score_obtained += $row['exe_result']; |
| 1603 | 1603 | $score_possible += $row['exe_weighting']; |
| 1604 | - $questions_answered ++; |
|
| 1604 | + $questions_answered++; |
|
| 1605 | 1605 | } |
| 1606 | 1606 | |
| 1607 | 1607 | if ($score_possible != 0) { |
@@ -1721,9 +1721,9 @@ discard block |
||
| 1721 | 1721 | } |
| 1722 | 1722 | } |
| 1723 | 1723 | // time spent in the course |
| 1724 | - $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course ($user[4], $courseId)); |
|
| 1724 | + $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course($user[4], $courseId)); |
|
| 1725 | 1725 | // student progress in course |
| 1726 | - $csv_row[] = round(Tracking::get_avg_student_progress ($user[4], $row[0]), 2); |
|
| 1726 | + $csv_row[] = round(Tracking::get_avg_student_progress($user[4], $row[0]), 2); |
|
| 1727 | 1727 | // student score |
| 1728 | 1728 | $csv_row[] = round(Tracking::get_avg_student_score($user[4], $row[0]), 2); |
| 1729 | 1729 | // student tes score |
@@ -1731,7 +1731,7 @@ discard block |
||
| 1731 | 1731 | // student messages |
| 1732 | 1732 | $csv_row[] = Tracking::count_student_messages($user[4], $row[0]); |
| 1733 | 1733 | // student assignments |
| 1734 | - $csv_row[] = Tracking::count_student_assignments ($user[4], $row[0]); |
|
| 1734 | + $csv_row[] = Tracking::count_student_assignments($user[4], $row[0]); |
|
| 1735 | 1735 | // student exercises results |
| 1736 | 1736 | $exercises_results = MySpace::exercises_results($user[4], $row[0]); |
| 1737 | 1737 | $csv_row[] = $exercises_results['score_obtained']; |
@@ -1739,7 +1739,7 @@ discard block |
||
| 1739 | 1739 | $csv_row[] = $exercises_results['questions_answered']; |
| 1740 | 1740 | $csv_row[] = $exercises_results['percentage']; |
| 1741 | 1741 | // first connection |
| 1742 | - $csv_row[] = Tracking::get_first_connection_date_on_the_course ($user[4], $courseId); |
|
| 1742 | + $csv_row[] = Tracking::get_first_connection_date_on_the_course($user[4], $courseId); |
|
| 1743 | 1743 | // last connection |
| 1744 | 1744 | $csv_row[] = strip_tags(Tracking::get_last_connection_date_on_the_course($user[4], $courseInfo)); |
| 1745 | 1745 | |
@@ -1773,9 +1773,9 @@ discard block |
||
| 1773 | 1773 | // get all courses with limit |
| 1774 | 1774 | $sql = "SELECT course.code as col1, course.title as col2 |
| 1775 | 1775 | FROM $tbl_course course |
| 1776 | - WHERE course.code IN (".implode(',',$courses_code).")"; |
|
| 1776 | + WHERE course.code IN (".implode(',', $courses_code).")"; |
|
| 1777 | 1777 | |
| 1778 | - if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC'; |
|
| 1778 | + if (!in_array($direction, array('ASC', 'DESC'))) $direction = 'ASC'; |
|
| 1779 | 1779 | |
| 1780 | 1780 | $column = intval($column); |
| 1781 | 1781 | $from = intval($from); |
@@ -1844,7 +1844,7 @@ discard block |
||
| 1844 | 1844 | $table_row[] = $avg_assignments_in_course; |
| 1845 | 1845 | |
| 1846 | 1846 | //set the "from" value to know if I access the Reporting by the chamilo tab or the course link |
| 1847 | - $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq=' .$course_code.'&from=myspace&id_session='.$session_id.'"> |
|
| 1847 | + $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq='.$course_code.'&from=myspace&id_session='.$session_id.'"> |
|
| 1848 | 1848 | '.Display::return_icon('2rightarrow.png').' |
| 1849 | 1849 | </a> |
| 1850 | 1850 | </center>'; |
@@ -1853,7 +1853,7 @@ discard block |
||
| 1853 | 1853 | $nb_students_in_course, |
| 1854 | 1854 | $avg_time_spent_in_course, |
| 1855 | 1855 | is_null($avg_progress_in_course) ? null : $avg_progress_in_course.'%', |
| 1856 | - is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course , |
|
| 1856 | + is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course, |
|
| 1857 | 1857 | is_null($avg_score_in_exercise) ? null : $avg_score_in_exercise.'%', |
| 1858 | 1858 | $avg_messages_in_course, |
| 1859 | 1859 | $avg_assignments_in_course, |
@@ -1924,7 +1924,7 @@ discard block |
||
| 1924 | 1924 | $sql .= " ORDER BY col$column $direction "; |
| 1925 | 1925 | $sql .= " LIMIT $from,$number_of_items"; |
| 1926 | 1926 | $result = Database::query($sql); |
| 1927 | - $return = array (); |
|
| 1927 | + $return = array(); |
|
| 1928 | 1928 | while ($user = Database::fetch_row($result)) { |
| 1929 | 1929 | $return[] = $user; |
| 1930 | 1930 | } |
@@ -1979,7 +1979,7 @@ discard block |
||
| 1979 | 1979 | $i++; |
| 1980 | 1980 | } |
| 1981 | 1981 | } |
| 1982 | - $username_array = array('username' => $desired_username , 'sufix' => $sufix); |
|
| 1982 | + $username_array = array('username' => $desired_username, 'sufix' => $sufix); |
|
| 1983 | 1983 | return $username_array; |
| 1984 | 1984 | } else { |
| 1985 | 1985 | $username_array = array('username' => $username, 'sufix' => ''); |
@@ -2254,7 +2254,7 @@ discard block |
||
| 2254 | 2254 | foreach ($users as $index => $user) { |
| 2255 | 2255 | $userid = $user['id']; |
| 2256 | 2256 | $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) |
| 2257 | - VALUES ('$id_session','$userid', '" . api_get_utc_datetime() . "')"; |
|
| 2257 | + VALUES ('$id_session','$userid', '".api_get_utc_datetime()."')"; |
|
| 2258 | 2258 | Database::query($sql_insert); |
| 2259 | 2259 | $user['added_at_session'] = 1; |
| 2260 | 2260 | $new_users[] = $user; |
@@ -2288,10 +2288,10 @@ discard block |
||
| 2288 | 2288 | ); |
| 2289 | 2289 | $userInfo = api_get_user_info($user['id']); |
| 2290 | 2290 | |
| 2291 | - if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { |
|
| 2291 | + if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { |
|
| 2292 | 2292 | if ($user['added_at_platform'] == 1) { |
| 2293 | 2293 | $addedto = get_lang('UserCreatedPlatform'); |
| 2294 | - } else { |
|
| 2294 | + } else { |
|
| 2295 | 2295 | $addedto = ' '; |
| 2296 | 2296 | } |
| 2297 | 2297 | |
@@ -2354,7 +2354,7 @@ discard block |
||
| 2354 | 2354 | global $current_tag; |
| 2355 | 2355 | switch ($data) { |
| 2356 | 2356 | case 'Contact' : |
| 2357 | - $user = array (); |
|
| 2357 | + $user = array(); |
|
| 2358 | 2358 | break; |
| 2359 | 2359 | default : |
| 2360 | 2360 | $current_tag = $data; |
@@ -2401,9 +2401,9 @@ discard block |
||
| 2401 | 2401 | global $current_value; |
| 2402 | 2402 | global $user; |
| 2403 | 2403 | global $users; |
| 2404 | - $users = array (); |
|
| 2404 | + $users = array(); |
|
| 2405 | 2405 | $parser = xml_parser_create('UTF-8'); |
| 2406 | - xml_set_element_handler($parser, array('MySpace','element_start'), array('MySpace','element_end')); |
|
| 2406 | + xml_set_element_handler($parser, array('MySpace', 'element_start'), array('MySpace', 'element_end')); |
|
| 2407 | 2407 | xml_set_character_data_handler($parser, "character_data"); |
| 2408 | 2408 | xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false); |
| 2409 | 2409 | xml_parse($parser, api_utf8_encode_xml(file_get_contents($file))); |
@@ -2449,7 +2449,7 @@ discard block |
||
| 2449 | 2449 | get_lang('SearchCourse'), |
| 2450 | 2450 | $courseList, |
| 2451 | 2451 | [ |
| 2452 | - 'url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?' . http_build_query([ |
|
| 2452 | + 'url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?'.http_build_query([ |
|
| 2453 | 2453 | 'a' => 'search_course_by_session_all', |
| 2454 | 2454 | 'session_id' => $sessionId |
| 2455 | 2455 | ]) |
@@ -2468,7 +2468,7 @@ discard block |
||
| 2468 | 2468 | course_id: $('#course_id').val() || 0 |
| 2469 | 2469 | }); |
| 2470 | 2470 | |
| 2471 | - return '" . api_get_path(WEB_AJAX_PATH) . "session.ajax.php?' + params; |
|
| 2471 | + return '" . api_get_path(WEB_AJAX_PATH)."session.ajax.php?' + params; |
|
| 2472 | 2472 | } |
| 2473 | 2473 | " |
| 2474 | 2474 | ] |
@@ -2499,7 +2499,7 @@ discard block |
||
| 2499 | 2499 | course_id: $('#course_id').val() |
| 2500 | 2500 | }); |
| 2501 | 2501 | |
| 2502 | - return '" . api_get_path(WEB_AJAX_PATH) . "course.ajax.php?' + params; |
|
| 2502 | + return '" . api_get_path(WEB_AJAX_PATH)."course.ajax.php?' + params; |
|
| 2503 | 2503 | } |
| 2504 | 2504 | " |
| 2505 | 2505 | ] |
@@ -2600,7 +2600,7 @@ discard block |
||
| 2600 | 2600 | " : " |
| 2601 | 2601 | u.lastname AS col2, |
| 2602 | 2602 | u.firstname AS col3, |
| 2603 | - " ) . " |
|
| 2603 | + " )." |
|
| 2604 | 2604 | a.logout_course_date, |
| 2605 | 2605 | c.title, |
| 2606 | 2606 | c.code, |
@@ -2611,7 +2611,7 @@ discard block |
||
| 2611 | 2611 | |
| 2612 | 2612 | if (isset($_GET['session_id']) && !empty($_GET['session_id'])) { |
| 2613 | 2613 | $sessionId = intval($_GET['session_id']); |
| 2614 | - $sql .= " WHERE a.session_id = " . $sessionId; |
|
| 2614 | + $sql .= " WHERE a.session_id = ".$sessionId; |
|
| 2615 | 2615 | } |
| 2616 | 2616 | |
| 2617 | 2617 | $sql .= " ORDER BY col$column $orderDirection "; |
@@ -2717,13 +2717,13 @@ discard block |
||
| 2717 | 2717 | function get_stats($user_id, $courseId, $start_date = null, $end_date = null) |
| 2718 | 2718 | { |
| 2719 | 2719 | // Database table definitions |
| 2720 | - $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
| 2720 | + $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
| 2721 | 2721 | |
| 2722 | 2722 | $course_info = api_get_course_info_by_id($courseId); |
| 2723 | 2723 | if (!empty($course_info)) { |
| 2724 | 2724 | $strg_sd = ''; |
| 2725 | 2725 | $strg_ed = ''; |
| 2726 | - if ($start_date != null && $end_date != null){ |
|
| 2726 | + if ($start_date != null && $end_date != null) { |
|
| 2727 | 2727 | $end_date = add_day_to($end_date); |
| 2728 | 2728 | $strg_sd = "AND login_course_date BETWEEN '$start_date' AND '$end_date'"; |
| 2729 | 2729 | $strg_ed = "AND logout_course_date BETWEEN '$start_date' AND '$end_date'"; |
@@ -2732,10 +2732,10 @@ discard block |
||
| 2732 | 2732 | SEC_TO_TIME(avg(time_to_sec(timediff(logout_course_date,login_course_date)))) as avrg, |
| 2733 | 2733 | SEC_TO_TIME(sum(time_to_sec(timediff(logout_course_date,login_course_date)))) as total, |
| 2734 | 2734 | count(user_id) as times |
| 2735 | - FROM ' . $tbl_track_course . ' |
|
| 2735 | + FROM ' . $tbl_track_course.' |
|
| 2736 | 2736 | WHERE |
| 2737 | - user_id = ' . intval($user_id) . ' AND |
|
| 2738 | - c_id = ' . intval($courseId) . ' '.$strg_sd.' '.$strg_ed.' '.' |
|
| 2737 | + user_id = ' . intval($user_id).' AND |
|
| 2738 | + c_id = ' . intval($courseId).' '.$strg_sd.' '.$strg_ed.' '.' |
|
| 2739 | 2739 | ORDER BY login_course_date ASC'; |
| 2740 | 2740 | |
| 2741 | 2741 | $rs = Database::query($sql); |
@@ -2753,7 +2753,7 @@ discard block |
||
| 2753 | 2753 | } |
| 2754 | 2754 | |
| 2755 | 2755 | function add_day_to($end_date) { |
| 2756 | - $foo_date = strtotime( $end_date ); |
|
| 2756 | + $foo_date = strtotime($end_date); |
|
| 2757 | 2757 | $foo_date = strtotime(" +1 day", $foo_date); |
| 2758 | 2758 | $foo_date = date("Y-m-d", $foo_date); |
| 2759 | 2759 | return $foo_date; |
@@ -2767,7 +2767,7 @@ discard block |
||
| 2767 | 2767 | * @version OCT-22- 2010 |
| 2768 | 2768 | * @return array |
| 2769 | 2769 | */ |
| 2770 | -function convert_to_array($sql_result){ |
|
| 2770 | +function convert_to_array($sql_result) { |
|
| 2771 | 2771 | $result_to_print = '<table>'; |
| 2772 | 2772 | foreach ($sql_result as $key => $data) { |
| 2773 | 2773 | $result_to_print .= '<tr><td>'.date('d-m-Y (H:i:s)', $data['login']).'</td><td>'.api_time_to_hms($data['logout'] - $data['login']).'</tr></td>'."\n"; |
@@ -2786,7 +2786,7 @@ discard block |
||
| 2786 | 2786 | * @version OCT-22- 2010 |
| 2787 | 2787 | * @return string |
| 2788 | 2788 | */ |
| 2789 | -function convert_to_string($sql_result){ |
|
| 2789 | +function convert_to_string($sql_result) { |
|
| 2790 | 2790 | $result_to_print = '<table>'; |
| 2791 | 2791 | if (!empty($sql_result)) { |
| 2792 | 2792 | foreach ($sql_result as $key => $data) { |
@@ -2811,10 +2811,10 @@ discard block |
||
| 2811 | 2811 | */ |
| 2812 | 2812 | function grapher($sql_result, $start_date, $end_date, $type = "") |
| 2813 | 2813 | { |
| 2814 | - if (empty($start_date)) { $start_date =""; } |
|
| 2815 | - if (empty($end_date)) { $end_date =""; } |
|
| 2816 | - if ($type == ""){ $type = 'day'; } |
|
| 2817 | - $main_year = $main_month_year = $main_day = []; |
|
| 2814 | + if (empty($start_date)) { $start_date = ""; } |
|
| 2815 | + if (empty($end_date)) { $end_date = ""; } |
|
| 2816 | + if ($type == "") { $type = 'day'; } |
|
| 2817 | + $main_year = $main_month_year = $main_day = []; |
|
| 2818 | 2818 | |
| 2819 | 2819 | $period = new DatePeriod( |
| 2820 | 2820 | new DateTime($start_date), |
@@ -2873,7 +2873,7 @@ discard block |
||
| 2873 | 2873 | /* Create and populate the pData object */ |
| 2874 | 2874 | $myData = new pData(); |
| 2875 | 2875 | $myData->addPoints($main_date, 'Serie1'); |
| 2876 | - if (count($main_date)!= 1) { |
|
| 2876 | + if (count($main_date) != 1) { |
|
| 2877 | 2877 | $myData->addPoints($labels, 'Labels'); |
| 2878 | 2878 | $myData->setSerieDescription('Labels', 'Months'); |
| 2879 | 2879 | $myData->setAbscissa('Labels'); |
@@ -2881,7 +2881,7 @@ discard block |
||
| 2881 | 2881 | $myData->setSerieWeight('Serie1', 1); |
| 2882 | 2882 | $myData->setSerieDescription('Serie1', get_lang('MyResults')); |
| 2883 | 2883 | $myData->setAxisName(0, get_lang('Minutes')); |
| 2884 | - $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true); |
|
| 2884 | + $myData->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true); |
|
| 2885 | 2885 | |
| 2886 | 2886 | // Cache definition |
| 2887 | 2887 | $cachePath = api_get_path(SYS_ARCHIVE_PATH); |
@@ -2890,9 +2890,9 @@ discard block |
||
| 2890 | 2890 | |
| 2891 | 2891 | if ($myCache->isInCache($chartHash)) { |
| 2892 | 2892 | //if we already created the img |
| 2893 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 2893 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 2894 | 2894 | $myCache->saveFromCache($chartHash, $imgPath); |
| 2895 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 2895 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 2896 | 2896 | } else { |
| 2897 | 2897 | /* Define width, height and angle */ |
| 2898 | 2898 | $mainWidth = 760; |
@@ -2921,7 +2921,7 @@ discard block |
||
| 2921 | 2921 | /* Set the default font */ |
| 2922 | 2922 | $myPicture->setFontProperties( |
| 2923 | 2923 | array( |
| 2924 | - "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
| 2924 | + "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
| 2925 | 2925 | "FontSize" => 10) |
| 2926 | 2926 | ); |
| 2927 | 2927 | /* Write the chart title */ |
@@ -2938,7 +2938,7 @@ discard block |
||
| 2938 | 2938 | /* Set the default font */ |
| 2939 | 2939 | $myPicture->setFontProperties( |
| 2940 | 2940 | array( |
| 2941 | - "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
| 2941 | + "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
| 2942 | 2942 | "FontSize" => 8 |
| 2943 | 2943 | ) |
| 2944 | 2944 | ); |
@@ -2980,7 +2980,7 @@ discard block |
||
| 2980 | 2980 | /* Draw the line chart */ |
| 2981 | 2981 | $myPicture->setFontProperties( |
| 2982 | 2982 | array( |
| 2983 | - "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
| 2983 | + "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
| 2984 | 2984 | "FontSize" => 10 |
| 2985 | 2985 | ) |
| 2986 | 2986 | ); |
@@ -2999,15 +2999,15 @@ discard block |
||
| 2999 | 2999 | |
| 3000 | 3000 | /* Write and save into cache */ |
| 3001 | 3001 | $myCache->writeToCache($chartHash, $myPicture); |
| 3002 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 3002 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 3003 | 3003 | $myCache->saveFromCache($chartHash, $imgPath); |
| 3004 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 3004 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 3005 | 3005 | } |
| 3006 | - $html = '<img src="' . $imgPath . '">'; |
|
| 3006 | + $html = '<img src="'.$imgPath.'">'; |
|
| 3007 | 3007 | |
| 3008 | 3008 | return $html; |
| 3009 | 3009 | } else { |
| 3010 | - $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>','UTF-8'); |
|
| 3010 | + $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>', 'UTF-8'); |
|
| 3011 | 3011 | |
| 3012 | 3012 | return $foo_img; |
| 3013 | 3013 | } |
