chamilo / chamilo-lms

main/exercice/hotpotatoes.lib.php

Doc Comments +5 added lines, -1 removed lines

@@ -94,7 +94,7 @@ 
  * Sets the comment in the database for a particular path.
  * @param    string    File path
  * @param    string    Comment to set
- * @return   string    Result of the database operation (Database::query will output some message directly on error anyway)
+ * @return   Doctrine\DBAL\Driver\Statement|null    Result of the database operation (Database::query will output some message directly on error anyway)
  */
 function SetComment($path, $comment)
 {
@@ -112,6 +112,7 @@ 
 /**
  * Reads the file contents into a string.
  * @param    string    Urlencoded path
+ * @param string $full_file_path
  * @return   string    The file contents or false on security error
  */
 function ReadFileCont($full_file_path)
@@ -257,6 +258,7 @@ 
  * Searches for a node in the given array.
  * @param    reference    Reference to the array to search
  * @param    string       Node we are looking for in the array
+ * @param string $node
  * @return   mixed        Node name or false if not found
  */
 function myarraysearch(&$array, $node)
@@ -316,6 +318,8 @@ 
  * Fills the folder name up to a certain length with "0".
  * @param    string    Original folder name
  * @param    integer   Length to reach
+ * @param integer $name
+ * @param integer $nsize
  * @return   string    Modified folder name
  */
 function FillFolderName($name, $nsize)

Indentation +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
                     if (is_dir($full_name)) {
                         $filelist[] = $file;
                     }
-               }
+                }
             }
         }
     }

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
     if ($title == '') {
         $title = basename($fname);
     }
-    return (string)$title;
+    return (string) $title;
 }
 
 /**
@@ -176,7 +176,7 @@ 
         if ($src == '') {
             return '';
         } else {
-            $tmp_src = basename($src) ;
+            $tmp_src = basename($src);
             if ($tmp_src == '') {
                 return $src;
             } else {
@@ -198,7 +198,7 @@ 
 {
     // Select src tag from img tag.
     $match = array();
-    preg_match("|(src=\".*\" )|U", $imgtag, $match);            //src
+    preg_match("|(src=\".*\" )|U", $imgtag, $match); //src
     list($key, $srctag) = each($match);
     $src = substr($srctag, 5, (strlen($srctag) - 7));
     if (stristr($src, 'http') === false) {
@@ -230,8 +230,8 @@ 
         while (list($key, $imgtag) = each($match)) {
             $imgname = GetImgName($imgtag);
             if ($imgname != '' && !in_array($imgname, $imgparams)) {
-                array_push($imgparams, $imgname);    // name (+ type) of the images in the html test
-                $imgcount = $imgcount + 1;            // number of images in the html test
+                array_push($imgparams, $imgname); // name (+ type) of the images in the html test
+                $imgcount = $imgcount + 1; // number of images in the html test
             }
         }
     }
@@ -404,7 +404,7 @@ 
                 if ($file != '..') {
                     $full_name = $folder.'/'.$file;
                     if (is_dir($full_name)) {
-                        $dflag = 1;    // first directory
+                        $dflag = 1; // first directory
                     }
                 }
             }

main/exercice/hotpotatoes_exercise_result.class.php

Doc Comments +1 added lines

@@ -18,6 +18,7 @@
 	 * Gets the results of all students (or just one student if access is limited)
 	 * @param	string		The document path (for HotPotatoes retrieval)
 	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+	 * @param string $document_path
 	 */
 	public function getExercisesReporting($document_path, $hotpotato_name)
     {

Indentation +136 added lines, -136 removed lines

@@ -14,14 +14,14 @@ 
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
@@ -33,7 +33,7 @@ 
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
@@ -110,25 +110,25 @@ 
         $this->results = $return;
 
         return true;
-	}
+    }
 
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path='', $hotpotato_name)
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
@@ -147,7 +147,7 @@ 
         }
         $data .= get_lang('Email').';';
 
-		/*if ($export_user_fields) {
+        /*if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
 			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 			$num = count($extra_user_fields);
@@ -156,25 +156,25 @@ 
 			}
 		}*/
 
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
 
-		//results
-		foreach($this->results as $row) {
+        //results
+        foreach($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
-			/*if ($export_user_fields) {
+            /*if ($export_user_fields) {
 				//show user fields data, if any, for this user
 				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
 				foreach($user_fields_values as $value) {
@@ -182,40 +182,40 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -224,37 +224,37 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+            $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
-    			$column++;
+                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $column++;
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
                 $column++;
             } else {
@@ -263,36 +263,36 @@ 
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
                 $column++;
             }
-		}
+        }
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $column++;
+            }
+        }
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
@@ -309,38 +309,38 @@ 
                     $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
+            }
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
-			$column++;
             $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +55 added lines, -55 removed lines

@@ -23,13 +23,13 @@ 
     {
 		$return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
-        $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
+        $TBL_TRACK_HOTPOTATOES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
         $cid             = api_get_course_id();
         $course_id       = api_get_course_int_id();
         //$user_id         = intval($user_id);
         $user_id = null;
-        $session_id_and  = ' AND te.session_id = ' . api_get_session_id() . ' ';
+        $session_id_and  = ' AND te.session_id = '.api_get_session_id().' ';
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
@@ -37,7 +37,7 @@ 
         }
 
         if (empty($user_id)) {
-            $sql="SELECT firstname as userpart1, lastname as userpart2 ,
+            $sql = "SELECT firstname as userpart1, lastname as userpart2 ,
                     email,
                     tth.exe_name,
                     tth.exe_result,
@@ -49,13 +49,13 @@ 
                             tth.exe_name = '$hotpotato_name'
                     ORDER BY tth.c_id ASC, tth.exe_date ASC";
         } else {
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
+            $user_id_and = ' AND te.exe_user_id = '.api_get_user_id().' ';
             // get only this user's results
 
             $sql = "SELECT '', exe_name, exe_result , exe_weighting, exe_date
                     FROM $TBL_TRACK_HOTPOTATOES
                     WHERE
-                        exe_user_id = '" . $user_id . "' AND
+                        exe_user_id = '".$user_id."' AND
                         c_id = $course_id AND
                         tth.exe_name = '$hotpotato_name'
                     ORDER BY c_id ASC, exe_date ASC";
@@ -64,13 +64,13 @@ 
         $results = array();
 
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $results[] = $rowx;
         }
 
         $hpresults = array();
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $hpresults[] = $rowx;
         }
 
@@ -89,19 +89,19 @@ 
 
         // Print the Result of Hotpotatoes Tests
         if (is_array($hpresults)) {
-            for($i = 0; $i < sizeof($hpresults); $i++) {
+            for ($i = 0; $i < sizeof($hpresults); $i++) {
                 $return[$i] = array();
                 $title = GetQuizName($hpresults[$i]['exe_name'], $document_path);
-                if ($title =='') {
+                if ($title == '') {
                     $title = basename($hpresults[$i]['exe_name']);
                 }
-                if(empty($user_id)) {
+                if (empty($user_id)) {
                 $return[$i]['email'] = $hpresults[$i]['email'];
                     $return[$i]['first_name'] = $hpresults[$i]['userpart1'];
                     $return[$i]['last_name'] = $hpresults[$i]['userpart2'];
                 }
                 $return[$i]['title'] = $title;
-                $return[$i]['exe_date']  = $hpresults[$i]['exe_date'];
+                $return[$i]['exe_date'] = $hpresults[$i]['exe_date'];
 
                 $return[$i]['result'] = $hpresults[$i]['exe_result'];
                 $return[$i]['max'] = $hpresults[$i]['exe_weighting'];
@@ -120,7 +120,7 @@ 
 	 * @param	boolean		Whether to include user fields or not
 	 * @return	boolean		False on error
 	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
     {
 		global $charset;
 		$this->getExercisesReporting($document_path, $hotpotato_name);
@@ -131,17 +131,17 @@ 
 		$data = '';
 
         if (api_is_western_name_order()) {
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
         } else {
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
         }
@@ -163,16 +163,16 @@ 
 		$data .= "\n";
 
 		//results
-		foreach($this->results as $row) {
+		foreach ($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
-            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
 			/*if ($export_user_fields) {
 				//show user fields data, if any, for this user
@@ -182,10 +182,10 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
+			$data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+			$data .= str_replace("\r\n", '  ', $row['exe_date']).';';
+			$data .= str_replace("\r\n", '  ', $row['result']).';';
+			$data .= str_replace("\r\n", '  ', $row['max']).';';
 			$data .= "\n";
 		}
 
@@ -207,7 +207,7 @@ 
 		header('Content-Description: '.$filename);
 		header('Content-transfer-encoding: binary');
 		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+		echo "\xEF\xBB\xBF"; // force utf-8 header of csv file
 		echo $data;
 		return true;
 	}
@@ -249,25 +249,25 @@ 
 		}
 
 		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+		    $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Email'));
 		    $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+    			$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
     			$column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
             } else {
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
                 $column++;
             }
 		}
 
 		if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
 
 			//show the fields names for user fields
 			foreach ($extra_user_fields as $field) {
@@ -276,63 +276,63 @@ 
 			}
 		}
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('EndDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
 		$column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
 		$line++;
 
 		foreach ($this->results as $row) {
 			$column = 0;
 
             if ($with_column_user) {
-                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
 
                 if (api_is_western_name_order()) {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
                 } else {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
 			}
 
 			if ($export_user_fields) {
 				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
+				foreach ($user_fields_values as $value) {
+					$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
 					$column++;
 				}
 			}
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+			$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['end_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['duration']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['result']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['max']);
 			$column++;
-            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
+            $worksheet->SetCellValueByColumnAndRow($line, $column, $row['status']);
 			$line++;
 		}
 

main/exercice/hotspot.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	/**
 	 * @param FormValidator $form
 	 * @param null $objExercise
-	 * @return bool
+	 * @return null|false
 	 */
 	public function processCreation($form, $objExercise = null)
 	{

Indentation +102 added lines, -102 removed lines

@@ -12,78 +12,78 @@ 
  **/
 class HotSpot extends Question
 {
-	static $typePicture = 'hotspot.png';
-	static $explanationLangVar = 'HotSpot';
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT;
-	}
-
-	public function display()
-	{
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param int $fck_config
-	 */
-	public function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm($form, $fck_config);
-
-		if (!isset($_GET['editQuestion'])) {
-			$form->addElement('file','imageUpload',array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')) );
-
-			// setting the save button here and not in the question class.php
-			// Saving a question
-			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
-			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
-		} else {
-			// setting the save button here and not in the question class.php
-			// Editing a question
-			$form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
-		}
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param null $objExercise
-	 * @return bool
-	 */
-	public function processCreation($form, $objExercise = null)
-	{
-		$file_info = $form->getSubmitValue('imageUpload');
-		$_course = api_get_course_info();
-		parent::processCreation($form, $objExercise);
-
-		if(!empty($file_info['tmp_name'])) {
-			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
-			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-			$picturePath   = $documentPath.'/images';
-
-			// fixed width ang height
-			if (file_exists($picturePath.'/'.$this->picture)) {
-				$this->resizePicture('width', 800);
-				$this->save();
-			} else {
-				return false;
-			}
-		}
-	}
-
-	function createAnswersForm ($form)
-	{
-		// nothing
-	}
-
-	function processAnswersCreation ($form)
-	{
-		// nothing
-	}
+    static $typePicture = 'hotspot.png';
+    static $explanationLangVar = 'HotSpot';
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT;
+    }
+
+    public function display()
+    {
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param int $fck_config
+     */
+    public function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm($form, $fck_config);
+
+        if (!isset($_GET['editQuestion'])) {
+            $form->addElement('file','imageUpload',array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')) );
+
+            // setting the save button here and not in the question class.php
+            // Saving a question
+            $form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            //$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            $form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
+            $form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
+        } else {
+            // setting the save button here and not in the question class.php
+            // Editing a question
+            $form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
+        }
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param null $objExercise
+     * @return bool
+     */
+    public function processCreation($form, $objExercise = null)
+    {
+        $file_info = $form->getSubmitValue('imageUpload');
+        $_course = api_get_course_info();
+        parent::processCreation($form, $objExercise);
+
+        if(!empty($file_info['tmp_name'])) {
+            $this->uploadPicture($file_info['tmp_name'], $file_info['name']);
+            $documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+            $picturePath   = $documentPath.'/images';
+
+            // fixed width ang height
+            if (file_exists($picturePath.'/'.$this->picture)) {
+                $this->resizePicture('width', 800);
+                $this->save();
+            } else {
+                return false;
+            }
+        }
+    }
+
+    function createAnswersForm ($form)
+    {
+        // nothing
+    }
+
+    function processAnswersCreation ($form)
+    {
+        // nothing
+    }
 }
 
 /**
@@ -91,35 +91,35 @@ 
  */
 class HotSpotDelineation extends HotSpot
 {
-	static $typePicture = 'hotspot-delineation.png';
-	static $explanationLangVar = 'HotspotDelineation';
-
-	function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT_DELINEATION;
-
-	}
-
-	function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm ($form, $fck_config);
-	}
-
-	function processCreation ($form, $objExercise = null)
-	{
-		$file_info = $form -> getSubmitValue('imageUpload');
-		parent::processCreation ($form, $objExercise);
-	}
-
-	function createAnswersForm ($form)
-	{
-		parent::createAnswersForm ($form);
-	}
-
-	function processAnswersCreation ($form)
-	{
-		parent::processAnswersCreation ($form);
-	}
+    static $typePicture = 'hotspot-delineation.png';
+    static $explanationLangVar = 'HotspotDelineation';
+
+    function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT_DELINEATION;
+
+    }
+
+    function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm ($form, $fck_config);
+    }
+
+    function processCreation ($form, $objExercise = null)
+    {
+        $file_info = $form -> getSubmitValue('imageUpload');
+        parent::processCreation ($form, $objExercise);
+    }
+
+    function createAnswersForm ($form)
+    {
+        parent::createAnswersForm ($form);
+    }
+
+    function processAnswersCreation ($form)
+    {
+        parent::processAnswersCreation ($form);
+    }
 }
 

Spacing +14 added lines, -14 removed lines

@@ -29,18 +29,18 @@ 
 	 * @param FormValidator $form
 	 * @param int $fck_config
 	 */
-	public function createForm (&$form, $fck_config=0)
+	public function createForm(&$form, $fck_config = 0)
 	{
 		parent::createForm($form, $fck_config);
 
 		if (!isset($_GET['editQuestion'])) {
-			$form->addElement('file','imageUpload',array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')) );
+			$form->addElement('file', 'imageUpload', array('<img src="'.Display::return_icon('hotspot.png', null, null, ICON_SIZE_BIG, false, true).'" />', get_lang('UploadJpgPicture')));
 
 			// setting the save button here and not in the question class.php
 			// Saving a question
 			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
 			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
+			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array('jpg', 'jpeg', 'png', 'gif'));
 			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
 		} else {
 			// setting the save button here and not in the question class.php
@@ -60,7 +60,7 @@ 
 		$_course = api_get_course_info();
 		parent::processCreation($form, $objExercise);
 
-		if(!empty($file_info['tmp_name'])) {
+		if (!empty($file_info['tmp_name'])) {
 			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
 			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 			$picturePath   = $documentPath.'/images';
@@ -75,12 +75,12 @@ 
 		}
 	}
 
-	function createAnswersForm ($form)
+	function createAnswersForm($form)
 	{
 		// nothing
 	}
 
-	function processAnswersCreation ($form)
+	function processAnswersCreation($form)
 	{
 		// nothing
 	}
@@ -101,25 +101,25 @@ 
 
 	}
 
-	function createForm (&$form, $fck_config=0)
+	function createForm(&$form, $fck_config = 0)
 	{
-		parent::createForm ($form, $fck_config);
+		parent::createForm($form, $fck_config);
 	}
 
-	function processCreation ($form, $objExercise = null)
+	function processCreation($form, $objExercise = null)
 	{
 		$file_info = $form -> getSubmitValue('imageUpload');
-		parent::processCreation ($form, $objExercise);
+		parent::processCreation($form, $objExercise);
 	}
 
-	function createAnswersForm ($form)
+	function createAnswersForm($form)
 	{
-		parent::createAnswersForm ($form);
+		parent::createAnswersForm($form);
 	}
 
-	function processAnswersCreation ($form)
+	function processAnswersCreation($form)
 	{
-		parent::processAnswersCreation ($form);
+		parent::processAnswersCreation($form);
 	}
 }
 

main/exercice/oral_expression.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      * @param null $feedback_type
      * @param null $counter
      * @param null $score
-     * @return null|string
+     * @return string
      */
     function return_header($feedback_type = null, $counter = null, $score = null)
     {

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     function createAnswersForm($form)
     {
 
-        $form -> addElement('text','weighting', get_lang('Weighting'), array('class' => 'span1'));
+        $form -> addElement('text', 'weighting', get_lang('Weighting'), array('class' => 'span1'));
         global $text, $class;
         // setting the save button here and not in the question class.php
         $form->addButtonSave($text, 'submitQuestion');

main/exercice/unique_answer.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -417,8 +417,8 @@
      * @param int $question_id  The question ID (to which the answer is attached)
      * @param string $title The text of the answer
      * @param string $comment The feedback for the answer
-     * @param float|null $score  The score you get when picking this answer
-     * @param int|null $correct  Whether this answer is considered *the* correct one (this is the unique answer type)
+     * @param double $score  The score you get when picking this answer
+     * @param integer $correct  Whether this answer is considered *the* correct one (this is the unique answer type)
      */
     public function addAnswer(
         $id,

Indentation +1 added lines, -1 removed lines

@@ -447,7 +447,7 @@
         $position = $row_max->max_position + 1;
 
         // Insert a new answer
-       $params = [
+        $params = [
             'c_id' => $course_id,
             'id' => $id,
             'question_id' => $question_id,

Spacing +54 added lines, -54 removed lines

@@ -59,21 +59,21 @@ 
 
         if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
             //Scenario
-            $comment_title = '<th width="20%">' . get_lang('Comment') . '</th>';
-            $feedback_title = '<th width="20%">' . get_lang('Scenario') . '</th>';
+            $comment_title = '<th width="20%">'.get_lang('Comment').'</th>';
+            $feedback_title = '<th width="20%">'.get_lang('Scenario').'</th>';
         } else {
-            $comment_title = '<th width="40%">' . get_lang('Comment') . '</th>';
+            $comment_title = '<th width="40%">'.get_lang('Comment').'</th>';
         }
 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr style="text-align: center;">
-                    <th width="5%">' . get_lang('Number') . '</th>
-                    <th width="5%"> ' . get_lang('True') . '</th>
-                    <th width="40%">' . get_lang('Answer') . '</th>
-                        ' . $comment_title . '
-                        ' . $feedback_title . '
-                    <th width="10%">' . get_lang('Weighting') . '</th>
+                    <th width="5%">' . get_lang('Number').'</th>
+                    <th width="5%"> ' . get_lang('True').'</th>
+                    <th width="40%">' . get_lang('Answer').'</th>
+                        ' . $comment_title.'
+                        ' . $feedback_title.'
+                    <th width="10%">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -103,7 +103,7 @@ 
                     continue;
                 }
                 $question = Question::read($questionid);
-                $select_question[$questionid] = 'Q' . $key . ' :' . cut(
+                $select_question[$questionid] = 'Q'.$key.' :'.cut(
                     $question->selectTitle(), 20
                 );
             }
@@ -134,9 +134,9 @@ 
                 if ($answer->correct[$i]) {
                     $correct = $i;
                 }
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['weighting[' . $i . ']'] = float_format(
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['weighting['.$i.']'] = float_format(
                     $answer->weighting[$i],
                     1
                 );
@@ -159,18 +159,18 @@ 
                     $url_result = $url;
                 }
 
-                $temp_scenario['url' . $i] = $url_result;
-                $temp_scenario['try' . $i] = $try_result;
-                $temp_scenario['lp' . $i] = $lp;
-                $temp_scenario['destination' . $i] = $list_dest;
+                $temp_scenario['url'.$i] = $url_result;
+                $temp_scenario['try'.$i] = $try_result;
+                $temp_scenario['lp'.$i] = $lp;
+                $temp_scenario['destination'.$i] = $list_dest;
             } else {
                 $defaults['answer[1]'] = get_lang('DefaultUniqueAnswer1');
                 $defaults['weighting[1]'] = 10;
                 $defaults['answer[2]'] = get_lang('DefaultUniqueAnswer2');
                 $defaults['weighting[2]'] = 0;
 
-                $temp_scenario['destination' . $i] = array('0');
-                $temp_scenario['lp' . $i] = array('0');
+                $temp_scenario['destination'.$i] = array('0');
+                $temp_scenario['lp'.$i] = array('0');
             }
             $defaults['scenario'] = $temp_scenario;
 
@@ -182,62 +182,62 @@ 
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'counter[' . $i . ']'
+                'counter['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'answer[' . $i . ']'
+                'answer['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'comment[' . $i . ']'
+                'comment['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'weighting[' . $i . ']'
+                'weighting['.$i.']'
             );
 
             $answer_number = $form->addElement(
-                'text', 'counter[' . $i . ']', null, ' value = "' . $i . '"'
+                'text', 'counter['.$i.']', null, ' value = "'.$i.'"'
             );
             $answer_number->freeze();
             $form->addElement(
                 'radio', 'correct', null, null, $i, 'class="checkbox"'
             );
 
-            $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editor_config);
+            $form->addHtmlEditor('answer['.$i.']', null, null, true, $editor_config);
 
             $form->addRule(
-                'answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'
+                'answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'
             );
 
             if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config);
                 // Direct feedback
                 //Adding extra feedback fields
                 $group = array();
