Inspection of "Merge pull request #1466 from jloguercio/1.11.x" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.11.x ( 63a9c1...5396c4 )

by José

created 2016-10-13 21:28 UTC

Status

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -536,8 +536,9 @@
 block discarded – undo
             }
         } else {
             $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';   // course path
-            if (file_exists($store_path))
-                $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
+            if (file_exists($store_path)) {
+                            $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
+            }
         }
         return $web_path;
     }

Please login to merge, or discard this patch.

Indentation -1 removed lines patch added patch discarded remove patch

@@ -16,7 +16,6 @@
 block discarded – undo
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

Please login to merge, or discard this patch.

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -192,7 +192,7 @@  discard block
 block discarded – undo
      * @param   string  pdf name
      * @param   string  course code (if you are using html that are located in the document tool you must provide this)
      * @param bool Whether to print the header, footer and watermark (true) or just the content (false)
-     * @return bool
+     * @return false|null
      */
     public function html_to_pdf(
         $html_file_array,
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
     }
 
     /**
-     * @param array $header html content
+     * @param string $header html content
      */
     public function set_custom_header($header)
     {
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
     }
 
     /**
-     * @param array $footer html content
+     * @param string $footer html content
      */
     public function set_custom_footer($footer)
     {

Please login to merge, or discard this patch.

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -33,7 +33,7 @@  discard block
 block discarded – undo
         /* More info @ http://mpdf1.com/manual/index.php?tid=184&searchstring=mPDF
          * 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 ]]]]]])
          */
-        if (!in_array($orientation, array('P','L'))) {
+        if (!in_array($orientation, array('P', 'L'))) {
             $orientation = 'P';
         }
         //$this->pdf = $pdf = new mPDF('UTF-8', $pageFormat, '', '', 30, 20, 27, 25, 16, 13, $orientation);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
             $visualTheme = api_get_visual_theme();
             $img = api_get_path(SYS_CSS_PATH).'themes/'.$visualTheme.'/images/pdf_logo_header.png';
             if (file_exists($img)) {
-                $img = api_get_path(WEB_CSS_PATH) . 'themes/' . $visualTheme . '/images/pdf_logo_header.png';
+                $img = api_get_path(WEB_CSS_PATH).'themes/'.$visualTheme.'/images/pdf_logo_header.png';
                 $organization = "<img src='$img'>";
             }
         }
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
             // then print the title in the PDF
             if (is_array($file) && isset($file['title'])) {
                 $html_title = $file['title'];
-                $file  = $file['path'];
+                $file = $file['path'];
             } else {
                 //we suppose we've only been sent a file path
                 $html_title = basename($file);
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
             //it's not a chapter but the file exists, print its title
             if ($print_title) {
                 $this->pdf->WriteHTML(
-                    '<html><body><h3>' . $html_title . '</h3></body></html>'
+                    '<html><body><h3>'.$html_title.'</h3></body></html>'
                 );
             }
 
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
                 $filename = str_replace('_', ' ', $filename);
 
                 if ($extension === 'html') {
-                    $filename = basename($filename,'.html');
-                } elseif($extension === 'htm'){
-                    $filename = basename($filename,'.htm');
+                    $filename = basename($filename, '.html');
+                } elseif ($extension === 'htm') {
+                    $filename = basename($filename, '.htm');
                 }
 
                 $document_html = @file_get_contents($file);
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
                 $document_html = str_replace('href="./css/frames.css"', $absolute_css_path, $document_html);
 
                 if (!empty($course_data['path'])) {
-                    $document_html= str_replace('../', '', $document_html);
+                    $document_html = str_replace('../', '', $document_html);
                     $document_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document/';
 
                     $doc = new DOMDocument();
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
                 if (!empty($document_html)) {
                     $this->pdf->WriteHTML($document_html.$page_break);
                 }
-            } elseif (in_array($extension, array('jpg','jpeg','png','gif'))) {
+            } elseif (in_array($extension, array('jpg', 'jpeg', 'png', 'gif'))) {
                 //Images
                 $image = Display::img($file);
                 $this->pdf->WriteHTML('<html><body>'.$image.'</body></html>'.$page_break);
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
 
         //absolute path for frames.css //TODO: necessary?
         $absolute_css_path = api_get_path(WEB_CSS_PATH).api_get_setting('stylesheets').'/frames.css';
-        $document_html = str_replace('href="./css/frames.css"','href="'.$absolute_css_path.'"', $document_html);
+        $document_html = str_replace('href="./css/frames.css"', 'href="'.$absolute_css_path.'"', $document_html);
 
         $document_html = str_replace('../../', '', $document_html);
         $document_html = str_replace('../', '', $document_html);
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
                                 $old_src_fixed = str_replace(api_get_path(REL_COURSE_PATH).$course_data['path'].'/document/', '', $old_src);
                                 $old_src_fixed = str_replace('courses/'.$course_data['path'].'/document/', '', $old_src_fixed);
                                 $new_path = $document_path.$old_src_fixed;
-                                $document_html= str_replace($old_src, $new_path, $document_html);
+                                $document_html = str_replace($old_src, $new_path, $document_html);
 
                             }
                         }
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
         //$document_html= str_replace('temp_template_path', 'src="/main/default_course_document/', $document_html);// restore src templates
 
         api_set_encoding_html($document_html, 'UTF-8'); // The library mPDF expects UTF-8 encoded input data.
-        $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8');  // TODO: Maybe it is better idea the title to be passed through
+        $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8'); // TODO: Maybe it is better idea the title to be passed through
         // $_GET[] too, as it is done with file name.
         // At the moment the title is retrieved from the html document itself.
 
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
         //$this->pdf->Output($output_file, $outputMode); // F to save the pdf in a file
 
         if ($outputMode == 'F') {
-            $output_file = api_get_path(SYS_ARCHIVE_PATH) . $output_file;
+            $output_file = api_get_path(SYS_ARCHIVE_PATH).$output_file;
         }
 
         if ($saveInFile) {
@@ -538,14 +538,14 @@  discard block
 block discarded – undo
         $web_path = false;
         if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
             $course_info = api_get_course_info($course_code);
-            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';   // course path
+            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
             if (file_exists($store_path)) {
-                $web_path   = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
+                $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
             }
         } else {
-            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';   // course path
+            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
             if (file_exists($store_path))
-                $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
+                $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
         }
         return $web_path;
     }
