From 67f2423401c6ad402bf408208e9dfa42703d6f1f Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 18 Mar 2010 15:42:17 -0500
Subject: [PATCH 1/2] Fixing typo

---
 main/inc/lib/online.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/online.inc.php b/main/inc/lib/online.inc.php
index b9aa62eac1..5e5190fe5d 100755
--- a/main/inc/lib/online.inc.php
+++ b/main/inc/lib/online.inc.php
@@ -191,7 +191,7 @@ function who_is_online($valid, $friends = false) {
 	}
 }
 
-function who_is_online_Count($valid, $friends = false) {
+function who_is_online_count($valid, $friends = false) {
 	$valid = (int) $valid;
 	$current_date		= date('Y-m-d H:i:s',time());
 	$track_online_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ONLINE);
@@ -205,7 +205,7 @@ function who_is_online_Count($valid, $friends = false) {
 				  WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."'  AND relation_type='".USER_RELATION_TYPE_FRIEND."' AND user_id = '".api_get_user_id()."' ";
 	} else {
 		// all users online
-		$query = "SELECT count(login_id) FROM ".$track_online_table ." WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."'  "; //WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."'		
+		$query = "SELECT count(login_id) as count FROM ".$track_online_table ." WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."'  "; //WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."'		
 	}
 
 	global $_configuration;
@@ -228,7 +228,7 @@ function who_is_online_Count($valid, $friends = false) {
 	}
 	$result = Database::query($query);	
 	if (Database::num_rows($result) > 0) {		
-		$row = Database::fetch_array($result);		
+		$row = Database::fetch_array($result);
 		return $row['count'];		
 	} else {
 		return false;

From 2a9256e83a212db8d0e9ee8351a8fd32af19b493 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 18 Mar 2010 16:46:07 -0500
Subject: [PATCH 2/2] Gradebook tool:  Fixing date in \"classroom assessment\"
 type of evaluation

---
 main/gradebook/gradebook_add_eval.php        | 10 ++++++----
 main/gradebook/lib/be/abstractlink.class.php |  2 +-
 main/gradebook/lib/be/evaluation.class.php   | 14 ++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/main/gradebook/gradebook_add_eval.php b/main/gradebook/gradebook_add_eval.php
index 7848a2b7ff..c5d974616b 100755
--- a/main/gradebook/gradebook_add_eval.php
+++ b/main/gradebook/gradebook_add_eval.php
@@ -1,10 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 $language_file = 'gradebook';
-require_once ('../inc/global.inc.php');
-require_once ('lib/be.inc.php');
-require_once ('lib/gradebook_functions.inc.php');
-require_once ('lib/fe/evalform.class.php');
+require_once '../inc/global.inc.php';
+require_once 'lib/be.inc.php';
+require_once 'lib/gradebook_functions.inc.php';
+require_once 'lib/fe/evalform.class.php';
 api_block_anonymous_users();
 block_students();
 
@@ -31,6 +32,7 @@ if ($form->validate()) {
 	}
 	$eval->set_category_id($values['hid_category_id']);
 	$eval->set_weight($values['weight']);
+	
 	$eval->set_max($values['max']);
 	if (empty ($values['visible'])) {
 		$visible = 0;
diff --git a/main/gradebook/lib/be/abstractlink.class.php b/main/gradebook/lib/be/abstractlink.class.php
index ee6cc91868..ef812b98c8 100755
--- a/main/gradebook/lib/be/abstractlink.class.php
+++ b/main/gradebook/lib/be/abstractlink.class.php
@@ -180,7 +180,7 @@ abstract class AbstractLink implements GradebookItem {
 			$link->set_user_id($data['user_id']);
 			$link->set_course_code($data['course_code']);
 			$link->set_category_id($data['category_id']);
-			$link->set_date(api_get_local_time($data['created_at']));
+			$link->set_date(api_get_local_time());
 			$link->set_weight($data['weight']);
 			$link->set_visible($data['visible']);
 			$links[]=$link;
diff --git a/main/gradebook/lib/be/evaluation.class.php b/main/gradebook/lib/be/evaluation.class.php
index 140bdb307c..d5adce1901 100755
--- a/main/gradebook/lib/be/evaluation.class.php
+++ b/main/gradebook/lib/be/evaluation.class.php
@@ -198,17 +198,17 @@ class Evaluation implements GradebookItem
 			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
 
 			$sql = 'INSERT INTO '.$tbl_grade_evaluations
-					.' (name,user_id,weight,max,visible';
+					.' (name, user_id, weight, max, visible';
 			if (isset($this->description)) {
 			 $sql .= ',description';
 			}
 			if (isset($this->course_code)) {
-			 $sql .= ',course_code';
+				$sql .= ', course_code';
 			}
 			if (isset($this->category)) {
-			 $sql .= ',category_id';
+				$sql .= ', category_id';
 			}
-			$sql .= ',created_at';
+			$sql .= ', created_at';
 			$sql .= ',type';
 			$sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
 					.','.intval($this->get_user_id())
@@ -227,10 +227,12 @@ class Evaluation implements GradebookItem
 			if (empty($this->type)) {
 				$this->type = 'evaluation';	
 			}
-			$sql .= ',\''.Database::escape_string($this->type).'\'';
-
 			$sql .= ", '".api_get_utc_datetime()."'";
+			
+			$sql .= ',\''.Database::escape_string($this->type).'\'';
+			
 			$sql .= ")";
+			
 			Database::query($sql);
 			$this->set_id(Database::insert_id());
 		}