chamilo / chamilo-lms

main/gradebook/lib/fe/userform.class.php

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
  */
 class UserForm extends FormValidator
 {
-	const TYPE_USER_INFO= 1;
+	const TYPE_USER_INFO = 1;
 	const TYPE_SIMPLE_SEARCH = 3;
 	/**
 	 * Builds a form containing form items based on a given parameter
@@ -19,15 +19,15 @@ 
 	 * @param method
 	 * @param action
 	 */
-	public function UserForm($form_type, $user, $form_name, $method= 'post', $action= null)
+	public function UserForm($form_type, $user, $form_name, $method = 'post', $action = null)
 	{
 		parent :: __construct($form_name, $method, $action);
-		$this->form_type= $form_type;
+		$this->form_type = $form_type;
 		if (isset ($user)) {
-			$this->user_info= $user;
+			$this->user_info = $user;
 		}
 		if (isset ($result_object)) {
-			$this->result_object= $result_object;
+			$this->result_object = $result_object;
 		}
 		if ($this->form_type == self :: TYPE_USER_INFO) {
 			$this->build_user_info_form();
@@ -45,9 +45,9 @@ 
 				'keyword' => Security::remove_XSS($_GET['search'])
 			));
 		}
-		$renderer =& $this->defaultRenderer();
+		$renderer = & $this->defaultRenderer();
 		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('text','keyword','');
+		$this->addElement('text', 'keyword', '');
 		$this->addButtonSearch(get_lang('Search'), 'submit');
 	}
 
@@ -61,7 +61,7 @@ 
 			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
 		}
 		$this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
-		$this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
+		$this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:'.$this->user_info['email'].'">'.$this->user_info['email'].'</a>');
 		$this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
 		$this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
 		$this->addButtonSave(get_lang('Back'), 'submit');
@@ -72,7 +72,7 @@ 
 		parent :: display();
 	}
 
-	function setDefaults($defaults= array(), $filter = null)
+	function setDefaults($defaults = array(), $filter = null)
 	{
 		parent :: setDefaults($defaults, $filter);
 	}

main/gradebook/lib/fe/gradebooktable.class.php

Spacing +42 added lines, -42 removed lines

@@ -71,7 +71,7 @@ 
             $this->set_additional_parameters($addparams);
         }
 
-        $column= 0;
+        $column = 0;
         if ($this->teacherView) {
             if ($this->exportToPdf == false) {
                 $this->set_header($column++, '', '', 'width="25px"');
@@ -283,13 +283,13 @@ 
                 $main_categories[$item->get_id()]['name'] = $item->get_name();
             } else {
                 $name = $this->build_name_link($item, $type);
-                $row[] = $invisibility_span_open.$name. $invisibility_span_close;
+                $row[] = $invisibility_span_open.$name.$invisibility_span_close;
                 $main_categories[$item->get_id()]['name'] = $name;
             }
 
             $this->dataForGraph['categories'][] = $item->get_name();
 
-            $main_categories[$item->get_id()]['weight']= $item->get_weight();
+            $main_categories[$item->get_id()]['weight'] = $item->get_weight();
             $total_categories_weight += $item->get_weight();
 
             // Description.
@@ -309,9 +309,9 @@ 
             );
 
             if ($this->teacherView) {
-                $row[] = $invisibility_span_open .Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
+                $row[] = $invisibility_span_open.Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
             } else {
-                $row[] = $invisibility_span_open .$weight.$invisibility_span_close;
+                $row[] = $invisibility_span_open.$weight.$invisibility_span_close;
             }
 
             $category_weight = $item->get_weight();