@@ -585,10 +585,10 @@  discard block
 block discarded – undo
     {
         if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
             $course_info = api_get_course_info($course_code);
-            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'];   // course path
+            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path
             $web_path   = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/pdf_watermark.png';
         } else {
-            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images';   // course path
+            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images'; // course path
             $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
         }
         $course_image = $store_path.'/'.api_get_current_access_url_id().'_pdf_watermark.png';
@@ -621,9 +621,9 @@  discard block
 block discarded – undo
      */
     public function set_footer()
     {
-        $this->pdf->defaultfooterfontsize = 12;   // in pts
-        $this->pdf->defaultfooterfontstyle = 'B';   // blank, B, I, or BI
-        $this->pdf->defaultfooterline = 1;        // 1 to include line below header/above footer
+        $this->pdf->defaultfooterfontsize = 12; // in pts
+        $this->pdf->defaultfooterfontstyle = 'B'; // blank, B, I, or BI
+        $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer
         $platform_name   = api_get_setting('Institution');
         $left_content    = $platform_name;
         $center_content  = '';
@@ -690,9 +690,9 @@  discard block
 block discarded – undo
      */
     public function set_header($course_data)
     {
-        $this->pdf->defaultheaderfontsize   = 10;   // in pts
-        $this->pdf->defaultheaderfontstyle  = 'BI';   // blank, B, I, or BI
-        $this->pdf->defaultheaderline       = 1;    // 1 to include line below header/above footer
+        $this->pdf->defaultheaderfontsize   = 10; // in pts
+        $this->pdf->defaultheaderfontstyle  = 'BI'; // blank, B, I, or BI
+        $this->pdf->defaultheaderline       = 1; // 1 to include line below header/above footer
 
         if (!empty($course_data['code'])) {
             $teacher_list = CourseManager::get_teacher_list_from_course_code($course_data['code']);
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
             $teachers = '';
             if (!empty($teacher_list)) {
                 foreach ($teacher_list as $teacher) {
-                    $teachers[]= $teacher['firstname'].' '.$teacher['lastname'];
+                    $teachers[] = $teacher['firstname'].' '.$teacher['lastname'];
                 }
                 if (count($teachers) > 1) {
                     $teachers = get_lang('Teachers').': '.implode(', ', $teachers);
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
                     'line' => 1,
                 ),
             );
-            $this->pdf->SetHeader($header);// ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title);
+            $this->pdf->SetHeader($header); // ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title);
         }
     }
 
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
         $this->pdf->directionality = api_get_text_direction();
         $this->pdf->useOnlyCoreFonts = true;
         // Use different Odd/Even headers and footers and mirror margins
-        $this->pdf->mirrorMargins       = 1;
+        $this->pdf->mirrorMargins = 1;
 
         // Add decoration only if not stated otherwise
         if ($complete) {
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
                     $watermark_text = api_get_setting('pdf_export_watermark_text');
                 }
                 if (!empty($watermark_text)) {
-                    $this->pdf->SetWatermarkText(strcode2utf($watermark_text),0.1);
+                    $this->pdf->SetWatermarkText(strcode2utf($watermark_text), 0.1);
                     $this->pdf->showWatermarkText = true;
                 }
             }
