瀏覽代碼

Minor - format code, white spaces

Julio Montoya 11 年之前
父節點
當前提交
5d9d2d752a
共有 2 個文件被更改,包括 34 次插入38 次删除
  1. 26 27
      main/gradebook/lib/be/evaluation.class.php
  2. 8 11
      main/newscorm/storageapi.php

+ 26 - 27
main/gradebook/lib/be/evaluation.class.php

@@ -26,7 +26,7 @@ class Evaluation implements GradebookItem
 
     // CONSTRUCTORS
 
-    function __construct() {    	
+    function __construct() {
     }
 
     // GETTERS AND SETTERS
@@ -66,23 +66,23 @@ class Evaluation implements GradebookItem
 	public function get_max() {
 		return $this->eval_max;
 	}
-	
+
 	public function get_type() {
 		return $this->type;
-	}	
+	}
 
 	public function is_visible() {
 		return $this->visible;
 	}
-	
+
 	public function get_locked() {
 		return $this->locked;
 	}
-    
+
     public function is_locked() {
 		return isset($this->locked) && $this->locked == 1 ? true : false ;
-	}  
-    
+	}
+
 	public function set_id ($id) {
 		$this->id = $id;
 	}
@@ -122,16 +122,16 @@ class Evaluation implements GradebookItem
 	public function set_visible ($visible) {
 		$this->visible = $visible;
 	}
-	
+
     public function set_type ($type) {
 		$this->type = $type;
 	}
- 
+
 	public function set_locked ($locked) {
 		$this->locked = $locked;
 	}
-    
-    
+
+
     // CRUD FUNCTIONS
 
 	/**
@@ -179,7 +179,7 @@ class Evaluation implements GradebookItem
 			else $sql .= ' WHERE';
 			$sql .= ' locked = '.intval($locked);
 			$paramcount ++;
-		}		
+		}
 		$result = Database::query($sql);
 		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
 		return $alleval;
@@ -202,7 +202,7 @@ class Evaluation implements GradebookItem
     			$eval->set_visible($data['visible']);
     			$eval->set_type($data['type']);
     			$eval->set_locked($data['locked']);
-    			
+
     			$alleval[]=$eval;
     		}
     	}
@@ -244,18 +244,17 @@ class Evaluation implements GradebookItem
 				 $sql .= ','.intval($this->get_category_id());
 			}
 			if (empty($this->type)) {
-				$this->type = 'evaluation';	
+				$this->type = 'evaluation';
 			}
 			$sql .= ", '".api_get_utc_datetime()."'";
-			
+
 			$sql .= ',\''.Database::escape_string($this->type).'\'';
-			
+
 			$sql .= ")";
-			
+
 			Database::query($sql);
 			$this->set_id(Database::insert_id());
-		}
-		else {
+		} else {
 			die('Error in Evaluation add: required field empty');
 		}
 	}
@@ -309,7 +308,7 @@ class Evaluation implements GradebookItem
 				.', visible = '.intval($this->is_visible())
 				.' WHERE id = '.intval($this->id);
 		//recorded history
-        
+
 		$eval_log=new Evaluation();
 		$eval_log->add_evaluation_log($this->id);
 		Database::query($sql);
@@ -585,18 +584,18 @@ class Evaluation implements GradebookItem
 	public function get_icon_name() {
 		return $this->has_results() ? 'evalnotempty' : 'evalempty';
 	}
-    
+
   	/**
-  	 * Locks an evaluation, only one who can unlock it is the platform administrator.  	 
-  	 * @param int locked 1 or unlocked 0 
-  	 * 
+  	 * Locks an evaluation, only one who can unlock it is the platform administrator.
+  	 * @param int locked 1 or unlocked 0
+  	 *
   	 **/
   	function lock($locked) {
   		$table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
   		$sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
   		Database::query($sql);
   	}
-    
+
     function check_lock_permissions() {
         if (api_is_platform_admin()) {
             return true;
@@ -606,8 +605,8 @@ class Evaluation implements GradebookItem
             }
         }
     }
-    
+
     function delete_linked_data() {
-        
+
     }
 }

+ 8 - 11
main/newscorm/storageapi.php

@@ -43,7 +43,7 @@ switch ($_REQUEST['action']) {
 		}
 		break;
 	case "stackgetall":
-		if (storage_can_set($_REQUEST['svuser'])) 
+		if (storage_can_set($_REQUEST['svuser']))
 			print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
 		break;
 	case "getposition":
@@ -82,8 +82,7 @@ function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) {
 		$row = Database::fetch_assoc($res);
 		if (get_magic_quotes_gpc()) {
 			return stripslashes($row['sv_value']);
-		}
-		else {
+		} else {
 			return $row['sv_value'];
 		}
 	}
@@ -91,7 +90,7 @@ function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) {
 		return null;
 	}
 }
-			
+
 function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
 
 	// get leaders
@@ -122,12 +121,12 @@ function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $s
 //				$row["values"][$dataRow["variable"]] = $dataRow["value"];
 //		}
 		$result[] = $row;
-	} 
+	}
 	return json_encode($result);
 }
 
 function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
-	$sql = "select count(list.user_id) as position 
+	$sql = "select count(list.user_id) as position
 		from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." search,
 			".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." list
 		where search.user_id= '$sv_user'
@@ -179,7 +178,7 @@ function storage_getall($sv_user, $sv_course, $sv_sco) {
 function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) {
 	$sv_value = Database::escape_string($sv_value);
 	Database::query("start transaction");
-	$sqlorder = "select ifnull((select max(stack_order) 
+	$sqlorder = "select ifnull((select max(stack_order)
 		from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
 		where user_id= '$sv_user'
 		and sco_id='$sv_sco'
@@ -229,12 +228,10 @@ function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key) {
 		Database::query("commit");
 		if (get_magic_quotes_gpc()) {
 			return stripslashes($rowselect['sv_value']);
-		}
-		else {
+		} else {
 			return $rowselect['sv_value'];
 		}
-	}
-	else {
+	} else {
 		Database::query("rollback");
 		return null;
 	}