chamilo / chamilo-lms

main/gradebook/gradebook_edit_link.php

Spacing +11 added lines, -11 removed lines

@@ -11,20 +11,20 @@ 
 GradebookUtils::block_students();
 $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 //selected name of database
-$course_id              = GradebookUtils::get_course_id_by_link_id($_GET['editlink']);
-$tbl_forum_thread 		= Database :: get_course_table(TABLE_FORUM_THREAD);
-$tbl_work 				= Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-$tbl_attendance 		= Database :: get_course_table(TABLE_ATTENDANCE);
+$course_id = GradebookUtils::get_course_id_by_link_id($_GET['editlink']);
+$tbl_forum_thread = Database :: get_course_table(TABLE_FORUM_THREAD);
+$tbl_work = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 
-$linkarray 				= LinkFactory :: load($_GET['editlink']);
+$linkarray = LinkFactory :: load($_GET['editlink']);
 /** @var AbstractLink $link */
 $link = $linkarray[0];
 if ($link->is_locked() && !api_is_platform_admin()) {
     api_not_allowed();
 }
 
-$linkcat  = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']):'';
-$linkedit = isset($_GET['editlink']) ? Security::remove_XSS($_GET['editlink']):'';
+$linkcat  = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
+$linkedit = isset($_GET['editlink']) ? Security::remove_XSS($_GET['editlink']) : '';
 
 $session_id = api_get_session_id();
 if ($session_id == 0) {
@@ -39,7 +39,7 @@ 
     null,
     $link,
     'edit_link_form',
-    api_get_self() . '?selectcat=' . $linkcat. '&editlink=' . $linkedit.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.$linkcat.'&editlink='.$linkedit.'&'.api_get_cidreq()
 );
 if ($form->validate()) {
     $values = $form->exportValues();
@@ -58,7 +58,7 @@ 
     //Update weight for attendance
     $sql = 'SELECT ref_id FROM '.$tbl_grade_links.'
             WHERE id = '.intval($_GET['editlink']).' AND type='.LINK_ATTENDANCE;
-    $rs_attendance  = Database::query($sql);
+    $rs_attendance = Database::query($sql);
     if (Database::num_rows($rs_attendance) > 0) {
         $row_attendance = Database::fetch_array($rs_attendance);
         $attendance_id  = $row_attendance['ref_id'];
@@ -81,11 +81,11 @@ 
               weight='.$final_weight.'
 			  WHERE c_id = '.$course_id.' AND id = (
 			    SELECT ref_id FROM '.$tbl_grade_links.'
-			    WHERE id='.intval($_GET['editlink'] ).' AND type=3
+			    WHERE id='.intval($_GET['editlink']).' AND type=3
               )';
 
     Database::query($sql_t);
-    header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat=' . $link->get_category_id().'&'.api_get_cidreq());
+    header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat='.$link->get_category_id().'&'.api_get_cidreq());
     exit;
 }
 

main/gradebook/gradebook_add_user.php

Spacing +19 added lines, -19 removed lines

@@ -14,59 +14,59 @@
 api_block_anonymous_users();
 GradebookUtils::block_students();
 
-$evaluation= Evaluation :: load($_GET['selecteval']);
+$evaluation = Evaluation :: load($_GET['selecteval']);
 $newstudents = $evaluation[0]->get_not_subscribed_students();
 
 if (count($newstudents) == '0') {
-	header('Location: gradebook_view_result.php?nouser=&selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
+	header('Location: gradebook_view_result.php?nouser=&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
 	exit;
 }
-$add_user_form= new EvalForm(EvalForm :: TYPE_ADD_USERS_TO_EVAL,
+$add_user_form = new EvalForm(EvalForm :: TYPE_ADD_USERS_TO_EVAL,
 							 $evaluation[0],
 							 null,
 							 'add_users_to_evaluation',
 							 null,
-							 api_get_self() . '?selecteval=' . Security::remove_XSS($_GET['selecteval']),
+							 api_get_self().'?selecteval='.Security::remove_XSS($_GET['selecteval']),
 							 Security::remove_XSS($_GET['firstletter']),
 							 $newstudents);
 
-if ( isset($_POST['submit_button']) ) {
-	$users= is_array($_POST['add_users']) ? $_POST['add_users'] : array ();
-	foreach ($users as $key => $value){
-		$users[$key]= intval($value);
+if (isset($_POST['submit_button'])) {
+	$users = is_array($_POST['add_users']) ? $_POST['add_users'] : array();
+	foreach ($users as $key => $value) {
+		$users[$key] = intval($value);
 	}
 
 	if (count($users) == 0) {
-		header('Location: ' . api_get_self() . '?erroroneuser=&selecteval=' .Security::remove_XSS($_GET['selecteval']));
+		header('Location: '.api_get_self().'?erroroneuser=&selecteval='.Security::remove_XSS($_GET['selecteval']));
 		exit;
 	} else {
 		foreach ($users as $user_id) {
-			$result= new Result();
+			$result = new Result();
 			$result->set_user_id($user_id);
 			$result->set_evaluation_id($_GET['selecteval']);
 			$result->add();
 			}
 		}
-	header('Location: gradebook_view_result.php?adduser=&selecteval=' .Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
+	header('Location: gradebook_view_result.php?adduser=&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
 	exit;
 	} elseif ($_POST['firstLetterUser']) {
-		$firstletter= $_POST['firstLetterUser'];
+		$firstletter = $_POST['firstLetterUser'];
 		if (!empty ($firstletter)) {
-			header('Location: ' . api_get_self() . '?firstletter=' . Security::remove_XSS($firstletter) . '&selecteval=' . Security::remove_XSS($_GET['selecteval']));
+			header('Location: '.api_get_self().'?firstletter='.Security::remove_XSS($firstletter).'&selecteval='.Security::remove_XSS($_GET['selecteval']));
 			exit;
 		}
 }
 
-$interbreadcrumb[]= array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('Gradebook'));
-$interbreadcrumb[]= array(
-	'url' => 'gradebook_view_result.php?selecteval=' .Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']), 'name' => get_lang('Gradebook'));
+$interbreadcrumb[] = array(
+	'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
 	'name' => get_lang('ViewResult')
 );
 Display :: display_header(get_lang('AddUserToEval'));
-if (isset ($_GET['erroroneuser'])){
-	Display :: display_warning_message(get_lang('AtLeastOneUser'),false);
+if (isset ($_GET['erroroneuser'])) {
+	Display :: display_warning_message(get_lang('AtLeastOneUser'), false);
 }
-DisplayGradebook :: display_header_result($evaluation[0], null, 0,0);
+DisplayGradebook :: display_header_result($evaluation[0], null, 0, 0);
 echo '<div class="main">';
 echo $add_user_form->toHtml();
 echo '</div>';

main/gradebook/user_stats.php

Spacing +13 added lines, -13 removed lines

@@ -16,7 +16,7 @@ 
 if (!$isDrhOfCourse) {
     GradebookUtils::block_students();
 }
-$interbreadcrumb[]= array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'],
     'name' => get_lang('Gradebook'
 ));
@@ -27,12 +27,12 @@ 
 $alllinks = $category[0]->get_links($my_user_id, true);
 
 if ($_GET['selectcat'] != null) {
-    $addparams= array (
+    $addparams = array(
         'userid' => $my_user_id,
         'selectcat' => Security::remove_XSS($_GET['selectcat'])
     );
 } else {
-    $addparams= array (
+    $addparams = array(
         'userid' => $my_user_id,
         'selecteval' => Security::remove_XSS($_GET['selecteval'])
     );
@@ -49,7 +49,7 @@ 
         $newarray[] = array_slice($data, 1);
     }
     $userinfo = api_get_user_info($my_user_id);
-    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')';
+    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')';
 
     if ($displayscore->is_custom()) {
         $header_names = array(
@@ -95,23 +95,23 @@ 
 $actions = '<div class="actions">';
 
 if (isset($_GET['selectcat'])) {
-    $interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
-    $actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'',ICON_SIZE_MEDIUM).'</a>';
+    $interbreadcrumb[] = array('url' => 'gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
+    $actions .= '<a href=gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'>'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
 if (isset ($_GET['selecteval'])) {
-    $interbreadcrumb[]= array (
-        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
+    $interbreadcrumb[] = array(
+        'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']),
         'name' => get_lang('ViewResult'
     ));
-    $actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '>
-	'.Display::return_icon('back.png', get_lang('BackToEvaluation'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actions .= '<a href=gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'>
+	'.Display::return_icon('back.png', get_lang('BackToEvaluation'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
-$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank">
-' . Display::return_icon('pdf.png', get_lang('ExportPDF'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions .= '<a href="'.api_get_self().'?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat='.$category[0]->get_id().'" target="_blank">
+' . Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
-$actions.='</div>';
+$actions .= '</div>';
 
 Display :: display_header(get_lang('ResultsPerUser'));
 echo $actions;

main/gradebook/get_badges.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 foreach ($userSkills as $skill) {
     $skillId = current($skill);
 
-    $assertionUrl = api_get_path(WEB_CODE_PATH) . "badge/assertion.php?";
+    $assertionUrl = api_get_path(WEB_CODE_PATH)."badge/assertion.php?";
     $assertionUrl .= http_build_query(array(
         'user' => $userId,
         'skill' => $skillId,
@@ -51,14 +51,14 @@ 
     $backpack = $configBackpack;
 }
 
-$htmlHeadXtra[] = '<script src="' . $backpack . 'issuer.js"></script>';
+$htmlHeadXtra[] = '<script src="'.$backpack.'issuer.js"></script>';
 
 $tpl = new Template(get_lang('Badges'), false, false);
 
 $tpl->assign(
     'content',
     "<script>"
-    . "$(document).on('ready', function (){ OpenBadges.issue_no_modal(" . json_encode($assertions) . "); });"
+    . "$(document).on('ready', function (){ OpenBadges.issue_no_modal(".json_encode($assertions)."); });"
     . "</script>"
 );
 

main/gradebook/gradebook_add_result.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  */
 //$cidReset = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 api_block_anonymous_users();
@@ -23,14 +23,14 @@ 
     $resultadd,
     'add_result_form',
     null,
-    api_get_self() . '?selectcat=' . Security::remove_XSS($category) . '&selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.Security::remove_XSS($category).'&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq()
 );
 $table = $add_result_form->toHtml();
 if ($add_result_form->validate()) {
     $values = $add_result_form->exportValues();
     $nr_users = $values['nr_users'];
     if ($nr_users == '0') {
-        header('Location: gradebook_view_result.php?addresultnostudents=&selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
+        header('Location: gradebook_view_result.php?addresultnostudents=&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
         exit;
     }
     $scores = ($values['score']);
@@ -43,7 +43,7 @@ 
         $res->add();
         next($scores);
     }
-    header('Location: gradebook_view_result.php?addresult=&selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
+    header('Location: gradebook_view_result.php?addresult=&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
     exit;
 }
 $interbreadcrumb[] = array(
@@ -51,6 +51,6 @@ 
     'name' => get_lang('Gradebook')
 );
 Display :: display_header(get_lang('AddResult'));
-DisplayGradebook :: display_header_result ($evaluation[0], null, 0,0);
+DisplayGradebook :: display_header_result($evaluation[0], null, 0, 0);
 echo $table;
 Display :: display_footer();

main/gradebook/gradebook_add_eval.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
     null,
     'add_eval_form',
     null,
-    api_get_self() . '?selectcat=' . $select_cat.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
 );
 
 if ($form->validate()) {
@@ -69,23 +69,23 @@ 
             //header('Location: gradebook_add_user.php?selecteval=' . $eval->get_id());
             exit;
         } else {
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
             exit;
         }
     } else {
         $val_addresult = isset($values['addresult']) ? $values['addresult'] : null;
         if ($val_addresult == 1) {
-            header('Location: gradebook_add_result.php?selecteval=' . $eval->get_id().'&'.api_get_cidreq());
+            header('Location: gradebook_add_result.php?selecteval='.$eval->get_id().'&'.api_get_cidreq());
             exit;
         } else {
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
             exit;
         }
     }
 }
 
 $interbreadcrumb[] = array(
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $select_cat.'&'.api_get_cidreq(),
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$select_cat.'&'.api_get_cidreq(),
     'name' => get_lang('Gradebook'))
 ;
 $this_section = SECTION_COURSES;
@@ -96,7 +96,7 @@ 
        $("#hid_category_id option:selected").each(function () {
            var cat_id = $(this).val();
             $.ajax({
-                url: "' . api_get_path(WEB_AJAX_PATH) . 'gradebook.ajax.php?a=get_gradebook_weight",
+                url: "' . api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight",
                 data: "cat_id="+cat_id,
                 success: function(return_value) {
                     if (return_value != 0 ) {

main/gradebook/gradebook_add_link_select_course.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 api_block_anonymous_users();
@@ -16,13 +16,13 @@ 
 $catadd = new Category();
 $catadd->set_user_id(api_get_user_id());
 $catadd->set_parent_id($_GET['selectcat']);
-$catcourse = Category :: load ($_GET['selectcat']);
+$catcourse = Category :: load($_GET['selectcat']);
 $form = new CatForm(
     CatForm :: TYPE_SELECT_COURSE,
     $catadd,
     'add_cat_form',
     null,
-    api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq()
 );
 
 if ($form->validate()) {
@@ -30,11 +30,11 @@ 
     $cat = new Category();
     $cat->set_course_code($values['select_course']);
     $cat->set_name($values['name']);
-    header('location: gradebook_add_link.php?selectcat=' .Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']).'&'.api_get_cidreq());
+    header('location: gradebook_add_link.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']).'&'.api_get_cidreq());
     exit;
 }
 
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq(),
     'name' => get_lang('Gradebook')
 );

main/gradebook/lib/user_data_generator.class.php

Spacing +25 added lines, -25 removed lines

@@ -50,9 +50,9 @@ 
 
         }
         if (count($result) == 0) {
-            $evals_filtered=$evals;
+            $evals_filtered = $evals;
         } else {
-            $evals_filtered=$evals_filtered_copy;
+            $evals_filtered = $evals_filtered_copy;
         }
         $this->items = array_merge($evals_filtered, $links);
 
@@ -85,7 +85,7 @@ 
 	{
 		// do some checks on count, redefine if invalid value
 		if (!isset($count)) {
-			$count = count ($this->items) - $start;
+			$count = count($this->items) - $start;
 		}
 		if ($count < 0) {
 			$count = 0;
@@ -104,20 +104,20 @@ 
 		} elseif ($sorting & self :: UDG_SORT_AVERAGE) {
 			// if user sorts on average scores, first calculate them and cache them
 			foreach ($allitems as $item) {
-				$this->avgcache[$item->get_item_type() . $item->get_id()]= $item->calc_score();
+				$this->avgcache[$item->get_item_type().$item->get_id()] = $item->calc_score();
 			}
 			usort($allitems, array('UserDataGenerator', 'sort_by_average'));
 		} elseif ($sorting & self :: UDG_SORT_SCORE) {
 			// if user sorts on student's scores, first calculate them and cache them
 			foreach ($allitems as $item) {
-				$this->scorecache[$item->get_item_type() . $item->get_id()]
+				$this->scorecache[$item->get_item_type().$item->get_id()]
 					= $item->calc_score($this->userid);
 			}
 			usort($allitems, array('UserDataGenerator', 'sort_by_score'));
 		} elseif ($sorting & self :: UDG_SORT_MASK) {
 			// if user sorts on student's masks, first calculate scores and cache them
 			foreach ($allitems as $item) {
-				$this->scorecache[$item->get_item_type() . $item->get_id()]
+				$this->scorecache[$item->get_item_type().$item->get_id()]
 					= $item->calc_score($this->userid);
 			}
 			usort($allitems, array('UserDataGenerator', 'sort_by_mask'));
@@ -132,7 +132,7 @@ 
 		// fill score cache if not done yet
 		if (!isset ($this->scorecache)) {
 			foreach ($visibleitems as $item) {
-				$this->scorecache[$item->get_item_type() . $item->get_id()]
+				$this->scorecache[$item->get_item_type().$item->get_id()]
 					= $item->calc_score($this->userid);
 			}
 
@@ -141,7 +141,7 @@ 
 		$scoredisplay = ScoreDisplay :: instance();
 		$data = array();
 		foreach ($visibleitems as $item) {
-			$row = array ();
+			$row = array();
 			$row[] = $item;
 			$row[] = $item->get_name();
 			$row[] = $this->build_course_name($item);
@@ -163,7 +163,7 @@ 
 	function sort_by_type($item1, $item2)
 	{
 		if ($item1->get_item_type() == $item2->get_item_type()) {
-			return $this->sort_by_name($item1,$item2);
+			return $this->sort_by_name($item1, $item2);
 		} else {
 			return ($item1->get_item_type() < $item2->get_item_type() ? -1 : 1);
 		}
@@ -203,7 +203,7 @@ 
 	 */
 	function sort_by_name($item1, $item2)
 	{
-		return api_strnatcmp($item1->get_name(),$item2->get_name());
+		return api_strnatcmp($item1->get_name(), $item2->get_name());
 	}
 
 	/**
@@ -213,8 +213,8 @@ 
 	 */
 	function sort_by_average($item1, $item2)
 	{
-		$score1 = $this->avgcache[$item1->get_item_type() . $item1->get_id()];
-		$score2 = $this->avgcache[$item2->get_item_type() . $item2->get_id()];
+		$score1 = $this->avgcache[$item1->get_item_type().$item1->get_id()];
+		$score2 = $this->avgcache[$item2->get_item_type().$item2->get_id()];
 
 		return $this->compare_scores($score1, $score2);
 	}
@@ -226,8 +226,8 @@ 
 	 */
 	function sort_by_score($item1, $item2)
 	{
-		$score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
-		$score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
+		$score1 = $this->scorecache[$item1->get_item_type().$item1->get_id()];
+		$score2 = $this->scorecache[$item2->get_item_type().$item2->get_id()];
 
 		return $this->compare_scores($score1, $score2);
 	}
@@ -239,8 +239,8 @@ 
 	 */
 	function sort_by_mask($item1, $item2)
 	{
-		$score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
-		$score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
+		$score1 = $this->scorecache[$item1->get_item_type().$item1->get_id()];
+		$score2 = $this->scorecache[$item2->get_item_type().$item2->get_id()];
 
 		return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
 	}
@@ -256,10 +256,10 @@ 
 			return (isset($score2) ? 1 : 0);
 		} elseif (!isset($score2)) {
 			return -1;
-		} elseif (($score1[0]/$score1[1]) == ($score2[0]/$score2[1])) {
+		} elseif (($score1[0] / $score1[1]) == ($score2[0] / $score2[1])) {
 			return 0;
 		} else {
-			return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
+			return (($score1[0] / $score1[1]) < ($score2[0] / $score2[1]) ? -1 : 1);
 		}
 	}
 
@@ -291,7 +291,7 @@ 
 	private function build_average_column($item, $ignore_score_color)
 	{
 		if (isset($this->avgcache)) {
-			$avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()];
+			$avgscore = $this->avgcache[$item->get_item_type().$item->get_id()];
 		} else {
 			$avgscore = $item->calc_score();
 		}
@@ -311,7 +311,7 @@ 
 	 */
 	private function build_result_column($item, $ignore_score_color)
 	{
-		$studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
+		$studscore = $this->scorecache[$item->get_item_type().$item->get_id()];
 		$scoredisplay = ScoreDisplay :: instance();
 		$displaytype = SCORE_DIV_PERCENT;
 		if ($ignore_score_color) {
@@ -328,7 +328,7 @@ 
 	 */
 	private function build_mask_column($item, $ignore_score_color)
 	{
-		$studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
+		$studscore = $this->scorecache[$item->get_item_type().$item->get_id()];
 		$scoredisplay = ScoreDisplay :: instance();
 		$displaytype = SCORE_DIV_PERCENT;
 		if ($ignore_score_color) {
@@ -362,12 +362,12 @@ 
 		if (isset ($this->categorycache)
 			&& isset ($this->categorycache[$category_id])) {
 			return $this->categorycache[$category_id];
-		}else {
+		} else {
 			$cat = Category::load($category_id);
-			if (isset($cat)){
+			if (isset($cat)) {
 				$this->categorycache[$category_id] = $cat[0];
 				return $cat[0];
-			}else
+			} else
 				return null;
 		}
 	}
@@ -379,7 +379,7 @@ 
 	private function get_category_name_to_display($cat)
 	{
 		if (isset($cat)) {
-			if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null){
+			if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null) {
 				return '';
 			} else {
 				return $cat->get_name();

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);
 	}