@@ -848,8 +848,8 @@  discard block
 block discarded – undo
             if (empty($this->custom_header)) {
                 self::set_header($course_data);
             } else {
-                $this->pdf->SetHTMLHeader($this->custom_header,'E');
-                $this->pdf->SetHTMLHeader($this->custom_header,'O');
+                $this->pdf->SetHTMLHeader($this->custom_header, 'E');
+                $this->pdf->SetHTMLHeader($this->custom_header, 'O');
             }
 
             if (empty($this->custom_footer)) {

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Element/receivers.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -41,9 +41,9 @@
 block discarded – undo
 	 */
 	function _createElements()
 	{
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
 		$this->_elements[0]->setChecked(true);
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
 		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
 		$this->_elements[2]->setSelected($this->receivers_selected);
 	}

Please login to merge, or discard this patch.

Indentation +66 added lines, -66 removed lines patch added patch discarded remove patch

@@ -10,66 +10,66 @@  discard block
 block discarded – undo
  */
 class HTML_QuickForm_receivers extends HTML_QuickForm_group
 {
-	/**
-	 * Array of all receivers
-	 */
-	var $receivers;
-	/**
-	 * Array of selected receivers
-	 */
-	var $receivers_selected;
+    /**
+     * Array of all receivers
+     */
+    var $receivers;
+    /**
+     * Array of selected receivers
+     */
+    var $receivers_selected;
 
-	/**
-	 * Constructor
-	 * @param string $elementName
-	 * @param string $elementLabel
-	 * @param array $attributes This should contain the keys 'receivers' and
-	 * 'receivers_selected'
-	 */
-	public function __construct($elementName = null, $elementLabel = null, $attributes = null)
-	{
-		$this->receivers = $attributes['receivers'];
-		$this->receivers_selected = $attributes['receivers_selected'];
-		unset($attributes['receivers']);
-		unset($attributes['receivers_selected']);
-		parent::__construct($elementName, $elementLabel, $attributes);
-		$this->_persistantFreeze = true;
-		$this->_appendName = true;
-		$this->_type = 'receivers';
-	}
-	/**
-	 * Create the form elements to build this element group
-	 */
-	function _createElements()
-	{
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
-		$this->_elements[0]->setChecked(true);
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
-		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
-		$this->_elements[2]->setSelected($this->receivers_selected);
-	}
-	/**
-	 * HTML representation
-	 */
-	public function toHtml()
-	{
-		include_once ('HTML/QuickForm/Renderer/Default.php');
-		$this->_separator = '<br/>';
-		$renderer = & new HTML_QuickForm_Renderer_Default();
-		$renderer->setElementTemplate('{element}');
-		$select_boxes = $this->_elements[2];
-		$select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
-		parent :: accept($renderer);
-		$js = $this->getElementJS();
-		return $renderer->toHtml().$js;
-	}
+    /**
+     * Constructor
+     * @param string $elementName
+     * @param string $elementLabel
+     * @param array $attributes This should contain the keys 'receivers' and
+     * 'receivers_selected'
+     */
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
+    {
+        $this->receivers = $attributes['receivers'];
+        $this->receivers_selected = $attributes['receivers_selected'];
+        unset($attributes['receivers']);
+        unset($attributes['receivers_selected']);
+        parent::__construct($elementName, $elementLabel, $attributes);
+        $this->_persistantFreeze = true;
+        $this->_appendName = true;
+        $this->_type = 'receivers';
+    }
+    /**
+     * Create the form elements to build this element group
+     */
+    function _createElements()
+    {
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
+        $this->_elements[0]->setChecked(true);
+        $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
+        $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
+        $this->_elements[2]->setSelected($this->receivers_selected);
+    }
+    /**
+     * HTML representation
+     */
+    public function toHtml()
+    {
+        include_once ('HTML/QuickForm/Renderer/Default.php');
+        $this->_separator = '<br/>';
+        $renderer = & new HTML_QuickForm_Renderer_Default();
+        $renderer->setElementTemplate('{element}');
+        $select_boxes = $this->_elements[2];
+        $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
+        parent :: accept($renderer);
+        $js = $this->getElementJS();
+        return $renderer->toHtml().$js;
+    }
 
-	/**
-	 * Get the necessary javascript
-	 */
+    /**
+     * Get the necessary javascript
+     */
     public function getElementJS()
-	{
-		$js = "<script type=\"text/javascript\">
+    {
+        $js = "<script type=\"text/javascript\">
 					/* <![CDATA[ */
 					receivers_hide('receivers_to');
 					function receivers_show(item) {
@@ -82,14 +82,14 @@  discard block
 block discarded – undo
 					}
 					/* ]]> */
 					</script>\n";
-		return $js;
-	}
-	/**
-	 * accept renderer
-	 */
-	function accept(& $renderer, $required = false, $error = null)
-	{
-		$renderer->renderElement($this, $required, $error);
-	}
+        return $js;
+    }
+    /**
+     * accept renderer
+     */
+    function accept(& $renderer, $required = false, $error = null)
+    {
+        $renderer->renderElement($this, $required, $error);
+    }
 }
 ?>

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Element/DateRangePicker.php 2 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -7,8 +7,8 @@  discard block
 block discarded – undo
 class DateRangePicker extends HTML_QuickForm_text
 {
     /**
-    * Constructor
-    */
+     * Constructor
+     */
     public function __construct($elementName = null, $elementLabel = null, $attributes = null)
     {
         if (!isset($attributes['id'])) {
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @param array $dates result of parseDateRange()
-    *
-    * @return bool
-    */
+     * @param array $dates result of parseDateRange()
+     *
+     * @return bool
+     */
     public function validateDates($dates, $format = null)
     {
         if (empty($dates['start']) || empty($dates['end'])) {

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -88,7 +88,7 @@
 block discarded – undo
         }
 
         $timePicker = 'true';
-        $timePickerValue =  $this->getAttribute('timePicker');
+        $timePickerValue = $this->getAttribute('timePicker');
         if (!empty($timePickerValue)) {
             $timePicker = $timePickerValue;
         }

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Element/HtmlEditor.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -74,9 +74,9 @@
 block discarded – undo
             $styleCss = $this->editor->getConfigAttribute('style');
 
             if ($styleCss) {
-               $style = true;
+                $style = true;
             } else {
-               $style = false;
+                $style = false;
             }
 
             return $this->buildEditor($style);

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Element/DatePicker.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -44,12 +44,12 @@  discard block
 block discarded – undo
             $value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
         }
 
-        return $this->getElementJS() . '
+        return $this->getElementJS().'
             <div class="input-group">
                 <span class="input-group-addon">
-                    <input ' . $this->_getAttrString($this->_attributes) . '>
+                    <input ' . $this->_getAttrString($this->_attributes).'>
                 </span>
-                <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
+                <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
             </div>
         ';
     }
@@ -79,14 +79,14 @@  discard block
 block discarded – undo
         $js .= "<script>
             $(function() {
                 $('#$id').hide().datepicker({
-                    defaultDate: '" . $this->getValue() . "',
+                    defaultDate: '".$this->getValue()."',
                     dateFormat: 'yy-mm-dd',
                     altField: '#{$id}_alt',
-                    altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
+                    altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
                     showOn: 'both',
-                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
+                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
                     buttonImageOnly: true,
-                    buttonText: '" . get_lang('SelectDate') . "',
+                    buttonText: '" . get_lang('SelectDate')."',
                     changeMonth: true,
                     changeYear: true,
                     yearRange: 'c-60y:c+5y'

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Element/DateTimePicker.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -38,12 +38,12 @@  discard block
 block discarded – undo
             $value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
         }
 
-        return $this->getElementJS() . '
+        return $this->getElementJS().'
             <div class="input-group">
                 <span class="input-group-addon">
-                    <input ' . $this->_getAttrString($this->_attributes) . '>
+                    <input ' . $this->_getAttrString($this->_attributes).'>
                 </span>
-                <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
+                <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
             </div>
         ';
     }
@@ -73,18 +73,18 @@  discard block
 block discarded – undo
         $js .= "<script>
             $(function() {
                 $('#$id').hide().datetimepicker({
-                    defaultDate: '" . $this->getValue() . "',
+                    defaultDate: '".$this->getValue()."',
                     dateFormat: 'yy-mm-dd',
                     timeFormat: 'HH:mm',
                     altField: '#{$id}_alt',
-                    altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
-                    altTimeFormat: \"" . get_lang('TimeFormatNoSecJS') . "\",
-                    altSeparator: \" " . get_lang('AtTime') . " \",
+                    altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
+                    altTimeFormat: \"" . get_lang('TimeFormatNoSecJS')."\",
+                    altSeparator: \" " . get_lang('AtTime')." \",
                     altFieldTimeOnly: false,
                     showOn: 'both',
-                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
+                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
                     buttonImageOnly: true,
-                    buttonText: '" . get_lang('SelectDate') . "',
+                    buttonText: '" . get_lang('SelectDate')."',
                     changeMonth: true,
                     changeYear: true
                 });

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Rule/Date.php 1 patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -7,16 +7,16 @@
 block discarded – undo
  */
 class HTML_QuickForm_Rule_Date extends HTML_QuickForm_Rule
 {
-	/**
-	 * Check a date
-	 * @see HTML_QuickForm_Rule
-	 * @param string $date example 2014-04-30
+    /**
+     * Check a date
+     * @see HTML_QuickForm_Rule
+     * @param string $date example 2014-04-30
      * @param array $options
      *
-	 * @return boolean True if date is valid
-	 */
-	public function validate($date, $options)
-	{
+     * @return boolean True if date is valid
+     */
+    public function validate($date, $options)
+    {
         return api_is_valid_date($date, 'Y-m-d');
-	}
+    }
 }

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Rule/UsernameAvailable.php 1 patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -6,24 +6,24 @@
 block discarded – undo
  */
 class HTML_QuickForm_Rule_UsernameAvailable extends HTML_QuickForm_Rule
 {
-	/**
-	 * Function to check if a username is available
-	 * @see HTML_QuickForm_Rule
-	 * @param string $username Wanted username
-	 * @param string $current_username
-	 * @return boolean True if username is available
-	 */
-	function validate($username, $current_username = null) {
-		$user_table = Database::get_main_table(TABLE_MAIN_USER);
+    /**
+     * Function to check if a username is available
+     * @see HTML_QuickForm_Rule
+     * @param string $username Wanted username
+     * @param string $current_username
+     * @return boolean True if username is available
+     */
+    function validate($username, $current_username = null) {
+        $user_table = Database::get_main_table(TABLE_MAIN_USER);
         $username = Database::escape_string($username);
         $current_username = Database::escape_string($current_username);
 
-		$sql = "SELECT * FROM $user_table WHERE username = '$username'";
-		if (!is_null($current_username)) {
-			$sql .= " AND username != '$current_username'";
-		}
-		$res = Database::query($sql);
-		$number = Database::num_rows($res);
-		return $number == 0;
-	}
+        $sql = "SELECT * FROM $user_table WHERE username = '$username'";
+        if (!is_null($current_username)) {
+            $sql .= " AND username != '$current_username'";
+        }
+        $res = Database::query($sql);
+        $number = Database::num_rows($res);
+        return $number == 0;
+    }
 }

Please login to merge, or discard this patch.

main/inc/lib/formvalidator/Rule/CompareDateTimeText.php 2 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
      * @return boolean True if the 2 given dates match the operator
      */
     function validate($values, $operator = null) {
-    	$datetime1 = api_strtotime($values[0]);
+        $datetime1 = api_strtotime($values[0]);
         $datetime2 = api_strtotime($values[1]);
 
         if (strpos($operator, 'allow_empty') !== false) {
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
                 return true;
             }
         }
-		$result =  parent::validate(array($datetime1, $datetime2), $operator);
+        $result =  parent::validate(array($datetime1, $datetime2), $operator);
         return $result;
     }
 }

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
                 return true;
             }
         }
-		$result =  parent::validate(array($datetime1, $datetime2), $operator);
+		$result = parent::validate(array($datetime1, $datetime2), $operator);
         return $result;
     }
 }

Please login to merge, or discard this patch.

		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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	{

		@@ -536,8 +536,9 @@
		block discarded – undo
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	}

		@@ -16,7 +16,6 @@
		block discarded – undo
16	16	* @author Patrick Cool
17	17	* @author René Haentjens, added CSV file import (October 2004)
18	18	* @package chamilo.link
19		-
20	19	*/
21	20
22	21	// Including libraries

		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
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
		block discarded – undo
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	}
		@@ -238,7 +238,7 @@ discard block
		block discarded – undo