@@ -337,7 +337,7 @@ 
 
                 if (!empty($score[1])) {
                     $completeScore = $scoredisplay->display_score($score, SCORE_DIV_PERCENT);
-                    $score = $score[0]/$score[1]*$item->get_weight();
+                    $score = $score[0] / $score[1] * $item->get_weight();
                     $score = $scoredisplay->display_score(array($score, null), SCORE_SIMPLE);
                     $scoreToDisplay = Display::tip($score, $completeScore);
                 } else {
@@ -373,7 +373,7 @@ 
                     $totalResultAverageValue = strip_tags($scoredisplay->display_score($totalResult, SCORE_AVERAGE));
                     $this->dataForGraph['my_result'][] = (float) str_replace('%', '', $totalResultAverageValue);
                     $totalAverageValue = strip_tags($scoredisplay->display_score($totalAverage, SCORE_AVERAGE));
-                    $this->dataForGraph['average'][] =  (float) str_replace('%', '', $totalAverageValue);
+                    $this->dataForGraph['average'][] = (float) str_replace('%', '', $totalAverageValue);
                     // Ranking
                     $row[] = $ranking;
                     // Best
@@ -456,7 +456,7 @@ 
                         $row[] = $this->build_type_column($item, array('style' => 'padding-left:5px'));
 
                         // Name.
-                        $row[] = $invisibility_span_open."     ".$this->build_name_link($item, $type) . $invisibility_span_close;
+                        $row[] = $invisibility_span_open."     ".$this->build_name_link($item, $type).$invisibility_span_close;
 
                         // Description.
                         if ($this->exportToPdf == false) {
@@ -494,7 +494,7 @@ 
                             // Students get the results and certificates columns
                             $eval_n_links = array_merge($alleval, $alllink);
 
-                            if (count($eval_n_links)> 0) {
+                            if (count($eval_n_links) > 0) {
                                 $value_data = isset($data[4]) ? $data[4] : null;
 
                                 if (!is_null($value_data)) {
@@ -593,7 +593,7 @@ 
                 $row = array(
                     null,
                     null,
-                    '<strong>' . get_lang('Total') . '</strong>',
+                    '<strong>'.get_lang('Total').'</strong>',
                     null,
                     $total
                 );
@@ -663,7 +663,7 @@ 
                 if ($this->exportToPdf) {
                     $row = array(
                         null,
-                        '<h3>' . get_lang('Total') . '</h3>',
+                        '<h3>'.get_lang('Total').'</h3>',
                         $main_weight,
                         $totalResult,
                         $totalRanking,
@@ -673,7 +673,7 @@ 
                 } else {
                     $row = array(
                         null,
-                        '<h3>' . get_lang('Total') . '</h3>',
+                        '<h3>'.get_lang('Total').'</h3>',
                         null,
                         $main_weight,
                         $totalResult,
@@ -688,7 +688,7 @@ 
         }
 
         // Warning messages
-        $view = isset($_GET['view']) ? $_GET['view']: null;
+        $view = isset($_GET['view']) ? $_GET['view'] : null;
 
         if ($this->teacherView) {
             if (isset($_GET['selectcat']) &&
@@ -701,14 +701,14 @@ 
                 $weight_category = intval($this->build_weight($category[0]));
 
                 $course_code = $this->build_course_code($category[0]);
-                $weight_total_links  = round($weight_total_links);
+                $weight_total_links = round($weight_total_links);
 
                 if ($weight_total_links > $weight_category ||
                     $weight_total_links < $weight_category ||
                     $weight_total_links > $weight_category
                 ) {
                     $warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
-                    $modify_icons  = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
+                    $modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
                         Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
                     $warning_message .= $modify_icons;
                     Display::display_warning_message($warning_message, false);
@@ -721,7 +721,7 @@ 
                 );
 
                 if (!empty($content_html)) {
-                    $new_content = explode('</head>',$content_html['content']);
+                    $new_content = explode('</head>', $content_html['content']);
                 }
 
                 if (empty($new_content[0])) {
@@ -755,7 +755,7 @@ 
                     is_array($course_codes)
                 ) {
                     $warning_message = '';
-                    for ($x = 0; $x<count($weight_categories);$x++) {
+                    for ($x = 0; $x < count($weight_categories); $x++) {
                         $weight_category = intval($weight_categories[$x]);
                         $certificate_min_score = intval($certificate_min_scores[$x]);
                         $course_code = $course_codes[$x];
@@ -763,12 +763,12 @@ 
                         if (empty($certificate_min_score) ||
                             ($certificate_min_score > $weight_category)
                         ) {
-                            $warning_message .= $course_code .'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />';
+                            $warning_message .= $course_code.'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />';
                         }
                     }
 
                     if (!empty($warning_message)) {
-                        Display::display_warning_message($warning_message,false);
+                        Display::display_warning_message($warning_message, false);
                     }
                 }
             }
@@ -812,15 +812,15 @@ 
             $pChart->Antialias = FALSE;
 
             /* Add a border to the picture */
-            $pChart->drawRectangle(0,0,$xSize-10,$ySize-10,array("R"=>0,"G"=>0,"B"=>0));
+            $pChart->drawRectangle(0, 0, $xSize - 10, $ySize - 10, array("R"=>0, "G"=>0, "B"=>0));
 
-            $pChart->drawText(10,16,get_lang('Results'),array("FontSize"=>11,"Align"=>TEXT_ALIGN_BOTTOMLEFT));
+            $pChart->drawText(10, 16, get_lang('Results'), array("FontSize"=>11, "Align"=>TEXT_ALIGN_BOTTOMLEFT));
 
-            $pChart->setGraphArea(50, 30, $xSize-50, $ySize-50);
+            $pChart->setGraphArea(50, 30, $xSize - 50, $ySize - 50);
 
             $pChart->setFontProperties(
                 array(
-                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     'FontSize' => 10,
                 )
             );
@@ -840,7 +840,7 @@ 
 
             /* Draw the line chart */
             $pChart->drawLineChart();
-            $pChart->drawPlotChart(array("DisplayValues"=>TRUE,"PlotBorder"=>TRUE,"BorderSize"=>2,"Surrounding"=>-60,"BorderAlpha"=>80));
+            $pChart->drawPlotChart(array("DisplayValues"=>TRUE, "PlotBorder"=>TRUE, "BorderSize"=>2, "Surrounding"=>-60, "BorderAlpha"=>80));
 
             /* Write the chart legend */
             $pChart->drawLegend(
@@ -860,13 +860,13 @@ 
             $chartHash = $myCache->getHash($dataSet);
 
             $myCache->writeToCache($chartHash, $pChart);
-            $imgSysPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgSysPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgSysPath);
-            $imgWebPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgWebPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
 
             if (file_exists($imgSysPath)) {
                 $result = '<div id="contentArea" style="text-align: center;" >';
-                $result .= '<img src="' . $imgWebPath.'" >';
+                $result .= '<img src="'.$imgWebPath.'" >';
                 $result .= '</div>';
                 return $result;
             }
@@ -911,13 +911,13 @@ 
         switch ($item->get_item_type()) {
             // category
             case 'C' :
-                return 'CATE' . $item->get_id();
+                return 'CATE'.$item->get_id();
             // evaluation
             case 'E' :
-                return 'EVAL' . $item->get_id();
+                return 'EVAL'.$item->get_id();
             // link
             case 'L' :
-                return 'LINK' . $item->get_id();
+                return 'LINK'.$item->get_id();
         }
     }
 
@@ -945,20 +945,20 @@ 
         switch ($item->get_item_type()) {
             // category
             case 'C' :
-                $prms_uri='?selectcat=' . $item->get_id() . '&amp;view='.$view;
+                $prms_uri = '?selectcat='.$item->get_id().'&amp;view='.$view;
 
                 if (isset($_GET['isStudentView'])) {
-                    if ( isset($is_student) || ( isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
-                        $prms_uri=$prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']);
+                    if (isset($is_student) || (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')) {
+                        $prms_uri = $prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']);
                     }
                 }
 
                 $cat = new Category();
-                $show_message=$cat->show_message_resource_delete($item->get_course_code());
+                $show_message = $cat->show_message_resource_delete($item->get_course_code());
                 return '&nbsp;<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).$prms_uri.'">'
                 . $item->get_name()
                 . '</a>'
-                . ($item->is_course() ? ' &nbsp;[' . $item->get_course_code() . ']'.$show_message : '');
+                . ($item->is_course() ? ' &nbsp;['.$item->get_course_code().']'.$show_message : '');
                 // evaluation
             case 'E' :
                 $cat = new Category();
@@ -966,10 +966,10 @@ 
                 $show_message = $cat->show_message_resource_delete($course_id);
 
                 // course/platform admin can go to the view_results page
-                if (api_is_allowed_to_edit() && $show_message===false) {
+                if (api_is_allowed_to_edit() && $show_message === false) {
                     if ($item->get_type() == 'presence') {
                         return '&nbsp;'
-                        . '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval=' . $item->get_id() . '">'
+                        . '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval='.$item->get_id().'">'
                         . $item->get_name()
                         . '</a>';
                     } else {
@@ -978,20 +978,20 @@ 
                             $extra = '';
                         }
                         return '&nbsp;'
-                        . '<a href="gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
+                        . '<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
                         . $item->get_name()
                         . '</a>&nbsp;'.$extra;
                     }
-                } elseif (ScoreDisplay :: instance()->is_custom() && $show_message===false) {
+                } elseif (ScoreDisplay :: instance()->is_custom() && $show_message === false) {
                     // students can go to the statistics page (if custom display enabled)
                     return '&nbsp;'
-                    . '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
+                    . '<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
                     . $item->get_name()
                     . '</a>';
 
                 } elseif ($show_message === false && !api_is_allowed_to_edit() && !ScoreDisplay :: instance()->is_custom()) {
                     return '&nbsp;'
-                    . '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
+                    . '<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
                     . $item->get_name()
                     . '</a>';
                 } else {
@@ -1006,7 +1006,7 @@ 
                 $url = $item->get_link();
 
                 if (isset($url) && $show_message === false) {
-                    $text = '&nbsp;<a href="' . $item->get_link() . '">'
+                    $text = '&nbsp;<a href="'.$item->get_link().'">'
                         . $item->get_name()
                         . '</a>';
                 } else {

main/gradebook/lib/fe/linkform.class.php

Spacing +7 added lines, -7 removed lines

@@ -56,17 +56,17 @@ 
 
 	protected function build_move()
 	{
-		$renderer =& $this->defaultRenderer();
+		$renderer = & $this->defaultRenderer();
 		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
-		$this->addElement('static',null,null,get_lang('MoveTo').' : ');
-		$select = $this->addElement('select','move_cat',null,null);
+		$this->addElement('static', null, null, '"'.$this->link_object->get_name().'" ');
+		$this->addElement('static', null, null, get_lang('MoveTo').' : ');
+		$select = $this->addElement('select', 'move_cat', null, null);
 		$line = '';
 		foreach ($this->link_object->get_target_categories() as $cat) {
-			for ($i=0;$i<$cat[2];$i++) {
+			for ($i = 0; $i < $cat[2]; $i++) {
 				$line .= '&mdash;';
 			}
-			$select->addoption($line.' '.$cat[1],$cat[0]);
+			$select->addoption($line.' '.$cat[1], $cat[0]);
 			$line = '';
 		}
 		$this->addElement('submit', null, get_lang('Ok'));
@@ -133,7 +133,7 @@ 
 		$link = LinkFactory::create($link);
 		if (!empty($courseCode)) {
 			$link->set_course_code($courseCode);
-		} elseif(!empty($_GET['course_code'])) {
+		} elseif (!empty($_GET['course_code'])) {
 			$link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
 		}
 

main/gradebook/lib/fe/catform.class.php

Spacing +10 added lines, -10 removed lines

@@ -52,15 +52,15 @@ 
      */
     protected function build_move_form()
     {
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement(
             'static',
             null,
             null,
-            '"' . $this->category_object->get_name() . '" '
+            '"'.$this->category_object->get_name().'" '
         );
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
         $line = null;
         foreach ($this->category_object->get_target_categories() as $cat) {
@@ -68,9 +68,9 @@ 
                 $line .= '--';
             }
             if ($cat[0] != $this->category_object->get_parent_id()) {
-                $select->addoption($line . ' ' . $cat[1], $cat[0]);
+                $select->addoption($line.' '.$cat[1], $cat[0]);
             } else {
-                $select->addoption($line . ' ' . $cat[1], $cat[0], 'disabled');
+                $select->addoption($line.' '.$cat[1], $cat[0], 'disabled');
             }
             $line = '';
         }
@@ -153,7 +153,7 @@ 
         $grade_model_id = $this->category_object->get_grade_model_id();
 
         if (empty($links)) {
-            $grade_model_id    = 0;
+            $grade_model_id = 0;
         }
 
         $category_name = $this->category_object->get_name();
@@ -242,7 +242,7 @@ 
                     [
                         'id' => 'skills',
                         'multiple' => 'multiple',
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'skill.ajax.php?a=search_skills'
+                        'url' => api_get_path(WEB_AJAX_PATH).'skill.ajax.php?a=search_skills'
                     ]
                 );
 
@@ -400,14 +400,14 @@ 
         //only return courses that are not yet created by the teacher
 
         foreach ($coursecat as $row) {
-            $select->addoption($row[1],$row[0]);
+            $select->addoption($row[1], $row[0]);
         }
         $this->setDefaults(array(
             'hid_user_id' => $this->category_object->get_user_id(),
             'hid_parent_id' => $this->category_object->get_parent_id()
         ));
-        $this->addElement('hidden','hid_user_id');
-        $this->addElement('hidden','hid_parent_id');
+        $this->addElement('hidden', 'hid_user_id');
+        $this->addElement('hidden', 'hid_parent_id');
         $this->addElement('submit', null, get_lang('Ok'));
     }
 

main/gradebook/lib/fe/linkaddeditform.class.php

Spacing +14 added lines, -14 removed lines

@@ -31,7 +31,7 @@ 
 		if (isset($link_object)) {
 			$link = $link_object;
 		} elseif (isset($link_type) && isset($category_object)) {
-			$link = LinkFactory :: create ($link_type);
+			$link = LinkFactory :: create($link_type);
 			$link->set_course_code(api_get_course_id());
 			$link->set_category_id($category_object[0]->get_id());
 		} else {
@@ -52,12 +52,12 @@ 
 			} else {
 				$select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
 				foreach ($link->get_all_links() as $newlink) {
-					$select->addoption($newlink[1],$newlink[0]);
+					$select->addoption($newlink[1], $newlink[0]);
 				}
 			}
 		} else {
-			$this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
-			$this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
+			$this->addElement('label', get_lang('Name'), '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
+			$this->addElement('hidden', 'name_link', $link->get_name(), array('id'=>'name_link'));
 		}
 
 		if (count($category_object) == 1) {
@@ -80,7 +80,7 @@ 
 						$grade_model_id = $my_cat->get_grade_model_id();
 						if (empty($grade_model_id)) {
 
-							if ($my_cat->get_parent_id() == 0 ) {
+							if ($my_cat->get_parent_id() == 0) {
 								$default_weight = $my_cat->get_weight();
 								$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
 							} else {
@@ -119,8 +119,8 @@ 
             'class' => 'span1'
         ));*/
 
-		$this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
-		$this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+		$this->addRule('weight_mask', get_lang('OnlyNumbers'), 'numeric');
+		$this->addRule(array('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
 		if ($form_type == self :: TYPE_EDIT) {
 			$parent_cat = Category :: load($link->get_category_id());
 
@@ -133,20 +133,20 @@ 
 				//var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
 				//$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
 				//$values['weight'] = $weight;
-				$values['weight'] = $link->get_weight() ;
+				$values['weight'] = $link->get_weight();
 			}
-			$defaults['weight_mask'] = $values['weight'] ;
+			$defaults['weight_mask'] = $values['weight'];
 			$defaults['select_gradebook'] = $link->get_category_id();
 
 		}
 		// ELEMENT: max
 		if ($link->needs_max()) {
 			if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
-				$this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
+				$this->addText('max', get_lang('QualificationNumeric'), false, array('size' => '4', 'maxlength' => '5', 'disabled' => 'disabled'));
 			} else {
-				$this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
+				$this->addText('max', get_lang('QualificationNumeric'), true, array('size' => '4', 'maxlength' => '5'));
 				$this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+				$this->addRule(array('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
 			}
 			if ($form_type == self :: TYPE_EDIT) {
 				$defaults['max'] = $link->get_max();
@@ -155,7 +155,7 @@ 
 
 		// ELEMENT: description
 		if ($link->needs_name_and_description()) {
-			$this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
+			$this->addElement('textarea', 'description', get_lang('Description'), array('rows' => '3', 'cols' => '34'));
 			if ($form_type == self :: TYPE_EDIT) {
 				$defaults['description'] = $link->get_description();
 			}
@@ -185,7 +185,7 @@ 
 			if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
 				$visibility_default = 0;
 			}
-			$defaults['visible']  = $visibility_default;
+			$defaults['visible'] = $visibility_default;
 		}
 
 		// set default values

main/gradebook/lib/fe/flatviewtable.class.php

Spacing +15 added lines, -15 removed lines

@@ -201,9 +201,9 @@ 
             $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
             $chartHash = $myCache->getHash($dataSet);
             if ($myCache->isInCache($chartHash)) {
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             } else {
                 /* Create the pChart object */
                 $widthSize = 480;
@@ -230,7 +230,7 @@ 
                 /* Set the default font */
                 $myPicture->setFontProperties(
                     array(
-                        'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                        'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                         'FontSize' => 10
                     )
                 );
@@ -302,11 +302,11 @@ 
                 /* Render the picture (choose the best way) */
 
                 $myCache->writeToCache($chartHash, $myPicture);
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             }
-            echo '<img src="' . $imgPath . '" >';
+            echo '<img src="'.$imgPath.'" >';
             if ($i % 2 == 0 && $i != 0) {
                 echo '<br /><br />';
             } else {
@@ -349,10 +349,10 @@ 
             // previous X
             $header .= '<td style="width:100%;">';
             if ($this->offset >= GRADEBOOK_ITEM_LIMIT) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . (($this->offset) - GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.(($this->offset) - GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)
                     . '</a>';
             } else {
@@ -364,10 +364,10 @@ 
                 ($totalitems - (GRADEBOOK_ITEM_LIMIT + $this->offset)) : GRADEBOOK_ITEM_LIMIT;
 
             if ($calcnext > 0) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . ($this->offset + GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.($this->offset + GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
                     . '</a>';
             } else {
@@ -475,6 +475,6 @@ 
      */
     private function build_name_link($user_id, $name)
     {
-        return '<a href="user_stats.php?userid=' . $user_id . '&selectcat=' . $this->selectcat->get_id() . '&'.api_get_cidreq().'">' . $name . '</a>';
+        return '<a href="user_stats.php?userid='.$user_id.'&selectcat='.$this->selectcat->get_id().'&'.api_get_cidreq().'">'.$name.'</a>';
     }
 }

main/gradebook/lib/fe/dataform.class.php

Spacing +14 added lines, -14 removed lines

@@ -21,9 +21,9 @@ 
 	 * @param method
 	 * @param action
 	 */
-	public function DataForm($form_type, $form_name, $method = 'post', $action = null, $target='', $locked_status)
+	public function DataForm($form_type, $form_name, $method = 'post', $action = null, $target = '', $locked_status)
 	{
-		parent :: __construct($form_name, $method, $action,$target);
+		parent :: __construct($form_name, $method, $action, $target);
 		$this->form_type = $form_type;
 		if ($this->form_type == self :: TYPE_IMPORT) {
 			$this->build_import_form();
@@ -41,13 +41,13 @@ 
 
 	protected function build_pdf_export_form()
 	{
-		$renderer =& $this->defaultRenderer();
+		$renderer = & $this->defaultRenderer();
 		$renderer->setCustomElementTemplate('<span>{element}</span>');
 		$this->addElement('header', get_lang('ChooseOrientation'));
 		$this->addElement('radio', 'orientation', null, get_lang('Portrait'), 'portrait');
 		$this->addElement('radio', 'orientation', null, get_lang('Landscape'), 'landscape');
 		$this->addButtonExport(get_lang('Export'));
-		$this->setDefaults(array (
+		$this->setDefaults(array(
 			'orientation' => 'portrait'
 		));
 	}
@@ -59,19 +59,19 @@ 
 		$this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
 		$this->addElement('radio', 'file_type', null, 'PDF (Portable Document Format)', 'pdf');
 		$this->addButtonExport(get_lang('Export'));
-		$this->setDefaults(array (
+		$this->setDefaults(array(
 			'file_type' => 'csv'
 		));
 	}
 
-	protected function build_export_form_option($show_pdf=true)
+	protected function build_export_form_option($show_pdf = true)
 	{
 		$this->addElement('header', get_lang('ChooseFormat'));
 		$this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
 		$this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
-		$this->addElement('radio', 'file_type', Display::return_icon('info3.gif',get_lang('ToExportMustLockEvaluation')), 'PDF (Portable Document Format)', 'pdf', array('disabled'));
+		$this->addElement('radio', 'file_type', Display::return_icon('info3.gif', get_lang('ToExportMustLockEvaluation')), 'PDF (Portable Document Format)', 'pdf', array('disabled'));
 		$this->addButtonExport(get_lang('Export'));
-		$this->setDefaults(array (
+		$this->setDefaults(array(
 			'file_type' => 'csv'
 		));
 	}
@@ -80,16 +80,16 @@ 
 	{
 		$this->addElement('hidden', 'formSent');
 		$this->addElement('header', get_lang('ImportFileLocation'));
-		$this->addElement('file', 'import_file',get_lang('Location'));
-		$allowed_file_types = array (
+		$this->addElement('file', 'import_file', get_lang('Location'));
+		$allowed_file_types = array(
 			'xml',
 			'csv'
 		);
 		//$this->addRule('file', get_lang('InvalidExtension') . ' (' . implode(',', $allowed_file_types) . ')', 'filetype', $allowed_file_types);
-		$this->addElement('radio', 'file_type', get_lang('FileType'), 'CSV (<a href="docs/example_csv.html" target="_blank">' . get_lang('ExampleCSVFile') . '</a>)', 'csv');
-		$this->addElement('radio', 'file_type', null, 'XML (<a href="docs/example_xml.html" target="_blank">' . get_lang('ExampleXMLFile') . '</a>)', 'xml');
-		$this->addElement('checkbox','overwrite', null,get_lang('OverwriteScores'));
-		$this->addElement('checkbox','ignoreerrors',null,get_lang('IgnoreErrors'));
+		$this->addElement('radio', 'file_type', get_lang('FileType'), 'CSV (<a href="docs/example_csv.html" target="_blank">'.get_lang('ExampleCSVFile').'</a>)', 'csv');
+		$this->addElement('radio', 'file_type', null, 'XML (<a href="docs/example_xml.html" target="_blank">'.get_lang('ExampleXMLFile').'</a>)', 'xml');
+		$this->addElement('checkbox', 'overwrite', null, get_lang('OverwriteScores'));
+		$this->addElement('checkbox', 'ignoreerrors', null, get_lang('IgnoreErrors'));
 		$this->addButtonImport(get_lang('Ok'));
 		$this->setDefaults(array(
 			'formSent' => '1',

main/gradebook/lib/fe/usertable.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	public function UserTable($userid, $evals = array(), $links = array(), $addparams = null)
 	{
-		parent :: __construct ('userlist', null, null, 0);
+		parent :: __construct('userlist', null, null, 0);
 		$this->userid = $userid;
 		$this->datagen = new UserDataGenerator($userid, $evals, $links);
 		if (isset($addparams)) {
@@ -87,8 +87,8 @@ 
 		// generate the data to display
 		$sortable_data = array();
 		foreach ($data_array as $data) {
-			if ($data[2]!="") {//filter by course removed
-				$row = array ();
+			if ($data[2] != "") {//filter by course removed
+				$row = array();
 				$row[] = $this->build_type_column($data[0]);
 				$row[] = $this->build_name_link($data[0]);
 				$row[] = $data[2];
@@ -123,15 +123,15 @@ 
 			// evaluation
 			case 'E' :
 				return ' '
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+				. '<a href="gradebook_view_result.php?selecteval='.$item->get_id().'">'
 				. $item->get_name()
 				. '</a>';
 			// link
 			case 'L' :
-				return '&nbsp;<a href="' . $item->get_link() . '">'
+				return '&nbsp;<a href="'.$item->get_link().'">'
 				. $item->get_name()
 				. '</a>'
-				. '&nbsp;[' . $item->get_type_name() . ']';
+				. '&nbsp;['.$item->get_type_name().']';
 		}
 	}
 }

main/gradebook/lib/fe/evalform.class.php

Spacing +52 added lines, -52 removed lines

@@ -91,7 +91,7 @@ 
             'onchange' => 'document.add_users_to_evaluation.submit()'
         ));
         $select->addOption('', '');
-        for ($i = 65; $i <= 90; $i ++) {
+        for ($i = 65; $i <= 90; $i++) {
             $letter = chr($i);
             if (isset($this->extra) && $this->extra == $letter) {
                 $select->addOption($letter, $letter, 'selected');
@@ -106,7 +106,7 @@ 
         ));
         foreach ($this->evaluation_object->get_not_subscribed_students() as $user) {
             if ((!isset($this->extra)) || empty($this->extra) || api_strtoupper(api_substr($user[1], 0, 1)) == $this->extra) {
-                $select->addoption($user[1] . ' ' . $user[2] . ' (' . $user[3] . ')', $user[0]);
+                $select->addoption($user[1].' '.$user[2].' ('.$user[3].')', $user[0]);
             }
         }
         $this->addButtonCreate(get_lang('AddUserToEval'), 'submit_button');
@@ -134,21 +134,21 @@ 
         if (api_is_western_name_order()) {
             $renderer->setHeaderTemplate(
                     '<tr>
-    		       <th>' . get_lang('OfficialCode') . '</th>
-    		      <th>' . get_lang('UserName') . '</th>
-    		      <th>' . get_lang('FirstName') . '</th>
-    		      <th>' . get_lang('LastName') . '</th>
-    		      <th>' . get_lang('Qualify') . '</th>
+    		       <th>' . get_lang('OfficialCode').'</th>
+    		      <th>' . get_lang('UserName').'</th>
+    		      <th>' . get_lang('FirstName').'</th>
+    		      <th>' . get_lang('LastName').'</th>
+    		      <th>' . get_lang('Qualify').'</th>
     		   </tr>'
             );
         } else {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         }
@@ -174,33 +174,33 @@ 
             $result = $result_and_user['result'];
 
             $renderer = &$this->defaultRenderer();
-            $this->addText('score[' . $result->get_id() . ']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
+            $this->addText('score['.$result->get_id().']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
                 'maxlength' => 5));
 
-            $this->addRule('score[' . $result->get_id() . ']', get_lang('OnlyNumbers'), 'numeric');
+            $this->addRule('score['.$result->get_id().']', get_lang('OnlyNumbers'), 'numeric');
             $this->addRule(array(
-                'score[' . $result->get_id() . ']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
+                'score['.$result->get_id().']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
             $this->addRule(array(
-                'score[' . $result->get_id() . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
-            $defaults['score[' . $result->get_id() . ']'] = $result->get_score();
+                'score['.$result->get_id().']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
+            $defaults['score['.$result->get_id().']'] = $result->get_score();
 
             if (api_is_western_name_order()) {
-                $user_info = '<td align="left" >' . $user['firstname'] . '</td>';
-                $user_info .= '<td align="left" >' . $user['lastname'] . '</td>';
+                $user_info = '<td align="left" >'.$user['firstname'].'</td>';
+                $user_info .= '<td align="left" >'.$user['lastname'].'</td>';
             } else {
-                $user_info = '<td align="left" >' . $user['lastname'] . '</td>';
-                $user_info .= '<td align="left" >' . $user['firstname'] . '</td>';
+                $user_info = '<td align="left" >'.$user['lastname'].'</td>';
+                $user_info .= '<td align="left" >'.$user['firstname'].'</td>';
             }
 
             $template = '<tr>
-		      <td align="left" >' . $user['official_code'] . '</td>
-		      <td align="left" >' . $user['username'] . '</td>
-		      ' . $user_info . '
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
+		      <td align="left" >' . $user['official_code'].'</td>
+		      <td align="left" >' . $user['username'].'</td>
+		      ' . $user_info.'
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 		      </td>
 		   </tr>';
-            $renderer->setElementTemplate($template, 'score[' . $result->get_id() . ']');
+            $renderer->setElementTemplate($template, 'score['.$result->get_id().']');
         }
         $this->setDefaults($defaults);
         $this->addButtonSave(get_lang('EditResult'), 'submit');
@@ -215,15 +215,15 @@ 
     {
         $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
-        $this->addElement('static', null, null, '"' . $this->evaluation_object->get_name() . '" ');
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
+        $this->addElement('static', null, null, '"'.$this->evaluation_object->get_name().'" ');
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
         $line = '';
         foreach ($this->evaluation_object->get_target_categories() as $cat) {
             for ($i = 0; $i < $cat[2]; $i++) {
                 $line .= '&mdash;';
             }
-            $select->addoption($line . ' ' . $cat[1], $cat[0]);
+            $select->addoption($line.' '.$cat[1], $cat[0]);
             $line = '';
         }
         $this->addButtonSave(get_lang('Ok'), 'submit');
@@ -253,21 +253,21 @@ 
         if (api_is_western_name_order()) {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         } else {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         }
@@ -275,7 +275,7 @@ 
         $firstUser = true;
         foreach ($tblusers as $user) {
 
-            $element_name = 'score[' . $user[0] . ']';
+            $element_name = 'score['.$user[0].']';
 
             $scoreColumnProperties = array('maxlength' => 5);
             if ($firstUser) {
@@ -290,19 +290,19 @@ 
             $this->addRule(array($element_name, 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
 
             if (api_is_western_name_order()) {
-                $user_info = '<td align="left" >' . $user[3] . '</td>';
-                $user_info .= '<td align="left" >' . $user[2] . '</td>';
+                $user_info = '<td align="left" >'.$user[3].'</td>';
+                $user_info .= '<td align="left" >'.$user[2].'</td>';
             } else {
-                $user_info = '<td align="left" >' . $user[2] . '</td>';
-                $user_info .= '<td align="left" >' . $user[3] . '</td>';
+                $user_info = '<td align="left" >'.$user[2].'</td>';
+                $user_info .= '<td align="left" >'.$user[3].'</td>';
             }
             $nr_users++;
 
             $template = '<tr>
-		      <td align="left" >' . $user[4] . '</td>
-		      <td align="left" >' . $user[1] . '</td>
-		      ' . $user_info . '
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
+		      <td align="left" >' . $user[4].'</td>
+		      <td align="left" >' . $user[1].'</td>
+		      ' . $user_info.'
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 		      </td>
             </tr>';
@@ -336,7 +336,7 @@ 
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement('label', get_lang('User'), $userinfo['complete_name']);
 
-        $this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array(
+        $this->addText('score', array(get_lang('Score'), null, '/ '.$this->evaluation_object->get_max()), false, array(
             'size' => '4',
             'class' => 'span1',
             'maxlength' => '5'
@@ -471,7 +471,7 @@ 
             }
         }
 
-        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">' . $all_categories[0]->get_weight() . '</span>] '), true, array(
+        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$all_categories[0]->get_weight().'</span>] '), true, array(
             'size' => '4',
             'maxlength' => '5',
             'class' => 'span1'
@@ -543,11 +543,11 @@ 
             $link = LinkFactory :: get_evaluation_link($this->evaluation_object->get_id());
             $doc_url = $link->get_view_url($id);
             if ($doc_url != null) {
-                $opendocurl_start .= '<a href="' . $doc_url . '" target="_blank">';
+                $opendocurl_start .= '<a href="'.$doc_url.'" target="_blank">';
                 $opendocurl_end = '</a>';
             }
         }
-        return $opendocurl_start . api_get_person_name($firstname, $lastname) . ' (' . $username . ')' . $opendocurl_end;
+        return $opendocurl_start.api_get_person_name($firstname, $lastname).' ('.$username.')'.$opendocurl_end;
     }
 
     function sort_by_user($item1, $item2)