-                $group['try' . $i] = $form->createElement(
+                $group['try'.$i] = $form->createElement(
                     'checkbox',
-                    'try' . $i,
+                    'try'.$i,
                     null,
                     get_lang('TryAgain')
                 );
-                $group['lp' . $i] = $form->createElement(
+                $group['lp'.$i] = $form->createElement(
                     'select',
-                    'lp' . $i,
-                    get_lang('SeeTheory') . ': ',
+                    'lp'.$i,
+                    get_lang('SeeTheory').': ',
                     $select_lp_id
                 );
-                $group['destination' . $i] = $form->createElement(
+                $group['destination'.$i] = $form->createElement(
                     'select',
-                    'destination' . $i,
-                    get_lang('GoToQuestion') . ': ',
+                    'destination'.$i,
+                    get_lang('GoToQuestion').': ',
                     $select_question
                 );
-                $group['url' . $i] = $form->createElement(
+                $group['url'.$i] = $form->createElement(
                     'text',
-                    'url' . $i,
-                    get_lang('Other') . ': ',
+                    'url'.$i,
+                    get_lang('Other').': ',
                     array(
                         'class' => 'col-md-2',
                         'placeholder' => get_lang('Other')
@@ -250,9 +250,9 @@ 
                     'scenario'
                 );
             } else {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config);
             }
-            $form->addText('weighting[' . $i . ']', null, null, array('value' => '0'));
+            $form->addText('weighting['.$i.']', null, null, array('value' => '0'));
             $form->addHtml('</tr>');
         }
 
@@ -306,19 +306,19 @@ 
         $nb_answers = $form->getSubmitValue('nb_answers');
 
         for ($i = 1; $i <= $nb_answers; $i++) {
-            $answer = trim($form->getSubmitValue('answer[' . $i . ']'));
-            $comment = trim($form->getSubmitValue('comment[' . $i . ']'));
-            $weighting = trim($form->getSubmitValue('weighting[' . $i . ']'));
+            $answer = trim($form->getSubmitValue('answer['.$i.']'));
+            $comment = trim($form->getSubmitValue('comment['.$i.']'));
+            $weighting = trim($form->getSubmitValue('weighting['.$i.']'));
 
             $scenario = $form->getSubmitValue('scenario');
 
             //$list_destination = $form -> getSubmitValue('destination'.$i);
             //$destination_str = $form -> getSubmitValue('destination'.$i);
 
-            $try = $scenario['try' . $i];
-            $lp = $scenario['lp' . $i];
-            $destination = $scenario['destination' . $i];
-            $url = trim($scenario['url' . $i]);
+            $try = $scenario['try'.$i];
+            $lp = $scenario['lp'.$i];
+            $destination = $scenario['destination'.$i];
+            $url = trim($scenario['url'.$i]);
 
             /*
             How we are going to parse the destination value
@@ -366,7 +366,7 @@ 
             }
 
             //1@@1;2;@@2;4;4;@@http://www.chamilo.org
-            $dest = $try . '@@' . $lp . '@@' . $destination . '@@' . $url;
+            $dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
             $objAnswer->createAnswer(
                 $answer,
                 $goodAnswer,
@@ -400,12 +400,12 @@ 
         $score = null
     ) {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="' . $this->question_table_class . '">
+        $header .= '<table class="'.$this->question_table_class.'">
 			<tr>
-				<th>' . get_lang("Choice") . '</th>
-				<th>' . get_lang("ExpectedChoice") . '</th>
-				<th>' . get_lang("Answer") . '</th>';
-        $header .= '<th>' . get_lang("Comment") . '</th>';
+				<th>' . get_lang("Choice").'</th>
+				<th>' . get_lang("ExpectedChoice").'</th>
+				<th>' . get_lang("Answer").'</th>';
+        $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
 
         return $header;
@@ -469,7 +469,7 @@ 
         if ($correct) {
             $sql = "UPDATE $tbl_quiz_question
                     SET ponderation = (ponderation + $score)
-                    WHERE c_id = $course_id AND id = " . $question_id;
+                    WHERE c_id = $course_id AND id = ".$question_id;
             Database::query($sql);
         }
     }

main/forum/forumfunction.inc.php

Doc Comments +16 added lines, -7 removed lines

@@ -1058,7 +1058,7 @@ 
  * an up and down icon except for the first (no up icon) and the last (no down icon)
  *          The key of this $list array is the id of the item.
  *
- * @return void HTML
+ * @return string HTML
  **/
 function return_up_down_icon($content, $id, $list)
 {
@@ -2011,7 +2011,7 @@ 
  * This function retrieves forum thread users details
  * @param   int Thread ID
  * @param   string  Course DB name (optional)
- * @return  resource array Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
+ * @return  Doctrine\DBAL\Driver\Statement|null array Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
  * @author Christian Fasanando <christian.fasanando@dokeos.com>,
  * @todo     this function need to be improved
  * @version octubre 2008, dokeos 1.8
@@ -2066,7 +2066,7 @@ 
  * This function retrieves forum thread users qualify
  * @param   int Thread ID
  * @param   string  Course DB name (optional)
- * @return  array Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
+ * @return  Doctrine\DBAL\Driver\Statement|null Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
  * @author Jhon Hinojosa
  * @todo     this function need to be improved
  */
@@ -2133,7 +2133,7 @@ 
  * This function retrieves forum thread users not qualify
  * @param   int Thread ID
  * @param   string  Course DB name (optional)
- * @return  array Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
+ * @return  Doctrine\DBAL\Driver\Statement|null Array of type ([user_id=>w,lastname=>x,firstname=>y,thread_id=>z],[])
  * @author   Jhon Hinojosa<jhon.hinojosa@dokeos.com>,
  * @version oct 2008, dokeos 1.8
  */
@@ -3163,6 +3163,10 @@ 
  * @param integer contains the information the current user id
  * @param integer contains the information the current thread id
  * @param integer contains the information the current qualify
+ * @param string $option
+ * @param integer $course_id
+ * @param integer $user_id
+ * @param integer $thread_id
  * @return void
  * <code>$option=1 obtained the qualification of the current thread</code>
  * @author Isaac Flores <isaac.flores@dokeos.com>, U.N.A.S University
@@ -3722,6 +3726,8 @@ 
  *
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @version february 2006, dokeos 1.8
+ * @param string $last_post_id
+ * @param string $post_date
  */
 function updateThreadInfo($thread_id, $last_post_id, $post_date)
 {
@@ -4025,6 +4031,8 @@ 
  *
  * @param string  Content type (post, thread, forum, forum_category)
  * @param int     Item DB ID
+ * @param string $content
+ * @param integer $id
  * @return string language variable
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @version february 2006, dokeos 1.8
@@ -4461,6 +4469,7 @@ 
 /**
  * Display the search results
  * @param string
+ * @param string $search_term
  * @return void display the results
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  * @version march 2008, dokeos 1.8.5
@@ -4590,7 +4599,7 @@ 
  * This function adds an attachment file into a forum
  * @param string $file_comment  a comment about file
  * @param int $last_id from forum_post table
- * @return int|bool
+ * @return false|null
  */
 function add_forum_attachment_file($file_comment, $last_id)
 {
@@ -4801,7 +4810,7 @@ 
  * @param post id
  * @param int $id_attach
  * @param bool $display to show or not result message
- * @return void
+ * @return integer
  * @author Julio Montoya Dokeos
  * @version october 2014, chamilo 1.9.8
  */
@@ -5083,7 +5092,7 @@ 
  * @param integer $forum_id the id of the forum
  * @param integer $thread_id the id of the thread
  * @param integer $post_id the id of the post
- * @return bool
+ * @return false|null
  *
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  * @version May 2008, dokeos 1.8.5

Spacing +63 added lines, -63 removed lines

@@ -63,10 +63,10 @@ 
         var l = $(this);
         var id = l.closest("tr").attr("id");
         var filename = l.closest("tr").find(".attachFilename").html();
-        if (confirm("' . get_lang('AreYouSureToDeleteJS') . '", filename)) {
+        if (confirm("' . get_lang('AreYouSureToDeleteJS').'", filename)) {
             $.ajax({
                 type: "POST",
-                url: "'.api_get_path(WEB_AJAX_PATH) . 'forum.ajax.php?'.api_get_cidreq().'&a=delete_file&attachId=" + id +"&thread='.$threadId .'&forum='.$forumId .'",
+                url: "'.api_get_path(WEB_AJAX_PATH).'forum.ajax.php?'.api_get_cidreq().'&a=delete_file&attachId=" + id +"&thread='.$threadId.'&forum='.$forumId.'",
                 dataType: "json",
                 success: function(data) {
                     if (data.error == false) {
@@ -179,7 +179,7 @@ 
 function show_add_forumcategory_form($inputvalues = array(), $lp_id)
 {
     // Initialize the object.
-    $form = new FormValidator('forumcategory', 'post', 'index.php?' . api_get_cidreq());
+    $form = new FormValidator('forumcategory', 'post', 'index.php?'.api_get_cidreq());
     // hidden field if from learning path
 
     $form->addElement('hidden', 'lp_id', $lp_id);
@@ -229,7 +229,7 @@ 
 function show_add_forum_form($inputvalues = array(), $lp_id)
 {
     $_course = api_get_course_info();
-    $form = new FormValidator('forumcategory', 'post', 'index.php?' . api_get_cidreq());
+    $form = new FormValidator('forumcategory', 'post', 'index.php?'.api_get_cidreq());
 
     // The header for the form
     if (!empty($inputvalues)) {
@@ -971,24 +971,24 @@ 
     $html = '';
     $id = Security::remove_XSS($id);
     if ($current_visibility_status == '1') {
-        $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&';
+        $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html.='action=invisible&content='.$content.'&id='.$id.'">'.
+        $html .= 'action=invisible&content='.$content.'&id='.$id.'">'.
             Display::return_icon('visible.png', get_lang('MakeInvisible'), array(), ICON_SIZE_SMALL).'</a>';
     }
     if ($current_visibility_status == '0') {
-        $html .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&';
+        $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html .= 'action=visible&content=' . $content . '&id=' . $id . '">' .
-            Display::return_icon('invisible.png', get_lang('MakeVisible'), array(), ICON_SIZE_SMALL) . '</a>';
+        $html .= 'action=visible&content='.$content.'&id='.$id.'">'.
+            Display::return_icon('invisible.png', get_lang('MakeVisible'), array(), ICON_SIZE_SMALL).'</a>';
     }
     return $html;
 }
@@ -1016,21 +1016,21 @@ 
         $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html.= 'action=unlock&content='.$content.'&id='.$id.'">'.
+        $html .= 'action=unlock&content='.$content.'&id='.$id.'">'.
             Display::return_icon('lock.png', get_lang('Unlock'), array(), ICON_SIZE_SMALL).'</a>';
     }
     if ($current_lock_status == '0') {
         $html .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&';
         if (is_array($additional_url_parameters)) {
             foreach ($additional_url_parameters as $key => $value) {
-                $html .= $key . '=' . $value . '&';
+                $html .= $key.'='.$value.'&';
             }
         }
-        $html .= 'action=lock&content=' . $content . '&id=' . $id . '">' .
-            Display::return_icon('unlock.png', get_lang('Lock'), array(), ICON_SIZE_SMALL) . '</a>';
+        $html .= 'action=lock&content='.$content.'&id='.$id.'">'.
+            Display::return_icon('unlock.png', get_lang('Lock'), array(), ICON_SIZE_SMALL).'</a>';
     }
     return $html;
 }
@@ -1233,7 +1233,7 @@ 
                     forum_categories.c_id = $course_id AND
                     item_properties.c_id = $course_id AND
                     forum_categories.cat_id=item_properties.ref AND
-                    item_properties.tool='" . TOOL_FORUM_CATEGORY . "'
+                    item_properties.tool='".TOOL_FORUM_CATEGORY."'
                 ORDER BY forum_categories.cat_order $sort_direction";
     }
     if ($content == 'forum') {
@@ -1241,7 +1241,7 @@ 
             FROM $table
             WHERE
                 c_id = $course_id AND
-                forum_category='" . Database::escape_string($forum_category) . "'
+                forum_category='".Database::escape_string($forum_category)."'
             ORDER BY forum_order $sort_direction";
     }
     // Finding the items that need to be switched.
@@ -1298,7 +1298,7 @@ 
 {
     $current_visibility_status = intval($current_visibility_status);
     if ($current_visibility_status == 0) {
-        $status='invisible';
+        $status = 'invisible';
         return $status;
     }
 }
@@ -2205,7 +2205,7 @@ 
 {
     $table_forums = Database :: get_course_table(TABLE_FORUM);
     $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    $courseId = empty($courseId) ? api_get_course_int_id(): intval($courseId);
+    $courseId = empty($courseId) ? api_get_course_int_id() : intval($courseId);
     $forum_id = intval($forum_id);
 
     $sql = "SELECT *
@@ -2364,7 +2364,7 @@ 
  */
 function store_thread($current_forum, $values, $courseInfo = array(), $showMessage = true)
 {
-    $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo ;
+    $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
     $_user = api_get_user_info();
     $course_id = $courseInfo['real_id'];
     $courseCode = $courseInfo['code'];
@@ -2608,11 +2608,11 @@ 
     $form = new FormValidator(
         'thread',
         'post',
-        api_get_self() . '?' . http_build_query([
+        api_get_self().'?'.http_build_query([
             'forum' => $myForum,
             'gradebook' => $myGradebook,
             'thread' => $myThread,
-        ]) . '&' . api_get_cidreq()
+        ]).'&'.api_get_cidreq()
     );
 
     $form->addElement('header', get_lang('EditThread'));
@@ -2675,7 +2675,7 @@ 
     $form->addElement('html', '</div>');
 
     if (!empty($formValues)) {
-        $defaults['thread_qualify_gradebook'] = ($formValues['threadQualifyMax'] > 0 && empty($_POST)) ? 1 : 0 ;
+        $defaults['thread_qualify_gradebook'] = ($formValues['threadQualifyMax'] > 0 && empty($_POST)) ? 1 : 0;
         $defaults['thread_title'] = prepare4display($formValues['threadTitle']);
         $defaults['thread_sticky'] = strval(intval($formValues['threadSticky']));
         $defaults['thread_peer_qualify'] = intval($formValues['threadPeerQualify']);
@@ -2747,13 +2747,13 @@ 
     $form = new FormValidator(
         'thread',
         'post',
-        api_get_self() . '?' . http_build_query([
+        api_get_self().'?'.http_build_query([
             'forum' => intval($my_forum),
             'gradebook' => $my_gradebook,
             'thread' => intval($myThread),
             'post' => intval($my_post),
             'action' => $action,
-        ]) . '&' . api_get_cidreq()
+        ]).'&'.api_get_cidreq()
     );
     $form->setConstants(array('forum' => '5'));
 
@@ -3012,7 +3012,7 @@ 
 
             if ($row[0] == 0) {
                 $sql = "INSERT INTO $table_threads_qualify (c_id, user_id, thread_id,qualify,qualify_user_id,qualify_time,session_id)
-                        VALUES (".$course_id.", '".$user_id."','".$thread_id."',".(float)$thread_qualify.", '".$currentUserId."','".$qualify_time."','".$session_id."')";
+                        VALUES (".$course_id.", '".$user_id."','".$thread_id."',".(float) $thread_qualify.", '".$currentUserId."','".$qualify_time."','".$session_id."')";
                 Database::query($sql);
 
                 $insertId = Database::insert_id();
@@ -4654,9 +4654,9 @@ 
             continue;
         }
 
-        $course_dir = $_course['path'] . '/upload/forum';
+        $course_dir = $_course['path'].'/upload/forum';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $updir = $sys_course_path . $course_dir;
+        $updir = $sys_course_path.$course_dir;
 
         // Try to add an extension to the file if it hasn't one.
         $new_file_name = add_ext_on_mime(
@@ -4673,7 +4673,7 @@ 
         }
 
         $new_file_name = uniqid('');
-        $new_path = $updir . '/' . $new_file_name;
+        $new_path = $updir.'/'.$new_file_name;
         $result = @move_uploaded_file($attachment['tmp_name'], $new_path);
         $safe_file_comment = Database::escape_string($file_comment);
         $safe_file_name = Database::escape_string($file_name);
@@ -4838,16 +4838,16 @@ 
     $forum_table_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
     $course_id = api_get_course_int_id();
 
-    $cond = (!empty($id_attach)) ? " iid = " . (int) $id_attach . "" : " post_id = " . (int) $post_id . "";
+    $cond = (!empty($id_attach)) ? " iid = ".(int) $id_attach."" : " post_id = ".(int) $post_id."";
     $sql = "SELECT path FROM $forum_table_attachment WHERE c_id = $course_id AND $cond";
     $res = Database::query($sql);
     $row = Database::fetch_array($res);
 
-    $course_dir = $_course['path'] . '/upload/forum';
+    $course_dir = $_course['path'].'/upload/forum';
     $sys_course_path = api_get_path(SYS_COURSE_PATH);
-    $updir = $sys_course_path . $course_dir;
+    $updir = $sys_course_path.$course_dir;
     $my_path = isset($row['path']) ? $row['path'] : null;
-    $file = $updir . '/' . $my_path;
+    $file = $updir.'/'.$my_path;
     if (Security::check_abs_path($file, $updir)) {
         @unlink($file);
     }
@@ -5395,35 +5395,35 @@ 
                         $post_list = get_thread_user_post_limit($course_code, $thread['thread_id'], $user_id, 1);
                         $post_counter = count($post_list);
                         if (is_array($post_list) && count($post_list) > 0) {
-                            $hand_forums.= '<div id="social-thread">';
-                            $hand_forums.= Display::return_icon('thread.png', get_lang('Thread'), '', ICON_SIZE_MEDIUM);
-                            $hand_forums.= '&nbsp;'.Security::remove_XSS($thread['thread_title'], STUDENT);
-                            $hand_forums.= '</div>';
+                            $hand_forums .= '<div id="social-thread">';
+                            $hand_forums .= Display::return_icon('thread.png', get_lang('Thread'), '', ICON_SIZE_MEDIUM);
+                            $hand_forums .= '&nbsp;'.Security::remove_XSS($thread['thread_title'], STUDENT);
+                            $hand_forums .= '</div>';
 
                             foreach ($post_list as $posts) {
-                                $hand_forums.= '<div id="social-post">';
-                                $hand_forums.= '<strong>'.Security::remove_XSS($posts['post_title'], STUDENT).'</strong>';
-                                $hand_forums.= '<br / >';
-                                $hand_forums.= Security::remove_XSS($posts['post_text'], STUDENT);
-                                $hand_forums.= '</div>';
-                                $hand_forums.= '<br / >';
+                                $hand_forums .= '<div id="social-post">';
+                                $hand_forums .= '<strong>'.Security::remove_XSS($posts['post_title'], STUDENT).'</strong>';
+                                $hand_forums .= '<br / >';
+                                $hand_forums .= Security::remove_XSS($posts['post_text'], STUDENT);
+                                $hand_forums .= '</div>';
+                                $hand_forums .= '<br / >';
                             }
                         }
                     }
                     $i++;
                 }
-                $forum_results .='<div id="social-forum">';
-                $forum_results .='<div class="clear"></div><br />';
-                $forum_results .='<div id="social-forum-title">'.
+                $forum_results .= '<div id="social-forum">';
+                $forum_results .= '<div class="clear"></div><br />';
+                $forum_results .= '<div id="social-forum-title">'.
                     Display::return_icon('forum.gif', get_lang('Forum')).'&nbsp;'.Security::remove_XSS($forum['forum_title'], STUDENT).
                     '<div style="float:right;margin-top:-35px">
                                         <a href="../forum/viewforum.php?cidReq='.$course_code.'&gidReq=&forum='.$forum['forum_id'].' " >'.get_lang('SeeForum').'</a>
                                     </div></div>';
-                $forum_results .='<br / >';
+                $forum_results .= '<br / >';
                 if ($post_counter > 0) {
-                    $forum_results .=$hand_forums;
+                    $forum_results .= $hand_forums;
                 }
-                $forum_results .='</div>';
+                $forum_results .= '</div>';
             }$j++;
         }
     }
@@ -5564,16 +5564,16 @@ 
     $courseId = intval($courseId);
     if (empty($courseId)) {
         // $courseId can be null, use api method
-        $courseId= api_get_course_int_id();
+        $courseId = api_get_course_int_id();
     }
     /*
      * Check if Attachment ID and Course ID are greater than zero
      * and array of field values is not empty
      */
     if ($id > 0 && $courseId > 0 && !empty($array) && is_array($array)) {
-        foreach($array as $key => &$item) {
+        foreach ($array as $key => &$item) {
             $item = Database::escape_string($item);
-            $setString .= $key . ' = "' .$item . '", ';
+            $setString .= $key.' = "'.$item.'", ';
         }
         // Delete last comma
         $setString = substr($setString, 0, strlen($setString) - 2);
@@ -5619,7 +5619,7 @@ 
         return '';
     }
 
-    $url = api_get_path(WEB_AJAX_PATH).'forum.ajax.php?'.api_get_cidreq().'&forum=' . $forumId . '&thread=' . $threadId . '&postId=' . $postId . '&a=upload_file';
+    $url = api_get_path(WEB_AJAX_PATH).'forum.ajax.php?'.api_get_cidreq().'&forum='.$forumId.'&thread='.$threadId.'&postId='.$postId.'&a=upload_file';
 
     $multipleForm = new FormValidator('post');
     $multipleForm->addMultipleUpload($url);
@@ -5660,10 +5660,10 @@ 
         foreach ($uploadedFiles as $k => $uploadedFile) {
             if (!empty($uploadedFile) && in_array($uploadedFile['id'], $attachIds)) {
                 // Buil html table including an input with attachmentID
-                $fileDataContent .= '<tr id="' . $uploadedFile['id'] . '" ><td>' . $uploadedFile['name'] . '</td><td>' . $uploadedFile['size'] . '</td><td>&nbsp;' . $uploadedFile['result'] .
-                    ' </td><td> <input style="width:90%;" type="text" value="' . $uploadedFile['comment'] . '" name="file_comments[]"> </td><td>' .
-                    $uploadedFile['delete'] . '</td>' .
-                    '<input type="hidden" value="' . $uploadedFile['id'] .'" name="file_ids[]">' . '</tr>';
+                $fileDataContent .= '<tr id="'.$uploadedFile['id'].'" ><td>'.$uploadedFile['name'].'</td><td>'.$uploadedFile['size'].'</td><td>&nbsp;'.$uploadedFile['result'].
+                    ' </td><td> <input style="width:90%;" type="text" value="'.$uploadedFile['comment'].'" name="file_comments[]"> </td><td>'.
+                    $uploadedFile['delete'].'</td>'.
+                    '<input type="hidden" value="'.$uploadedFile['id'].'" name="file_ids[]">'.'</tr>';
             } else {
                 /*
                  * If attachment data is empty, then delete it from $_SESSION
@@ -5676,7 +5676,7 @@ 
     $style = empty($fileDataContent) ? 'display: none;' : '';
     // Forum attachment Ajax table
     $fileData = '
-    <div class="control-group " style="'. $style . '">
+    <div class="control-group " style="'. $style.'">
         <label class="control-label">'.get_lang('AttachmentList').'</label>
         <div class="controls">
             <table id="attachmentFileList" class="files data_table span10">
@@ -5748,7 +5748,7 @@ 
             // name contains an URL to download attachment file and its filename
             $json['name'] = Display::url(
                 api_htmlentities($row['filename']),
-                api_get_path(WEB_CODE_PATH) . 'forum/download.php?file='.$row['path'].'&'.api_get_cidreq(),
+                api_get_path(WEB_CODE_PATH).'forum/download.php?file='.$row['path'].'&'.api_get_cidreq(),
                 array('target'=>'_blank', 'class' => 'attachFilename')
             );
             $json['id'] = $row['iid'];
@@ -5759,9 +5759,9 @@ 
             if (!empty($row) && is_array($row)) {
                 // Set result as success and bring delete URL
                 $json['result'] = Display::return_icon('accept.png', get_lang('Uploaded'));
-                $url = api_get_path(WEB_CODE_PATH) . 'forum/viewthread.php?' . api_get_cidreq() . '&action=delete_attach&forum=' . $forumId . '&thread=' . $threadId.'&id_attach=' . $row['iid'];
+                $url = api_get_path(WEB_CODE_PATH).'forum/viewthread.php?'.api_get_cidreq().'&action=delete_attach&forum='.$forumId.'&thread='.$threadId.'&id_attach='.$row['iid'];
                 $json['delete'] = Display::url(
-                    Display::return_icon('delete.png',get_lang('Delete'), array(), ICON_SIZE_SMALL),
+                    Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL),
                     $url,
                     array('class' => 'deleteLink')
                 );
@@ -5850,7 +5850,7 @@ 
                 WHERE c_id = $courseId AND post_id = $postId";
         $result = Database::query($sql);
         if ($result !== false && Database::num_rows($result) > 0) {
-            while ($row = Database::fetch_array($result,'ASSOC')) {
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $array[] = $row['id'];
             }
         }

main/gradebook/lib/be/abstractlink.class.php

Doc Comments +15 added lines, -4 removed lines

@@ -193,6 +193,9 @@ 
         $this->visible = $visible;
     }
 
+    /**
+     * @param integer $id
+     */
     public function set_session_id($id)
     {
         $this->session_id = $id;
@@ -217,6 +220,12 @@ 
     /**
      * Retrieve links and return them as an array of extensions of AbstractLink.
      * To keep consistency, do not call this method but LinkFactory::load instead.
+     * @param integer $id
+     * @param integer $type
+     * @param integer $user_id
+     * @param string $course_code
+     * @param integer $category_id
+     * @param integer $visible
      */
     public static function load(
         $id = null,
@@ -288,7 +297,7 @@ 
     }
 
     /**
-     * @param $result
+     * @param Doctrine\DBAL\Driver\Statement|null $result
      * @return array
      */
     private static function create_objects_from_sql_result($result)
@@ -463,6 +472,7 @@ 
 
     /**
      * Internal function used by get_target_categories()
+     * @param integer $level
      */
     private function add_target_subcategories($targets, $level, $catid)
     {
@@ -492,6 +502,7 @@ 
      * Find links by name
      * To keep consistency, do not call this method but LinkFactory::find_links instead.
      * @todo can be written more efficiently using a new (but very complex) sql query
+     * @param string $name_mask
      */
     public function find_links ($name_mask,$selectcat)
     {
@@ -559,21 +570,21 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      */
     public function set_name($name)
     {
     }
 
     /**
-     * @param $description
+     * @param string $description
      */
     public function set_description($description)
     {
     }
 
     /**
-     * @param $max
+     * @param integer $max
      */
     public function set_max($max)
     {

Spacing +24 added lines, -24 removed lines

@@ -138,22 +138,22 @@ 
         return $this->visible;
     }
 
-    public function set_id ($id)
+    public function set_id($id)
     {
         $this->id = $id;
     }
 
-    public function set_type ($type)
+    public function set_type($type)
     {
         $this->type = $type;
     }
 
-    public function set_ref_id ($ref_id)
+    public function set_ref_id($ref_id)
     {
         $this->ref_id = $ref_id;
     }
 
-    public function set_user_id ($user_id)
+    public function set_user_id($user_id)
     {
         $this->user_id = $user_id;
     }
@@ -231,29 +231,29 @@ 
         $sql = 'SELECT * FROM '.$tbl_grade_links;
         $paramcount = 0;
         if (isset ($id)) {
-            $sql.= ' WHERE id = '.intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE id = '.intval($id);
+            $paramcount++;
         }
         if (isset ($type)) {
             if ($paramcount != 0) $sql .= ' AND';
             else $sql .= ' WHERE';
             $sql .= ' type = '.intval($type);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($ref_id)) {
             if ($paramcount != 0) $sql .= ' AND';
             else $sql .= ' WHERE';
             $sql .= ' ref_id = '.intval($ref_id);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($user_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' user_id = '.intval($user_id);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($course_code)) {
             if ($paramcount != 0) {
@@ -262,16 +262,16 @@ 
                 $sql .= ' WHERE';
             }
             $sql .= " course_code = '".Database::escape_string($course_code)."'";
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($category_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' category_id = '.intval($category_id);
-            $paramcount ++;
+            $paramcount++;
         }
         if (isset ($visible)) {
             if ($paramcount != 0) {
@@ -311,7 +311,7 @@ 
             $session_id = api_get_session_id();
 
             $link->set_session_id($session_id);
-            $links[]=$link;
+            $links[] = $link;
         }
         return $links;
     }
@@ -402,12 +402,12 @@ 
         $dateobject = AbstractLink::load($idevaluation, null, null, null, null);
         $current_date_server = api_get_utc_datetime();
         $arreval = get_object_vars($dateobject[0]);
-        $description_log = isset($arreval['description']) ? $arreval['description']:'';
+        $description_log = isset($arreval['description']) ? $arreval['description'] : '';
         if (empty($nameLog)) {
             if (isset($_POST['name_link'])) {
                 $name_log = isset($_POST['name_link']) ? $_POST['name_link'] : $arreval['course_code'];
-            } elseif (isset($_POST['link_' . $idevaluation]) && $_POST['link_' . $idevaluation]) {
-                $name_log = $_POST['link_' . $idevaluation];
+            } elseif (isset($_POST['link_'.$idevaluation]) && $_POST['link_'.$idevaluation]) {
+                $name_log = $_POST['link_'.$idevaluation];
             } else {
                 $name_log = $arreval['course_code'];
             }
@@ -452,10 +452,10 @@ 
         $targets = array();
         $level = 0;
 
-        $crscats = Category::load(null,null,$this->get_course_code(),0);
+        $crscats = Category::load(null, null, $this->get_course_code(), 0);
         foreach ($crscats as $cat) {
-            $targets[] = array($cat->get_id(), $cat->get_name(), $level+1);
-            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+            $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
         }
 
         return $targets;
@@ -466,10 +466,10 @@ 
      */
     private function add_target_subcategories($targets, $level, $catid)
     {
-        $subcats = Category::load(null,null,null,$catid);
+        $subcats = Category::load(null, null, null, $catid);
         foreach ($subcats as $cat) {
-            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+            $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
         }
         return $targets;
     }
@@ -493,7 +493,7 @@ 
      * To keep consistency, do not call this method but LinkFactory::find_links instead.
      * @todo can be written more efficiently using a new (but very complex) sql query
      */
-    public function find_links ($name_mask,$selectcat)
+    public function find_links($name_mask, $selectcat)
     {
         $rootcat = Category::load($selectcat);
         $links = $rootcat[0]->get_links((api_is_allowed_to_edit() ? null : api_get_user_id()), true);

Braces +12 added lines, -6 removed lines

@@ -235,21 +235,27 @@ 
             $paramcount ++;
         }
         if (isset ($type)) {
-            if ($paramcount != 0) $sql .= ' AND';
-            else $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                $sql .= ' AND';
+            } else {
+                $sql .= ' WHERE';
+            }
             $sql .= ' type = '.intval($type);
             $paramcount ++;
         }
         if (isset ($ref_id)) {
-            if ($paramcount != 0) $sql .= ' AND';
-            else $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                $sql .= ' AND';
+            } else {
+                $sql .= ' WHERE';
+            }
             $sql .= ' ref_id = '.intval($ref_id);
             $paramcount ++;
         }
         if (isset ($user_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' user_id = '.intval($user_id);
@@ -267,7 +273,7 @@ 
         if (isset ($category_id)) {
             if ($paramcount != 0) {
                 $sql .= ' AND';
-            }else {
+            } else {
                 $sql .= ' WHERE';
             }
             $sql .= ' category_id = '.intval($category_id);

main/gradebook/lib/be/category.class.php

Doc Comments +22 added lines, -10 removed lines

@@ -77,7 +77,7 @@ 
     }
 
     /**
-     * @return float
+     * @return integer|null
      */
     public function get_certificate_min_score()
     {
@@ -97,7 +97,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return integer
      */
     public function get_parent_id()
     {
@@ -105,7 +105,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return integer
      */
     public function get_weight()
     {
@@ -121,7 +121,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return boolean
      */
     public function is_visible()
     {
@@ -244,7 +244,7 @@ 
     }
 
     /**
-     * @return null
+     * @return null|integer
      */
     public function get_grade_model_id()
     {
@@ -487,7 +487,7 @@ 
     }
 
     /**
-     * @param $result
+     * @param Doctrine\DBAL\Driver\Statement|null $result
      *
      * @return array
      */
@@ -863,7 +863,8 @@ 
 
     /**
      * Calculate the score of this category
-     * @param $stud_id student id (default: all students - then the average is returned)
+     * @param integer $stud_id student id (default: all students - then the average is returned)
+     * @param integer $session_id
      * @return    array (score sum, weight sum)
      *             or null if no scores available
      */
@@ -1122,6 +1123,9 @@ 
      * @param int       student id
      * @param string    Course code
      * @param int       Session id
+     * @param integer $stud_id
+     * @param string $course_code
+     * @param integer $session_id
      */
     public function get_root_categories_for_student($stud_id, $course_code = null, $session_id = null)
     {
@@ -1202,6 +1206,9 @@ 
      * @param int user id (to return everything, use 'null' here)
      * @param string course code (optional)
      * @param int session id (optional)
+     * @param integer $user_id
+     * @param string $course_code
+     * @param integer $session_id
      */
     public function get_root_categories_for_teacher($user_id, $course_code = null, $session_id = null)
     {
@@ -1300,6 +1307,7 @@ 
 
     /**
      * Internal function used by get_target_categories()
+     * @param integer $level
      */
     private function add_target_subcategories($targets, $level, $catid)
     {
@@ -1399,6 +1407,8 @@ 
 
     /**
      * Internal function used by get_tree()
+     * @param integer $level
+     * @param null|integer $visible
      */
     private function add_subtree ($targets, $level, $catid, $visible)
     {
@@ -1416,6 +1426,7 @@ 
 
     /**
      * Generate an array of courses that a teacher hasn't created a category for.
+     * @param integer $user_id
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
     public function get_not_created_course_categories ($user_id)
@@ -1450,6 +1461,7 @@ 
 
     /**
      * Generate an array of all courses that a teacher is admin of.
+     * @param integer $user_id
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
     public function get_all_courses ($user_id)
@@ -1530,7 +1542,7 @@ 
     /**
      * Retrieve all categories inside a course independent category
      * that should be visible to a student.
-     * @param $cat_id parent category
+     * @param integer $cat_id parent category
      * @param $stud_id student id
      * @param $cats optional: if defined, the categories will be added to this array
      */
@@ -1851,7 +1863,7 @@ 
      * the platform administrator.
      * @param int locked 1 or unlocked 0
 
-     * @return bool
+     * @return boolean|null
      * */
     public function lock($locked)
     {
@@ -2282,7 +2294,7 @@ 
      * @param float $score The achieved score
      * @param int $userId The user id
      * @param int $categoryId The gradebook category
-     * @return int The insert id
+     * @return false|string The insert id
      */
     public static function registerCurrentScore($score, $userId, $categoryId)
     {

Indentation -2 removed lines

@@ -1571,7 +1571,6 @@ 
      * @param string $course_code Course code (optional)
      * @param int    $session_id Session ID (optional)
      * @param bool   $order
-
      * @return array Array of subcategories
      */
     public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null)
@@ -1850,7 +1849,6 @@ 
      * This function, locks a category , only one who can unlock it is
      * the platform administrator.
      * @param int locked 1 or unlocked 0
-
      * @return bool
      * */
     public function lock($locked)

Spacing +63 added lines, -63 removed lines

@@ -199,7 +199,7 @@ 
      */
     public function set_session_id($session_id = 0)
     {
-        $this->session_id = (int)$session_id;
+        $this->session_id = (int) $session_id;
     }
 
     /**
@@ -288,7 +288,7 @@ 
         $skills = $this->get_skills();
         $skill_select = array();
         if (!empty($skills)) {
-            foreach($skills as $skill) {
+            foreach ($skills as $skill) {
                 $skill_select[$skill['id']] = $skill['name'];
             }
         }
@@ -322,7 +322,7 @@ 
      */
     public static function load_session_categories($id = null, $session_id = null)
     {
-        if (isset($id) && (int)$id === 0) {
+        if (isset($id) && (int) $id === 0) {
             $cats = array();
             $cats[] = Category::create_root_category();
             return $cats;
@@ -335,7 +335,7 @@ 
         if (!empty($session_id)) {
             $tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
             $sql = 'SELECT id, course_code
-                    FROM '.$tbl_grade_categories. '
+                    FROM '.$tbl_grade_categories.'
                     WHERE session_id = '.$session_id;
             $result_session = Database::query($sql);
             if (Database::num_rows($result_session) > 0) {
@@ -375,7 +375,7 @@ 
     ) {
         //if the category given is explicitly 0 (not null), then create
         // a root category object (in memory)
-        if (isset($id) && (int)$id === 0) {
+        if (isset($id) && (int) $id === 0) {
             $cats = array();
             $cats[] = Category::create_root_category();
 
@@ -386,8 +386,8 @@ 
         $sql = 'SELECT * FROM '.$tbl_grade_categories;
         $paramcount = 0;
         if (isset($id)) {
-            $sql.= ' WHERE id = '.intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE id = '.intval($id);
+            $paramcount++;
         }
 
         if (isset($user_id)) {
@@ -423,10 +423,10 @@ 
             if (empty($session_id)) {
                 $sql .= ' AND (session_id IS NULL OR session_id = 0) ';
             } else {
-                $sql .= ' AND session_id = '.(int)$session_id.' ';
+                $sql .= ' AND session_id = '.(int) $session_id.' ';
             }
             //}
-            $paramcount ++;
+            $paramcount++;
         }
 
         if (isset($parent_id)) {
@@ -598,7 +598,7 @@ 
                             $default_weight = $default_weight_setting;
                         }
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -615,7 +615,7 @@ 
                 }
             }
 
-            $gradebook= new Gradebook();
+            $gradebook = new Gradebook();
             $gradebook->update_skills_to_gradebook($this->id, $this->get_skills(false));
 
             return $id;
@@ -680,7 +680,7 @@ 
                         $params['description']      = $component['title'];
                         $params['user_id']          = api_get_user_id();
                         $params['parent_id']        = $this->id;
-                        $params['weight']           = $component['percentage']/100*$default_weight;
+                        $params['weight']           = $component['percentage'] / 100 * $default_weight;
                         $params['session_id']       = api_get_session_id();
                         $params['course_code']      = $this->get_course_code();
 
@@ -690,7 +690,7 @@ 
             }
         }
 
-        $gradebook= new Gradebook();
+        $gradebook = new Gradebook();
         $gradebook->update_skills_to_gradebook(
             $this->id,
             $this->get_skills(false),
@@ -710,7 +710,7 @@ 
         if (!empty($links)) {
             foreach ($links as $link_item) {
                 if (isset($link_item)) {
-                    $new_item_weight =  $new_weight * $link_item->get_weight() / $old_weight;
+                    $new_item_weight = $new_weight * $link_item->get_weight() / $old_weight;
                     $link_item->set_weight($new_item_weight);
                     $link_item->save();
                 }
@@ -751,7 +751,7 @@ 
                     visible=3';
         $res = Database::query($sql);
         $option = Database::fetch_array($res, 'ASSOC');
-        if ($option['num']>=1) {
+        if ($option['num'] >= 1) {
             return '&nbsp;&nbsp;<span class="resource-deleted">(&nbsp;'.get_lang('ResourceDeleted').'&nbsp;)</span>';
         } else {
             return false;
@@ -812,9 +812,9 @@ 
             $sql .= ' AND user_id = '.api_get_user_id();
         }
         if (!isset ($parent)) {
-            $sql.= ' AND parent_id is null';
+            $sql .= ' AND parent_id is null';
         } else {
-            $sql.= ' AND parent_id = '.intval($parent);
+            $sql .= ' AND parent_id = '.intval($parent);
         }
 
         $result = Database::query($sql);
@@ -912,7 +912,7 @@ 
                     }
 
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
-                        $ressum += $score[0]/$score[1] * $catweight;
+                        $ressum += $score[0] / $score[1] * $catweight;
                     }
                 }
             }
@@ -1001,7 +1001,7 @@ 
                     }
 
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
-                        $ressum += $score[0]/$score[1] * $catweight;
+                        $ressum += $score[0] / $score[1] * $catweight;
 
                         if ($ressum > $bestResult) {
                             $bestResult = $ressum;
@@ -1140,7 +1140,7 @@ 
                 // session, we don't check his registration to these, but this
                 // could be an improvement
                 if (!empty($session_id)) {
-                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int)$session_id;
+                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int) $session_id;
                 } else {
                     $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id is null OR session_id=0";
                 }
@@ -1164,9 +1164,9 @@ 
                 // could be an improvement
                 $sql .= " AND course_code  = '".Database::escape_string($course_code)."'";
                 if (!empty($session_id)) {
-                    $sql .= " AND session_id = ".(int)$session_id;
+                    $sql .= " AND session_id = ".(int) $session_id;
                 } else {
-                    $sql .="AND session_id IS NULL OR session_id=0";
+                    $sql .= "AND session_id IS NULL OR session_id=0";
                 }
             } else {
                 $sql .= ' AND course_code IN
@@ -1180,10 +1180,10 @@ 
                     )';
             }
         }elseif (api_is_platform_admin()) {
-            if (isset($session_id) && $session_id!=0) {
-                $sql.=' AND session_id='.intval($session_id);
+            if (isset($session_id) && $session_id != 0) {
+                $sql .= ' AND session_id='.intval($session_id);
             } else {
-                $sql.=' AND coalesce(session_id,0)=0';
+                $sql .= ' AND coalesce(session_id,0)=0';
             }
         }
         $result = Database::query($sql);
@@ -1191,7 +1191,7 @@ 
 
         // course independent categories
         if (empty($course_code)) {
-            $cats = Category::get_independent_categories_with_result_for_student (0, $stud_id, $cats);
+            $cats = Category::get_independent_categories_with_result_for_student(0, $stud_id, $cats);
         }
 
         return $cats;
@@ -1206,7 +1206,7 @@ 
     public function get_root_categories_for_teacher($user_id, $course_code = null, $session_id = null)
     {
         if ($user_id == null) {
-            return Category::load(null,null,$course_code,0,null,$session_id);
+            return Category::load(null, null, $course_code, 0, null, $session_id);
         }
 
         $courseTable = Database :: get_main_table(TABLE_MAIN_COURSE);
@@ -1218,7 +1218,7 @@ 
         if (!empty($course_code)) {
             $sql .= " AND course_code = '".Database::escape_string($course_code)."' ";
             if (!empty($session_id)) {
-                $sql .= " AND session_id = ".(int)$session_id;
+                $sql .= " AND session_id = ".(int) $session_id;
             }
         } else {
             $sql .= ' AND course_code in
@@ -1234,7 +1234,7 @@ 
         $cats = Category::create_category_objects_from_sql_result($result);
         // course independent categories
         if (isset($course_code)) {
-            $indcats = Category::load(null,$user_id,$course_code,0,null,$session_id);
+            $indcats = Category::load(null, $user_id, $course_code, 0, null, $session_id);
             $cats = array_merge($cats, $indcats);
         }
 
@@ -1277,20 +1277,20 @@ 
             $targets[] = $root;
 
             if (isset($this->course_code) && !empty($this->course_code)) {
-                $crscats = Category::load(null,null,$this->course_code,0);
+                $crscats = Category::load(null, null, $this->course_code, 0);
                 foreach ($crscats as $cat) {
                     if ($this->can_be_moved_to_cat($cat)) {
-                        $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                        $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                        $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                        $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
                     }
                 }
             }
 
-            $indcats = Category::load(null,$user,0,0);
+            $indcats = Category::load(null, $user, 0, 0);
             foreach ($indcats as $cat) {
                 if ($this->can_be_moved_to_cat($cat)) {
-                    $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                    $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                    $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                    $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
                 }
             }
 
@@ -1303,11 +1303,11 @@ 
      */
     private function add_target_subcategories($targets, $level, $catid)
     {
-        $subcats = Category::load(null,null,null,$catid);
+        $subcats = Category::load(null, null, null, $catid);
         foreach ($subcats as $cat) {
             if ($this->can_be_moved_to_cat($cat)) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
             }
         }
 
@@ -1320,7 +1320,7 @@ 
      * Impossible when origin and target are the same... children won't be processed
      * either. (a category can't be moved to one of its own children)
      */
-    private function can_be_moved_to_cat ($cat)
+    private function can_be_moved_to_cat($cat)
     {
         return $cat->get_id() != $this->get_id();
     }
@@ -1349,7 +1349,7 @@ 
     {
         $cats = Category::load(null, null, null, $this->id, null);
         $evals = Evaluation::load(null, null, null, $this->id, null);
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
 
         foreach ($cats as $cat) {
             $cat->set_course_code($this->get_course_code());
@@ -1382,15 +1382,15 @@ 
             $user = (api_is_platform_admin() ? null : api_get_user_id());
             $cats = Category::get_root_categories_for_teacher($user);
             foreach ($cats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),null);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), null);
             }
         } else {
             // student
             $cats = Category::get_root_categories_for_student(api_get_user_id());
             foreach ($cats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(), 1);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), 1);
             }
         }
 
@@ -1400,14 +1400,14 @@ 
     /**
      * Internal function used by get_tree()
      */
-    private function add_subtree ($targets, $level, $catid, $visible)
+    private function add_subtree($targets, $level, $catid, $visible)
     {
-        $subcats = Category::load(null,null,null,$catid,$visible);
+        $subcats = Category::load(null, null, null, $catid, $visible);
 
         if (!empty($subcats)) {
             foreach ($subcats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),$visible);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), $visible);
             }
         }
 
@@ -1418,7 +1418,7 @@ 
      * Generate an array of courses that a teacher hasn't created a category for.
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
-    public function get_not_created_course_categories ($user_id)
+    public function get_not_created_course_categories($user_id)
     {
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1440,9 +1440,9 @@ 
                 )';
         $result = Database::query($sql);
 
-        $cats=array();
-        while ($data=Database::fetch_array($result)) {
-            $cats[] = array ($data['code'], $data['title']);
+        $cats = array();
+        while ($data = Database::fetch_array($result)) {
+            $cats[] = array($data['code'], $data['title']);
         }
 
         return $cats;
@@ -1452,7 +1452,7 @@ 
      * Generate an array of all courses that a teacher is admin of.
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
-    public function get_all_courses ($user_id)
+    public function get_all_courses($user_id)
     {
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1466,7 +1466,7 @@ 
         $result = Database::query($sql);
         $cats = array();
         while ($data = Database::fetch_array($result)) {
-            $cats[] = array ($data['code'], $data['title']);
+            $cats[] = array($data['code'], $data['title']);
         }
 
         return $cats;
@@ -1479,7 +1479,7 @@ 
     {
         $cats = Category::load(null, null, null, $this->id, null);
         $evals = Evaluation::load(null, null, null, $this->id, null);
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
         if (!empty($cats)) {
             foreach ($cats as $cat) {
                 $cat->set_visible($this->is_visible());
@@ -1834,7 +1834,7 @@ 
      * @param string $name_mask search string
      * @return array category objects matching the search criterium
      */
-    public function find_category($name_mask,$allcat)
+    public function find_category($name_mask, $allcat)
     {
         $foundcats = array();
         foreach ($allcat as $search_cat) {
@@ -1877,9 +1877,9 @@ 
                 }
             }
 
-            $link_to_lock= $this->get_links();
+            $link_to_lock = $this->get_links();
             if (!empty($link_to_lock)) {
-                foreach ($link_to_lock as $item ) {
+                foreach ($link_to_lock as $item) {
                     $item->lock($locked);
                 }
             }
@@ -1968,7 +1968,7 @@ 
                 return [
                     'badge_link' => Display::url(
                         get_lang('DownloadBadges'),
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
                         array(
                             'target' => '_blank',
                             'class' => 'btn btn-default'
@@ -2002,7 +2002,7 @@ 
             $fileWasGenerated = $certificate_obj->html_file_is_generated();
 
             if (!empty($fileWasGenerated)) {
-                $url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $my_certificate['id'];
+                $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$my_certificate['id'];
 
                 $certificates = Display::url(
                     Display::returnFontAwesomeIcon('download').' '.get_lang('DownloadCertificate'),
@@ -2025,7 +2025,7 @@ 
 
                 $hideExportLink = api_get_setting('hide_certificate_export_link');
                 $hideExportLinkStudent = api_get_setting('hide_certificate_export_link_students');
-                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true') ) {
+                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true')) {
                     $exportToPDF = null;
                 }
 
@@ -2038,7 +2038,7 @@ 
                 if ($skillToolEnabled && $userHasSkills) {
                     $html['badge_link'] = Display::url(
                         get_lang('DownloadBadges'),
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
                         array(
                             'target' => '_blank',
                             'class' => 'btn btn-default'
@@ -2098,7 +2098,7 @@ 
                     $certificate_obj = new Certificate($value_certificate['id']);
                     $certificate_obj->generate(array('hide_print_button' => true));
                     if ($certificate_obj->html_file_is_generated()) {
-                        $certificate_path_list[]= $certificate_obj->html_file;
+                        $certificate_path_list[] = $certificate_obj->html_file;
                     }
                 }
             }

Braces +1 added lines, -1 removed lines

@@ -1179,7 +1179,7 @@
                             cu.status = '.COURSEMANAGER.'
                     )';
             }
-        }elseif (api_is_platform_admin()) {
+        } elseif (api_is_platform_admin()) {
             if (isset($session_id) && $session_id!=0) {
                 $sql.=' AND session_id='.intval($session_id);
             } else {

main/gradebook/lib/be/evaluation.class.php

Doc Comments +6 added lines, -2 removed lines

@@ -81,6 +81,9 @@ 
 		return $this->name;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function get_description()
 	{
 		return $this->description;
@@ -208,7 +211,7 @@ 
 	 * @param int $user_id user id (evaluation owner)
 	 * @param string $course_code course code
 	 * @param int $category_id parent category
-	 * @param $visible visible
+	 * @param integer $visible visible
 	 */
 	public static function load(
 		$id = null,
@@ -270,7 +273,7 @@ 
 
 
 	/**
-	 * @param array $result
+	 * @param Doctrine\DBAL\Driver\Statement|null $result
 	 * @return array
 	 */
 	private static function create_evaluation_objects_from_sql_result($result)
@@ -658,6 +661,7 @@ 
 
 	/**
 	 * Internal function used by get_target_categories()
+	 * @param integer $level
 	 */
 	private function add_target_subcategories($targets, $level, $catid)
 	{

Indentation +744 added lines, -744 removed lines

@@ -9,364 +9,364 @@ 
  */
 class Evaluation implements GradebookItem
 {
-	private $id;
-	private $name;
-	private $description;
-	private $user_id;
-	private $course_code;
-	/** @var Category */
-	private $category;
-	private $created_at;
-	private $weight;
-	private $eval_max;
-	private $visible;
-	private $sessionId;
-	public $studentList;
-
-	/**
-	 * Construct
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * @return Category
-	 */
-	public function getCategory()
-	{
-		return $this->category;
-	}
-
-	/**
-	 * @param Category $category
-	 */
-	public function setCategory($category)
-	{
-		$this->category = $category;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_category_id()
-	{
-		return $this->category->get_id();
-	}
-
-	/**
-	 * @param int $category_id
-	 */
-	public function set_category_id($category_id)
-	{
-		$categories = Category::load($category_id);
-		if (isset($categories[0])) {
-			$this->setCategory($categories[0]);
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_id()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	public function get_description()
-	{
-		return $this->description;
-	}
-
-	public function get_user_id()
-	{
-		return $this->user_id;
-	}
-
-	public function get_course_code()
-	{
-		return $this->course_code;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getSessionId()
-	{
-		return $this->sessionId;
-	}
-
-	/**
-	 * @param int $sessionId
-	 */
-	public function setSessionId($sessionId)
-	{
-		$this->sessionId = intval($sessionId);
-	}
-
-	public function get_date()
-	{
-		return $this->created_at;
-	}
-
-	public function get_weight()
-	{
-		return $this->weight;
-	}
-
-	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;
-	}
-
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
-	public function set_description($description)
-	{
-		$this->description = $description;
-	}
-
-	public function set_user_id($user_id)
-	{
-		$this->user_id = $user_id;
-	}
-
-	public function set_course_code($course_code)
-	{
-		$this->course_code = $course_code;
-	}
-
-	public function set_date($date)
-	{
-		$this->created_at = $date;
-	}
-
-	public function set_weight($weight)
-	{
-		$this->weight = $weight;
-	}
-
-	public function set_max($max)
-	{
-		$this->eval_max = $max;
-	}
-
-	public function set_visible($visible)
-	{
-		$this->visible = $visible;
-	}
-
-	public function set_type($type)
-	{
-		$this->type = $type;
-	}
-
-	public function set_locked($locked)
-	{
-		$this->locked = $locked;
-	}
-
-	/**
-	 * Retrieve evaluations and return them as an array of Evaluation objects
-	 * @param int $id evaluation id
-	 * @param int $user_id user id (evaluation owner)
-	 * @param string $course_code course code
-	 * @param int $category_id parent category
-	 * @param $visible visible
-	 */
-	public static function load(
-		$id = null,
-		$user_id = null,
-		$course_code = null,
-		$category_id = null,
-		$visible = null,
-		$locked = null
-	) {
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations;
-		$paramcount = 0;
-
-		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
-		}
-
-		if (isset ($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
-		}
-
-		if (isset ($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
-		}
-
-		if (isset ($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
-		}
-
-		if (isset ($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
-		}
-
-		if (isset ($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' locked = '.intval($locked);
-		}
-
-		$result = Database::query($sql);
-		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $alleval;
-	}
-
-
-
-	/**
-	 * @param array $result
-	 * @return array
-	 */
-	private static function create_evaluation_objects_from_sql_result($result)
-	{
-		$alleval = array();
-		if (Database::num_rows($result)) {
-			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
-				$eval->set_id($data['id']);
-				$eval->set_name($data['name']);
-				$eval->set_description($data['description']);
-				$eval->set_user_id($data['user_id']);
-				$eval->set_course_code($data['course_code']);
-				$eval->set_category_id($data['category_id']);
-				$eval->set_date(api_get_local_time($data['created_at']));
-				$eval->set_weight($data['weight']);
-				$eval->set_max($data['max']);
-				$eval->set_visible($data['visible']);
-				$eval->set_type($data['type']);
-				$eval->set_locked($data['locked']);
-				$eval->setSessionId(api_get_session_id());
-
-				$alleval[] = $eval;
-			}
-		}
-
-		return $alleval;
-	}
-
-	/**
-	 * Insert this evaluation into the database
-	 */
-	public function add()
-	{
-		if (isset($this->name) &&
-			isset($this->user_id) &&
-			isset($this->weight) &&
-			isset ($this->eval_max) &&
-			isset($this->visible)
-		) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-
-			$sql = 'INSERT INTO '.$tbl_grade_evaluations
-				.' (name, user_id, weight, max, visible';
-			if (isset($this->description)) {
-				$sql .= ',description';
-			}
-			if (isset($this->course_code)) {
-				$sql .= ', course_code';
-			}
-			if (isset($this->category)) {
-				$sql .= ', category_id';
-			}
-			$sql .= ', created_at';
-			$sql .= ',type';
-			$sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
-				.','.intval($this->get_user_id())
-				.','.floatval($this->get_weight())
-				.','.intval($this->get_max())
-				.','.intval($this->is_visible());
-			if (isset($this->description)) {
-				$sql .= ",'".Database::escape_string($this->get_description())."'";
-			}
-			if (isset($this->course_code)) {
-				$sql .= ",'".Database::escape_string($this->get_course_code())."'";
-			}
-			if (isset($this->category)) {
-				$sql .= ','.intval($this->get_category_id());
-			}
-			if (empty($this->type)) {
-				$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 {
-			die('Error in Evaluation add: required field empty');
-		}
-	}
-
-	/**
-	 * @param int $idevaluation
-	 */
-	public function add_evaluation_log($idevaluation)
-	{
-		if (!empty($idevaluation)) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
-			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
-			$arreval = get_object_vars($dateobject[0]);
-			if (!empty($arreval['id'])) {
-				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
+    private $id;
+    private $name;
+    private $description;
+    private $user_id;
+    private $course_code;
+    /** @var Category */
+    private $category;
+    private $created_at;
+    private $weight;
+    private $eval_max;
+    private $visible;
+    private $sessionId;
+    public $studentList;
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return Category
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * @param Category $category
+     */
+    public function setCategory($category)
+    {
+        $this->category = $category;
+    }
+
+    /**
+     * @return int
+     */
+    public function get_category_id()
+    {
+        return $this->category->get_id();
+    }
+
+    /**
+     * @param int $category_id
+     */
+    public function set_category_id($category_id)
+    {
+        $categories = Category::load($category_id);
+        if (isset($categories[0])) {
+            $this->setCategory($categories[0]);
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function get_id()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+    }
+
+    public function get_description()
+    {
+        return $this->description;
+    }
+
+    public function get_user_id()
+    {
+        return $this->user_id;
+    }
+
+    public function get_course_code()
+    {
+        return $this->course_code;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSessionId()
+    {
+        return $this->sessionId;
+    }
+
+    /**
+     * @param int $sessionId
+     */
+    public function setSessionId($sessionId)
+    {
+        $this->sessionId = intval($sessionId);
+    }
+
+    public function get_date()
+    {
+        return $this->created_at;
+    }
+
+    public function get_weight()
+    {
+        return $this->weight;
+    }
+
+    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;
+    }
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_description($description)
+    {
+        $this->description = $description;
+    }
+
+    public function set_user_id($user_id)
+    {
+        $this->user_id = $user_id;
+    }
+
+    public function set_course_code($course_code)
+    {
+        $this->course_code = $course_code;
+    }
+
+    public function set_date($date)
+    {
+        $this->created_at = $date;
+    }
+
+    public function set_weight($weight)
+    {
+        $this->weight = $weight;
+    }
+
+    public function set_max($max)
+    {
+        $this->eval_max = $max;
+    }
+
+    public function set_visible($visible)
+    {
+        $this->visible = $visible;
+    }
+
+    public function set_type($type)
+    {
+        $this->type = $type;
+    }
+
+    public function set_locked($locked)
+    {
+        $this->locked = $locked;
+    }
+
+    /**
+     * Retrieve evaluations and return them as an array of Evaluation objects
+     * @param int $id evaluation id
+     * @param int $user_id user id (evaluation owner)
+     * @param string $course_code course code
+     * @param int $category_id parent category
+     * @param $visible visible
+     */
+    public static function load(
+        $id = null,
+        $user_id = null,
+        $course_code = null,
+        $category_id = null,
+        $visible = null,
+        $locked = null
+    ) {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations;
+        $paramcount = 0;
+
+        if (isset ($id)) {
+            $sql.= ' WHERE id = '.intval($id);
+            $paramcount ++;
+        }
+
+        if (isset ($user_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' user_id = '.intval($user_id);
+            $paramcount ++;
+        }
+
+        if (isset ($course_code) && $course_code <> '-1') {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= " course_code = '".Database::escape_string($course_code)."'";
+            $paramcount ++;
+        }
+
+        if (isset ($category_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' category_id = '.intval($category_id);
+            $paramcount ++;
+        }
+
+        if (isset ($visible)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' visible = '.intval($visible);
+            $paramcount ++;
+        }
+
+        if (isset ($locked)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' locked = '.intval($locked);
+        }
+
+        $result = Database::query($sql);
+        $alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $alleval;
+    }
+
+
+
+    /**
+     * @param array $result
+     * @return array
+     */
+    private static function create_evaluation_objects_from_sql_result($result)
+    {
+        $alleval = array();
+        if (Database::num_rows($result)) {
+            while ($data = Database::fetch_array($result)) {
+                $eval= new Evaluation();
+                $eval->set_id($data['id']);
+                $eval->set_name($data['name']);
+                $eval->set_description($data['description']);
+                $eval->set_user_id($data['user_id']);
+                $eval->set_course_code($data['course_code']);
+                $eval->set_category_id($data['category_id']);
+                $eval->set_date(api_get_local_time($data['created_at']));
+                $eval->set_weight($data['weight']);
+                $eval->set_max($data['max']);
+                $eval->set_visible($data['visible']);
+                $eval->set_type($data['type']);
+                $eval->set_locked($data['locked']);
+                $eval->setSessionId(api_get_session_id());
+
+                $alleval[] = $eval;
+            }
+        }
+
+        return $alleval;
+    }
+
+    /**
+     * Insert this evaluation into the database
+     */
+    public function add()
+    {
+        if (isset($this->name) &&
+            isset($this->user_id) &&
+            isset($this->weight) &&
+            isset ($this->eval_max) &&
+            isset($this->visible)
+        ) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+
+            $sql = 'INSERT INTO '.$tbl_grade_evaluations
+                .' (name, user_id, weight, max, visible';
+            if (isset($this->description)) {
+                $sql .= ',description';
+            }
+            if (isset($this->course_code)) {
+                $sql .= ', course_code';
+            }
+            if (isset($this->category)) {
+                $sql .= ', category_id';
+            }
+            $sql .= ', created_at';
+            $sql .= ',type';
+            $sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
+                .','.intval($this->get_user_id())
+                .','.floatval($this->get_weight())
+                .','.intval($this->get_max())
+                .','.intval($this->is_visible());
+            if (isset($this->description)) {
+                $sql .= ",'".Database::escape_string($this->get_description())."'";
+            }
+            if (isset($this->course_code)) {
+                $sql .= ",'".Database::escape_string($this->get_course_code())."'";
+            }
+            if (isset($this->category)) {
+                $sql .= ','.intval($this->get_category_id());
+            }
+            if (empty($this->type)) {
+                $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 {
+            die('Error in Evaluation add: required field empty');
+        }
+    }
+
+    /**
+     * @param int $idevaluation
+     */
+    public function add_evaluation_log($idevaluation)
+    {
+        if (!empty($idevaluation)) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+            $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
+            $eval = new Evaluation();
+            $dateobject = $eval->load($idevaluation,null,null,null,null);
+            $arreval = get_object_vars($dateobject[0]);
+            if (!empty($arreval['id'])) {
+                $sql = 'SELECT weight from '.$tbl_grade_evaluations.'
                         WHERE id='.$arreval['id'];
                 $rs = Database::query($sql);
                 $row_old_weight = Database::fetch_array($rs, 'ASSOC');
@@ -382,425 +382,425 @@ 
                     'user_id_log' => api_get_user_id()
                 ];
                 Database::insert($tbl_grade_linkeval_log, $params);
-			}
-		}
-	}
-
-	/**
-	 * Update the properties of this evaluation in the database
-	 */
-	public function save()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'UPDATE '.$tbl_grade_evaluations
-			." SET name = '".Database::escape_string($this->get_name())."'"
-			.', description = ';
-		if (isset($this->description)) {
-			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
-			$sql .= 'null';
-		}
-		$sql .= ', user_id = '.intval($this->get_user_id())
-			.', course_code = ';
-		if (isset($this->course_code)) {
-			$sql .= "'".Database::escape_string($this->get_course_code())."'";
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', category_id = ';
-		if (isset($this->category)) {
-			$sql .= intval($this->get_category_id());
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
-			.', max = '.intval($this->get_max())
-			.', 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);
-	}
-
-	/**
-	 * Delete this evaluation from the database
-	 */
-	public function delete()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Check if an evaluation name (with the same parent category) already exists
-	 * @param $name name to check (if not given, the name property of this object will be checked)
-	 * @param $parent parent category
-	 */
-	public function does_name_exist($name, $parent)
-	{
-		if (!isset ($name)) {
-			$name = $this->name;
-			$parent = $this->category;
-		}
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT count(id) AS number'
-			.' FROM '.$tbl_grade_evaluations
-			." WHERE name = '".Database::escape_string($name)."'";
-
-		if (api_is_allowed_to_edit()) {
-			$parent = Category::load($parent);
-			$code = $parent[0]->get_course_code();
-			$courseInfo = api_get_course_info($code);
-			$courseId = $courseInfo['real_id'];
-
-			if (isset($code) && $code != '0') {
-				$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-				$sql .= ' AND user_id IN (
+            }
+        }
+    }
+
+    /**
+     * Update the properties of this evaluation in the database
+     */
+    public function save()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'UPDATE '.$tbl_grade_evaluations
+            ." SET name = '".Database::escape_string($this->get_name())."'"
+            .', description = ';
+        if (isset($this->description)) {
+            $sql .= "'".Database::escape_string($this->get_description())."'";
+        }else {
+            $sql .= 'null';
+        }
+        $sql .= ', user_id = '.intval($this->get_user_id())
+            .', course_code = ';
+        if (isset($this->course_code)) {
+            $sql .= "'".Database::escape_string($this->get_course_code())."'";
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', category_id = ';
+        if (isset($this->category)) {
+            $sql .= intval($this->get_category_id());
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
+            .', max = '.intval($this->get_max())
+            .', 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);
+    }
+
+    /**
+     * Delete this evaluation from the database
+     */
+    public function delete()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Check if an evaluation name (with the same parent category) already exists
+     * @param $name name to check (if not given, the name property of this object will be checked)
+     * @param $parent parent category
+     */
+    public function does_name_exist($name, $parent)
+    {
+        if (!isset ($name)) {
+            $name = $this->name;
+            $parent = $this->category;
+        }
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT count(id) AS number'
+            .' FROM '.$tbl_grade_evaluations
+            ." WHERE name = '".Database::escape_string($name)."'";
+
+        if (api_is_allowed_to_edit()) {
+            $parent = Category::load($parent);
+            $code = $parent[0]->get_course_code();
+            $courseInfo = api_get_course_info($code);
+            $courseId = $courseInfo['real_id'];
+
+            if (isset($code) && $code != '0') {
+                $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+                $sql .= ' AND user_id IN (
 					 SELECT user_id FROM '.$main_course_user_table.'
 					 WHERE
 						c_id = '.$courseId.' AND
 						status = '.COURSEMANAGER.'
 					)';
-			} else {
-				$sql .= ' AND user_id = '.api_get_user_id();
-			}
-
-		}else {
-			$sql .= ' AND user_id = '.api_get_user_id();
-		}
-
-		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
-		} else {
-			$sql.= ' AND category_id = '.intval($parent);
-		}
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return $number[0] != 0;
-	}
-
-	/**
-	 * Are there any results for this evaluation yet ?
-	 * The 'max' property should not be changed then.
-	 */
-	public function has_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'SELECT count(id) AS number
+            } else {
+                $sql .= ' AND user_id = '.api_get_user_id();
+            }
+
+        }else {
+            $sql .= ' AND user_id = '.api_get_user_id();
+        }
+
+        if (!isset ($parent)) {
+            $sql.= ' AND category_id is null';
+        } else {
+            $sql.= ' AND category_id = '.intval($parent);
+        }
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return $number[0] != 0;
+    }
+
+    /**
+     * Are there any results for this evaluation yet ?
+     * The 'max' property should not be changed then.
+     */
+    public function has_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'SELECT count(id) AS number
 				FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Delete all results for this evaluation
-	 */
-	public function delete_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'DELETE FROM '.$tbl_grade_results.'
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Delete all results for this evaluation
+     */
+    public function delete_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'DELETE FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation and all underlying results.
-	 */
-	public function delete_with_results()
-	{
-		$this->delete_results();
-		$this->delete();
-	}
-
-	/**
-	 * Check if the given score is possible for this evaluation
-	 */
-	public function is_valid_score($score)
-	{
-		return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
-	}
-
-	/**
-	 * Calculate the score of this evaluation
-	 * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
-	 * @param string $type (best, average, ranking)
-	 * @return	array (score, max) if student is given
-	 * 			array (sum of scores, number of scores) otherwise
-	 * 			or null if no scores available
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation and all underlying results.
+     */
+    public function delete_with_results()
+    {
+        $this->delete_results();
+        $this->delete();
+    }
+
+    /**
+     * Check if the given score is possible for this evaluation
+     */
+    public function is_valid_score($score)
+    {
+        return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
+    }
+
+    /**
+     * Calculate the score of this evaluation
+     * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
+     * @param string $type (best, average, ranking)
+     * @return	array (score, max) if student is given
+     * 			array (sum of scores, number of scores) otherwise
+     * 			or null if no scores available
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
         $useSession = true;
-		if (isset($stud_id) && empty($type)) {
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
-			$data = Session::read('calc_score');
+        if (isset($stud_id) && empty($type)) {
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
+            $data = Session::read('calc_score');
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
                 $results  = null;
             }
-			if (empty($results)) {
-				$results = Result::load(null, $stud_id, $this->id);
-				Session::write('calc_score', array($key => $results));
-			}
-
-			$score = 0;
-			/** @var Result $res */
-			foreach ($results as $res) {
-				$score = $res->get_score();
-			}
-
-			return array($score, $this->get_max());
-		} else {
-
-			$count = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
+            if (empty($results)) {
+                $results = Result::load(null, $stud_id, $this->id);
+                Session::write('calc_score', array($key => $results));
+            }
+
+            $score = 0;
+            /** @var Result $res */
+            foreach ($results as $res) {
+                $score = $res->get_score();
+            }
+
+            return array($score, $this->get_max());
+        } else {
+
+            $count = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
                 $allResults  = null;
             }
-			if (empty($allResults)) {
-				$allResults = Result::load(null, null, $this->id);
-				Session::write($key, $allResults);
-			}
-
-			$students = array();
-			/** @var Result $res */
-			foreach ($allResults as $res) {
-				$score = $res->get_score();
-				if (!empty($score) || $score == '0') {
-					$count++;
-					$sum += $score / $this->get_max();
-					$sumResult += $score;
-					if ($score > $bestResult) {
-						$bestResult = $score;
-					}
-					$weight = $this->get_max();
-				}
-				$students[$res->get_user_id()] = $score;
-			}
-
-			if (empty($count)) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $weight);
-					break;
-				case 'average':
-					return array($sumResult/$count, $weight);
-					break;
-				case 'ranking':
+            if (empty($allResults)) {
+                $allResults = Result::load(null, null, $this->id);
+                Session::write($key, $allResults);
+            }
+
+            $students = array();
+            /** @var Result $res */
+            foreach ($allResults as $res) {
+                $score = $res->get_score();
+                if (!empty($score) || $score == '0') {
+                    $count++;
+                    $sum += $score / $this->get_max();
+                    $sumResult += $score;
+                    if ($score > $bestResult) {
+                        $bestResult = $score;
+                    }
+                    $weight = $this->get_max();
+                }
+                $students[$res->get_user_id()] = $score;
+            }
+
+            if (empty($count)) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $weight);
+                    break;
+                case 'average':
+                    return array($sumResult/$count, $weight);
+                    break;
+                case 'ranking':
                     $students = array();
                     /** @var Result $res */
                     foreach ($allResults as $res) {
                         $score = $res->get_score();
                         $students[$res->get_user_id()] = $score;
                     }
-					return AbstractLink::getCurrentUserRanking($stud_id, $students);
-					break;
-				default:
-					return array($sum, $count);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Generate an array of possible categories where this evaluation can be moved to.
-	 * Notice: its own parent will be included in the list: it's up to the frontend
-	 * to disable this element.
-	 * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
-	 */
-	public function get_target_categories()
-	{
-		// - course independent evaluation
-		//   -> movable to root or other course independent categories
-		// - evaluation inside a course
-		//   -> movable to root, independent categories or categories inside the course
-		$user = (api_is_platform_admin() ? null : api_get_user_id());
-		$targets = array();
-		$level = 0;
-
-		$root = array(0, get_lang('RootCat'), $level);
-		$targets[] = $root;
-
-		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
-			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-			}
-		}
-
-		$indcats = Category::load(null,$user,0,0);
-		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-
-		return $targets;
-	}
-
-	/**
-	 * Internal function used by get_target_categories()
-	 */
-	private function add_target_subcategories($targets, $level, $catid)
-	{
-		$subcats = Category::load(null,null,null,$catid);
-		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-		return $targets;
-	}
-
-	/**
-	 * Move this evaluation to the given category.
-	 * If this evaluation moves from inside a course to outside,
-	 * its course code is also changed.
-	 */
-	public function move_to_cat($cat)
-	{
-		$this->set_category_id($cat->get_id());
-		if ($this->get_course_code() != $cat->get_course_code()) {
-			$this->set_course_code($cat->get_course_code());
-		}
-		$this->save();
-	}
-
-	/**
-	 * Retrieve evaluations where a student has results for
-	 * and return them as an array of Evaluation objects
-	 * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
-	 * @param int $stud_id student id
-	 */
-	public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
+                    return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                    break;
+                default:
+                    return array($sum, $count);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Generate an array of possible categories where this evaluation can be moved to.
+     * Notice: its own parent will be included in the list: it's up to the frontend
+     * to disable this element.
+     * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
+     */
+    public function get_target_categories()
+    {
+        // - course independent evaluation
+        //   -> movable to root or other course independent categories
+        // - evaluation inside a course
+        //   -> movable to root, independent categories or categories inside the course
+        $user = (api_is_platform_admin() ? null : api_get_user_id());
+        $targets = array();
+        $level = 0;
+
+        $root = array(0, get_lang('RootCat'), $level);
+        $targets[] = $root;
+
+        if (isset($this->course_code) && !empty($this->course_code)) {
+            $crscats = Category::load(null,null,$this->course_code,0);
+            foreach ($crscats as $cat) {
+                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            }
+        }
+
+        $indcats = Category::load(null,$user,0,0);
+        foreach ($indcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+
+        return $targets;
+    }
+
+    /**
+     * Internal function used by get_target_categories()
+     */
+    private function add_target_subcategories($targets, $level, $catid)
+    {
+        $subcats = Category::load(null,null,null,$catid);
+        foreach ($subcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+        return $targets;
+    }
+
+    /**
+     * Move this evaluation to the given category.
+     * If this evaluation moves from inside a course to outside,
+     * its course code is also changed.
+     */
+    public function move_to_cat($cat)
+    {
+        $this->set_category_id($cat->get_id());
+        if ($this->get_course_code() != $cat->get_course_code()) {
+            $this->set_course_code($cat->get_course_code());
+        }
+        $this->save();
+    }
+
+    /**
+     * Retrieve evaluations where a student has results for
+     * and return them as an array of Evaluation objects
+     * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
+     * @param int $stud_id student id
+     */
+    public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
 				WHERE id IN (
 					SELECT evaluation_id FROM '.$tbl_grade_results.'
 					WHERE user_id = '.intval($stud_id).' AND score IS NOT NULL
 				)';
-		if (!api_is_allowed_to_edit()) {
-			$sql .= ' AND visible = 1';
-		}
-		if (isset($cat_id)) {
-			$sql .= ' AND category_id = '.intval($cat_id);
-		} else {
-			$sql .= ' AND category_id >= 0';
-		}
-
-		$result = Database::query($sql);
-		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $alleval;
-	}
-
-	/**
-	 * Get a list of students that do not have a result record for this evaluation
-	 */
-	public function get_not_subscribed_students($first_letter_user = '')
-	{
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
-			." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
-			.' AND status = '.STUDENT
-			.' AND user_id NOT IN'
-			.' (SELECT user_id FROM '.$tbl_grade_results
-			.' WHERE evaluation_id = '.intval($this->id)
-			.' )'
-			.' ORDER BY lastname';
-
-		$result = Database::query($sql);
-		$users = Database::store_result($result);
-
-		return $users;
-	}
-
-	/**
-	 * Find evaluations by name
-	 * @param string $name_mask search string
-	 * @return array evaluation objects matching the search criterium
-	 * @todo can be written more efficiently using a new (but very complex) sql query
-	 */
-	public function find_evaluations($name_mask,$selectcat)
-	{
-		$rootcat = Category::load($selectcat);
-		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
-		$foundevals = array();
-		foreach ($evals as $eval) {
-			if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
-				$foundevals[] = $eval;
-			}
-		}
-		return $foundevals;
-	}
-
-	public function get_item_type()
-	{
-		return 'E';
-	}
-
-	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
-	 *
-	 **/
-	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;
-		} else {
-			if ($this->is_locked()) {
-				api_not_allowed();
-			}
-		}
-	}
-
-	function delete_linked_data()
-	{
-
-	}
+        if (!api_is_allowed_to_edit()) {
+            $sql .= ' AND visible = 1';
+        }
+        if (isset($cat_id)) {
+            $sql .= ' AND category_id = '.intval($cat_id);
+        } else {
+            $sql .= ' AND category_id >= 0';
+        }
+
+        $result = Database::query($sql);
+        $alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $alleval;
+    }
+
+    /**
+     * Get a list of students that do not have a result record for this evaluation
+     */
+    public function get_not_subscribed_students($first_letter_user = '')
+    {
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
+            ." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
+            .' AND status = '.STUDENT
+            .' AND user_id NOT IN'
+            .' (SELECT user_id FROM '.$tbl_grade_results
+            .' WHERE evaluation_id = '.intval($this->id)
+            .' )'
+            .' ORDER BY lastname';
+
+        $result = Database::query($sql);
+        $users = Database::store_result($result);
+
+        return $users;
+    }
+
+    /**
+     * Find evaluations by name
+     * @param string $name_mask search string
+     * @return array evaluation objects matching the search criterium
+     * @todo can be written more efficiently using a new (but very complex) sql query
+     */
+    public function find_evaluations($name_mask,$selectcat)
+    {
+        $rootcat = Category::load($selectcat);
+        $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
+        $foundevals = array();
+        foreach ($evals as $eval) {
+            if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
+                $foundevals[] = $eval;
+            }
+        }
+        return $foundevals;
+    }
+
+    public function get_item_type()
+    {
+        return 'E';
+    }
+
+    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
+     *
+     **/
+    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;
+        } else {
+            if ($this->is_locked()) {
+                api_not_allowed();
+            }
+        }
+    }
+
+    function delete_linked_data()
+    {
+
+    }
 
     public function getStudentList()
     {
         return $this->studentList;
     }
 
-	public function setStudentList($list)
-	{
-		$this->studentList = $list;
-	}
+    public function setStudentList($list)
+    {
+        $this->studentList = $list;
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -223,36 +223,36 @@ 
 		$paramcount = 0;
 
 		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
+			$sql .= ' WHERE id = '.intval($id);
+			$paramcount++;
 		}
 
 		if (isset ($user_id)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($course_code) && $course_code <> '-1') {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($category_id)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($visible)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($locked)) {
@@ -278,7 +278,7 @@ 
 		$alleval = array();
 		if (Database::num_rows($result)) {
 			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
+				$eval = new Evaluation();
 				$eval->set_id($data['id']);
 				$eval->set_name($data['name']);
 				$eval->set_description($data['description']);
@@ -363,7 +363,7 @@ 
 			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
 			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
 			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
+			$dateobject = $eval->load($idevaluation, null, null, null, null);
 			$arreval = get_object_vars($dateobject[0]);
 			if (!empty($arreval['id'])) {
 				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
@@ -397,7 +397,7 @@ 
 			.', description = ';
 		if (isset($this->description)) {
 			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
+		} else {
 			$sql .= 'null';
 		}
 		$sql .= ', user_id = '.intval($this->get_user_id())
@@ -468,17 +468,17 @@ 
 				$sql .= ' AND user_id = '.api_get_user_id();
 			}
 
-		}else {
+		} else {
 			$sql .= ' AND user_id = '.api_get_user_id();
 		}
 
 		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
+			$sql .= ' AND category_id is null';
 		} else {
-			$sql.= ' AND category_id = '.intval($parent);
+			$sql .= ' AND category_id = '.intval($parent);
 		}
 		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
+		$number = Database::fetch_row($result);
 
 		return $number[0] != 0;
 	}
@@ -494,7 +494,7 @@ 
 				FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
 		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
+		$number = Database::fetch_row($result);
 
 		return ($number[0] != 0);
 	}
@@ -544,7 +544,7 @@ 
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
-                $results  = null;
+                $results = null;
             }
 			if (empty($results)) {
 				$results = Result::load(null, $stud_id, $this->id);
@@ -570,7 +570,7 @@ 
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
-                $allResults  = null;
+                $allResults = null;
             }
 			if (empty($allResults)) {
 				$allResults = Result::load(null, null, $this->id);
@@ -602,7 +602,7 @@ 
 					return array($bestResult, $weight);
 					break;
 				case 'average':
-					return array($sumResult/$count, $weight);
+					return array($sumResult / $count, $weight);
 					break;
 				case 'ranking':
                     $students = array();
@@ -640,17 +640,17 @@ 
 		$targets[] = $root;
 
 		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
+			$crscats = Category::load(null, null, $this->course_code, 0);
 			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+				$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+				$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 			}
 		}
 
-		$indcats = Category::load(null,$user,0,0);
+		$indcats = Category::load(null, $user, 0, 0);
 		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+			$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+			$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 		}
 
 		return $targets;
@@ -661,10 +661,10 @@ 
 	 */
 	private function add_target_subcategories($targets, $level, $catid)
 	{
-		$subcats = Category::load(null,null,null,$catid);
+		$subcats = Category::load(null, null, null, $catid);
 		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+			$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+			$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 		}
 		return $targets;
 	}
@@ -743,7 +743,7 @@ 
 	 * @return array evaluation objects matching the search criterium
 	 * @todo can be written more efficiently using a new (but very complex) sql query
 	 */
-	public function find_evaluations($name_mask,$selectcat)
+	public function find_evaluations($name_mask, $selectcat)
 	{
 		$rootcat = Category::load($selectcat);
 		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);

Braces +27 added lines, -12 removed lines

@@ -228,36 +228,51 @@ 
 		}
 
 		if (isset ($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' user_id = '.intval($user_id);
 			$paramcount ++;
 		}
 
 		if (isset ($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= " course_code = '".Database::escape_string($course_code)."'";
 			$paramcount ++;
 		}
 
 		if (isset ($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' category_id = '.intval($category_id);
 			$paramcount ++;
 		}
 
 		if (isset ($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' visible = '.intval($visible);
 			$paramcount ++;
 		}
 
 		if (isset ($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' locked = '.intval($locked);
 		}
 
@@ -397,7 +412,7 @@ 
 			.', description = ';
 		if (isset($this->description)) {
 			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
+		} else {
 			$sql .= 'null';
 		}
 		$sql .= ', user_id = '.intval($this->get_user_id())
@@ -468,7 +483,7 @@ 
 				$sql .= ' AND user_id = '.api_get_user_id();
 			}
 
-		}else {
+		} else {
 			$sql .= ' AND user_id = '.api_get_user_id();
 		}