238	238	// then print the title in the PDF
239	239	if (is_array($file) && isset($file['title'])) {
240	240	$html_title = $file['title'];
241		- $file = $file['path'];
	241	+ $file = $file['path'];
242	242	} else {
243	243	//we suppose we've only been sent a file path
244	244	$html_title = basename($file);
		@@ -269,7 +269,7 @@ discard block
		block discarded – undo
269	269	//it's not a chapter but the file exists, print its title
270	270	if ($print_title) {
271	271	$this->pdf->WriteHTML(
272		- '<html><body><h3>' . $html_title . '</h3></body></html>'
	272	+ '<html><body><h3>'.$html_title.'</h3></body></html>'
273	273	);
274	274	}
275	275
		@@ -282,9 +282,9 @@ discard block
		block discarded – undo
282	282	$filename = str_replace('_', ' ', $filename);
283	283
284	284	if ($extension === 'html') {
285		- $filename = basename($filename,'.html');
286		- } elseif($extension === 'htm'){
287		- $filename = basename($filename,'.htm');
	285	+ $filename = basename($filename, '.html');
	286	+ } elseif ($extension === 'htm') {
	287	+ $filename = basename($filename, '.htm');
288	288	}
289	289
290	290	$document_html = @file_get_contents($file);
		@@ -295,7 +295,7 @@ discard block
		block discarded – undo
295	295	$document_html = str_replace('href="./css/frames.css"', $absolute_css_path, $document_html);
296	296
297	297	if (!empty($course_data['path'])) {
298		- $document_html= str_replace('../', '', $document_html);
	298	+ $document_html = str_replace('../', '', $document_html);
299	299	$document_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document/';
300	300
301	301	$doc = new DOMDocument();
		@@ -373,7 +373,7 @@ discard block
		block discarded – undo
373	373	if (!empty($document_html)) {
374	374	$this->pdf->WriteHTML($document_html.$page_break);
375	375	}
376		- } elseif (in_array($extension, array('jpg','jpeg','png','gif'))) {
	376	+ } elseif (in_array($extension, array('jpg', 'jpeg', 'png', 'gif'))) {
377	377	//Images
378	378	$image = Display::img($file);
379	379	$this->pdf->WriteHTML('<html><body>'.$image.'</body></html>'.$page_break);
		@@ -436,7 +436,7 @@ discard block
		block discarded – undo
436	436
437	437	//absolute path for frames.css //TODO: necessary?
438	438	$absolute_css_path = api_get_path(WEB_CSS_PATH).api_get_setting('stylesheets').'/frames.css';
439		- $document_html = str_replace('href="./css/frames.css"','href="'.$absolute_css_path.'"', $document_html);
	439	+ $document_html = str_replace('href="./css/frames.css"', 'href="'.$absolute_css_path.'"', $document_html);
440	440
441	441	$document_html = str_replace('../../', '', $document_html);
442	442	$document_html = str_replace('../', '', $document_html);
		@@ -464,7 +464,7 @@ discard block
		block discarded – undo
464	464	$old_src_fixed = str_replace(api_get_path(REL_COURSE_PATH).$course_data['path'].'/document/', '', $old_src);
465	465	$old_src_fixed = str_replace('courses/'.$course_data['path'].'/document/', '', $old_src_fixed);
466	466	$new_path = $document_path.$old_src_fixed;
467		- $document_html= str_replace($old_src, $new_path, $document_html);
	467	+ $document_html = str_replace($old_src, $new_path, $document_html);
468	468
469	469	}
470	470	}
		@@ -483,7 +483,7 @@ discard block
		block discarded – undo
483	483	//$document_html= str_replace('temp_template_path', 'src="/main/default_course_document/', $document_html);// restore src templates
484	484
485	485	api_set_encoding_html($document_html, 'UTF-8'); // The library mPDF expects UTF-8 encoded input data.
486		- $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8'); // TODO: Maybe it is better idea the title to be passed through
	486	+ $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8'); // TODO: Maybe it is better idea the title to be passed through
487	487	// $_GET[] too, as it is done with file name.
488	488	// At the moment the title is retrieved from the html document itself.
489	489
		@@ -505,7 +505,7 @@ discard block
		block discarded – undo
505	505	//$this->pdf->Output($output_file, $outputMode); // F to save the pdf in a file
506	506
507	507	if ($outputMode == 'F') {
508		- $output_file = api_get_path(SYS_ARCHIVE_PATH) . $output_file;
	508	+ $output_file = api_get_path(SYS_ARCHIVE_PATH).$output_file;
509	509	}
510	510
511	511	if ($saveInFile) {
		@@ -538,14 +538,14 @@ discard block
		block discarded – undo
538	538	$web_path = false;
539	539	if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
540	540	$course_info = api_get_course_info($course_code);
541		- $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
	541	+ $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
542	542	if (file_exists($store_path)) {
543		- $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
	543	+ $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
544	544	}
545	545	} else {
546		- $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
	546	+ $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
547	547	if (file_exists($store_path))
548		- $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
	548	+ $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
549	549	}
550	550	return $web_path;
551	551	}
		@@ -585,10 +585,10 @@ discard block
		block discarded – undo
585	585	{
586	586	if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
587	587	$course_info = api_get_course_info($course_code);
588		- $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path
	588	+ $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path
589	589	$web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/pdf_watermark.png';
590	590	} else {
591		- $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images'; // course path
	591	+ $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images'; // course path
592	592	$web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
593	593	}
594	594	$course_image = $store_path.'/'.api_get_current_access_url_id().'_pdf_watermark.png';
		@@ -621,9 +621,9 @@ discard block
		block discarded – undo
621	621	*/
622	622	public function set_footer()
623	623	{
624		- $this->pdf->defaultfooterfontsize = 12; // in pts
625		- $this->pdf->defaultfooterfontstyle = 'B'; // blank, B, I, or BI
626		- $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer
	624	+ $this->pdf->defaultfooterfontsize = 12; // in pts
	625	+ $this->pdf->defaultfooterfontstyle = 'B'; // blank, B, I, or BI
	626	+ $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer
627	627	$platform_name = api_get_setting('Institution');
628	628	$left_content = $platform_name;
629	629	$center_content = '';
		@@ -690,9 +690,9 @@ discard block
		block discarded – undo
690	690	*/
691	691	public function set_header($course_data)
692	692	{
693		- $this->pdf->defaultheaderfontsize = 10; // in pts
694		- $this->pdf->defaultheaderfontstyle = 'BI'; // blank, B, I, or BI
695		- $this->pdf->defaultheaderline = 1; // 1 to include line below header/above footer
	693	+ $this->pdf->defaultheaderfontsize = 10; // in pts
	694	+ $this->pdf->defaultheaderfontstyle = 'BI'; // blank, B, I, or BI
	695	+ $this->pdf->defaultheaderline = 1; // 1 to include line below header/above footer
696	696
697	697	if (!empty($course_data['code'])) {
698	698	$teacher_list = CourseManager::get_teacher_list_from_course_code($course_data['code']);
		@@ -700,7 +700,7 @@ discard block
		block discarded – undo
700	700	$teachers = '';
701	701	if (!empty($teacher_list)) {
702	702	foreach ($teacher_list as $teacher) {
703		- $teachers[]= $teacher['firstname'].' '.$teacher['lastname'];
	703	+ $teachers[] = $teacher['firstname'].' '.$teacher['lastname'];
704	704	}
705	705	if (count($teachers) > 1) {
706	706	$teachers = get_lang('Teachers').': '.implode(', ', $teachers);
		@@ -767,7 +767,7 @@ discard block
		block discarded – undo
767	767	'line' => 1,
768	768	),
769	769	);
770		- $this->pdf->SetHeader($header);// ('{DATE j-m-Y}\|{PAGENO}/{nb}\|'.$title);
	770	+ $this->pdf->SetHeader($header); // ('{DATE j-m-Y}\|{PAGENO}/{nb}\|'.$title);
771	771	}
772	772	}
773	773
		@@ -812,7 +812,7 @@ discard block
		block discarded – undo
812	812	$this->pdf->directionality = api_get_text_direction();
813	813	$this->pdf->useOnlyCoreFonts = true;
814	814	// Use different Odd/Even headers and footers and mirror margins
815		- $this->pdf->mirrorMargins = 1;
	815	+ $this->pdf->mirrorMargins = 1;
816	816
817	817	// Add decoration only if not stated otherwise
818	818	if ($complete) {
		@@ -840,7 +840,7 @@ discard block
		block discarded – undo
840	840	$watermark_text = api_get_setting('pdf_export_watermark_text');
841	841	}
842	842	if (!empty($watermark_text)) {
843		- $this->pdf->SetWatermarkText(strcode2utf($watermark_text),0.1);
	843	+ $this->pdf->SetWatermarkText(strcode2utf($watermark_text), 0.1);
844	844	$this->pdf->showWatermarkText = true;
845	845	}
846	846	}
		@@ -848,8 +848,8 @@ discard block
		block discarded – undo
848	848	if (empty($this->custom_header)) {
849	849	self::set_header($course_data);
850	850	} else {
851		- $this->pdf->SetHTMLHeader($this->custom_header,'E');
852		- $this->pdf->SetHTMLHeader($this->custom_header,'O');
	851	+ $this->pdf->SetHTMLHeader($this->custom_header, 'E');
	852	+ $this->pdf->SetHTMLHeader($this->custom_header, 'O');
853	853	}
854	854
855	855	if (empty($this->custom_footer)) {

		@@ -41,9 +41,9 @@
		block discarded – undo
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,66 +10,66 @@ discard block
		block discarded – undo
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		- }
40		- /**
41		- * Create the form elements to build this element group
42		- */
43		- function _createElements()
44		- {
45		- $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
46		- $this->_elements[0]->setChecked(true);
47		- $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
48		- $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
49		- $this->_elements[2]->setSelected($this->receivers_selected);
50		- }
51		- /**
52		- * HTML representation
53		- */
54		- public function toHtml()
55		- {
56		- include_once ('HTML/QuickForm/Renderer/Default.php');
57		- $this->_separator = '<br/>';
58		- $renderer = & new HTML_QuickForm_Renderer_Default();
59		- $renderer->setElementTemplate('{element}');
60		- $select_boxes = $this->_elements[2];
61		- $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
62		- parent :: accept($renderer);
63		- $js = $this->getElementJS();
64		- return $renderer->toHtml().$js;
65		- }
	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	+ /**
	41	+ * Create the form elements to build this element group
	42	+ */
	43	+ function _createElements()
	44	+ {
	45	+ $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
	46	+ $this->_elements[0]->setChecked(true);
	47	+ $this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
	48	+ $this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
	49	+ $this->_elements[2]->setSelected($this->receivers_selected);
	50	+ }
	51	+ /**
	52	+ * HTML representation
	53	+ */
	54	+ public function toHtml()
	55	+ {
	56	+ include_once ('HTML/QuickForm/Renderer/Default.php');
	57	+ $this->_separator = '<br/>';
	58	+ $renderer = & new HTML_QuickForm_Renderer_Default();
	59	+ $renderer->setElementTemplate('{element}');
	60	+ $select_boxes = $this->_elements[2];
	61	+ $select_boxes->setElementTemplate('<div style="margin-left:20px;display:block;" id="receivers_'.$select_boxes->getName().'">'.$select_boxes->_elementTemplate.'</div>');
	62	+ parent :: accept($renderer);
	63	+ $js = $this->getElementJS();
	64	+ return $renderer->toHtml().$js;
	65	+ }
66	66
67		- /**
68		- * Get the necessary javascript
69		- */
	67	+ /**
	68	+ * Get the necessary javascript
	69	+ */
70	70	public function getElementJS()
71		- {
72		- $js = "<script type=\"text/javascript\">
	71	+ {
	72	+ $js = "<script type=\"text/javascript\">
73	73	/* <![CDATA[ */
74	74	receivers_hide('receivers_to');
75	75	function receivers_show(item) {
		@@ -82,14 +82,14 @@ discard block
		block discarded – undo
82	82	}
83	83	/* ]]> */
84	84	</script>\n";
85		- return $js;
86		- }
87		- /**
88		- * accept renderer
89		- */
90		- function accept(& $renderer, $required = false, $error = null)
91		- {
92		- $renderer->renderElement($this, $required, $error);
93		- }
	85	+ return $js;
	86	+ }
	87	+ /**
	88	+ * accept renderer
	89	+ */
	90	+ function accept(& $renderer, $required = false, $error = null)
	91	+ {
	92	+ $renderer->renderElement($this, $required, $error);
	93	+ }
94	94	}
95	95	?>

		@@ -7,8 +7,8 @@ discard block
		block discarded – undo
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
		block discarded – undo
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 @@
		block discarded – undo
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 @@
		block discarded – undo
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);

		@@ -44,12 +44,12 @@ discard block
		block discarded – undo
44	44	$value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
45	45	}
46	46
47		- return $this->getElementJS() . '
	47	+ return $this->getElementJS().'
48	48	<div class="input-group">
49	49	<span class="input-group-addon">
50		- <input ' . $this->_getAttrString($this->_attributes) . '>
	50	+ <input ' . $this->_getAttrString($this->_attributes).'>
51	51	</span>
52		- <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
	52	+ <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
53	53	</div>
54	54	';
55	55	}
		@@ -79,14 +79,14 @@ discard block
		block discarded – undo
79	79	$js .= "<script>
80	80	$(function() {
81	81	$('#$id').hide().datepicker({
82		- defaultDate: '" . $this->getValue() . "',
	82	+ defaultDate: '".$this->getValue()."',
83	83	dateFormat: 'yy-mm-dd',
84	84	altField: '#{$id}_alt',
85		- altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
	85	+ altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
86	86	showOn: 'both',
87		- buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
	87	+ buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
88	88	buttonImageOnly: true,
89		- buttonText: '" . get_lang('SelectDate') . "',
	89	+ buttonText: '" . get_lang('SelectDate')."',
90	90	changeMonth: true,
91	91	changeYear: true,
92	92	yearRange: 'c-60y:c+5y'

		@@ -38,12 +38,12 @@ discard block
		block discarded – undo
38	38	$value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
39	39	}
40	40
41		- return $this->getElementJS() . '
	41	+ return $this->getElementJS().'
42	42	<div class="input-group">
43	43	<span class="input-group-addon">
44		- <input ' . $this->_getAttrString($this->_attributes) . '>
	44	+ <input ' . $this->_getAttrString($this->_attributes).'>
45	45	</span>
46		- <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
	46	+ <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
47	47	</div>
48	48	';
49	49	}
		@@ -73,18 +73,18 @@ discard block
		block discarded – undo
73	73	$js .= "<script>
74	74	$(function() {
75	75	$('#$id').hide().datetimepicker({
76		- defaultDate: '" . $this->getValue() . "',
	76	+ defaultDate: '".$this->getValue()."',
77	77	dateFormat: 'yy-mm-dd',
78	78	timeFormat: 'HH:mm',
79	79	altField: '#{$id}_alt',
80		- altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
81		- altTimeFormat: \"" . get_lang('TimeFormatNoSecJS') . "\",
82		- altSeparator: \" " . get_lang('AtTime') . " \",
	80	+ altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
	81	+ altTimeFormat: \"" . get_lang('TimeFormatNoSecJS')."\",
	82	+ altSeparator: \" " . get_lang('AtTime')." \",
83	83	altFieldTimeOnly: false,
84	84	showOn: 'both',
85		- buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
	85	+ buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
86	86	buttonImageOnly: true,
87		- buttonText: '" . get_lang('SelectDate') . "',
	87	+ buttonText: '" . get_lang('SelectDate')."',
88	88	changeMonth: true,
89	89	changeYear: true
90	90	});

		@@ -7,16 +7,16 @@
		block discarded – undo
7	7	*/
8	8	class HTML_QuickForm_Rule_Date extends HTML_QuickForm_Rule
9	9	{
10		- /**
11		- * Check a date
12		- * @see HTML_QuickForm_Rule
13		- * @param string $date example 2014-04-30
	10	+ /**
	11	+ * Check a date
	12	+ * @see HTML_QuickForm_Rule
	13	+ * @param string $date example 2014-04-30
14	14	* @param array $options
15	15	*
16		- * @return boolean True if date is valid
17		- */
18		- public function validate($date, $options)
19		- {
	16	+ * @return boolean True if date is valid
	17	+ */
	18	+ public function validate($date, $options)
	19	+ {
20	20	return api_is_valid_date($date, 'Y-m-d');
21		- }
	21	+ }
22	22	}

		@@ -6,24 +6,24 @@
		block discarded – undo
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	}

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12	* @return boolean True if the 2 given dates match the operator
13	13	*/
14	14	function validate($values, $operator = null) {
15		- $datetime1 = api_strtotime($values[0]);
	15	+ $datetime1 = api_strtotime($values[0]);
16	16	$datetime2 = api_strtotime($values[1]);
17	17
18	18	if (strpos($operator, 'allow_empty') !== false) {
		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	return true;
22	22	}
23	23	}
24		- $result = parent::validate(array($datetime1, $datetime2), $operator);
	24	+ $result = parent::validate(array($datetime1, $datetime2), $operator);
25	25	return $result;
26	26	}
27	27	}

		@@ -21,7 +21,7 @@
		block discarded – undo
21	21	return true;
22	22	}
23	23	}
24		- $result = parent::validate(array($datetime1, $datetime2), $operator);
	24	+ $result = parent::validate(array($datetime1, $datetime2), $operator);
25	25	return $result;
26	26	}
27	27	}

chamilo / chamilo-lms

Push — 1.11.x ( 63a9c1...5396c4 )

Status

Category

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Indentation -1 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +66 added lines, -66 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch