chamilo / chamilo-lms

main/dropbox/dropbox_class.inc.php

Doc Comments +2 added lines, -1 removed lines

@@ -266,7 +266,7 @@ 
 	 * @param string $author
 	 * @param string $filename
 	 * @param int $filesize
-	 * @param array $recipient_ids
+	 * @param unknown_type|null $recipient_ids
 	 */
 	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {
@@ -584,6 +584,7 @@ 
 
 	/**
 	 * Deletes all the received categories and work of this person
+	 * @param integer $id
 	 */
 	function deleteReceivedWorkFolder($id)
     {

Spacing +20 added lines, -20 removed lines

@@ -184,7 +184,7 @@ 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
 
         // Do some sanity checks
-        $id	= intval($id);
+        $id = intval($id);
 
         // Get the data from DB
         $sql = "SELECT uploader_id, filename, filesize, title, description, author, upload_date, last_upload_date, cat_id
@@ -226,14 +226,14 @@ 
                 $row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
                 $feedback2[] = $row_feedback;
             }
-            $this->feedback2= $feedback2;
+            $this->feedback2 = $feedback2;
         }
 	}
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
+	public $recipients; //array of ['id']['name'] arrays
 
 	/**
 	 * Constructor calls private functions to create a new work or retreive an existing work from DB
@@ -290,15 +290,15 @@ 
 		settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
 
 		$justSubmit = false;
-		if ( is_int($recipient_ids)) {
+		if (is_int($recipient_ids)) {
 			$justSubmit = true;
 			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif ( count($recipient_ids) == 0) {
+		} elseif (count($recipient_ids) == 0) {
 			$justSubmit = true;
 			$recipient_ids = array($uploader_id);
 		}
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+		if (!is_array($recipient_ids) || count($recipient_ids) == 0) {
 			die(get_lang('GeneralError').' (code 209)');
 		}
 
@@ -313,11 +313,11 @@ 
         $table_person = $dropbox_cnf['tbl_person'];
         $session_id = api_get_session_id();
         $uploader_id = $this->uploader_id;
-        $user  = api_get_user_id();
+        $user = api_get_user_id();
 		// Insert data in dropbox_post and dropbox_person table for each recipient
 		foreach ($this->recipients as $rec) {
-            $file_id = (int)$this->id;
-            $user_id = (int)$rec['id'];
+            $file_id = (int) $this->id;
+            $user_id = (int) $rec['id'];
 			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id)";
 	        Database::query($sql);
@@ -333,7 +333,7 @@ 
 
                 // Do not add recipient in person table if mailing zip or just upload.
                 if (!$justSubmit) {
-                    Database::query($sql);	// If work already exists no error is generated
+                    Database::query($sql); // If work already exists no error is generated
                 }
             }
 
@@ -342,7 +342,7 @@ 
 			    $ownerid = getUserOwningThisMailing($ownerid);
 			}
 			if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+			    $recipid = $ownerid; // mailing file recipient = mailing id, not a person
 			}
             api_item_property_update(
                 $_course,
@@ -401,13 +401,13 @@ 
 class Dropbox_Person
 {
 	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
+	public $receivedWork; // an array of Dropbox_Work objects
+	public $sentWork; // an array of Dropbox_SentWork objects
 
 	public $userId = 0;
 	public $isCourseAdmin = false;
 	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
+	public $_orderBy = ''; // private property that determines by which field
 
 	/**
 	 * Constructor for recreating the Dropbox_Person object
@@ -506,7 +506,7 @@ 
 	 */
 	function orderSentWork($sort)
     {
-		switch($sort) {
+		switch ($sort) {
 			case 'lastDate':
 				$this->_orderBy = 'last_upload_date';
 				break;
@@ -539,7 +539,7 @@ 
 	 */
 	function orderReceivedWork($sort)
     {
-		switch($sort) {
+		switch ($sort) {
 			case 'lastDate':
 				$this->_orderBy = 'last_upload_date';
 				break;
@@ -632,7 +632,7 @@ 
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
 		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 			Database::query($sql);
 			removeMoreIfMailing($w->id);
 		}
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -683,7 +683,7 @@ 
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
 		Database::query($sql);
 		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -705,7 +705,7 @@ 
 		$wi = -1;
 		foreach ($this->receivedWork as $w) {
 			$wi++;
-			if ($w->id == $id){
+			if ($w->id == $id) {
 			   $found = true;
 			   break;
 			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)

Braces +12 added lines, -4 removed lines

@@ -303,7 +303,9 @@ 
 		}
 
 		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
+			if (empty($rec)) {
+			    die(get_lang('GeneralError').' (code 210)');
+			}
 			//if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
 				//this check is done when validating submitted data
 			$this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
@@ -593,13 +595,19 @@ 
 		$id = intval($id);
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		return true;
 	}
 

Indentation +421 added lines, -421 removed lines

@@ -77,20 +77,20 @@ 
         }
     }
 
-	/**
-	 * private function creating a new work object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 *
-	 * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
-	 * 			As a consequence this parameter can be removed
-	 */
-	public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
+    /**
+     * private function creating a new work object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     *
+     * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
+     * 			As a consequence this parameter can be removed
+     */
+    public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
     {
         $dropbox_cnf = getDropboxConf();
 
@@ -108,17 +108,17 @@ 
         // Check if object exists already. If it does, the old object is used
         // with updated information (authors, description, upload_date)
         $this->isOldWork = false;
-		$sql = "SELECT id, upload_date FROM ".$dropbox_cnf['tbl_file']."
+        $sql = "SELECT id, upload_date FROM ".$dropbox_cnf['tbl_file']."
 				WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'";
         $result = Database::query($sql);
-		$res = Database::fetch_array($result);
-		if ($res) {
-			$this->isOldWork = true;
-		}
-		// Insert or update the dropbox_file table and set the id property
-		if ($this->isOldWork) {
-			$this->id = $res['id'];
-			$this->upload_date = $res['upload_date'];
+        $res = Database::fetch_array($result);
+        if ($res) {
+            $this->isOldWork = true;
+        }
+        // Insert or update the dropbox_file table and set the id property
+        if ($this->isOldWork) {
+            $this->id = $res['id'];
+            $this->upload_date = $res['upload_date'];
 
             $params = [
                 'filesize' => $this->filesize,
@@ -135,9 +135,9 @@ 
                 ['c_id = ? AND id = ?' => [$course_id, $this->id]]
             );
 
-		} else {
-			$this->upload_date = $this->last_upload_date;
-			$params = [
+        } else {
+            $this->upload_date = $this->last_upload_date;
+            $params = [
                 'c_id' => $course_id,
                 'uploader_id' => $this->uploader_id,
                 'filename' => $this->filename,
@@ -148,14 +148,14 @@ 
                 'upload_date' => $this->upload_date,
                 'last_upload_date' => $this->last_upload_date,
                 'session_id' => api_get_session_id(),
-			];
-			$this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
+            ];
+            $this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
 
-			if ($this->id) {
-				$sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
-				Database::query($sql);
-			}
-		}
+            if ($this->id) {
+                $sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
+                Database::query($sql);
+            }
+        }
 
         $sql = "SELECT count(file_id) as count
         		FROM ".$dropbox_cnf['tbl_person']."
@@ -169,16 +169,16 @@ 
                     VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
             Database::query($sql);
         }
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param int $id
-	 */
-	public function _createExistingWork($id)
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param int $id
+     */
+    public function _createExistingWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -228,52 +228,52 @@ 
             }
             $this->feedback2= $feedback2;
         }
-	}
+    }
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
-
-	/**
-	 * Constructor calls private functions to create a new work or retreive an existing work from DB
-	 * depending on the number of parameters
-	 *
-	 * @param unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @param unknown_type $arg7
-	 * @return Dropbox_SentWork
-	 */
-	function Dropbox_SentWork($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
+    public $recipients;	//array of ['id']['name'] arrays
+
+    /**
+     * Constructor calls private functions to create a new work or retreive an existing work from DB
+     * depending on the number of parameters
+     *
+     * @param unknown_type $arg1
+     * @param unknown_type $arg2
+     * @param unknown_type $arg3
+     * @param unknown_type $arg4
+     * @param unknown_type $arg5
+     * @param unknown_type $arg6
+     * @param unknown_type $arg7
+     * @return Dropbox_SentWork
+     */
+    function Dropbox_SentWork($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
     {
-		if (func_num_args() > 1) {
-		    $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
-		} else {
-			$this->_createExistingSentWork($arg1);
-		}
-	}
-
-	/**
-	 * private function creating a new SentWork object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 * @param array $recipient_ids
-	 */
-	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
+        if (func_num_args() > 1) {
+            $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
+        } else {
+            $this->_createExistingSentWork($arg1);
+        }
+    }
+
+    /**
+     * private function creating a new SentWork object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     * @param array $recipient_ids
+     */
+    public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {
         $dropbox_cnf = getDropboxConf();
         $_course = api_get_course_info();
 
-		// Call constructor of Dropbox_Work object
+        // Call constructor of Dropbox_Work object
         $this->Dropbox_Work(
             $uploader_id,
             $title,
@@ -283,44 +283,44 @@ 
             $filesize
         );
 
-		$course_id = api_get_course_int_id();
-
-		// Do sanity checks on recipient_ids array & property fillin
-		// The sanity check for ex-coursemembers is already done in base constructor
-		settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
+        $course_id = api_get_course_int_id();
 
-		$justSubmit = false;
-		if ( is_int($recipient_ids)) {
-			$justSubmit = true;
-			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif ( count($recipient_ids) == 0) {
-			$justSubmit = true;
-			$recipient_ids = array($uploader_id);
-		}
+        // Do sanity checks on recipient_ids array & property fillin
+        // The sanity check for ex-coursemembers is already done in base constructor
+        settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
+
+        $justSubmit = false;
+        if ( is_int($recipient_ids)) {
+            $justSubmit = true;
+            $recipient_ids = array($recipient_ids + $this->id);
+        } elseif ( count($recipient_ids) == 0) {
+            $justSubmit = true;
+            $recipient_ids = array($uploader_id);
+        }
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
-			die(get_lang('GeneralError').' (code 209)');
-		}
+        if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+            die(get_lang('GeneralError').' (code 209)');
+        }
 
-		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
-			//if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
-				//this check is done when validating submitted data
-			$this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
-		}
+        foreach ($recipient_ids as $rec) {
+            if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
+            //if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
+                //this check is done when validating submitted data
+            $this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
+        }
 
         $table_post = $dropbox_cnf['tbl_post'];
         $table_person = $dropbox_cnf['tbl_person'];
         $session_id = api_get_session_id();
         $uploader_id = $this->uploader_id;
         $user  = api_get_user_id();
-		// Insert data in dropbox_post and dropbox_person table for each recipient
-		foreach ($this->recipients as $rec) {
+        // Insert data in dropbox_post and dropbox_person table for each recipient
+        foreach ($this->recipients as $rec) {
             $file_id = (int)$this->id;
             $user_id = (int)$rec['id'];
-			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id)
+            $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id)";
-	        Database::query($sql);
+            Database::query($sql);
             // If work already exists no error is generated
 
             /**
@@ -337,13 +337,13 @@ 
                 }
             }
 
-			// Update item_property table for each recipient
-			if (($ownerid = $this->uploader_id) > $dropbox_cnf['mailingIdBase']) {
-			    $ownerid = getUserOwningThisMailing($ownerid);
-			}
-			if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
-			}
+            // Update item_property table for each recipient
+            if (($ownerid = $this->uploader_id) > $dropbox_cnf['mailingIdBase']) {
+                $ownerid = getUserOwningThisMailing($ownerid);
+            }
+            if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
+                $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+            }
             api_item_property_update(
                 $_course,
                 TOOL_DROPBOX,
@@ -353,92 +353,92 @@ 
                 null,
                 $recipid
             );
-		}
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param unknown_type $id
-	 */
-	function _createExistingSentWork($id)
+        }
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param unknown_type $id
+     */
+    function _createExistingSentWork($id)
     {
         $dropbox_cnf = getDropboxConf();
         $id = intval($id);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Call constructor of Dropbox_Work object
-		$this->Dropbox_Work($id);
+        // Call constructor of Dropbox_Work object
+        $this->Dropbox_Work($id);
 
-		// Fill in recipients array
-		$this->recipients = array();
-		$sql = "SELECT dest_user_id, feedback_date, feedback
+        // Fill in recipients array
+        $this->recipients = array();
+        $sql = "SELECT dest_user_id, feedback_date, feedback
 				FROM ".$dropbox_cnf['tbl_post']."
 				WHERE c_id = $course_id AND file_id = ".intval($id)."";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result, 'ASSOC')) {
-
-			// Check for deleted users
-			$dest_user_id = $res['dest_user_id'];
-			$user_info = api_get_user_info($dest_user_id);
-			//$this->category = $res['cat_id'];
-			if (!$user_info) {
-				$this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
-			} else {
-				$this->recipients[] = array(
+        while ($res = Database::fetch_array($result, 'ASSOC')) {
+
+            // Check for deleted users
+            $dest_user_id = $res['dest_user_id'];
+            $user_info = api_get_user_info($dest_user_id);
+            //$this->category = $res['cat_id'];
+            if (!$user_info) {
+                $this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
+            } else {
+                $this->recipients[] = array(
                     'id' => $dest_user_id,
                     'name' => $user_info['complete_name'],
                     'user_id' => $dest_user_id,
-				    'feedback_date' => $res['feedback_date'],
+                    'feedback_date' => $res['feedback_date'],
                     'feedback' => $res['feedback']
                 );
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 class Dropbox_Person
 {
-	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
-
-	public $userId = 0;
-	public $isCourseAdmin = false;
-	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
-
-	/**
-	 * Constructor for recreating the Dropbox_Person object
-	 *
-	 * @param int $userId
-	 * @param bool $isCourseAdmin
-	 * @param bool $isCourseTutor
-	 * @return Dropbox_Person
-	 */
-	function Dropbox_Person($userId, $isCourseAdmin, $isCourseTutor)
+    // The receivedWork and the sentWork arrays are sorted.
+    public $receivedWork;	// an array of Dropbox_Work objects
+    public $sentWork;		// an array of Dropbox_SentWork objects
+
+    public $userId = 0;
+    public $isCourseAdmin = false;
+    public $isCourseTutor = false;
+    public $_orderBy = '';	// private property that determines by which field
+
+    /**
+     * Constructor for recreating the Dropbox_Person object
+     *
+     * @param int $userId
+     * @param bool $isCourseAdmin
+     * @param bool $isCourseTutor
+     * @return Dropbox_Person
+     */
+    function Dropbox_Person($userId, $isCourseAdmin, $isCourseTutor)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Fill in properties
+        // Fill in properties
         $this->userId = $userId;
         $this->isCourseAdmin = $isCourseAdmin;
         $this->isCourseTutor = $isCourseTutor;
         $this->receivedWork = array();
         $this->sentWork = array();
 
-		// Note: perhaps include an ex coursemember check to delete old files
+        // Note: perhaps include an ex coursemember check to delete old files
 
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id);
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id);
 
-		$post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
-		$person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
-		$file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
+        $post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
+        $person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
+        $file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
 
         // Find all entries where this person is the recipient
-		$sql = "SELECT DISTINCT r.file_id, r.cat_id
+        $sql = "SELECT DISTINCT r.file_id, r.cat_id
                 FROM $post_tbl r
                 INNER JOIN $person_tbl p
                     ON (r.file_id = p.file_id AND r.c_id = $course_id AND p.c_id = $course_id )
@@ -447,12 +447,12 @@ 
                      r.dest_user_id = ".intval($this->userId)." $condition_session ";
 
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$temp = new Dropbox_Work($res['file_id']);
-			$temp->category = $res['cat_id'];
-			$this->receivedWork[] = $temp;
-		}
-		// Find all entries where this person is the sender/uploader
+        while ($res = Database::fetch_array($result)) {
+            $temp = new Dropbox_Work($res['file_id']);
+            $temp->category = $res['cat_id'];
+            $this->receivedWork[] = $temp;
+        }
+        // Find all entries where this person is the sender/uploader
         $sql = "SELECT DISTINCT f.id
 				FROM $file_tbl f
 				INNER JOIN $person_tbl p
@@ -463,260 +463,260 @@ 
                     $condition_session
                 ";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$this->sentWork[] = new Dropbox_SentWork($res['id']);
-		}
-	}
-
-	/**
-	 * This private method is used by the usort function in  the
-	 * orderSentWork and orderReceivedWork methods.
-	 * It compares 2 work-objects by 1 of the properties of that object, dictated by the
-	 * private property _orderBy
-	 *
-	 * @param unknown_type $a
-	 * @param unknown_type $b
-	 * @return -1, 0 or 1 dependent of the result of the comparison.
-	 */
-	function _cmpWork($a, $b)
+        while ($res = Database::fetch_array($result)) {
+            $this->sentWork[] = new Dropbox_SentWork($res['id']);
+        }
+    }
+
+    /**
+     * This private method is used by the usort function in  the
+     * orderSentWork and orderReceivedWork methods.
+     * It compares 2 work-objects by 1 of the properties of that object, dictated by the
+     * private property _orderBy
+     *
+     * @param unknown_type $a
+     * @param unknown_type $b
+     * @return -1, 0 or 1 dependent of the result of the comparison.
+     */
+    function _cmpWork($a, $b)
     {
-		$sort = $this->_orderBy;
-		$aval = $a->$sort;
-		$bval = $b->$sort;
-		if ($sort == 'recipients') {
-		    // The recipients property is an array so we do the comparison based
-		    // on the first item of the recipients array
-		    $aval = $aval[0]['name'];
-			$bval = $bval[0]['name'];
-		}
-		if ($sort == 'filesize') {    // Filesize is not a string, so we use other comparison technique
-			return $aval < $bval ? -1 : 1;
-		} elseif ($sort == 'title') { // Natural order for sorting titles is more "human-friendly"
-			return api_strnatcmp($aval, $bval);
-		} else {
-		    return api_strcasecmp($aval, $bval);
-		}
-	}
-
-	/**
-	 * A method that sorts the objects in the sentWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 *
-	 * @param unknown_type $sort
-	 */
-	function orderSentWork($sort)
+        $sort = $this->_orderBy;
+        $aval = $a->$sort;
+        $bval = $b->$sort;
+        if ($sort == 'recipients') {
+            // The recipients property is an array so we do the comparison based
+            // on the first item of the recipients array
+            $aval = $aval[0]['name'];
+            $bval = $bval[0]['name'];
+        }
+        if ($sort == 'filesize') {    // Filesize is not a string, so we use other comparison technique
+            return $aval < $bval ? -1 : 1;
+        } elseif ($sort == 'title') { // Natural order for sorting titles is more "human-friendly"
+            return api_strnatcmp($aval, $bval);
+        } else {
+            return api_strcasecmp($aval, $bval);
+        }
+    }
+
+    /**
+     * A method that sorts the objects in the sentWork array, dependent on the $sort parameter.
+     * $sort can be lastDate, firstDate, title, size, ...
+     *
+     * @param unknown_type $sort
+     */
+    function orderSentWork($sort)
     {
-		switch($sort) {
-			case 'lastDate':
-				$this->_orderBy = 'last_upload_date';
-				break;
-			case 'firstDate':
-				$this->_orderBy = 'upload_date';
-				break;
-			case 'title':
-				$this->_orderBy = 'title';
-				break;
-			case 'size':
-				$this->_orderBy = 'filesize';
-				break;
-			case 'author':
-				$this->_orderBy = 'author';
-				break;
-			case 'recipient':
-				$this->_orderBy = 'recipients';
-				break;
-			default:
-				$this->_orderBy = 'last_upload_date';
-		}
-
-		usort($this->sentWork, array($this, '_cmpWork'));
-	}
-
-	/**
-	 * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 * @param unknown_type $sort
-	 */
-	function orderReceivedWork($sort)
+        switch($sort) {
+            case 'lastDate':
+                $this->_orderBy = 'last_upload_date';
+                break;
+            case 'firstDate':
+                $this->_orderBy = 'upload_date';
+                break;
+            case 'title':
+                $this->_orderBy = 'title';
+                break;
+            case 'size':
+                $this->_orderBy = 'filesize';
+                break;
+            case 'author':
+                $this->_orderBy = 'author';
+                break;
+            case 'recipient':
+                $this->_orderBy = 'recipients';
+                break;
+            default:
+                $this->_orderBy = 'last_upload_date';
+        }
+
+        usort($this->sentWork, array($this, '_cmpWork'));
+    }
+
+    /**
+     * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
+     * $sort can be lastDate, firstDate, title, size, ...
+     * @param unknown_type $sort
+     */
+    function orderReceivedWork($sort)
     {
-		switch($sort) {
-			case 'lastDate':
-				$this->_orderBy = 'last_upload_date';
-				break;
-			case 'firstDate':
-				$this->_orderBy = 'upload_date';
-				break;
-			case 'title':
-				$this->_orderBy = 'title';
-				break;
-			case 'size':
-				$this->_orderBy = 'filesize';
-				break;
-			case 'author':
-				$this->_orderBy = 'author';
-				break;
-			case 'sender':
-				$this->_orderBy = 'uploaderName';
-				break;
-			default:
-				$this->_orderBy = 'last_upload_date';
-		}
-
-		usort($this->receivedWork, array($this, '_cmpWork'));
-	}
-
-	/**
-	 * Deletes all the received work of this person
-	 */
-	function deleteAllReceivedWork()
+        switch($sort) {
+            case 'lastDate':
+                $this->_orderBy = 'last_upload_date';
+                break;
+            case 'firstDate':
+                $this->_orderBy = 'upload_date';
+                break;
+            case 'title':
+                $this->_orderBy = 'title';
+                break;
+            case 'size':
+                $this->_orderBy = 'filesize';
+                break;
+            case 'author':
+                $this->_orderBy = 'author';
+                break;
+            case 'sender':
+                $this->_orderBy = 'uploaderName';
+                break;
+            default:
+                $this->_orderBy = 'last_upload_date';
+        }
+
+        usort($this->receivedWork, array($this, '_cmpWork'));
+    }
+
+    /**
+     * Deletes all the received work of this person
+     */
+    function deleteAllReceivedWork()
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		// Delete entries in person table concerning received works
-		foreach ($this->receivedWork as $w) {
+        // Delete entries in person table concerning received works
+        foreach ($this->receivedWork as $w) {
             $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
 			        WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-		}
+            Database::query($sql);
+        }
         // Check for unused files
-		removeUnusedFiles();
-	}
+        removeUnusedFiles();
+    }
 
-	/**
-	 * Deletes all the received categories and work of this person
-	 */
-	function deleteReceivedWorkFolder($id)
+    /**
+     * Deletes all the received categories and work of this person
+     */
+    function deleteReceivedWorkFolder($id)
     {
         $dropbox_cnf = getDropboxConf();
         $course_id = api_get_course_int_id();
 
-		$id = intval($id);
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
+        $id = intval($id);
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		return true;
-	}
-
-	/**
-	 * Deletes a received dropbox file of this person with id=$id
-	 *
-	 * @param integer $id
-	 */
-	function deleteReceivedWork($id)
+        if (!Database::query($sql)) return false;
+        return true;
+    }
+
+    /**
+     * Deletes a received dropbox file of this person with id=$id
+     *
+     * @param integer $id
+     */
+    function deleteReceivedWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->receivedWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 216)');
-			}
-		}
-		// Delete entries in person table concerning received works
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->receivedWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 216)');
+            }
+        }
+        // Delete entries in person table concerning received works
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
-		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes all the sent dropbox files of this person
-	 */
-	function deleteAllSentWork()
+        Database::query($sql);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes all the sent dropbox files of this person
+     */
+    function deleteAllSentWork()
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		//delete entries in person table concerning sent works
-		foreach ($this->sentWork as $w) {
+        //delete entries in person table concerning sent works
+        foreach ($this->sentWork as $w) {
             $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                     WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-			removeMoreIfMailing($w->id);
-		}
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes a sent dropbox file of this person with id=$id
-	 *
-	 * @param unknown_type $id
-	 */
-	function deleteSentWork($id)
+            Database::query($sql);
+            removeMoreIfMailing($w->id);
+        }
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes a sent dropbox file of this person with id=$id
+     *
+     * @param unknown_type $id
+     */
+    function deleteSentWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->sentWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 219)');
-			}
-		}
-		//$file_id = $this->sentWork[$index]->id;
-		// Delete entries in person table concerning sent works
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->sentWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 219)');
+            }
+        }
+        //$file_id = $this->sentWork[$index]->id;
+        // Delete entries in person table concerning sent works
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
-		Database::query($sql);
-		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Updates feedback for received work of this person with id=$id
-	 *
-	 * @param string $id
-	 * @param string $text
-	 */
-	function updateFeedback($id, $text)
+        Database::query($sql);
+        removeMoreIfMailing($id);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Updates feedback for received work of this person with id=$id
+     *
+     * @param string $id
+     * @param string $text
+     */
+    function updateFeedback($id, $text)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		$wi = -1;
-		foreach ($this->receivedWork as $w) {
-			$wi++;
-			if ($w->id == $id){
-			   $found = true;
-			   break;
-			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
-		}
-		if (!$found) {
-			die(get_lang('GeneralError').' (code 221)');
-		}
-
-		$feedback_date = api_get_utc_datetime();
-		$this->receivedWork[$wi]->feedback_date = $feedback_date;
-		$this->receivedWork[$wi]->feedback = $text;
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        $wi = -1;
+        foreach ($this->receivedWork as $w) {
+            $wi++;
+            if ($w->id == $id){
+                $found = true;
+                break;
+            }  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
+        }
+        if (!$found) {
+            die(get_lang('GeneralError').' (code 221)');
+        }
+
+        $feedback_date = api_get_utc_datetime();
+        $this->receivedWork[$wi]->feedback_date = $feedback_date;
+        $this->receivedWork[$wi]->feedback = $text;
 
         $params = [
             'feedback_date' => $feedback_date,
@@ -734,11 +734,11 @@ 
             ]
         );
 
-		// Update item_property table
+        // Update item_property table
 
-		if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) {
-		    $ownerid = getUserOwningThisMailing($ownerid);
-		}
+        if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) {
+            $ownerid = getUserOwningThisMailing($ownerid);
+        }
         api_item_property_update(
             $_course,
             TOOL_DROPBOX,
@@ -749,31 +749,31 @@ 
             $ownerid
         );
 
-	}
+    }
 
-	/**
-	 * Filter the received work
-	 * @param string $type
-	 * @param string $value
-	 */
-	function filter_received_work($type, $value)
+    /**
+     * Filter the received work
+     * @param string $type
+     * @param string $value
+     */
+    function filter_received_work($type, $value)
     {
         $dropbox_cnf = getDropboxConf();
-    	$new_received_work = array();
-		foreach ($this->receivedWork as $work) {
-			switch ($type) {
-				case 'uploader_id':
-					if ($work->uploader_id == $value ||
-						($work->uploader_id > $dropbox_cnf['mailingIdBase'] &&
+        $new_received_work = array();
+        foreach ($this->receivedWork as $work) {
+            switch ($type) {
+                case 'uploader_id':
+                    if ($work->uploader_id == $value ||
+                        ($work->uploader_id > $dropbox_cnf['mailingIdBase'] &&
                         getUserOwningThisMailing($work->uploader_id) == $value)
                     ) {
-						$new_received_work[] = $work;
-					}
-					break;
-				default:
-					$new_received_work[] = $work;
-			}
-		}
-		$this->receivedWork = $new_received_work;
-	}
+                        $new_received_work[] = $work;
+                    }
+                    break;
+                default:
+                    $new_received_work[] = $work;
+            }
+        }
+        $this->receivedWork = $new_received_work;
+    }
 }

main/exercice/answer.class.php

Doc Comments +10 added lines

@@ -186,6 +186,7 @@ 
      * Reads answer information from the data base ordered by parameter
      * @param	string	Field we want to order by
      * @param	string	DESC or ASC
+     * @param string $field
      * @author 	Frederic Vauthier
      */
     public function readOrderedBy($field, $order='ASC')
@@ -300,6 +301,7 @@ 
 	 * returns the question ID of the destination question
 	 *
 	 * @author Julio Montoya
+	 * @param integer $id
 	 * @return integer - the question ID
 	 */
 	public function selectDestination($id)
@@ -321,6 +323,7 @@ 
 
 	/**
 	 * return array answer by id else return a bool
+	 * @param integer $auto_id
 	 */
 	public function selectAnswerByAutoId($auto_id)
 	{
@@ -435,6 +438,7 @@ 
 	 *
 	 * @author Olivier Brouckaert
 	 * @param - integer $id - answer ID
+	 * @param integer $id
 	 * @return integer - 0 if bad answer, not 0 if good answer
 	 */
     public function isCorrect($id)
@@ -447,6 +451,7 @@ 
 	 *
 	 * @author Olivier Brouckaert
 	 * @param - integer $id - answer ID
+	 * @param integer $id
 	 * @return string - answer comment
 	 */
     public function selectComment($id)
@@ -459,6 +464,7 @@ 
 	 *
 	 * @author Olivier Brouckaert
 	 * @param - integer $id - answer ID
+	 * @param integer $id
 	 * @return integer - answer weighting
 	 */
     public function selectWeighting($id)
@@ -483,6 +489,7 @@ 
 	 *
 	 * @author	Olivier Brouckaert
 	 * @param	integer	Answer ID
+	 * @param integer $id
 	 * @return	integer	Answer position
 	 */
     public function selectHotspotCoordinates($id)
@@ -495,6 +502,7 @@ 
 	 *
 	 * @author	Toon Keppens
 	 * @param	integer		Answer ID
+	 * @param integer $id
 	 * @return	integer		Answer position
 	 */
     public function selectHotspotType($id)
@@ -550,6 +558,7 @@ 
      * @param string $destination
      * @param string $hotspot_coordinates
      * @param string $hotspot_type
+     * @param integer $autoId
      */
     public function updateAnswers(
         $autoId,
@@ -720,6 +729,7 @@ 
 	 * @author Olivier Brouckaert
 	 * @param  int question id
      * @param  array destination course info (result of the function api_get_course_info() )
+     * @param string $newQuestionId
 	 */
     public function duplicate($newQuestionId, $course_info = null)
     {

Indentation +296 added lines, -296 removed lines

@@ -155,12 +155,12 @@ 
         return [];
     }
 
-     /**
-     * returns all answer ids from this question Id
-     *
-     * @author Yoselyn Castillo
-     * @return array - $id (answer ids)
-     */
+        /**
+         * returns all answer ids from this question Id
+         *
+         * @author Yoselyn Castillo
+         * @return array - $id (answer ids)
+         */
     public function selectAnswerId()
     {
         $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
@@ -180,7 +180,7 @@ 
         }
 
         return $id;
-	}
+    }
 
     /**
      * Reads answer information from the data base ordered by parameter
@@ -190,23 +190,23 @@ 
      */
     public function readOrderedBy($field, $order='ASC')
     {
-		$field = Database::escape_string($field);
-		if (empty($field)) {
-			$field = 'position';
-		}
+        $field = Database::escape_string($field);
+        if (empty($field)) {
+            $field = 'position';
+        }
 
-		if ($order != 'ASC' && $order!='DESC') {
-			$order = 'ASC';
-		}
+        if ($order != 'ASC' && $order!='DESC') {
+            $order = 'ASC';
+        }
 
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
-		$questionId = intval($this->questionId);
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $TBL_QUIZ = Database::get_course_table(TABLE_QUIZ_QUESTION);
+        $questionId = intval($this->questionId);
 
-		$sql = "SELECT type FROM $TBL_QUIZ
+        $sql = "SELECT type FROM $TBL_QUIZ
 		        WHERE c_id = {$this->course_id} AND id = $questionId";
-		$result_question = Database::query($sql);
-		$questionType = Database::fetch_array($result_question);
+        $result_question = Database::query($sql);
+        $questionType = Database::fetch_array($result_question);
 
         if ($questionType['type'] == DRAGGABLE) {
             // Random is done by submit.js.tpl
@@ -215,7 +215,7 @@ 
             return true;
         }
 
-		$sql = "SELECT
+        $sql = "SELECT
 		            answer,
 		            correct,
 		            comment,
@@ -230,16 +230,16 @@ 
                     c_id = {$this->course_id} AND
                     question_id='".$questionId."'
                 ORDER BY $field $order";
-		$result=Database::query($sql);
-
-		$i = 1;
-		// while a record is found
-		$doubt_data = null;
-		while ($object = Database::fetch_object($result)) {
-		    if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
-		        $doubt_data = $object;
+        $result=Database::query($sql);
+
+        $i = 1;
+        // while a record is found
+        $doubt_data = null;
+        while ($object = Database::fetch_object($result)) {
+            if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
+                $doubt_data = $object;
                 continue;
-		    }
+            }
             $this->answer[$i] = $object->answer;
             $this->correct[$i] = $object->correct;
             $this->comment[$i] = $object->comment;
@@ -248,9 +248,9 @@ 
             $this->destination[$i] = $object->destination;
             $this->autoId[$i] = $object->id_auto;
             $i++;
-		}
+        }
 
-		if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
+        if ($questionType['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
             $this->answer[$i] = $doubt_data->answer;
             $this->correct[$i] = $doubt_data->correct;
             $this->comment[$i] = $doubt_data->comment;
@@ -259,86 +259,86 @@ 
             $this->destination[$i] = $doubt_data->destination;
             $this->autoId[$i] = $doubt_data->id_auto;
             $i++;
-	    }
+        }
         $this->nbrAnswers = $i-1;
-	}
-
-	/**
-	 * returns the autoincrement id identificator
-	 *
-	 * @author Juan Carlos Ra�a
-	 * @return integer - answer num
-	 */
+    }
+
+    /**
+     * returns the autoincrement id identificator
+     *
+     * @author Juan Carlos Ra�a
+     * @return integer - answer num
+     */
     public function selectAutoId($id)
     {
-		return isset($this->autoId[$id]) ? $this->autoId[$id] : null;
-	}
-
-	/**
-	 * returns the number of answers in this question
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - number of answers
-	 */
-	public function selectNbrAnswers()
+        return isset($this->autoId[$id]) ? $this->autoId[$id] : null;
+    }
+
+    /**
+     * returns the number of answers in this question
+     *
+     * @author Olivier Brouckaert
+     * @return integer - number of answers
+     */
+    public function selectNbrAnswers()
     {
-		return $this->nbrAnswers;
-	}
-
-	/**
-	 * returns the question ID which the answers belong to
-	 *
-	 * @author Olivier Brouckaert
-	 * @return integer - the question ID
-	 */
-	public function selectQuestionId()
+        return $this->nbrAnswers;
+    }
+
+    /**
+     * returns the question ID which the answers belong to
+     *
+     * @author Olivier Brouckaert
+     * @return integer - the question ID
+     */
+    public function selectQuestionId()
     {
-		return $this->questionId;
-	}
-
-	/**
-	 * returns the question ID of the destination question
-	 *
-	 * @author Julio Montoya
-	 * @return integer - the question ID
-	 */
-	public function selectDestination($id)
+        return $this->questionId;
+    }
+
+    /**
+     * returns the question ID of the destination question
+     *
+     * @author Julio Montoya
+     * @return integer - the question ID
+     */
+    public function selectDestination($id)
     {
-		return isset($this->destination[$id]) ? $this->destination[$id] : null;
-	}
+        return isset($this->destination[$id]) ? $this->destination[$id] : null;
+    }
 
     /**
-	 * returns the answer title
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer title
-	 */
-	public function selectAnswer($id)
-	{
-		return isset($this->answer[$id]) ? $this->answer[$id] : null;
-	}
-
-	/**
-	 * return array answer by id else return a bool
-	 */
-	public function selectAnswerByAutoId($auto_id)
-	{
-		$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
-
-		$auto_id = intval($auto_id);
-		$sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
+     * returns the answer title
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer title
+     */
+    public function selectAnswer($id)
+    {
+        return isset($this->answer[$id]) ? $this->answer[$id] : null;
+    }
+
+    /**
+     * return array answer by id else return a bool
+     */
+    public function selectAnswerByAutoId($auto_id)
+    {
+        $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
+
+        $auto_id = intval($auto_id);
+        $sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
 				WHERE c_id = {$this->course_id} AND id_auto='$auto_id'";
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		if (Database::num_rows($rs) > 0) {
-			$row = Database::fetch_array($rs, 'ASSOC');
+        if (Database::num_rows($rs) > 0) {
+            $row = Database::fetch_array($rs, 'ASSOC');
 
-			return $row;
-		}
+            return $row;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * returns the answer title from an answer's position
@@ -347,18 +347,18 @@ 
      * @param - integer $id - answer ID
      * @return bool - answer title
      */
-	public function selectAnswerIdByPosition($pos)
-	{
-		foreach ($this->position as $k => $v) {
-			if ($v != $pos) {
-				continue;
-			}
+    public function selectAnswerIdByPosition($pos)
+    {
+        foreach ($this->position as $k => $v) {
+            if ($v != $pos) {
+                continue;
+            }
 
-			return $k;
-		}
+            return $k;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * Returns a list of answers
@@ -367,18 +367,18 @@ 
      * of (id, answer, comment, grade) and grade=weighting
      */
     public function getAnswersList($decode = false)
-     {
-	 	$list = array();
-         for ($i = 1; $i <= $this->nbrAnswers; $i++) {
-             if (!empty($this->answer[$i])) {
-
-	 			//Avoid problems when parsing elements with accents
-	 			if ($decode) {
-	        		$this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
-	        		$this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
-	 			}
-
-	 			$list[] = array(
+        {
+            $list = array();
+            for ($i = 1; $i <= $this->nbrAnswers; $i++) {
+                if (!empty($this->answer[$i])) {
+
+                    //Avoid problems when parsing elements with accents
+                    if ($decode) {
+                    $this->answer[$i] 	= api_html_entity_decode($this->answer[$i], ENT_QUOTES, api_get_system_encoding());
+                    $this->comment[$i]	= api_html_entity_decode($this->comment[$i], ENT_QUOTES, api_get_system_encoding());
+                    }
+
+                    $list[] = array(
                     'id' => $i,
                     'answer' => $this->answer[$i],
                     'comment' => $this->comment[$i],
@@ -387,134 +387,134 @@ 
                     'hotspot_type' => $this->hotspot_type[$i],
                     'correct' => $this->correct[$i],
                     'destination' => $this->destination[$i]
-				);
+                );
+            }
             }
-	 	}
 
-	 	return $list;
-	 }
+            return $list;
+        }
 
-	/**
-	 * Returns a list of grades
-	 * @author Yannick Warnier <ywarnier@beeznest.org>
-	 * @return array	List of grades where grade=weighting (?)
-	 */
+    /**
+     * Returns a list of grades
+     * @author Yannick Warnier <ywarnier@beeznest.org>
+     * @return array	List of grades where grade=weighting (?)
+     */
     public function getGradesList()
-     {
-	 	$list = array();
-	 	for ($i = 0; $i<$this->nbrAnswers;$i++){
-	 		if(!empty($this->answer[$i])){
-	 			$list[$i] = $this->weighting[$i];
-	 		}
-	 	}
-	 	return $list;
-	 }
-
-	 /**
-	  * Returns the question type
-	  * @author	Yannick Warnier <ywarnier@beeznest.org>
-	  * @return	integer	The type of the question this answer is bound to
-	  */
+        {
+            $list = array();
+            for ($i = 0; $i<$this->nbrAnswers;$i++){
+                if(!empty($this->answer[$i])){
+                    $list[$i] = $this->weighting[$i];
+                }
+            }
+            return $list;
+        }
+
+        /**
+         * Returns the question type
+         * @author	Yannick Warnier <ywarnier@beeznest.org>
+         * @return	integer	The type of the question this answer is bound to
+         */
     public function getQuestionType()
-     {
-	 	$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
-	 	$sql = "SELECT type FROM $TBL_QUESTIONS
+        {
+            $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
+            $sql = "SELECT type FROM $TBL_QUESTIONS
 	 	        WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
-	 	$res = Database::query($sql);
-	 	if (Database::num_rows($res)<=0){
-	 		return null;
-	 	}
-	 	$row = Database::fetch_array($res);
-
-	 	return $row['type'];
-	 }
-
-
-	/**
-	 * tells if answer is correct or not
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - 0 if bad answer, not 0 if good answer
-	 */
+            $res = Database::query($sql);
+            if (Database::num_rows($res)<=0){
+                return null;
+            }
+            $row = Database::fetch_array($res);
+
+            return $row['type'];
+        }
+
+
+    /**
+     * tells if answer is correct or not
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - 0 if bad answer, not 0 if good answer
+     */
     public function isCorrect($id)
-	{
-		return isset($this->correct[$id]) ? $this->correct[$id] : null;
-	}
-
-	/**
-	 * returns answer comment
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return string - answer comment
-	 */
+    {
+        return isset($this->correct[$id]) ? $this->correct[$id] : null;
+    }
+
+    /**
+     * returns answer comment
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return string - answer comment
+     */
     public function selectComment($id)
-	{
+    {
         return isset($this->comment[$id]) ? $this->comment[$id] : null;
-	}
-
-	/**
-	 * returns answer weighting
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - answer weighting
-	 */
+    }
+
+    /**
+     * returns answer weighting
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - answer weighting
+     */
     public function selectWeighting($id)
-	{
-		return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
-	}
-
-	/**
-	 * returns answer position
-	 *
-	 * @author Olivier Brouckaert
-	 * @param - integer $id - answer ID
-	 * @return integer - answer position
-	 */
-	function selectPosition($id)
-	{
-		return isset($this->position[$id]) ? $this->position[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot coordinates
-	 *
-	 * @author	Olivier Brouckaert
-	 * @param	integer	Answer ID
-	 * @return	integer	Answer position
-	 */
+    {
+        return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
+    }
+
+    /**
+     * returns answer position
+     *
+     * @author Olivier Brouckaert
+     * @param - integer $id - answer ID
+     * @return integer - answer position
+     */
+    function selectPosition($id)
+    {
+        return isset($this->position[$id]) ? $this->position[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot coordinates
+     *
+     * @author	Olivier Brouckaert
+     * @param	integer	Answer ID
+     * @return	integer	Answer position
+     */
     public function selectHotspotCoordinates($id)
-	{
-		return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
-	}
-
-	/**
-	 * returns answer hotspot type
-	 *
-	 * @author	Toon Keppens
-	 * @param	integer		Answer ID
-	 * @return	integer		Answer position
-	 */
+    {
+        return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
+    }
+
+    /**
+     * returns answer hotspot type
+     *
+     * @author	Toon Keppens
+     * @param	integer		Answer ID
+     * @return	integer		Answer position
+     */
     public function selectHotspotType($id)
-	{
-		return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
-	}
-
-	/**
-	 * Creates a new answer
-	 *
-	 * @author Olivier Brouckaert
-	 * @param string 	$answer answer title
-	 * @param integer 	$correct 0 if bad answer, not 0 if good answer
-	 * @param string 	$comment answer comment
-	 * @param integer 	$weighting answer weighting
-	 * @param integer 	$position answer position
-	 * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
-	 * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
+    {
+        return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
+    }
+
+    /**
+     * Creates a new answer
+     *
+     * @author Olivier Brouckaert
+     * @param string 	$answer answer title
+     * @param integer 	$correct 0 if bad answer, not 0 if good answer
+     * @param string 	$comment answer comment
+     * @param integer 	$weighting answer weighting
+     * @param integer 	$position answer position
+     * @param array    $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
+     * @param integer	$new_hotspot_type Type for hotspot exercises (optional)
      * @param string   $destination
-	 */
+     */
     public function createAnswer(
         $answer,
         $correct,
@@ -525,7 +525,7 @@ 
         $new_hotspot_type = null,
         $destination = ''
     ) {
-		$this->new_nbrAnswers++;
+        $this->new_nbrAnswers++;
         $id = $this->new_nbrAnswers;
         $this->new_answer[$id] = $answer;
         $this->new_correct[$id] = $correct;
@@ -535,7 +535,7 @@ 
         $this->new_hotspot_coordinates[$id] = $new_hotspot_coordinates;
         $this->new_hotspot_type[$id] = $new_hotspot_type;
         $this->new_destination[$id] = $destination;
-	}
+    }
 
     /**
      * Updates an answer
@@ -577,31 +577,31 @@ 
         ];
 
         Database::update($answerTable, $params, ['id_auto = ?' => $autoId]);
-	}
+    }
 
-	/**
-	 * Records answers into the data base
-	 *
-	 * @author Olivier Brouckaert
-	 */
+    /**
+     * Records answers into the data base
+     *
+     * @author Olivier Brouckaert
+     */
     public function save()
     {
-		$answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
-		$questionId = intval($this->questionId);
+        $answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        $questionId = intval($this->questionId);
 
-		$c_id = $this->course['real_id'];
+        $c_id = $this->course['real_id'];
         $correctList = [];
         $answerList = [];
 
-		for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
-			$answer = $this->new_answer[$i];
-			$correct = $this->new_correct[$i];
-			$comment = $this->new_comment[$i];
-			$weighting = $this->new_weighting[$i];
-			$position = $this->new_position[$i];
-			$hotspot_coordinates = $this->new_hotspot_coordinates[$i];
-			$hotspot_type = $this->new_hotspot_type[$i];
-			$destination = $this->new_destination[$i];
+        for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
+            $answer = $this->new_answer[$i];
+            $correct = $this->new_correct[$i];
+            $comment = $this->new_comment[$i];
+            $weighting = $this->new_weighting[$i];
+            $position = $this->new_position[$i];
+            $hotspot_coordinates = $this->new_hotspot_coordinates[$i];
+            $hotspot_type = $this->new_hotspot_type[$i];
+            $destination = $this->new_destination[$i];
             $autoId = $this->selectAutoId($i);
 
             if (!isset($this->position[$i])) {
@@ -698,36 +698,36 @@ 
             }
         }
 
-		// moves $new_* arrays
-		$this->answer = $this->new_answer;
-		$this->correct = $this->new_correct;
-		$this->comment = $this->new_comment;
-		$this->weighting = $this->new_weighting;
-		$this->position = $this->new_position;
-		$this->hotspot_coordinates = $this->new_hotspot_coordinates;
-		$this->hotspot_type = $this->new_hotspot_type;
-
-		$this->nbrAnswers = $this->new_nbrAnswers;
-		$this->destination = $this->new_destination;
-		// clears $new_* arrays
-
-		$this->cancel();
-	}
-
-	/**
-	 * Duplicates answers by copying them into another question
-	 *
-	 * @author Olivier Brouckaert
-	 * @param  int question id
+        // moves $new_* arrays
+        $this->answer = $this->new_answer;
+        $this->correct = $this->new_correct;
+        $this->comment = $this->new_comment;
+        $this->weighting = $this->new_weighting;
+        $this->position = $this->new_position;
+        $this->hotspot_coordinates = $this->new_hotspot_coordinates;
+        $this->hotspot_type = $this->new_hotspot_type;
+
+        $this->nbrAnswers = $this->new_nbrAnswers;
+        $this->destination = $this->new_destination;
+        // clears $new_* arrays
+
+        $this->cancel();
+    }
+
+    /**
+     * Duplicates answers by copying them into another question
+     *
+     * @author Olivier Brouckaert
+     * @param  int question id
      * @param  array destination course info (result of the function api_get_course_info() )
-	 */
+     */
     public function duplicate($newQuestionId, $course_info = null)
     {
         if (empty($course_info)) {
             $course_info = $this->course;
         }
 
-		$TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
+        $TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
         $fixed_list = array();
 
         if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ||
@@ -741,7 +741,7 @@ 
 
             if (!empty($origin_options)) {
                 foreach ($origin_options as $item) {
-            	   $new_option_list[] = $item['id'];
+                    $new_option_list[] = $item['id'];
                 }
             }
 
@@ -755,12 +755,12 @@ 
             }
         }
 
-		// if at least one answer
-		if ($this->nbrAnswers) {
-			// inserts new answers into data base
-			$c_id = $course_info['real_id'];
+        // if at least one answer
+        if ($this->nbrAnswers) {
+            // inserts new answers into data base
+            $c_id = $course_info['real_id'];
 
-			for ($i=1;$i <= $this->nbrAnswers;$i++) {
+            for ($i=1;$i <= $this->nbrAnswers;$i++) {
                 if ($this->course['id'] != $course_info['id']) {
                     $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $this->answer[$i],
@@ -774,8 +774,8 @@ 
                     );
                 }
 
-				$answer = $this->answer[$i];
-				$correct = $this->correct[$i];
+                $answer = $this->answer[$i];
+                $correct = $this->correct[$i];
 
                 if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ||
                     self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE
@@ -783,12 +783,12 @@ 
                     $correct = $fixed_list[intval($correct)];
                 }
 
-				$comment = $this->comment[$i];
-				$weighting = $this->weighting[$i];
-				$position = $this->position[$i];
-				$hotspot_coordinates = $this->hotspot_coordinates[$i];
-				$hotspot_type = $this->hotspot_type[$i];
-				$destination = $this->destination[$i];
+                $comment = $this->comment[$i];
+                $weighting = $this->weighting[$i];
+                $position = $this->position[$i];
+                $hotspot_coordinates = $this->hotspot_coordinates[$i];
+                $hotspot_type = $this->hotspot_type[$i];
+                $destination = $this->destination[$i];
 
                 $params = [
                     'c_id' => $c_id,
@@ -808,9 +808,9 @@ 
                     $sql = "UPDATE $TBL_REPONSES SET id = iid, id_auto = iid WHERE iid = $id";
                     Database::query($sql);
                 }
-			}
+            }
         }
-	}
+    }
 
     /**
      * Get the necessary JavaScript for some answers

Spacing +15 added lines, -15 removed lines

@@ -73,7 +73,7 @@ 
         $objExercise->read($exerciseId);
 
         if ($objExercise->random_answers == '1') {
-            $this->readOrderedBy('rand()', '');// randomize answers
+            $this->readOrderedBy('rand()', ''); // randomize answers
         } else {
             $this->read(); // natural order
         }
@@ -114,7 +114,7 @@ 
                 ORDER BY position";
 
         $result = Database::query($sql);
-        $i=1;
+        $i = 1;
 
         // while a record is found
         while ($object = Database::fetch_object($result)) {
@@ -130,7 +130,7 @@ 
             $this->autoId[$i] = $object->id_auto;
             $i++;
         }
-        $this->nbrAnswers = $i-1;
+        $this->nbrAnswers = $i - 1;
     }
 
     /**
@@ -142,7 +142,7 @@ 
     {
         foreach ($this->autoId as $key => $autoId) {
             if ($autoId == $id) {
-                $result =  [
+                $result = [
                     'answer' => $this->answer[$key],
                     'correct' => $this->correct[$key],
                     'comment' => $this->comment[$key],
@@ -166,7 +166,7 @@ 
         $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
         $questionId = $this->questionId;
 
-        $sql="SELECT id FROM
+        $sql = "SELECT id FROM
               $TBL_ANSWER
               WHERE c_id = {$this->course_id} AND question_id ='".$questionId."'";
 
@@ -188,14 +188,14 @@ 
      * @param	string	DESC or ASC
      * @author 	Frederic Vauthier
      */
-    public function readOrderedBy($field, $order='ASC')
+    public function readOrderedBy($field, $order = 'ASC')
     {
 		$field = Database::escape_string($field);
 		if (empty($field)) {
 			$field = 'position';
 		}
 
-		if ($order != 'ASC' && $order!='DESC') {
+		if ($order != 'ASC' && $order != 'DESC') {
 			$order = 'ASC';
 		}
 
@@ -230,7 +230,7 @@ 
                     c_id = {$this->course_id} AND
                     question_id='".$questionId."'
                 ORDER BY $field $order";
-		$result=Database::query($sql);
+		$result = Database::query($sql);
 
 		$i = 1;
 		// while a record is found
@@ -260,7 +260,7 @@ 
             $this->autoId[$i] = $doubt_data->id_auto;
             $i++;
 	    }
-        $this->nbrAnswers = $i-1;
+        $this->nbrAnswers = $i - 1;
 	}
 
 	/**
@@ -402,8 +402,8 @@ 
     public function getGradesList()
      {
 	 	$list = array();
-	 	for ($i = 0; $i<$this->nbrAnswers;$i++){
-	 		if(!empty($this->answer[$i])){
+	 	for ($i = 0; $i < $this->nbrAnswers; $i++) {
+	 		if (!empty($this->answer[$i])) {
 	 			$list[$i] = $this->weighting[$i];
 	 		}
 	 	}
@@ -421,7 +421,7 @@ 
 	 	$sql = "SELECT type FROM $TBL_QUESTIONS
 	 	        WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
 	 	$res = Database::query($sql);
-	 	if (Database::num_rows($res)<=0){
+	 	if (Database::num_rows($res) <= 0) {
 	 		return null;
 	 	}
 	 	$row = Database::fetch_array($res);
@@ -593,7 +593,7 @@ 
         $correctList = [];
         $answerList = [];
 
-		for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
+		for ($i = 1; $i <= $this->new_nbrAnswers; $i++) {
 			$answer = $this->new_answer[$i];
 			$correct = $this->new_correct[$i];
 			$comment = $this->new_comment[$i];
@@ -748,7 +748,7 @@ 
             $destination_options = Question::readQuestionOption($newQuestionId, $course_info['real_id']);
             $i = 0;
             if (!empty($destination_options)) {
-                foreach($destination_options as $item) {
+                foreach ($destination_options as $item) {
                     $fixed_list[$new_option_list[$i]] = $item['id'];
                     $i++;
                 }
@@ -760,7 +760,7 @@ 
 			// inserts new answers into data base
 			$c_id = $course_info['real_id'];
 
-			for ($i=1;$i <= $this->nbrAnswers;$i++) {
+			for ($i = 1; $i <= $this->nbrAnswers; $i++) {
                 if ($this->course['id'] != $course_info['id']) {
                     $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $this->answer[$i],

main/exercice/exercise.class.php

Doc Comments +10 added lines, -5 removed lines

@@ -283,7 +283,7 @@ 
     }
 
     /**
-     * @return int
+     * @return string
      */
     public function selectPassPercentage()
     {
@@ -378,7 +378,7 @@ 
      * tells if questions are selected randomly, and if so returns the draws
      *
      * @author Olivier Brouckaert
-     * @return integer - 0 if not random, otherwise the draws
+     * @return boolean - 0 if not random, otherwise the draws
      */
     public function isRandom()
     {
@@ -1856,7 +1856,7 @@ 
      * @param int  int lp id
      * @param int  int lp item id
      * @param int  int lp item_view id
-     * @param float $weight
+     * @param integer $weight
      * @param array question list
      */
     public function save_stat_track_exercise_info(
@@ -4121,6 +4121,7 @@ 
     /**
      * Sends a notification when a user ends an examn
      *
+     * @param integer $exe_id
      */
     public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id)
     {
@@ -4201,6 +4202,7 @@ 
     /**
      * Sends a notification when a user ends an examn
      *
+     * @param integer $exe_id
      */
     function send_notification_for_open_questions($question_list_answers, $origin, $exe_id)
     {
@@ -4298,6 +4300,9 @@ 
         }
     }
 
+    /**
+     * @param integer $exe_id
+     */
     function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id)
     {
         if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
@@ -4391,7 +4396,7 @@ 
 
     /**
      * @param array $user_data result of api_get_user_info()
-     * @param null $start_date
+     * @param string $start_date
      * @param null $duration
      * @param string $ip Optional. The user IP
      * @return string
@@ -4449,7 +4454,7 @@ 
      * @param int     Maximum number of attempts (0 if no limit)
      * @param int     Feedback type
      * @todo this was function was added due the import exercise via CSV
-     * @return    int New exercise ID
+     * @return    string New exercise ID
      */
     public function createExercise(
         $title,

Indentation +5 added lines, -5 removed lines

@@ -1966,7 +1966,7 @@ 
                     $label = get_lang('NextQuestion');
                     $class = 'btn btn-primary';
                 }
-				$class .= ' question-validate-btn'; // used to select it with jquery
+                $class .= ' question-validate-btn'; // used to select it with jquery
                 if ($this->type == ONE_PER_PAGE) {
                     if ($questionNum != 1) {
                         $prev_question = $questionNum - 2;
@@ -1991,7 +1991,7 @@ 
                         $all_label = get_lang('EndTest');
                         $class = 'btn btn-warning';
                     }
-					$class .= ' question-validate-btn'; // used to select it with jquery
+                    $class .= ' question-validate-btn'; // used to select it with jquery
                     $all_button = '&nbsp;<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>';
                     $all_button .= '&nbsp;' . Display::span(null, ['id' => 'save_all_reponse']);
                     $html .= $all_button;
@@ -3774,7 +3774,7 @@ 
 
         //Fixes multiple answer question in order to be exact
         //if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
-       /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
+        /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
             $diff = @array_diff($answer_correct_array, $real_answers);
 
             // All good answers or nothing works like exact
@@ -5073,8 +5073,8 @@ 
     }
 
     /**
-    * @return string
-    */
+     * @return string
+     */
     public function get_formated_title()
     {
         return api_html_entity_decode($this->selectTitle());

Spacing +321 added lines, -321 removed lines

@@ -27,7 +27,7 @@ 
     public $feedback_type;
     public $end_time;
     public $start_time;
-    public $questionList;  // array with the list of this exercise's questions
+    public $questionList; // array with the list of this exercise's questions
     public $results_disabled;
     public $expired_time;
     public $course;
@@ -97,7 +97,7 @@ 
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
         $table_lp_item = Database::get_course_table(TABLE_LP_ITEM);
 
-        $id  = intval($id);
+        $id = intval($id);
         if (empty($this->course_id)) {
             return false;
         }
@@ -154,17 +154,17 @@ 
             }
 
             if ($object->end_time != '0000-00-00 00:00:00') {
-                $this->end_time 	= $object->end_time;
+                $this->end_time = $object->end_time;
             }
             if ($object->start_time != '0000-00-00 00:00:00') {
-                $this->start_time 	= $object->start_time;
+                $this->start_time = $object->start_time;
             }
 
             //control time
-            $this->expired_time 	= $object->expired_time;
+            $this->expired_time = $object->expired_time;
 
             //Checking if question_order is correctly set
-            $this->questionList     = $this->selectQuestionList(true);
+            $this->questionList = $this->selectQuestionList(true);
 
             //overload questions list with recorded questions list
             //load questions only for exercises of type 'one question per page'
@@ -382,7 +382,7 @@ 
      */
     public function isRandom()
     {
-        if($this->random > 0 || $this->random == -1) {
+        if ($this->random > 0 || $this->random == -1) {
             return true;
         } else {
             return false;
@@ -427,7 +427,7 @@ 
     public function selectQuestionList($from_db = false)
     {
         if ($from_db && !empty($this->id)) {
-            $TBL_EXERCISE_QUESTION  = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
+            $TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
             $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
 
             $sql = "SELECT DISTINCT e.question_order
@@ -454,7 +454,7 @@ 
             $question_list = array();
 
             while ($new_object = Database::fetch_object($result)) {
-                $question_list[$new_object->question_order]=  $new_object->question_id;
+                $question_list[$new_object->question_order] = $new_object->question_id;
                 $temp_question_list[$counter] = $new_object->question_id;
                 $counter++;
             }
@@ -500,16 +500,16 @@ 
      */
     public function selectRandomList()
     {
-        $nbQuestions	= $this->selectNbrQuestions();
-        $temp_list		= $this->questionList;
+        $nbQuestions = $this->selectNbrQuestions();
+        $temp_list = $this->questionList;
 
         //Not a random exercise, or if there are not at least 2 questions
-        if($this->random == 0 || $nbQuestions < 2) {
+        if ($this->random == 0 || $nbQuestions < 2) {
             return $this->questionList;
         }
         if ($nbQuestions != 0) {
             shuffle($temp_list);
-            $my_random_list = array_combine(range(1,$nbQuestions),$temp_list);
+            $my_random_list = array_combine(range(1, $nbQuestions), $temp_list);
             $my_question_list = array();
             // $this->random == -1 if random with all questions
             if ($this->random > 0) {
@@ -539,7 +539,7 @@ 
     public function isInList($questionId)
     {
         if (is_array($this->questionList))
-            return in_array($questionId,$this->questionList);
+            return in_array($questionId, $this->questionList);
         else
             return false;
     }
@@ -552,7 +552,7 @@ 
      */
     public function updateTitle($title)
     {
-        $this->exercise=$title;
+        $this->exercise = $title;
     }
 
     /**
@@ -562,7 +562,7 @@ 
      */
     public function updateAttempts($attempts)
     {
-        $this->attempts=$attempts;
+        $this->attempts = $attempts;
     }
 
     /**
@@ -572,7 +572,7 @@ 
      */
     public function updateFeedbackType($feedback_type)
     {
-        $this->feedback_type=$feedback_type;
+        $this->feedback_type = $feedback_type;
     }
 
     /**
@@ -583,7 +583,7 @@ 
      */
     public function updateDescription($description)
     {
-        $this->description=$description;
+        $this->description = $description;
     }
 
     /**
@@ -628,23 +628,23 @@ 
      * @param string $sound - exercise sound file
      * @param string $delete - ask to delete the file
      */
-    public function updateSound($sound,$delete)
+    public function updateSound($sound, $delete)
     {
         global $audioPath, $documentPath;
         $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
 
-        if ($sound['size'] && (strstr($sound['type'],'audio') || strstr($sound['type'],'video'))) {
-            $this->sound=$sound['name'];
+        if ($sound['size'] && (strstr($sound['type'], 'audio') || strstr($sound['type'], 'video'))) {
+            $this->sound = $sound['name'];
 
-            if (@move_uploaded_file($sound['tmp_name'],$audioPath.'/'.$this->sound)) {
+            if (@move_uploaded_file($sound['tmp_name'], $audioPath.'/'.$this->sound)) {
                 $query = "SELECT 1 FROM $TBL_DOCUMENT
-                        WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'";
-                $result=Database::query($query);
+                        WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath, '', $audioPath).'/'.$this->sound."'";
+                $result = Database::query($query);
 
                 if (!Database::num_rows($result)) {
                     $id = add_document(
                         $this->course,
-                        str_replace($documentPath,'',$audioPath).'/'.$this->sound,
+                        str_replace($documentPath, '', $audioPath).'/'.$this->sound,
                         'file',
                         $sound['size'],
                         $sound['name']
@@ -663,8 +663,8 @@ 
                     );
                 }
             }
-        } elseif($delete && is_file($audioPath.'/'.$this->sound)) {
-            $this->sound='';
+        } elseif ($delete && is_file($audioPath.'/'.$this->sound)) {
+            $this->sound = '';
         }
     }
 
@@ -676,7 +676,7 @@ 
      */
     public function updateType($type)
     {
-        $this->type=$type;
+        $this->type = $type;
     }
 
     /**
@@ -712,7 +712,7 @@ 
      */
     public function enable()
     {
-        $this->active=1;
+        $this->active = 1;
     }
 
     /**
@@ -722,7 +722,7 @@ 
      */
     public function disable()
     {
-        $this->active=0;
+        $this->active = 0;
     }
 
     /**
@@ -846,7 +846,7 @@ 
                 api_get_user_id()
             );
 
-            if (api_get_setting('search_enabled')=='true') {
+            if (api_get_setting('search_enabled') == 'true') {
                 $this->search_engine_edit();
             }
         } else {
@@ -985,7 +985,7 @@ 
     public function removeFromList($questionId)
     {
         // searches the position of the question ID in the list
-        $pos = array_search($questionId,$this->questionList);
+        $pos = array_search($questionId, $this->questionList);
 
         // question not found
         if ($pos === false) {
@@ -1020,7 +1020,7 @@ 
         api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'QuizDeleted', api_get_user_id());
         api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'delete', api_get_user_id());
 
-        if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian') ) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $this->search_engine_delete();
         }
     }
@@ -1029,7 +1029,7 @@ 
      * Creates the form to create / edit an exercise
      * @param FormValidator $form
      */
-    public function createForm($form, $type='full')
+    public function createForm($form, $type = 'full')
     {
         if (empty($type)) {
             $type = 'full';
@@ -1060,7 +1060,7 @@ 
             'Width' => '100%',
             'Height' => '150',
         );
-        if (is_array($type)){
+        if (is_array($type)) {
             $editor_config = array_merge($editor_config, $type);
         }
 
@@ -1114,13 +1114,13 @@ 
                     '2',
                     array('id' => 'exerciseType_2')
                 );
-                $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions')), '');
+                $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')), '');
 
                 // Type of results display on the final page
                 $radios_results_disabled = array();
                 $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2', array('id'=>'result_disabled_2'));
+                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2'));
                 //$radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ExamModeWithFinalScoreShowOnlyFinalScoreWithCategoriesIfAvailable'),  '3', array('id'=>'result_disabled_3','onclick' => 'check_results_disabled()'));
 
                 $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
@@ -1128,8 +1128,8 @@ 
                 // Type of questions disposition on page
                 $radios = array();
 
-                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
-                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
+                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
+                $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
                 $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
 
@@ -1139,33 +1139,33 @@ 
 
                     // feedback type
                     $radios_feedback = array();
-                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()'));
+                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'), '0', array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()'));
 
                     if (api_get_setting('enable_quiz_scenario') == 'true') {
-                        $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()'));
+                        $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1', 'onclick' => 'check_direct_feedback()'));
                     }
-                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2'));
-                    $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions')));
+                    $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'), '2', array('id' =>'exerciseType_2'));
+                    $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')));
 
                     //$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"');
                     $radios_results_disabled = array();
                     $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-                    $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
+                    $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
 
                     // Type of questions disposition on page
                     $radios = array();
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1');
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2');
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1');
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2');
                     $form->addGroup($radios, null, get_lang('ExerciseType'));
 
                 } else {
                     //Show options freeze
                     $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'),  '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()'));
-                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'),  '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()'));
-                    $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),'');
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()'));
+                    $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()'));
+                    $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), '');
                     $result_disable_group->freeze();
 
                     //we force the options to the DirectFeedback exercisetype
@@ -1173,8 +1173,8 @@ 
                     $form->addElement('hidden', 'exerciseType', ONE_PER_PAGE);
 
                     // Type of questions disposition on page
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'),    '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
-                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all'));
+                    $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one'));
 
                     $type_group = $form->addGroup($radios, null, get_lang('QuestionsPerPage'), '');
                     $type_group->freeze();
@@ -1183,26 +1183,26 @@ 
 
             // number of random question
 
-            $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10 ;
-            $option = range(0,$max);
+            $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10;
+            $option = range(0, $max);
             $option[0] = get_lang('No');
             $option[-1] = get_lang('AllQuestionsShort');
-            $form->addElement('select', 'randomQuestions',array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions'));
+            $form->addElement('select', 'randomQuestions', array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions'));
 
             // Random answers
             $radios_random_answers = array();
-            $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'),'1');
-            $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'),'0');
+            $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'), '1');
+            $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'), '0');
             $form->addGroup($radios_random_answers, null, get_lang('RandomAnswers'), '');
 
             // Random by category
-            $form->addElement('html','<div class="clear">&nbsp;</div>');
+            $form->addElement('html', '<div class="clear">&nbsp;</div>');
             $radiocat = array();
-            $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'),'1');
-            $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'),'2');
-            $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'),'0');
+            $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'), '1');
+            $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'), '2');
+            $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'), '0');
             $radioCatGroup = $form->addGroup($radiocat, null, get_lang('RandomQuestionByCategory'), '');
-            $form->addElement('html','<div class="clear">&nbsp;</div>');
+            $form->addElement('html', '<div class="clear">&nbsp;</div>');
 
             // add the radio display the category name for student
             $radio_display_cat_name = array();
@@ -1223,36 +1223,36 @@ 
             );
 
             // Exercise time limit
-            $form->addElement('checkbox', 'activate_start_date_check',null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
+            $form->addElement('checkbox', 'activate_start_date_check', null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
 
             $var = Exercise::selectTimeLimit();
 
             if (($this->start_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="start_date_div" style="display:block;">');
+                $form->addElement('html', '<div id="start_date_div" style="display:block;">');
             else
-                $form->addElement('html','<div id="start_date_div" style="display:none;">');
+                $form->addElement('html', '<div id="start_date_div" style="display:none;">');
 
             $form->addElement('date_time_picker', 'start_time');
 
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
-            $form->addElement('checkbox', 'activate_end_date_check', null , get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
+            $form->addElement('checkbox', 'activate_end_date_check', null, get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
 
             if (($this->end_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="end_date_div" style="display:block;">');
+                $form->addElement('html', '<div id="end_date_div" style="display:block;">');
             else
-                $form->addElement('html','<div id="end_date_div" style="display:none;">');
+                $form->addElement('html', '<div id="end_date_div" style="display:none;">');
 
             $form->addElement('date_time_picker', 'end_time');
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
             //$check_option=$this->selectType();
             $diplay = 'block';
             $form->addElement('checkbox', 'propagate_neg', null, get_lang('PropagateNegativeResults'));
-            $form->addElement('html','<div class="clear">&nbsp;</div>');
+            $form->addElement('html', '<div class="clear">&nbsp;</div>');
             $form->addElement('checkbox', 'review_answers', null, get_lang('ReviewAnswers'));
 
-            $form->addElement('html','<div id="divtimecontrol"  style="display:'.$diplay.';">');
+            $form->addElement('html', '<div id="divtimecontrol"  style="display:'.$diplay.';">');
 
             //Timer control
             //$time_hours_option = range(0,12);
@@ -1268,12 +1268,12 @@ 
                     'onload' => 'check_load_time()',
                 )
             );
-            $expired_date = (int)$this->selectExpiredTime();
+            $expired_date = (int) $this->selectExpiredTime();
 
-            if (($expired_date!='0')) {
-                $form->addElement('html','<div id="timercontrol" style="display:block;">');
+            if (($expired_date != '0')) {
+                $form->addElement('html', '<div id="timercontrol" style="display:block;">');
             } else {
-                $form->addElement('html','<div id="timercontrol" style="display:none;">');
+                $form->addElement('html', '<div id="timercontrol" style="display:none;">');
             }
             $form->addText(
                 'enabletimercontroltotalminutes',
@@ -1284,7 +1284,7 @@ 
                     'cols-size' => [2, 2, 8]
                 ]
             );
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>');
 
             $form->addElement(
                 'text',
@@ -1306,18 +1306,18 @@ 
             $defaults = array();
 
             if (api_get_setting('search_enabled') === 'true') {
-                require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+                require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
-                $form->addElement ('checkbox', 'index_document','', get_lang('SearchFeatureDoIndexDocument'));
-                $form->addElement ('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
+                $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
+                $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
 
                 $specific_fields = get_specific_field_list();
 
                 foreach ($specific_fields as $specific_field) {
-                    $form->addElement ('text', $specific_field['code'], $specific_field['name']);
-                    $filter = array('c_id'=> "'". api_get_course_int_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => $this->id, 'tool_id' => '\''. TOOL_QUIZ .'\'');
+                    $form->addElement('text', $specific_field['code'], $specific_field['name']);
+                    $filter = array('c_id'=> "'".api_get_course_int_id()."'", 'field_id' => $specific_field['id'], 'ref_id' => $this->id, 'tool_id' => '\''.TOOL_QUIZ.'\'');
                     $values = get_specific_field_values_list($filter, array('value'));
-                    if ( !empty($values) ) {
+                    if (!empty($values)) {
                         $arr_str_values = array();
                         foreach ($values as $value) {
                             $arr_str_values[] = $value['value'];
@@ -1328,8 +1328,8 @@ 
                 //$form->addElement ('html','</div>');
             }
 
-            $form->addElement('html','</div>');  //End advanced setting
-            $form->addElement('html','</div>');
+            $form->addElement('html', '</div>'); //End advanced setting
+            $form->addElement('html', '</div>');
         }
 
         // submit
@@ -1349,10 +1349,10 @@ 
         }
 
         // defaults
-        if ($type=='full') {
+        if ($type == 'full') {
             if ($this->id > 0) {
                 if ($this->random > $this->selectNbrQuestions()) {
-                    $defaults['randomQuestions'] =  $this->selectNbrQuestions();
+                    $defaults['randomQuestions'] = $this->selectNbrQuestions();
                 } else {
                     $defaults['randomQuestions'] = $this->random;
                 }
@@ -1378,8 +1378,8 @@ 
                     $defaults['activate_end_date_check'] = 1;
                 }
 
-                $defaults['start_time'] = ($this->start_time!='0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00');
-                $defaults['end_time'] = ($this->end_time!='0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time()+84600);
+                $defaults['start_time'] = ($this->start_time != '0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00');
+                $defaults['end_time'] = ($this->end_time != '0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time() + 84600);
 
                 // Get expired time
                 if ($this->expired_time != '0') {
@@ -1400,7 +1400,7 @@ 
                 $defaults['text_when_finished'] = "";
                 $defaults['start_time'] = date('Y-m-d 12:00:00');
                 $defaults['display_category_name'] = 1;
-                $defaults['end_time']   = date('Y-m-d 12:00:00', time()+84600);
+                $defaults['end_time']   = date('Y-m-d 12:00:00', time() + 84600);
                 $defaults['pass_percentage'] = '';
             }
         } else {
@@ -1467,7 +1467,7 @@ 
             $end_time = $form->getSubmitValue('end_time');
             $this->end_time = api_get_utc_datetime($end_time);
         } else {
-            $this->end_time   = '0000-00-00 00:00:00';
+            $this->end_time = '0000-00-00 00:00:00';
         }
 
         if ($form->getSubmitValue('enabletimercontrol') == 1) {
@@ -1480,9 +1480,9 @@ 
         }
 
         if ($form->getSubmitValue('randomAnswers') == 1) {
-            $this->random_answers=1;
+            $this->random_answers = 1;
         } else {
-            $this->random_answers=0;
+            $this->random_answers = 0;
         }
         $this->save($type);
     }
@@ -1494,9 +1494,9 @@ 
         }
         $course_id = api_get_course_id();
 
-        require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
-        require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php';
-        require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+        require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
+        require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
+        require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
         $specific_fields = get_specific_field_list();
         $ic_slide = new IndexableChunk();
@@ -1506,7 +1506,7 @@ 
             if (isset($_REQUEST[$specific_field['code']])) {
                 $sterms = trim($_REQUEST[$specific_field['code']]);
                 if (!empty($sterms)) {
-                    $all_specific_terms .= ' '. $sterms;
+                    $all_specific_terms .= ' '.$sterms;
                     $sterms = explode(',', $sterms);
                     foreach ($sterms as $sterm) {
                         $ic_slide->addTerm(trim($sterm), $specific_field['code']);
@@ -1523,15 +1523,15 @@ 
         $xapian_data = array(
             SE_COURSE_ID => $course_id,
             SE_TOOL_ID => TOOL_QUIZ,
-            SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id),
-            SE_USER => (int)api_get_user_id(),
+            SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id),
+            SE_USER => (int) api_get_user_id(),
         );
         $ic_slide->xapian_data = serialize($xapian_data);
-        $exercise_description = $all_specific_terms .' '. $this->description;
+        $exercise_description = $all_specific_terms.' '.$this->description;
         $ic_slide->addValue("content", $exercise_description);
 
         $di = new ChamiloIndexer();
-        isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+        isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
         $di->connectDb(NULL, NULL, $lang);
         $di->addChunk($ic_slide);
 
@@ -1550,7 +1550,7 @@ 
     function search_engine_edit()
     {
         // update search enchine and its values table if enabled
-        if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $course_id = api_get_course_id();
 
             // actually, it consists on delete terms from db,
@@ -1562,9 +1562,9 @@ 
             $res = Database::query($sql);
 
             if (Database::num_rows($res) > 0) {
-                require_once(api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php');
-                require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php');
-                require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php');
 
                 $se_ref = Database::fetch_array($res);
                 $specific_fields = get_specific_field_list();
@@ -1575,7 +1575,7 @@ 
                     delete_all_specific_field_value($course_id, $specific_field['id'], TOOL_QUIZ, $this->id);
                     if (isset($_REQUEST[$specific_field['code']])) {
                         $sterms = trim($_REQUEST[$specific_field['code']]);
-                        $all_specific_terms .= ' '. $sterms;
+                        $all_specific_terms .= ' '.$sterms;
                         $sterms = explode(',', $sterms);
                         foreach ($sterms as $sterm) {
                             $ic_slide->addTerm(trim($sterm), $specific_field['code']);
@@ -1591,17 +1591,17 @@ 
                 $xapian_data = array(
                     SE_COURSE_ID => $course_id,
                     SE_TOOL_ID => TOOL_QUIZ,
-                    SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id),
+                    SE_USER => (int) api_get_user_id(),
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
-                $exercise_description = $all_specific_terms .' '. $this->description;
+                $exercise_description = $all_specific_terms.' '.$this->description;
                 $ic_slide->addValue("content", $exercise_description);
 
                 $di = new ChamiloIndexer();
-                isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english';
+                isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
                 $di->connectDb(NULL, NULL, $lang);
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 //index and return search engine document id
@@ -1626,7 +1626,7 @@ 
     function search_engine_delete()
     {
         // remove from search engine if enabled
-        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian') ) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $course_id = api_get_course_id();
             $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
             $sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL LIMIT 1';
@@ -1634,19 +1634,19 @@ 
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
                 $row = Database::fetch_array($res);
-                require_once(api_get_path(LIBRARY_PATH) .'search/ChamiloIndexer.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
                 $di = new ChamiloIndexer();
-                $di->remove_document((int)$row['search_did']);
+                $di->remove_document((int) $row['search_did']);
                 unset($di);
                 $tbl_quiz_question = Database::get_course_table(TABLE_QUIZ_QUESTION);
-                foreach ( $this->questionList as $question_i) {
+                foreach ($this->questionList as $question_i) {
                     $sql = 'SELECT type FROM %s WHERE id=%s';
                     $sql = sprintf($sql, $tbl_quiz_question, $question_i);
                     $qres = Database::query($sql);
                     if (Database::num_rows($qres) > 0) {
                         $qrow = Database::fetch_array($qres);
                         $objQuestion = Question::getInstance($qrow['type']);
-                        $objQuestion = Question::read((int)$question_i);
+                        $objQuestion = Question::read((int) $question_i);
                         $objQuestion->search_engine_edit($this->id, FALSE, TRUE);
                         unset($objQuestion);
                     }
@@ -1657,7 +1657,7 @@ 
             Database::query($sql);
 
             // remove terms from db
-            require_once api_get_path(LIBRARY_PATH) .'specific_fields_manager.lib.php';
+            require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
             delete_all_values_for_item($course_id, TOOL_QUIZ, $this->id);
         }
     }
@@ -1752,7 +1752,7 @@ 
      */
     public function copy_exercise()
     {
-        $exercise_obj= new Exercise();
+        $exercise_obj = new Exercise();
         $exercise_obj = $this;
 
         // force the creation of a new exercise
@@ -1824,25 +1824,25 @@ 
             $lp_id = 0;
         }
         if (empty($lp_item_id)) {
-            $lp_item_id   = 0;
+            $lp_item_id = 0;
         }
         if (empty($lp_item_view_id)) {
             $lp_item_view_id = 0;
         }
-        $condition = ' WHERE exe_exo_id 	= ' . "'" . $this->id . "'" .' AND
-					   exe_user_id 			= ' . "'" . api_get_user_id() . "'" . ' AND
-					   c_id                 = ' . api_get_course_int_id() . ' AND
-					   status 				= ' . "'" . Database::escape_string($status). "'" . ' AND
-					   orig_lp_id 			= ' . "'" . $lp_id . "'" . ' AND
-					   orig_lp_item_id 		= ' . "'" . $lp_item_id . "'" . ' AND
-                       orig_lp_item_view_id = ' . "'" . $lp_item_view_id . "'" . ' AND
-					   session_id 			= ' . "'" . api_get_session_id() . "' LIMIT 1"; //Adding limit 1 just in case
+        $condition = ' WHERE exe_exo_id 	= '."'".$this->id."'".' AND
+					   exe_user_id 			= ' . "'".api_get_user_id()."'".' AND
+					   c_id                 = ' . api_get_course_int_id().' AND
+					   status 				= ' . "'".Database::escape_string($status)."'".' AND
+					   orig_lp_id 			= ' . "'".$lp_id."'".' AND
+					   orig_lp_item_id 		= ' . "'".$lp_item_id."'".' AND
+                       orig_lp_item_view_id = ' . "'".$lp_item_view_id."'".' AND
+					   session_id 			= ' . "'".api_get_session_id()."' LIMIT 1"; //Adding limit 1 just in case
 
         $sql_track = 'SELECT * FROM '.$track_exercises.$condition;
 
         $result = Database::query($sql_track);
         $new_array = array();
-        if (Database::num_rows($result) > 0 ) {
+        if (Database::num_rows($result) > 0) {
             $new_array = Database::fetch_array($result, 'ASSOC');
             $new_array['num_exe'] = Database::num_rows($result);
         }
@@ -1885,12 +1885,12 @@ 
         $questionList = array_map('intval', $questionList);
 
         $params = array(
-            'exe_exo_id' => $this->id ,
+            'exe_exo_id' => $this->id,
             'exe_user_id' => api_get_user_id(),
             'c_id' => api_get_course_int_id(),
             'status' =>  'incomplete',
             'session_id'  => api_get_session_id(),
-            'data_tracking'  => implode(',', $questionList) ,
+            'data_tracking'  => implode(',', $questionList),
             'start_date' => api_get_utc_datetime(),
             'orig_lp_id' => $safe_lp_id,
             'orig_lp_item_id'  => $safe_lp_item_id,
@@ -1922,7 +1922,7 @@ 
         $nbrQuestions = $this->get_count_question_list();
 
         $all_button = $html = $label = '';
-        $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']):null;
+        $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']) : null;
 
         if ($this->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT && $this->type == ONE_PER_PAGE) {
             $urlTitle = get_lang('ContinueTest');
@@ -1933,7 +1933,7 @@ 
 
             $html .= Display::url(
                 $urlTitle,
-                'exercise_submit_modal.php?' . http_build_query([
+                'exercise_submit_modal.php?'.http_build_query([
                     'learnpath_id' => $safe_lp_id,
                     'learnpath_item_id' => $safe_lp_item_id,
                     'learnpath_item_view_id' => $safe_lp_item_view_id,
@@ -1950,7 +1950,7 @@ 
                     'data-size' => 'md'
                 ]
             );
-            $html .='<br />';
+            $html .= '<br />';
         } else {
             // User
             if (api_is_allowed_to_session_edit()) {
@@ -1975,7 +1975,7 @@ 
 
                     //Next question
                     if (!empty($questions_in_media)) {
-                        $questions_in_media = "['".implode("','",$questions_in_media)."']";
+                        $questions_in_media = "['".implode("','", $questions_in_media)."']";
                         $all_button .= '&nbsp;<a href="javascript://" class="'.$class.'" onclick="save_question_list('.$questions_in_media.'); ">'.$label.'</a>';
                     } else {
                         $all_button .= '&nbsp;<a href="javascript://" class="'.$class.'" onclick="save_now('.$question_id.', \'\', \''.$currentAnswer.'\'); ">'.$label.'</a>';
@@ -1993,7 +1993,7 @@ 
                     }
 					$class .= ' question-validate-btn'; // used to select it with jquery
                     $all_button = '&nbsp;<a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>';
-                    $all_button .= '&nbsp;' . Display::span(null, ['id' => 'save_all_reponse']);
+                    $all_button .= '&nbsp;'.Display::span(null, ['id' => 'save_all_reponse']);
                     $html .= $all_button;
                 }
             }
@@ -2233,8 +2233,8 @@ 
             $params = array();
             $params['course_id'] = $course_id;
             $params['session_id'] = api_get_session_id();
-            $params['user_id'] = isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id();
-            $params['exercise_id'] = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id;
+            $params['user_id'] = isset($exe_info['exe_user_id']) ? $exe_info['exe_user_id'] : api_get_user_id();
+            $params['exercise_id'] = isset($exe_info['exe_exo_id']) ? $exe_info['exe_exo_id'] : $this->id;
             $params['question_id'] = $questionId;
             $params['exe_id'] = isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId;
 
@@ -2276,10 +2276,10 @@ 
             $answer = $objAnswerTmp->selectAnswer($answerId);
             $answerComment = $objAnswerTmp->selectComment($answerId);
             $answerCorrect = $objAnswerTmp->isCorrect($answerId);
-            $answerWeighting = (float)$objAnswerTmp->selectWeighting($answerId);
+            $answerWeighting = (float) $objAnswerTmp->selectWeighting($answerId);
             $answerAutoId = $objAnswerTmp->selectAutoId($answerId);
 
-            $answer_correct_array[$answerId] = (bool)$answerCorrect;
+            $answer_correct_array[$answerId] = (bool) $answerCorrect;
 
             if ($debug) {
                 error_log("answer auto id: $answerAutoId ");
@@ -2288,7 +2288,7 @@ 
 
             // Delineation
             $delineation_cord = $objAnswerTmp->selectHotspotCoordinates(1);
-            $answer_delineation_destination=$objAnswerTmp->selectDestination(1);
+            $answer_delineation_destination = $objAnswerTmp->selectDestination(1);
 
             switch ($answerType) {
                 // for unique answer
@@ -2301,7 +2301,7 @@ 
                                     exe_id = '".$exeId."' AND
                                     question_id= '".$questionId."'";
                         $result = Database::query($sql);
-                        $choice = Database::result($result,0,"answer");
+                        $choice = Database::result($result, 0, "answer");
 
                         $studentChoice = $choice == $answerAutoId ? 1 : 0;
                         if ($studentChoice) {
@@ -2352,7 +2352,7 @@ 
                     } else {
                         // If no result then the user just hit don't know
                         $studentChoice = 3;
-                        $questionScore  +=  $doubt_score;
+                        $questionScore += $doubt_score;
                     }
                     $totalScore = $questionScore;
                     break;
@@ -2368,17 +2368,17 @@ 
                         }
 
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
 
                         if ($studentChoice) {
-                            $questionScore  +=$answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     } else {
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
 
                         if (isset($studentChoice)) {
-                            $questionScore  += $answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     }
                     $totalScore += $answerWeighting;
@@ -2396,16 +2396,16 @@ 
                             $choice[$ind] = 1;
                         }
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
                         if ($studentChoice) {
-                            $questionScore +=$answerWeighting;
+                            $questionScore += $answerWeighting;
                         }
                     } else {
                         $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
                         if (isset($studentChoice)) {
                             $questionScore += $answerWeighting;
                         }
-                        $real_answers[$answerId] = (bool)$studentChoice;
+                        $real_answers[$answerId] = (bool) $studentChoice;
                     }
                     $totalScore += $answerWeighting;
                     if ($debug) error_log("studentChoice: $studentChoice");
@@ -2417,7 +2417,7 @@ 
                         $resultans = Database::query($sql);
                         while ($row = Database::fetch_array($resultans)) {
                             $ind = $row['answer'];
-                            $result = explode(':',$ind);
+                            $result = explode(':', $ind);
                             if (isset($result[0])) {
                                 $my_answer_id = isset($result[0]) ? $result[0] : '';
                                 $option = isset($result[1]) ? $result[1] : '';
@@ -2538,10 +2538,10 @@ 
                             }
                             // adds the piece of text that is before the blank
                             //and ends with '[' into a general storage array
-                            $real_text[] = api_substr($temp, 0, $pos +1);
-                            $answer .= api_substr($temp, 0, $pos +1);
+                            $real_text[] = api_substr($temp, 0, $pos + 1);
+                            $answer .= api_substr($temp, 0, $pos + 1);
                             //take the string remaining (after the last "[" we found)
-                            $temp = api_substr($temp, $pos +1);
+                            $temp = api_substr($temp, $pos + 1);
                             // quit the loop if there are no more blanks, and update $pos to the position of next ']'
                             if (($pos = api_strpos($temp, ']')) === false) {
                                 // adds the end of the text
@@ -2577,7 +2577,7 @@ 
                             //put the contents of the [] answer tag into correct_tags[]
                             $correct_tags[] = api_substr($temp, 0, $pos);
                             $j++;
-                            $temp = api_substr($temp, $pos +1);
+                            $temp = api_substr($temp, $pos + 1);
                         }
                         $answer = '';
                         $real_correct_tags = $correct_tags;
@@ -2600,7 +2600,7 @@ 
                                 } elseif (!empty($user_tags[$i])) {
                                     // else if the word entered by the student IS NOT the same as the one defined by the professor
                                     // adds the word in red at the end of the string, and strikes it
-                                    $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                    $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>';
                                 } else {
                                     // adds a tabulation if no word has been typed by the student
                                     $answer .= ''; // remove &nbsp; that causes issue
@@ -2619,17 +2619,17 @@ 
                                 } elseif (!empty ($user_tags[$i])) {
                                     // else if the word entered by the student IS NOT the same as the one defined by the professor
                                     // adds the word in red at the end of the string, and strikes it
-                                    $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
+                                    $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>';
                                 } else {
                                     // adds a tabulation if no word has been typed by the student
-                                    $answer .= '';  // remove &nbsp; that causes issue
+                                    $answer .= ''; // remove &nbsp; that causes issue
                                 }
                             }
 
                             // adds the correct word, followed by ] to close the blank
-                            $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
-                            if (isset($real_text[$i +1])) {
-                                $answer .= $real_text[$i +1];
+                            $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]';
+                            if (isset($real_text[$i + 1])) {
+                                $answer .= $real_text[$i + 1];
                             }
                         }
                     } else {
@@ -2763,10 +2763,10 @@ 
                         }
                         // adds the piece of text that is before the blank
                         //and ends with '[' into a general storage array
-                        $realText[] = api_substr($temp, 0, $pos +1);
-                        $answer .= api_substr($temp, 0, $pos +1);
+                        $realText[] = api_substr($temp, 0, $pos + 1);
+                        $answer .= api_substr($temp, 0, $pos + 1);
                         //take the string remaining (after the last "[" we found)
-                        $temp = api_substr($temp, $pos +1);
+                        $temp = api_substr($temp, $pos + 1);
                         // quit the loop if there are no more blanks, and update $pos to the position of next ']'
                         if (($pos = api_strpos($temp, ']')) === false) {
                             // adds the end of the text
@@ -2800,7 +2800,7 @@ 
                         //put the contents of the [] answer tag into correct_tags[]
                         $correctTags[] = api_substr($temp, 0, $pos);
                         $j++;
-                        $temp = api_substr($temp, $pos +1);
+                        $temp = api_substr($temp, $pos + 1);
                     }
                     $answer = '';
                     $realCorrectTags = $correctTags;
@@ -2820,22 +2820,22 @@ 
                         } elseif (!empty($userTags[$i])) {
                             // else if the word entered by the student IS NOT the same as the one defined by the professor
                             // adds the word in red at the end of the string, and strikes it
-                            $answer .= '<font color="red"><s>' . $userTags[$i] . '</s></font>';
+                            $answer .= '<font color="red"><s>'.$userTags[$i].'</s></font>';
                         } else {
                             // adds a tabulation if no word has been typed by the student
                             $answer .= ''; // remove &nbsp; that causes issue
                         }
                         // adds the correct word, followed by ] to close the blank
-                        $answer .= ' / <font color="green"><b>' . $realCorrectTags[$i] . '</b></font>]';
-                        if (isset($realText[$i +1])) {
-                            $answer .= $realText[$i +1];
+                        $answer .= ' / <font color="green"><b>'.$realCorrectTags[$i].'</b></font>]';
+                        if (isset($realText[$i + 1])) {
+                            $answer .= $realText[$i + 1];
                         }
                     }
                     break;
                 // for free answer
                 case FREE_ANSWER:
                     if ($from_database) {
-                        $query  = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
+                        $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
                                    WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
                         $resq = Database::query($query);
                         $data = Database::fetch_array($resq);
@@ -2846,9 +2846,9 @@ 
                         $questionScore = $data['marks'];
 
                         if ($questionScore == -1) {
-                            $totalScore+= 0;
+                            $totalScore += 0;
                         } else {
-                            $totalScore+= $questionScore;
+                            $totalScore += $questionScore;
                         }
                         if ($questionScore == '') {
                             $questionScore = 0;
@@ -2869,14 +2869,14 @@ 
                         $query  = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
                                    WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
                         $resq   = Database::query($query);
-                        $choice = Database::result($resq,0,'answer');
+                        $choice = Database::result($resq, 0, 'answer');
                         $choice = str_replace('\r\n', '', $choice);
                         $choice = stripslashes($choice);
-                        $questionScore = Database::result($resq,0,"marks");
-                        if ($questionScore==-1) {
-                            $totalScore+=0;
+                        $questionScore = Database::result($resq, 0, "marks");
+                        if ($questionScore == -1) {
+                            $totalScore += 0;
                         } else {
-                            $totalScore+=$questionScore;
+                            $totalScore += $questionScore;
                         }
                         $arrques = $questionName;
                         $arrans  = $choice;
@@ -2921,7 +2921,7 @@ 
 
                         while ($a_answers = Database::fetch_array($res_answers)) {
                             $i_answer_id = $a_answers['id']; //3
-                            $s_answer_label = $a_answers['answer'];  // your daddy - your mother
+                            $s_answer_label = $a_answers['answer']; // your daddy - your mother
                             $i_answer_correct_answer = $a_answers['correct']; //1 - 2
                             $i_answer_id_auto = $a_answers['id_auto']; // 3 - 4
 
@@ -2973,8 +2973,8 @@ 
 
                             if ($show_result) {
                                 echo '<tr>';
-                                echo '<td>' . $s_answer_label . '</td>';
-                                echo '<td>' . $user_answer;
+                                echo '<td>'.$s_answer_label.'</td>';
+                                echo '<td>'.$user_answer;
 
                                 if (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
                                     if (isset($real_list[$i_answer_correct_answer])) {
@@ -3083,7 +3083,7 @@ 
                     if ($from_database) {
                         // getting the user answer
                         $TBL_TRACK_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT);
-                        $query   = "SELECT hotspot_correct, hotspot_coordinate
+                        $query = "SELECT hotspot_correct, hotspot_coordinate
                                     FROM $TBL_TRACK_HOTSPOT
                                     WHERE
                                         hotspot_exe_id = '".$exeId."' AND
@@ -3091,20 +3091,20 @@ 
                                         hotspot_answer_id='1'";
                         //by default we take 1 because it's a delineation
                         $resq = Database::query($query);
-                        $row = Database::fetch_array($resq,'ASSOC');
+                        $row = Database::fetch_array($resq, 'ASSOC');
 
                         $choice = $row['hotspot_correct'];
                         $user_answer = $row['hotspot_coordinate'];
 
                         // THIS is very important otherwise the poly_compile will throw an error!!
                         // round-up the coordinates
-                        $coords = explode('/',$user_answer);
+                        $coords = explode('/', $user_answer);
                         $user_array = '';
                         foreach ($coords as $coord) {
-                            list($x,$y) = explode(';',$coord);
+                            list($x, $y) = explode(';', $coord);
                             $user_array .= round($x).';'.round($y).'/';
                         }
-                        $user_array = substr($user_array,0,-1);
+                        $user_array = substr($user_array, 0, -1);
                     } else {
                         if (!empty($studentChoice)) {
                             $newquestionList[] = $questionId;
@@ -3114,13 +3114,13 @@ 
                             $studentChoice = $choice[$answerId];
                             $questionScore += $answerWeighting;
 
-                            if ($hotspot_delineation_result[1]==1) {
+                            if ($hotspot_delineation_result[1] == 1) {
                                 $totalScore += $answerWeighting; //adding the total
                             }
                         }
                     }
-                    $_SESSION['hotspot_coord'][1]	= $delineation_cord;
-                    $_SESSION['hotspot_dest'][1]	= $answer_delineation_destination;
+                    $_SESSION['hotspot_coord'][1] = $delineation_cord;
+                    $_SESSION['hotspot_dest'][1] = $answer_delineation_destination;
                     break;
             } // end switch Answertype
 
@@ -3178,7 +3178,7 @@ 
                                 $results_disabled
                             );
                             //}
-                        } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE ) {
+                        } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
                             //	if ($origin!='learnpath') {
                             ExerciseShowFunctions::display_multiple_answer_combination_true_false(
                                 $feedback_type,
@@ -3195,11 +3195,11 @@ 
                             //}
                         } elseif ($answerType == FILL_IN_BLANKS) {
                             //if ($origin!='learnpath') {
-                            ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer,0,0, $results_disabled);
+                            ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer, 0, 0, $results_disabled);
                             //	}
                         } elseif ($answerType == CALCULATED_ANSWER) {
                             //if ($origin!='learnpath') {
-                            ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer,0,0);
+                            ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer, 0, 0);
                             //  }
                         } elseif ($answerType == FREE_ANSWER) {
                             //if($origin != 'learnpath') {
@@ -3246,13 +3246,13 @@ 
                             $user_answer = $_SESSION['exerciseResultCoordinates'][$questionId];
 
                             //round-up the coordinates
-                            $coords = explode('/',$user_answer);
+                            $coords = explode('/', $user_answer);
                             $user_array = '';
                             foreach ($coords as $coord) {
-                                list($x,$y) = explode(';',$coord);
+                                list($x, $y) = explode(';', $coord);
                                 $user_array .= round($x).';'.round($y).'/';
                             }
-                            $user_array = substr($user_array,0,-1);
+                            $user_array = substr($user_array, 0, -1);
 
                             if ($next) {
 
@@ -3279,7 +3279,7 @@ 
                                 //$overlap = round(polygons_overlap($poly_answer,$poly_user));
                                 // //this is an area in pixels
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+                                    error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
                                 }
 
                                 if ($overlap < 1) {
@@ -3292,43 +3292,43 @@ 
                                     // that is overlapped by the user's polygon
                                     $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+                                        error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
                                     }
                                     // the final missing area is the percentage of the initial polygon
                                     // that is not overlapped by the user's polygon
                                     $final_missing = 100 - $final_overlap;
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+                                        error_log(__LINE__.' - Final missing is '.$final_missing, 0);
                                     }
                                     // the final excess area is the percentage of the initial polygon's size
                                     // that is covered by the user's polygon outside of the initial polygon
                                     $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+                                        error_log(__LINE__.' - Final excess is '.$final_excess, 0);
                                     }
                                 }
 
                                 //checking the destination parameters parsing the "@@"
-                                $destination_items= explode('@@', $answerDestination);
+                                $destination_items = explode('@@', $answerDestination);
                                 $threadhold_total = $destination_items[0];
-                                $threadhold_items=explode(';',$threadhold_total);
+                                $threadhold_items = explode(';', $threadhold_total);
                                 $threadhold1 = $threadhold_items[0]; // overlap
                                 $threadhold2 = $threadhold_items[1]; // excess
-                                $threadhold3 = $threadhold_items[2];	 //missing
+                                $threadhold3 = $threadhold_items[2]; //missing
 
                                 // if is delineation
-                                if ($answerId===1) {
+                                if ($answerId === 1) {
                                     //setting colors
-                                    if ($final_overlap>=$threadhold1) {
-                                        $overlap_color=true; //echo 'a';
+                                    if ($final_overlap >= $threadhold1) {
+                                        $overlap_color = true; //echo 'a';
                                     }
                                     //echo $excess.'-'.$threadhold2;
-                                    if ($final_excess<=$threadhold2) {
-                                        $excess_color=true; //echo 'b';
+                                    if ($final_excess <= $threadhold2) {
+                                        $excess_color = true; //echo 'b';
                                     }
                                     //echo '--------'.$missing.'-'.$threadhold3;
-                                    if ($final_missing<=$threadhold3) {
-                                        $missing_color=true; //echo 'c';
+                                    if ($final_missing <= $threadhold3) {
+                                        $missing_color = true; //echo 'c';
                                     }
 
                                     // if pass
@@ -3337,67 +3337,67 @@ 
                                         $final_missing <= $threadhold3 &&
                                         $final_excess <= $threadhold2
                                     ) {
-                                        $next=1; //go to the oars
-                                        $result_comment=get_lang('Acceptable');
-                                        $final_answer = 1;	// do not update with  update_exercise_attempt
+                                        $next = 1; //go to the oars
+                                        $result_comment = get_lang('Acceptable');
+                                        $final_answer = 1; // do not update with  update_exercise_attempt
                                     } else {
-                                        $next=0;
-                                        $result_comment=get_lang('Unacceptable');
-                                        $comment=$answerDestination=$objAnswerTmp->selectComment(1);
-                                        $answerDestination=$objAnswerTmp->selectDestination(1);
+                                        $next = 0;
+                                        $result_comment = get_lang('Unacceptable');
+                                        $comment = $answerDestination = $objAnswerTmp->selectComment(1);
+                                        $answerDestination = $objAnswerTmp->selectDestination(1);
                                         //checking the destination parameters parsing the "@@"
-                                        $destination_items= explode('@@', $answerDestination);
+                                        $destination_items = explode('@@', $answerDestination);
                                     }
-                                } elseif($answerId>1) {
+                                } elseif ($answerId > 1) {
                                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
-                                        if ($debug>0) {
-                                            error_log(__LINE__.' - answerId is of type noerror',0);
+                                        if ($debug > 0) {
+                                            error_log(__LINE__.' - answerId is of type noerror', 0);
                                         }
                                         //type no error shouldn't be treated
                                         $next = 1;
                                         continue;
                                     }
-                                    if ($debug>0) {
-                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0);
+                                    if ($debug > 0) {
+                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
                                     }
                                     //check the intersection between the oar and the user
                                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
                                     //echo 'official';print_r($x_list);print_r($y_list);
                                     //$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list);
-                                    $inter= $result['success'];
+                                    $inter = $result['success'];
 
                                     //$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
-                                    $delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId);
+                                    $delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId);
 
-                                    $poly_answer = convert_coordinates($delineation_cord,'|');
-                                    $max_coord = poly_get_max($poly_user,$poly_answer);
-                                    $poly_answer_compiled = poly_compile($poly_answer,$max_coord);
-                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                                    $poly_answer = convert_coordinates($delineation_cord, '|');
+                                    $max_coord = poly_get_max($poly_user, $poly_answer);
+                                    $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
+                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
 
                                     if ($overlap == false) {
                                         //all good, no overlap
                                         $next = 1;
                                         continue;
                                     } else {
-                                        if ($debug>0) {
-                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0);
+                                        if ($debug > 0) {
+                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
                                         }
                                         $organs_at_risk_hit++;
                                         //show the feedback
-                                        $next=0;
-                                        $comment=$answerDestination=$objAnswerTmp->selectComment($answerId);
-                                        $answerDestination=$objAnswerTmp->selectDestination($answerId);
-
-                                        $destination_items= explode('@@', $answerDestination);
-                                        $try_hotspot=$destination_items[1];
-                                        $lp_hotspot=$destination_items[2];
-                                        $select_question_hotspot=$destination_items[3];
-                                        $url_hotspot=$destination_items[4];
+                                        $next = 0;
+                                        $comment = $answerDestination = $objAnswerTmp->selectComment($answerId);
+                                        $answerDestination = $objAnswerTmp->selectDestination($answerId);
+
+                                        $destination_items = explode('@@', $answerDestination);
+                                        $try_hotspot = $destination_items[1];
+                                        $lp_hotspot = $destination_items[2];
+                                        $select_question_hotspot = $destination_items[3];
+                                        $url_hotspot = $destination_items[4];
                                     }
                                 }
                             } else {	// the first delineation feedback
-                                if ($debug>0) {
-                                    error_log(__LINE__.' first',0);
+                                if ($debug > 0) {
+                                    error_log(__LINE__.' first', 0);
                                 }
                             }
                         } elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) {
@@ -3405,7 +3405,7 @@ 
                             echo Display::tag('td', $answerMatching[$answerId]);
                             echo Display::tag(
                                 'td',
-                                "$user_answer / " . Display::tag(
+                                "$user_answer / ".Display::tag(
                                     'strong',
                                     $answerMatching[$answerCorrect],
                                     ['style' => 'color: #008000; font-weight: bold;']
@@ -3545,7 +3545,7 @@ 
                                     $exeId,
                                     $questionId,
                                     $nano
-                                ) . '</td>
+                                ).'</td>
                                 </tr>
                                 </table>';
                             break;
@@ -3604,7 +3604,7 @@ 
 
                                 //$overlap = round(polygons_overlap($poly_answer,$poly_user)); //this is an area in pixels
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0);
+                                    error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0);
                                 }
                                 if ($overlap < 1) {
                                     //shortcut to avoid complicated calculations
@@ -3615,17 +3615,17 @@ 
                                     // the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon
                                     $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0);
+                                        error_log(__LINE__.' - Final overlap is '.$final_overlap, 0);
                                     }
                                     // the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon
                                     $final_missing = 100 - $final_overlap;
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0);
+                                        error_log(__LINE__.' - Final missing is '.$final_missing, 0);
                                     }
                                     // the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon
                                     $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100);
                                     if ($debug > 1) {
-                                        error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0);
+                                        error_log(__LINE__.' - Final excess is '.$final_excess, 0);
                                     }
                                 }
 
@@ -3635,7 +3635,7 @@ 
                                 $threadhold_items = explode(';', $threadhold_total);
                                 $threadhold1 = $threadhold_items[0]; // overlap
                                 $threadhold2 = $threadhold_items[1]; // excess
-                                $threadhold3 = $threadhold_items[2];  //missing
+                                $threadhold3 = $threadhold_items[2]; //missing
                                 // if is delineation
                                 if ($answerId === 1) {
                                     //setting colors
@@ -3667,14 +3667,14 @@ 
                                 } elseif ($answerId > 1) {
                                     if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') {
                                         if ($debug > 0) {
-                                            error_log(__LINE__ . ' - answerId is of type noerror', 0);
+                                            error_log(__LINE__.' - answerId is of type noerror', 0);
                                         }
                                         //type no error shouldn't be treated
                                         $next = 1;
                                         continue;
                                     }
                                     if ($debug > 0) {
-                                        error_log(__LINE__ . ' - answerId is >1 so we\'re probably in OAR', 0);
+                                        error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0);
                                     }
                                     //check the intersection between the oar and the user
                                     //echo 'user';	print_r($x_user_list);		print_r($y_user_list);
@@ -3688,7 +3688,7 @@ 
                                     $poly_answer = convert_coordinates($delineation_cord, '|');
                                     $max_coord = poly_get_max($poly_user, $poly_answer);
                                     $poly_answer_compiled = poly_compile($poly_answer, $max_coord);
-                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord);
+                                    $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord);
 
                                     if ($overlap == false) {
                                         //all good, no overlap
@@ -3696,7 +3696,7 @@ 
                                         continue;
                                     } else {
                                         if ($debug > 0) {
-                                            error_log(__LINE__ . ' - Overlap is ' . $overlap . ': OAR hit', 0);
+                                            error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0);
                                         }
                                         $organs_at_risk_hit++;
                                         //show the feedback
@@ -3708,12 +3708,12 @@ 
                                         $try_hotspot = $destination_items[1];
                                         $lp_hotspot = $destination_items[2];
                                         $select_question_hotspot = $destination_items[3];
-                                        $url_hotspot=$destination_items[4];
+                                        $url_hotspot = $destination_items[4];
                                     }
                                 }
                             } else {	// the first delineation feedback
                                 if ($debug > 0) {
-                                    error_log(__LINE__ . ' first', 0);
+                                    error_log(__LINE__.' first', 0);
                                 }
                             }
                             break;
@@ -3735,7 +3735,7 @@ 
                             echo Display::tag('td', $answerMatching[$answerId]);
                             echo Display::tag(
                                 'td',
-                                "$user_answer / " . Display::tag(
+                                "$user_answer / ".Display::tag(
                                     'strong',
                                     $answerMatching[$answerCorrect],
                                     ['style' => 'color: #008000; font-weight: bold;']
@@ -3821,7 +3821,7 @@ 
             //  we use the results from the session (from_db=0)
             // TODO Change this, because it is wrong to show the user
             //  some results that haven't been stored in the database yet
-            if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) {
+            if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION) {
 
                 if ($debug) error_log('$from AND this is a hotspot kind of question ');
 
@@ -3830,19 +3830,19 @@ 
                 if ($answerType == HOT_SPOT_DELINEATION) {
                     if (0) {
                         if ($overlap_color) {
-                            $overlap_color='green';
+                            $overlap_color = 'green';
                         } else {
-                            $overlap_color='red';
+                            $overlap_color = 'red';
                         }
                         if ($missing_color) {
-                            $missing_color='green';
+                            $missing_color = 'green';
                         } else {
-                            $missing_color='red';
+                            $missing_color = 'red';
                         }
                         if ($excess_color) {
-                            $excess_color='green';
+                            $excess_color = 'green';
                         } else {
-                            $excess_color='red';
+                            $excess_color = 'red';
                         }
                         if (!is_numeric($final_overlap)) {
                             $final_overlap = 0;
@@ -3854,33 +3854,33 @@ 
                             $final_excess = 0;
                         }
 
-                        if ($final_overlap>100) {
+                        if ($final_overlap > 100) {
                             $final_overlap = 100;
                         }
 
-                        $table_resume='<table class="data_table">
+                        $table_resume = '<table class="data_table">
                                 <tr class="row_odd" >
                                     <td></td>
-                                    <td ><b>' . get_lang('Requirements') . '</b></td>
-                                    <td><b>' . get_lang('YourAnswer') . '</b></td>
+                                    <td ><b>' . get_lang('Requirements').'</b></td>
+                                    <td><b>' . get_lang('YourAnswer').'</b></td>
                                 </tr>
                                 <tr class="row_even">
-                                    <td><b>' . get_lang('Overlap') . '</b></td>
-                                    <td>' . get_lang('Min') . ' ' . $threadhold1 . '</td>
-                                    <td><div style="color:' . $overlap_color . '">'
-                                        . (($final_overlap < 0) ? 0 : intval($final_overlap)) . '</div></td>
+                                    <td><b>' . get_lang('Overlap').'</b></td>
+                                    <td>' . get_lang('Min').' '.$threadhold1.'</td>
+                                    <td><div style="color:' . $overlap_color.'">'
+                                        . (($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td>
                                 </tr>
                                 <tr>
-                                    <td><b>' . get_lang('Excess') . '</b></td>
-                                    <td>' . get_lang('Max') . ' ' . $threadhold2 . '</td>
-                                    <td><div style="color:' . $excess_color . '">'
-                                        . (($final_excess < 0) ? 0 : intval($final_excess)) . '</div></td>
+                                    <td><b>' . get_lang('Excess').'</b></td>
+                                    <td>' . get_lang('Max').' '.$threadhold2.'</td>
+                                    <td><div style="color:' . $excess_color.'">'
+                                        . (($final_excess < 0) ? 0 : intval($final_excess)).'</div></td>
                                 </tr>
                                 <tr class="row_even">
-                                    <td><b>' . get_lang('Missing') . '</b></td>
-                                    <td>' . get_lang('Max') . ' ' . $threadhold3 . '</td>
-                                    <td><div style="color:' . $missing_color . '">'
-                                        . (($final_missing < 0) ? 0 : intval($final_missing)) . '</div></td>
+                                    <td><b>' . get_lang('Missing').'</b></td>
+                                    <td>' . get_lang('Max').' '.$threadhold3.'</td>
+                                    <td><div style="color:' . $missing_color.'">'
+                                        . (($final_missing < 0) ? 0 : intval($final_missing)).'</div></td>
                                 </tr>
                             </table>';
                         if ($next == 0) {
@@ -3895,20 +3895,20 @@ 
                             $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers);
                         }
 
-                        echo '<h1><div style="color:#333;">' . get_lang('Feedback') . '</div></h1>
+                        echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1>
                             <p style="text-align:center">';
 
-                        $message = '<p>' . get_lang('YourDelineation') . '</p>';
+                        $message = '<p>'.get_lang('YourDelineation').'</p>';
                         $message .= $table_resume;
-                        $message .= '<br />' . get_lang('ResultIs') . ' ' . $result_comment . '<br />';
+                        $message .= '<br />'.get_lang('ResultIs').' '.$result_comment.'<br />';
                         if ($organs_at_risk_hit > 0) {
-                            $message .= '<p><b>' . get_lang('OARHit') . '</b></p>';
+                            $message .= '<p><b>'.get_lang('OARHit').'</b></p>';
                         }
-                        $message .='<p>' . $comment . '</p>';
+                        $message .= '<p>'.$comment.'</p>';
                         echo $message;
                     } else {
                         echo $hotspot_delineation_result[0]; //prints message
-                        $from_database = 1;  // the hotspot_solution.swf needs this variable
+                        $from_database = 1; // the hotspot_solution.swf needs this variable
                     }
 
                     //save the score attempts
@@ -3930,20 +3930,20 @@ 
                             $exerciseResultCoordinates[$quesId]
                         );
                     } else {
-                        if ($final_answer==0) {
+                        if ($final_answer == 0) {
                             $questionScore = 0;
-                            $answer=0;
+                            $answer = 0;
                             Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
                             if (is_array($exerciseResultCoordinates[$quesId])) {
-                                foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
-                                    Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,0,$val);
+                                foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) {
+                                    Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, 0, $val);
                                 }
                             }
                         } else {
                             Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0);
                             if (is_array($exerciseResultCoordinates[$quesId])) {
-                                foreach($exerciseResultCoordinates[$quesId] as $idx => $val) {
-                                    Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,$choice[$idx],$val);
+                                foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) {
+                                    Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, $choice[$idx], $val);
                                 }
                             }
                         }
@@ -3962,7 +3962,7 @@ 
                     echo "
                         <tr>
                             <td colspan=\"2\">
-                                <p><em>" . get_lang('HotSpot') . "</em></p>
+                                <p><em>" . get_lang('HotSpot')."</em></p>
 
                                 <div id=\"hotspot-solution-$questionId\"></div>
 
@@ -4000,7 +4000,7 @@ 
 
         if ($saved_results) {
             if ($debug) error_log("Save question results $saved_results");
-            if ($debug) error_log(print_r($choice ,1 ));
+            if ($debug) error_log(print_r($choice, 1));
 
             if (empty($choice)) {
                 $choice = 0;
@@ -4012,14 +4012,14 @@ 
                         $ans = $reply[$i];
                         Event::saveQuestionAttempt(
                             $questionScore,
-                            $ans . ':' . $choice[$ans],
+                            $ans.':'.$choice[$ans],
                             $quesId,
                             $exeId,
                             $i,
                             $this->id
                         );
                         if ($debug) {
-                            error_log('result =>' . $questionScore . ' ' . $ans . ':' . $choice[$ans]);
+                            error_log('result =>'.$questionScore.' '.$ans.':'.$choice[$ans]);
                         }
                     }
                 } else {
@@ -4030,7 +4030,7 @@ 
                     $reply = array_keys($choice);
 
                     if ($debug) {
-                        error_log("reply " . print_r($reply, 1) . "");
+                        error_log("reply ".print_r($reply, 1)."");
                     }
                     for ($i = 0; $i < sizeof($reply); $i++) {
                         $ans = $reply[$i];
@@ -4089,7 +4089,7 @@ 
 
                 Event::saveQuestionAttempt($questionScore, implode('|', $answer), $quesId, $exeId, 0, $this->id);
             } else {
-                Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0,$this->id);
+                Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id);
             }
         }
 
@@ -4099,8 +4099,8 @@ 
 
         if ($saved_results) {
             $stat_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-            $sql = 'UPDATE ' . $stat_table . ' SET
-                        exe_result = exe_result + ' . floatval($questionScore) . '
+            $sql = 'UPDATE '.$stat_table.' SET
+                        exe_result = exe_result + ' . floatval($questionScore).'
                     WHERE exe_id = ' . $exeId;
             if ($debug) error_log($sql);
             Database::query($sql);
@@ -4124,7 +4124,7 @@ 
      */
     public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -4175,7 +4175,7 @@ 
         $msg = str_replace("#course#", $courseInfo['name'], $msg1);
 
         if ($origin != 'learnpath') {
-            $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
+            $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
         }
         $msg1 = str_replace("#url#", $url_email, $msg);
         $mail_content = $msg1;
@@ -4204,7 +4204,7 @@ 
      */
     function send_notification_for_open_questions($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -4267,11 +4267,11 @@ 
             $msg .= '</table><br />';
 
 
-            $msg1   = str_replace("#exercise#",    $this->exercise, $msg);
-            $msg    = str_replace("#firstName#",   $user_info['firstname'],$msg1);
-            $msg1   = str_replace("#lastName#",    $user_info['lastname'],$msg);
-            $msg    = str_replace("#mail#",        $user_info['email'],$msg1);
-            $msg    = str_replace("#course#",      $course_info['name'],$msg1);
+            $msg1   = str_replace("#exercise#", $this->exercise, $msg);
+            $msg    = str_replace("#firstName#", $user_info['firstname'], $msg1);
+            $msg1   = str_replace("#lastName#", $user_info['lastname'], $msg);
+            $msg    = str_replace("#mail#", $user_info['email'], $msg1);
+            $msg    = str_replace("#course#", $course_info['name'], $msg1);
 
             if ($origin != 'learnpath') {
                 $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
@@ -4300,7 +4300,7 @@ 
 
     function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id)
     {
-        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+        if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) {
             return null;
         }
         // Email configuration settings
@@ -4324,7 +4324,7 @@ 
             $answer_type = $item['answer_type'];
 
             if (!empty($question) && !empty($answer) && $answer_type == ORAL_EXPRESSION) {
-                $oral_question_list.='<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">'
+                $oral_question_list .= '<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">'
                     .'<tr>'
                         .'<td width="220" valign="top" bgcolor="#E5EDF8">&nbsp;&nbsp;'.get_lang('Question').'</td>'
                         .'<td width="473" valign="top" bgcolor="#F3F3F3">'.$question.'</td>'
@@ -4357,7 +4357,7 @@ 
                             .'<td>&nbsp;#mail#</td>'
                         .'</tr>'
                     .'</table>';
-            $msg .=  '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'),$oral_question_list).'<br />';
+            $msg .= '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'), $oral_question_list).'<br />';
             $msg1 = str_replace("#exercise#", $this->exercise, $msg);
             $msg = str_replace("#firstName#", $user_info['firstname'], $msg1);
             $msg1 = str_replace("#lastName#", $user_info['lastname'], $msg);
@@ -4365,7 +4365,7 @@ 
             $msg = str_replace("#course#", $course_info['name'], $msg1);
 
             if ($origin != 'learnpath') {
-                $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
+                $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
             }
             $msg1 = str_replace("#url#", $url_email, $msg);
             $mail_content = $msg1;
@@ -4431,10 +4431,10 @@ 
         }
         $html  = '<div class="question-result">';
         $html .= Display::page_header(
-            Display::return_icon('test-quiz.png', get_lang('Result'),null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result')
+            Display::return_icon('test-quiz.png', get_lang('Result'), null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result')
         );
         $html .= Display::description($array);
-        $html .="</div>";
+        $html .= "</div>";
         return $html;
     }
 
@@ -4551,7 +4551,7 @@ 
                     false,
                     $objExercise->selectPropagateNeg()
                 );
-                $totalScore      += $question_result['score'];
+                $totalScore += $question_result['score'];
             }
 
             if ($objExercise->selectPropagateNeg() == 0 && $totalScore < 0) {
@@ -4695,7 +4695,7 @@ 
             }
         }
 
-        if (!empty($message)){
+        if (!empty($message)) {
             $message = Display::return_message($message, 'warning', false);
         }
 
@@ -4709,7 +4709,7 @@ 
     {
         $TBL_LP_ITEM = Database::get_course_table(TABLE_LP_ITEM);
         $sql = "SELECT max_score FROM $TBL_LP_ITEM
-            WHERE c_id = {$this->course_id} AND item_type = '" . TOOL_QUIZ . "' AND path = '{$this->id}'";
+            WHERE c_id = {$this->course_id} AND item_type = '".TOOL_QUIZ."' AND path = '{$this->id}'";
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return true;
@@ -4875,7 +4875,7 @@ 
         $sql_track = "SELECT * FROM $track_exercises WHERE exe_id = $exe_id ";
         $result = Database::query($sql_track);
         $new_array = array();
-        if (Database::num_rows($result) > 0 ) {
+        if (Database::num_rows($result) > 0) {
             $new_array = Database::fetch_array($result, 'ASSOC');
 
             $new_array['duration'] = null;
@@ -4887,11 +4887,11 @@ 
                 $start_date = api_strtotime($start_date, 'UTC');
                 $end_date = api_strtotime($end_date, 'UTC');
                 if ($start_date && $end_date) {
-                    $mytime = $end_date- $start_date;
+                    $mytime = $end_date - $start_date;
                     $new_learnpath_item = new learnpathItem(null);
                     $time_attemp = $new_learnpath_item->get_scorm_time('js', $mytime);
                     $h = get_lang('h');
-                    $time_attemp = str_replace('NaN', '00' . $h . '00\'00"', $time_attemp);
+                    $time_attemp = str_replace('NaN', '00'.$h.'00\'00"', $time_attemp);
                     $new_array['duration'] = $time_attemp;
                 }
             }
@@ -4913,7 +4913,7 @@ 
                     $result = Database::query($sql);
                 }
             } else {
-                $remind_list = explode(',',$exercise_info['questions_to_check']);
+                $remind_list = explode(',', $exercise_info['questions_to_check']);
 
                 $remind_list_string = '';
                 if ($action == 'add') {
@@ -4925,7 +4925,7 @@ 
                         }
                         $remind_list_string = implode(',', $remind_list);
                     }
-                } elseif ($action == 'delete')  {
+                } elseif ($action == 'delete') {
                     if (!empty($remind_list)) {
                         if (in_array($question_id, $remind_list)) {
                             $remind_list = array_flip($remind_list);
@@ -5026,7 +5026,7 @@ 
     public function get_max_score()
     {
         $out_max_score = 0;
-        $tab_question_list = $this->selectQuestionList(true);   // list of question's id !!! the array key start at 1 !!!
+        $tab_question_list = $this->selectQuestionList(true); // list of question's id !!! the array key start at 1 !!!
         // test is randomQuestions - see field random of test
         if ($this->random > 0 && $this->randomByCat == 0) {
             $nb_random_questions = $this->random;

Braces +51 added lines, -24 removed lines

@@ -538,10 +538,11 @@ 
      */
     public function isInList($questionId)
     {
-        if (is_array($this->questionList))
-            return in_array($questionId,$this->questionList);
-        else
-            return false;
+        if (is_array($this->questionList)) {
+                    return in_array($questionId,$this->questionList);
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -1227,10 +1228,11 @@ 
 
             $var = Exercise::selectTimeLimit();
 
-            if (($this->start_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="start_date_div" style="display:block;">');
-            else
-                $form->addElement('html','<div id="start_date_div" style="display:none;">');
+            if (($this->start_time != '0000-00-00 00:00:00')) {
+                            $form->addElement('html','<div id="start_date_div" style="display:block;">');
+            } else {
+                            $form->addElement('html','<div id="start_date_div" style="display:none;">');
+            }
 
             $form->addElement('date_time_picker', 'start_time');
 
@@ -1238,10 +1240,11 @@ 
 
             $form->addElement('checkbox', 'activate_end_date_check', null , get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
 
-            if (($this->end_time != '0000-00-00 00:00:00'))
-                $form->addElement('html','<div id="end_date_div" style="display:block;">');
-            else
-                $form->addElement('html','<div id="end_date_div" style="display:none;">');
+            if (($this->end_time != '0000-00-00 00:00:00')) {
+                            $form->addElement('html','<div id="end_date_div" style="display:block;">');
+            } else {
+                            $form->addElement('html','<div id="end_date_div" style="display:none;">');
+            }
 
             $form->addElement('date_time_picker', 'end_time');
             $form->addElement('html','</div>');
@@ -2268,7 +2271,9 @@ 
         $organs_at_risk_hit = 0;
         $questionScore = 0;
 
-        if ($debug) error_log('Start answer loop ');
+        if ($debug) {
+            error_log('Start answer loop ');
+        }
 
         $answer_correct_array = array();
 
@@ -2383,7 +2388,9 @@ 
                     }
                     $totalScore += $answerWeighting;
 
-                    if ($debug) error_log("studentChoice: $studentChoice");
+                    if ($debug) {
+                        error_log("studentChoice: $studentChoice");
+                    }
                     break;
                 case GLOBAL_MULTIPLE_ANSWER:
                     if ($from_database) {
@@ -2408,7 +2415,9 @@ 
                         $real_answers[$answerId] = (bool)$studentChoice;
                     }
                     $totalScore += $answerWeighting;
-                    if ($debug) error_log("studentChoice: $studentChoice");
+                    if ($debug) {
+                        error_log("studentChoice: $studentChoice");
+                    }
                     break;
                 case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
                     if ($from_database) {
@@ -3125,9 +3134,13 @@ 
             } // end switch Answertype
 
             if ($show_result) {
-                if ($debug) error_log('show result '.$show_result);
+                if ($debug) {
+                    error_log('show result '.$show_result);
+                }
                 if ($from == 'exercise_result') {
-                    if ($debug) error_log('Showing questions $from '.$from);
+                    if ($debug) {
+                        error_log('Showing questions $from '.$from);
+                    }
                     //display answers (if not matching type, or if the answer is correct)
                     if (
                         !in_array(
@@ -3415,7 +3428,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log('Showing questions $from '.$from);
+                    if ($debug) {
+                        error_log('Showing questions $from '.$from);
+                    }
 
                     switch ($answerType) {
                         case UNIQUE_ANSWER:
@@ -3747,10 +3762,14 @@ 
                     }
                 }
             }
-            if ($debug) error_log(' ------ ');
+            if ($debug) {
+                error_log(' ------ ');
+            }
         } // end for that loops over all answers of the current question
 
-        if ($debug) error_log('-- end answer loop --');
+        if ($debug) {
+            error_log('-- end answer loop --');
+        }
 
         $final_answer = true;
 
@@ -3823,7 +3842,9 @@ 
             //  some results that haven't been stored in the database yet
             if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) {
 
-                if ($debug) error_log('$from AND this is a hotspot kind of question ');
+                if ($debug) {
+                    error_log('$from AND this is a hotspot kind of question ');
+                }
 
                 $my_exe_id = 0;
                 $from_database = 0;
@@ -3999,8 +4020,12 @@ 
         // stored by exercise_results.php (using the session)
 
         if ($saved_results) {
-            if ($debug) error_log("Save question results $saved_results");
-            if ($debug) error_log(print_r($choice ,1 ));
+            if ($debug) {
+                error_log("Save question results $saved_results");
+            }
+            if ($debug) {
+                error_log(print_r($choice ,1 ));
+            }
 
             if (empty($choice)) {
                 $choice = 0;
@@ -4102,7 +4127,9 @@ 
             $sql = 'UPDATE ' . $stat_table . ' SET
                         exe_result = exe_result + ' . floatval($questionScore) . '
                     WHERE exe_id = ' . $exeId;
-            if ($debug) error_log($sql);
+            if ($debug) {
+                error_log($sql);
+            }
             Database::query($sql);
         }
 

main/exercice/export/aiken/aiken_classes.php

Doc Comments +4 added lines

@@ -10,6 +10,10 @@
 if ( count( get_included_files() ) == 1 ) die( '---' );
 
 if (!function_exists('mime_content_type')) {
+
+	/**
+	 * @param string $filename
+	 */
 	function mime_content_type($filename) {
 		return DocumentManager::file_get_mime_type((string)$filename);
 	}

Indentation +11 added lines, -11 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @author Claro Team <cvs@claroline.net>
- * @author Yannick Warnier <yannick.warnier@beeznest.com> - updated ImsAnswerHotspot to match QTI norms
- * @author César Perales <cesar.perales@gmail.com> Updated function names and import files for Aiken format support
- * @package chamilo.exercise
- */
+     * @author Claro Team <cvs@claroline.net>
+     * @author Yannick Warnier <yannick.warnier@beeznest.com> - updated ImsAnswerHotspot to match QTI norms
+     * @author César Perales <cesar.perales@gmail.com> Updated function names and import files for Aiken format support
+     * @package chamilo.exercise
+     */
 
 if ( count( get_included_files() ) == 1 ) die( '---' );
 
 if (!function_exists('mime_content_type')) {
-	function mime_content_type($filename) {
-		return DocumentManager::file_get_mime_type((string)$filename);
-	}
+    function mime_content_type($filename) {
+        return DocumentManager::file_get_mime_type((string)$filename);
+    }
 }
 
 /**
@@ -29,7 +29,7 @@ 
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);
-            	return $answer;
+                return $answer;
             default :
                 $answer = null;
                 break;
@@ -38,11 +38,11 @@ 
     }
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@ 
  * @package chamilo.exercise
  */
 
-if ( count( get_included_files() ) == 1 ) die( '---' );
+if (count(get_included_files()) == 1) die('---');
 
 if (!function_exists('mime_content_type')) {
 	function mime_content_type($filename) {
-		return DocumentManager::file_get_mime_type((string)$filename);
+		return DocumentManager::file_get_mime_type((string) $filename);
 	}
 }
 
@@ -25,7 +25,7 @@ 
      */
     function setAnswer()
     {
-        switch($this->type)
+        switch ($this->type)
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
  * @package chamilo.exercise
  */
 
-if ( count( get_included_files() ) == 1 ) die( '---' );
+if ( count( get_included_files() ) == 1 ) {
+    die( '---' );
+}
 
 if (!function_exists('mime_content_type')) {
 	function mime_content_type($filename) {

main/exercice/export/aiken/aiken_import.inc.php

Doc Comments +6 added lines, -1 removed lines

@@ -55,6 +55,8 @@ 
  * Gets the uploaded file (from $_FILES) and unzip it to the given directory
  * @param string The directory where to do the work
  * @param string The path of the temporary directory where the exercise was uploaded and unzipped
+ * @param string $baseWorkDir
+ * @param string $uploadPath
  * @return bool True on success, false on failure
  */
 function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath) {
@@ -229,7 +231,10 @@ 
  * @param string Path to the directory with the file to be parsed (without final /)
  * @param string Name of the last directory part for the file (without /)
  * @param string Name of the file to be parsed (including extension)
- * @return mixed True on success, error message on error
+ * @param string $exercisePath
+ * @param string $file
+ * @param string $questionFile
+ * @return string|boolean True on success, error message on error
  * @assert ('','','') === false
  */
 function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) {

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
         $dir .= '/';
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -38,10 +38,10 @@ 
 function aiken_display_form($msg = '') {
     $name_tools = get_lang('ImportAikenQuiz');
     $form  = '<div class="actions">';
-    $form .= '<a href="exercise.php?show=test">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    $form .= '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     $form .= '</div>';
     $form .= $msg;
-    $form_validator  = new FormValidator('aiken_upload', 'post',api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data') );
+    $form_validator = new FormValidator('aiken_upload', 'post', api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data'));
     $form_validator->addElement('header', $name_tools);
     $form_validator->addElement('text', 'total_weight', get_lang('TotalWeight'));
     $form_validator->addElement('file', 'userFile', get_lang('DownloadFile'));
@@ -89,7 +89,7 @@ 
     global $record_item_body;
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'aiken';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'aiken';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -130,9 +130,9 @@ 
 
     // Parse every subdirectory to search txt question files
     while (false !== ($file = readdir($exerciseHandle))) {
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
             //find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.txt$/i', $questionFile)) {
                     $result = aiken_parse_file(
@@ -154,7 +154,7 @@ 
         $result = 'NoTxtFileFoundInTheZip';
     }
 
-    if ($result !== true ) {
+    if ($result !== true) {
         return $result;
     }
 
@@ -215,7 +215,7 @@ 
         }
 
         // Delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         $operation = $last_exercise_id;
     }
 
@@ -235,8 +235,8 @@ 
 function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) {
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!is_file($questionFilePath)) {
         return 'FileNotFound';
@@ -248,13 +248,13 @@ 
     $answers_array = array();
     $new_question = true;
     foreach ($data as $line => $info) {
-        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/',$info)) {
+        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/', $info)) {
             // double empty line
             continue;
         }
         $new_question = false;
         //make sure it is transformed from iso-8859-1 to utf-8 if in that form
-        if (!mb_check_encoding($info,'utf-8') && mb_check_encoding($info,'iso-8859-1')) {
+        if (!mb_check_encoding($info, 'utf-8') && mb_check_encoding($info, 'iso-8859-1')) {
             $info = utf8_encode($info);
         }
         $exercise_info['question'][$question_index]['type'] = 'MCUA';
@@ -286,7 +286,7 @@ 
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
-        } elseif (preg_match('/^(\r)?\n/',$info)) {
+        } elseif (preg_match('/^(\r)?\n/', $info)) {
             //moving to next question (tolerate \r\n or just \n)
             if (empty($exercise_info['question'][$question_index]['correct_answers'])) {
                 error_log('Aiken: Error in question index '.$question_index.': no correct answer defined');
@@ -306,7 +306,7 @@ 
                     $exercise_info['question'][$question_index]['title'] = $info;
                 } else {
                     //Question itself (use a 100-chars long title and a larger description)
-                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)) . '...';
+                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)).'...';
                     $exercise_info['question'][$question_index]['description'] = $info;
                 }
             } else {
@@ -316,7 +316,7 @@ 
     }
     $total_questions = count($exercise_info['question']);
     $total_weight = (!empty($_POST['total_weight'])) ? intval($_POST['total_weight']) : 20;
-    foreach  ($exercise_info['question'] as $key => $question) {
+    foreach ($exercise_info['question'] as $key => $question) {
         $exercise_info['question'][$key]['weighting'][current(array_keys($exercise_info['question'][$key]['weighting']))] = $total_weight / $total_questions;
     }
     return true;

Braces +5 added lines, -3 removed lines

@@ -10,8 +10,9 @@ 
 /**
  * Security check
  */
-if (count(get_included_files()) == 1)
+if (count(get_included_files()) == 1) {
     die('---');
+}
 
 /**
  * Creates a temporary directory
@@ -21,8 +22,9 @@ 
  * @return string
  */
 function tempdir($dir, $prefix = 'tmp', $mode = 0777) {
-    if (substr($dir, -1) != '/')
-        $dir .= '/';
+    if (substr($dir, -1) != '/') {
+            $dir .= '/';
+    }
 
     do {
         $path = $dir . $prefix . mt_rand(0, 9999999);

Indentation +4 added lines, -4 removed lines

@@ -78,9 +78,9 @@ 
     }
 }
 /**
- * Main function to import the Aiken exercise
- * @return mixed True on success, error message on failure
- */
+     * Main function to import the Aiken exercise
+     * @return mixed True on success, error message on failure
+     */
 function aiken_import_exercise($file)
 {
     global $exercise_info;
@@ -281,7 +281,7 @@ 
             $correct_answer_index = array_search($matches[1], $answers_array);
             $exercise_info['question'][$question_index]['title'] = $matches[1];
         } elseif (preg_match('/^TAGS:\s?([A-Z])\s?/', $info, $matches)) {
-             //TAGS for chamilo >= 1.10
+                //TAGS for chamilo >= 1.10
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)

main/exercice/export/exercise_import.inc.php

Doc Comments +5 added lines, -3 removed lines

@@ -30,6 +30,8 @@ 
  * Unzip the exercise in the temp folder
  * @param string The path of the temporary directory where the exercise was uploaded and unzipped
  * @param string
+ * @param string $baseWorkDir
+ * @param string $uploadPath
  * @return bool
  */
 function get_and_unzip_uploaded_exercise($baseWorkDir, $uploadPath)
@@ -217,9 +219,9 @@ 
 
 /**
  * Parses a given XML file and fills global arrays with the elements
- * @param $exercisePath
- * @param $file
- * @param $questionFile
+ * @param string $exercisePath
+ * @param string $file
+ * @param string $questionFile
  * @return bool
  */
 function parse_file($exercisePath, $file, $questionFile)

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
     }
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -74,7 +74,7 @@ 
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
 
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'qti2';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'qti2';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -118,14 +118,14 @@ 
     // parse every subdirectory to search xml question files
     while (false !== ($file = readdir($exerciseHandle))) {
 
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
 
             // Find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.xml$/i', $questionFile)) {
                     $result = parse_file($baseWorkDir, $file, $questionFile);
-                    $filePath = $baseWorkDir . $file;
+                    $filePath = $baseWorkDir.$file;
                     $file_found = true;
                 }
             }
@@ -133,7 +133,7 @@ 
 
             // Else ignore file
             $result = parse_file($baseWorkDir, '', $file);
-            $filePath = $baseWorkDir . '/' . $file;
+            $filePath = $baseWorkDir.'/'.$file;
             $file_found = true;
         }
     }
@@ -200,7 +200,7 @@ 
         }
 
         // delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         return $last_exercise_id;
     }
 
@@ -228,8 +228,8 @@ 
     global $record_item_body;
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!($fp = fopen($questionFilePath, 'r'))) {
         Display:: display_error_message(get_lang('Error opening question\'s XML file'));
@@ -326,10 +326,10 @@ 
     if ($record_item_body) {
 
         if ((!in_array($current_element, $non_HTML_tag_to_avoid))) {
-            $current_question_item_body .= "<" . $name;
+            $current_question_item_body .= "<".$name;
 
             foreach ($attributes as $attribute_name => $attribute_value) {
-                $current_question_item_body .= " " . $attribute_name . "=\"" . $attribute_value . "\"";
+                $current_question_item_body .= " ".$attribute_name."=\"".$attribute_value."\"";
             }
             $current_question_item_body .= ">";
         } else {
@@ -338,11 +338,11 @@ 
 
             if ($current_element == 'INLINECHOICEINTERACTION') {
 
-                $current_question_item_body .= "**claroline_start**" . $attributes['RESPONSEIDENTIFIER'] . "**claroline_end**";
+                $current_question_item_body .= "**claroline_start**".$attributes['RESPONSEIDENTIFIER']."**claroline_end**";
             }
             if ($current_element == 'TEXTENTRYINTERACTION') {
                 $correct_answer_value = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
-                $current_question_item_body .= "[" . $correct_answer_value . "]";
+                $current_question_item_body .= "[".$correct_answer_value."]";
 
             }
             if ($current_element == 'BR') {
@@ -457,7 +457,7 @@ 
     //treat the record of the full content of itembody tag :
 
     if ($record_item_body && (!in_array($current_element, $non_HTML_tag_to_avoid))) {
-        $current_question_item_body .= "</" . $name . ">";
+        $current_question_item_body .= "</".$name.">";
     }
 
     switch ($name) {
@@ -515,14 +515,14 @@ 
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= '' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= ''.trim($data);
             }
             break;
         case 'FEEDBACKINLINE':
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' ' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' '.trim($data);
             }
             break;
         case 'SIMPLEASSOCIABLECHOICE':
@@ -546,8 +546,8 @@ 
             $answer_identifier = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
             if ($current_inlinechoice_id == $answer_identifier) {
                 $current_question_item_body = str_replace(
-                    "**claroline_start**" . $current_answer_id . "**claroline_end**",
-                    "[" . $data . "]",
+                    "**claroline_start**".$current_answer_id."**claroline_end**",
+                    "[".$data."]",
                     $current_question_item_body
                 );
             } else {

main/exercice/export/qti2/qti2_export.php

Doc Comments +9 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
     /**
      * Constructor.
      *
-     * @param $question Ims2Question object we want to export.
+     * @param Ims2Question $question Ims2Question object we want to export.
      */
      function ImsAssessmentItem($question)
      {
@@ -101,7 +101,7 @@ 
       * This is a default behaviour, some classes may want to override this.
       *
       * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return A string, the XML flow for an Item.
+      * @return string string, the XML flow for an Item.
       */
      function export($standalone = false)
      {
@@ -154,7 +154,7 @@ 
 
     /**
      * Constructor.
-     * @param $exe The Exercise instance to export
+     * @param Exercise $exe The Exercise instance to export
      * @author Amand Tihon <amand@alrj.org>
      */
     function ImsSection($exe)
@@ -239,7 +239,7 @@ 
      * Export the exercise in IMS/QTI.
      *
      * @param bool $standalone Wether it should include XML tag and DTD line.
-     * @return a string containing the XML flow
+     * @return string string containing the XML flow
      * @author Amand Tihon <amand@alrj.org>
      */
     function export($standalone)
@@ -383,7 +383,7 @@ 
       * This is a default behaviour, some classes may want to override this.
       *
       * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return A string, the XML flow for an Item.
+      * @return string string, the XML flow for an Item.
       * @author Amand Tihon <amand@alrj.org>
       */
      function export($standalone = False)
@@ -417,7 +417,7 @@ 
  *
  * @param int $exerciseId The exercise to export
  * @param boolean $standalone Wether it should include XML tag and DTD line.
- * @return The XML as a string, or an empty string if there's no exercise with given ID.
+ * @return string XML as a string, or an empty string if there's no exercise with given ID.
  */
 function export_exercise_to_qti($exerciseId, $standalone = true)
 {
@@ -474,6 +474,9 @@ 
     return htmlspecialchars($text);
 }
 
+/**
+ * @param string $text
+ */
 function cleanAttribute($text)
 {
     return $text;

Spacing +23 added lines, -23 removed lines

@@ -8,7 +8,7 @@ 
 /**
  * Code
  */
-require dirname(__FILE__) . '/qti2_classes.php';
+require dirname(__FILE__).'/qti2_classes.php';
 /**
  * Classes
 */
@@ -38,7 +38,7 @@ 
      {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
-        $this->questionIdent = "QST_" . $question->id ;
+        $this->questionIdent = "QST_".$question->id;
      }
 
      /**
@@ -73,7 +73,7 @@ 
       */
      function start_item_body()
      {
-        return '  <itemBody>' . "\n";
+        return '  <itemBody>'."\n";
      }
 
      /**
@@ -92,7 +92,7 @@ 
 
       function add_response_processing()
       {
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
+          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>'."\n";
       }
 
      /**
@@ -108,7 +108,7 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . "\n";
+            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'."\n";
         }
         //TODO understand why answer might be a non-object sometimes
         if (!is_object($this->answer)) {
@@ -164,7 +164,7 @@ 
 
     function start_section()
     {
-        $out = '<section ident="EXO_' . $this->exercise->selectId() . '" title="' .cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())) . '">' . "\n";
+        $out = '<section ident="EXO_'.$this->exercise->selectId().'" title="'.cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())).'">'."\n";
         return $out;
     }
 
@@ -180,7 +180,7 @@ 
             // return exercise duration in ISO8601 format.
             $minutes = floor($max_time / 60);
             $seconds = $max_time % 60;
-            return '<duration>PT' . $minutes . 'M' . $seconds . "S</duration>\n";
+            return '<duration>PT'.$minutes.'M'.$seconds."S</duration>\n";
         } else {
             return '';
         }
@@ -193,7 +193,7 @@ 
     function export_presentation()
     {
         $out = "<presentation_material><flow_mat><material>\n"
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
+             . "  <mattext><![CDATA[".formatExerciseQtiDescription($this->exercise->selectDescription())."]]></mattext>\n"
              . "</material></flow_mat></presentation_material>\n";
         return $out;
     }
@@ -207,14 +207,14 @@ 
     {
         $out = '';
         if ($n = $this->exercise->getShuffle()) {
-            $out.= "<selection_ordering>"
+            $out .= "<selection_ordering>"
                  . "  <selection>\n"
-                 . "    <selection_number>" . $n . "</selection_number>\n"
+                 . "    <selection_number>".$n."</selection_number>\n"
                  . "  </selection>\n"
                  . '  <order order_type="Random" />'
                  . "\n</selection_ordering>\n";
         } else {
-            $out.= '<selection_ordering sequence_type="Normal">' . "\n"
+            $out .= '<selection_ordering sequence_type="Normal">'."\n"
                  . "  <selection />\n"
                  . "</selection_ordering>\n";
         }
@@ -246,8 +246,8 @@ 
     {
         $head = $foot = "";
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -308,7 +308,7 @@ 
      {
         $this->question = $question;
         $this->answer = $question->answer;
-        $this->questionIdent = "QST_" . $question->selectId() ;
+        $this->questionIdent = "QST_".$question->selectId();
      }
 
      /**
@@ -320,7 +320,7 @@ 
       */
       function start_item()
       {
-        return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
+        return '<item title="'.cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())).'" ident="'.$this->questionIdent.'">'."\n";
       }
 
       /**
@@ -343,8 +343,8 @@ 
       */
      function start_presentation()
      {
-        return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
+        return '<presentation label="'.$this->questionIdent.'"><flow>'."\n"
+             . '<material><mattext>'.formatExerciseQtiDescription($this->question->selectDescription())."</mattext></material>\n";
      }
 
      /**
@@ -364,7 +364,7 @@ 
       */
      function start_processing()
      {
-        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
+        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>'."\n";
      }
 
      /**
@@ -392,8 +392,8 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -447,9 +447,9 @@ 
     $question->type = $qst->type;
     $question->question = $qst->question;
     $question->description = $qst->description;
-	$question->weighting=$qst->weighting;
-	$question->position=$qst->position;
-	$question->picture=$qst->picture;
+	$question->weighting = $qst->weighting;
+	$question->position = $qst->position;
+	$question->picture = $qst->picture;
     $ims = new ImsAssessmentItem($question);
 
     return $ims->export($standalone);

Indentation +166 added lines, -166 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @author Claro Team <cvs@claroline.net>
- * @author Yannick Warnier <yannick.warnier@beeznest.com>
- * @package chamilo.exercise
- */
+     * @author Claro Team <cvs@claroline.net>
+     * @author Yannick Warnier <yannick.warnier@beeznest.com>
+     * @package chamilo.exercise
+     */
 /**
- * Code
- */
+     * Code
+     */
 require dirname(__FILE__) . '/qti2_classes.php';
 /**
- * Classes
+     * Classes
 */
 
 /**
@@ -34,21 +34,21 @@ 
      *
      * @param $question Ims2Question object we want to export.
      */
-     function ImsAssessmentItem($question)
-     {
+        function ImsAssessmentItem($question)
+        {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
         $this->questionIdent = "QST_" . $question->id ;
-     }
-
-     /**
-      * Start the XML flow.
-      *
-      * This opens the <item> block, with correct attributes.
-      *
-      */
-      function start_item()
-      {
+        }
+
+        /**
+         * Start the XML flow.
+         *
+         * This opens the <item> block, with correct attributes.
+         *
+         */
+        function start_item()
+        {
         $string = '<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p1"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p1 imsqti_v2p1.xsd"
@@ -56,55 +56,55 @@ 
                     title="'.htmlspecialchars(formatExerciseQtiTitle($this->question->selectTitle())).'">'."\n";
 
         return $string;
-      }
-
-      /**
-       * End the XML flow, closing the </item> tag.
-       *
-       */
-      function end_item()
-      {
+        }
+
+        /**
+         * End the XML flow, closing the </item> tag.
+         *
+         */
+        function end_item()
+        {
         return "</assessmentItem>\n";
-      }
-
-     /**
-      * Start the itemBody
-      *
-      */
-     function start_item_body()
-     {
+        }
+
+        /**
+         * Start the itemBody
+         *
+         */
+        function start_item_body()
+        {
         return '  <itemBody>' . "\n";
-     }
-
-     /**
-      * End the itemBody part.
-      *
-      */
-     function end_item_body()
-     {
+        }
+
+        /**
+         * End the itemBody part.
+         *
+         */
+        function end_item_body()
+        {
         return "  </itemBody>\n";
-     }
-
-     /**
-      * add the response processing template used.
-      *
-      */
-
-      function add_response_processing()
-      {
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
-      }
-
-     /**
-      * Export the question as an IMS/QTI Item.
-      *
-      * This is a default behaviour, some classes may want to override this.
-      *
-      * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return A string, the XML flow for an Item.
-      */
-     function export($standalone = false)
-     {
+        }
+
+        /**
+         * add the response processing template used.
+         *
+         */
+
+        function add_response_processing()
+        {
+            return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
+        }
+
+        /**
+         * Export the question as an IMS/QTI Item.
+         *
+         * This is a default behaviour, some classes may want to override this.
+         *
+         * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+         * @return A string, the XML flow for an Item.
+         */
+        function export($standalone = false)
+        {
         $head = $foot = "";
 
         if ($standalone) {
@@ -131,7 +131,7 @@ 
             .$foot;
 
         return $res;
-     }
+        }
 }
 
 /**
@@ -193,8 +193,8 @@ 
     function export_presentation()
     {
         $out = "<presentation_material><flow_mat><material>\n"
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
-             . "</material></flow_mat></presentation_material>\n";
+                . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
+                . "</material></flow_mat></presentation_material>\n";
         return $out;
     }
 
@@ -208,15 +208,15 @@ 
         $out = '';
         if ($n = $this->exercise->getShuffle()) {
             $out.= "<selection_ordering>"
-                 . "  <selection>\n"
-                 . "    <selection_number>" . $n . "</selection_number>\n"
-                 . "  </selection>\n"
-                 . '  <order order_type="Random" />'
-                 . "\n</selection_ordering>\n";
+                    . "  <selection>\n"
+                    . "    <selection_number>" . $n . "</selection_number>\n"
+                    . "  </selection>\n"
+                    . '  <order order_type="Random" />'
+                    . "\n</selection_ordering>\n";
         } else {
             $out.= '<selection_ordering sequence_type="Normal">' . "\n"
-                 . "  <selection />\n"
-                 . "</selection_ordering>\n";
+                    . "  <selection />\n"
+                    . "</selection_ordering>\n";
         }
 
         return $out;
@@ -230,7 +230,7 @@ 
     {
         $out = "";
         foreach ($this->exercise->selectQuestionList() as $q) {
-        	$out .= export_question_qti($q, false);
+            $out .= export_question_qti($q, false);
         }
         return $out;
     }
@@ -247,18 +247,18 @@ 
         $head = $foot = "";
         if ($standalone) {
             $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
-                  . "<questestinterop>\n";
+                    . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+                    . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
         $out = $head
-             . $this->start_section()
-             . $this->export_duration()
-             . $this->export_presentation()
-             . $this->export_ordering()
-             . $this->export_questions()
-             . $this->end_section()
-             . $foot;
+                . $this->start_section()
+                . $this->export_duration()
+                . $this->export_presentation()
+                . $this->export_ordering()
+                . $this->export_questions()
+                . $this->end_section()
+                . $foot;
 
         return $out;
     }
@@ -304,97 +304,97 @@ 
      * @param $question The Question object we want to export.
      * @author Anamd Tihon
      */
-     function ImsItem($question)
-     {
+        function ImsItem($question)
+        {
         $this->question = $question;
         $this->answer = $question->answer;
         $this->questionIdent = "QST_" . $question->selectId() ;
-     }
-
-     /**
-      * Start the XML flow.
-      *
-      * This opens the <item> block, with correct attributes.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-      function start_item()
-      {
+        }
+
+        /**
+         * Start the XML flow.
+         *
+         * This opens the <item> block, with correct attributes.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_item()
+        {
         return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
-      }
-
-      /**
-       * End the XML flow, closing the </item> tag.
-       *
-       * @author Amand Tihon <amand@alrj.org>
-       */
-      function end_item()
-      {
+        }
+
+        /**
+         * End the XML flow, closing the </item> tag.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_item()
+        {
         return "</item>\n";
-      }
-
-     /**
-      * Create the opening, with the question itself.
-      *
-      * This means it opens the <presentation> but doesn't close it, as this is the role of end_presentation().
-      * In between, the export_responses from the subclass should have been called.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function start_presentation()
-     {
+        }
+
+        /**
+         * Create the opening, with the question itself.
+         *
+         * This means it opens the <presentation> but doesn't close it, as this is the role of end_presentation().
+         * In between, the export_responses from the subclass should have been called.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_presentation()
+        {
         return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
-     }
-
-     /**
-      * End the </presentation> part, opened by export_header.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function end_presentation()
-     {
+                . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
+        }
+
+        /**
+         * End the </presentation> part, opened by export_header.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_presentation()
+        {
         return "</flow></presentation>\n";
-     }
-
-     /**
-      * Start the response processing, and declare the default variable, SCORE, at 0 in the outcomes.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function start_processing()
-     {
+        }
+
+        /**
+         * Start the response processing, and declare the default variable, SCORE, at 0 in the outcomes.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_processing()
+        {
         return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
-     }
-
-     /**
-      * End the response processing part.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function end_processing()
-     {
+        }
+
+        /**
+         * End the response processing part.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_processing()
+        {
         return "</resprocessing>\n";
-     }
-
-     /**
-      * Export the question as an IMS/QTI Item.
-      *
-      * This is a default behaviour, some classes may want to override this.
-      *
-      * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return A string, the XML flow for an Item.
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function export($standalone = False)
-     {
+        }
+
+        /**
+         * Export the question as an IMS/QTI Item.
+         *
+         * This is a default behaviour, some classes may want to override this.
+         *
+         * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+         * @return A string, the XML flow for an Item.
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function export($standalone = False)
+        {
         global $charset;
         $head = $foot = "";
 
         if ($standalone) {
             $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
-                  . "<questestinterop>\n";
+                    . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+                    . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
 
@@ -409,7 +409,7 @@ 
             . $this->answer->imsExportFeedback($this->questionIdent)
             . $this->end_item()
             . $foot;
-     }
+        }
 }
 
 /**
@@ -447,9 +447,9 @@ 
     $question->type = $qst->type;
     $question->question = $qst->question;
     $question->description = $qst->description;
-	$question->weighting=$qst->weighting;
-	$question->position=$qst->position;
-	$question->picture=$qst->picture;
+    $question->weighting=$qst->weighting;
+    $question->position=$qst->position;
+    $question->picture=$qst->picture;
     $ims = new ImsAssessmentItem($question);
 
     return $ims->export($standalone);

main/exercice/export/scorm/scorm_classes.php

Doc Comments +5 added lines, -4 removed lines

@@ -27,6 +27,7 @@ 
      * @param int  The JavaScript ID for this question.
      * Due to the nature of interactions, we must have a natural sequence for
      * questions in the generated JavaScript.
+     * @param integer $js_id
      */
     public static function export_question($questionId, $standalone = true, $js_id)
     {
@@ -687,7 +688,7 @@ 
     /**
      * Constructor.
      *
-     * @param $question The Question object we want to export.
+     * @param ScormQuestion $question The Question object we want to export.
      */
     public function ScormAssessmentItem($question, $standalone = false)
     {
@@ -915,7 +916,7 @@ 
      *
      * @param int $exerciseId The exercise to exporte
      * @param boolean $standalone Wether it should include XML tag and DTD line.
-     * @return The XML as a string, or an empty string if there's no exercise with given ID.
+     * @return string XML as a string, or an empty string if there's no exercise with given ID.
      */
     public static function export_exercise_to_scorm($exerciseId, $standalone=true) {
         $exercise = new Exercise();
@@ -930,7 +931,7 @@ 
 
     /**
      * Constructor.
-     * @param $exe The Exercise instance to export
+     * @param Exercise $exe The Exercise instance to export
      * @author Amand Tihon <amand@alrj.org>
      */
     function ScormSection($exe) {
@@ -1091,7 +1092,7 @@ 
      * This is a default behaviour, some classes may want to override this.
      *
      * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-     * @return A string, the XML flow for an Item.
+     * @return string string, the XML flow for an Item.
      */
     function export()
     {

Spacing +181 added lines, -181 removed lines

@@ -32,7 +32,7 @@ 
     {
         $question = new ScormQuestion();
         $qst = $question->read($questionId);
-        if( !$qst ) {
+        if (!$qst) {
             return '';
         }
         $question->id = $qst->id;
@@ -40,9 +40,9 @@ 
         $question->type = $qst->type;
         $question->question = $qst->question;
         $question->description = $qst->description;
-        $question->weighting=$qst->weighting;
-        $question->position=$qst->position;
-        $question->picture=$qst->picture;
+        $question->weighting = $qst->weighting;
+        $question->position = $qst->position;
+        $question->picture = $qst->picture;
         $assessmentItem = new ScormAssessmentItem($question, $standalone);
         //echo "<pre>".print_r($scorm,1)."</pre>";exit;
         return $assessmentItem->export();
@@ -111,14 +111,14 @@ 
 		$html = $this->getQuestionHTML();
 		$js   = $this->getQuestionJS();
 
-		if( is_object($this->answer) )
+		if (is_object($this->answer))
 		{
-			list($js2,$html2) = $this->answer->export();
+			list($js2, $html2) = $this->answer->export();
 			$js .= $js2;
 			$html .= $html2;
 		}
 
-		return array($js,$html);
+		return array($js, $html);
 	}
 
     function createAnswersForm($form)
@@ -136,19 +136,19 @@ 
      */
     function getQuestionHTML()
     {
-    	$title			= $this->selectTitle();
-		$description	= $this->selectDescription();
+    	$title = $this->selectTitle();
+		$description = $this->selectDescription();
 		$cols = 2;
-		$s='<tr>' .
-			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
+		$s = '<tr>'.
+			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">'."\n".
 		   	$title.
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n" .
-		   	'<tr>' . "\n" .
-		   	'<td valign="top" colspan="'.$cols.'">' . "\n" .
-		   	'<i>'.$description.'</i>' . "\n" .
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n";
+		   	'</td>'."\n".
+		   	'</tr>'."\n".
+		   	'<tr>'."\n".
+		   	'<td valign="top" colspan="'.$cols.'">'."\n".
+		   	'<i>'.$description.'</i>'."\n".
+		   	'</td>'."\n".
+		   	'</tr>'."\n";
 		return $s;
     }
 
@@ -160,10 +160,10 @@ 
     	//$id = $this->id;
     	$w = $this->selectWeighting();
     	$s = 'questions.push('.$this->js_id.');'."\n";
-    	if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
+    	if ($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
     	{ //put the max score to 0 to avoid discounting the points of
     	  //non-exported quiz types in the SCORM
-    		$w=0;
+    		$w = 0;
     	}
     	$s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
     	return $s;
@@ -184,40 +184,40 @@ 
 	{
 		$html = '';
     	$js   = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		$type = $this->getQuestionType();
 		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
 		//not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
         //if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
-		if ($type == MCMA ) {
+		if ($type == MCMA) {
         	//$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
         	$id = 1;
         	$jstmp = '';
         	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
+			foreach ($this->answer as $i => $answer)
 			{
 				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
 				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
+		    		'<tr>'."\n"
+				.	'<td align="center" width="5%">'."\n"
+		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />'."\n"
+		    	.	'</td>'."\n"
+		    	.	'<td width="95%">'."\n"
+		    	.	'<label for="'.$identifier.'">'.$this->answer[$i].'</label>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'</tr>'."\n\n";
 		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
+		    	if ($this->correct[$i])
 		    	{
 		    		$jstmpc .= $i.',';
 		    	}
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
 		    	$id++;
 			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
+	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc, 0, -1).');'."\n";
 	    	if ($type == MCMA) {
 	    		$js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
 	    	} else {
@@ -228,14 +228,14 @@ 
         		//To this items we show the ThisItemIsNotExportable
         	    $qId = $this->questionJSId;
 		    	$js = '';
-		    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+		    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 				// some javascript must be added for that kind of questions
-				$html .= '<tr>' . "\n"
-						.	'<td>' . "\n"
-				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
-				    	.	'</td>' . "\n"
-				    	.	'</tr>' . "\n";
-				$html .= '</table></td></tr>' . "\n";
+				$html .= '<tr>'."\n"
+						.	'<td>'."\n"
+				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>'."\n"
+				    	.	'</td>'."\n"
+				    	.	'</tr>'."\n";
+				$html .= '</table></td></tr>'."\n";
 				// currently the exact answers cannot be displayed, so ignore the textarea
 				$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
 				$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
@@ -245,40 +245,40 @@ 
 				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
 		    	$js .= $jstmpw;
-		        return array($js,$html);
+		        return array($js, $html);
         } else {
         	//$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
         	$id = 1;
         	$jstmp = '';
         	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
+			foreach ($this->answer as $i => $answer)
 			{
 	        	$identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
 	        	$identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
 				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
+		    		'<tr>'."\n"
+				.	'<td align="center" width="5%">'."\n"
+		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'<td width="95%">'."\n"
+		    	.	'<label for="'.$identifier.'">'.$this->answer[$i].'</label>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'</tr>'."\n\n";
 		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
+		    	if ($this->correct[$i])
 		    	{
 		    		$jstmpc .= $i;
 		    	}
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
 		    	$id++;
 			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
 	    	$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
 			$js .= $jstmpw;
         }
-		$html .= '</table></td></tr>' . "\n";
-        return array($js,$html);
+		$html .= '</table></td></tr>'."\n";
+        return array($js, $html);
     }
 }
 
@@ -302,29 +302,29 @@ 
 		$identifier_true  = $identifier.'_true';
 		$identifier_false = $identifier.'_false';
 		$html .=
-    		'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
+    		'<tr>'."\n"
+		.	'<td align="center" width="5%">'."\n"
     	.	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
-		.		'/>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'<td width="95%">' . "\n"
-    	.	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'</tr>' . "\n\n";
+		.		'/>'."\n"
+    	.	'</td>'."\n"
+    	.	'<td width="95%">'."\n"
+    	.	'<label for="'.$identifier_true.'">'.get_lang('True').'</label>'."\n"
+    	.	'</td>'."\n"
+    	.	'</tr>'."\n\n";
     	$html .=
-			'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
+			'<tr>'."\n"
+		.	'<td align="center" width="5%">'."\n"
 		.	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
-		.		'/>' . "\n"
-		.	'</td>' . "\n"
-		.	'<td width="95%">' . "\n"
-		.	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
-		.	'</td>' . "\n"
-		.	'</tr>' . "\n\n";
-		$html .= '</table></td></tr>' . "\n";
+		.		'/>'."\n"
+		.	'</td>'."\n"
+		.	'<td width="95%">'."\n"
+		.	'<label for="'.$identifier_false.'">'.get_lang('False').'</label>'."\n"
+		.	'</td>'."\n"
+		.	'</tr>'."\n\n";
+		$html .= '</table></td></tr>'."\n";
 		$js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-		if($this->response == 'TRUE')
+		if ($this->response == 'TRUE')
 		{
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
 		}
@@ -337,7 +337,7 @@ 
     	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
     	$js .= $jstmpw;
 
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -357,56 +357,56 @@ 
     {
     	global $charset;
     	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		// get all enclosed answers
 		$blankList = array();
 		// build replacement
 		$replacementList = array();
-		foreach( $this->answer as $i => $answer) {
+		foreach ($this->answer as $i => $answer) {
 			$blankList[] = '['.$answer.']';
 		}
 		$answerCount = count($blankList);
 
 		// splits text and weightings that are joined with the character '::'
-		list($answer,$weight)=explode('::',$answer);
-		$weights = explode(',',$weight);
+		list($answer, $weight) = explode('::', $answer);
+		$weights = explode(',', $weight);
 		// because [] is parsed here we follow this procedure:
 		// 1. find everything between the [ and ] tags
-		$i=1;
+		$i = 1;
 		$jstmp = '';
 		$jstmpc = '';
 		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$startlocations=api_strpos($answer,'[');
-		$endlocations=api_strpos($answer,']');
-		while($startlocations !== false && $endlocations !== false) {
-			$texstring=api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
-			$answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+		$startlocations = api_strpos($answer, '[');
+		$endlocations = api_strpos($answer, ']');
+		while ($startlocations !== false && $endlocations !== false) {
+			$texstring = api_substr($answer, $startlocations, ($endlocations - $startlocations) + 1);
+			$answer = api_substr_replace($answer, '<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />', $startlocations, ($endlocations - $startlocations) + 1);
 			$jstmp .= $i.',';
-			$jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
-				$my_weight=explode('@',$weights[$i-1]);
-				if (count($my_weight)==2) {
-					$weight_db=$my_weight[0];
+			$jstmpc .= "'".api_htmlentities(api_substr($texstring, 1, -1), ENT_QUOTES, $charset)."',";
+				$my_weight = explode('@', $weights[$i - 1]);
+				if (count($my_weight) == 2) {
+					$weight_db = $my_weight[0];
 				} else {
-					$weight_db=$my_weight[0];
+					$weight_db = $my_weight[0];
 				}
 	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
 			$i++;
-			$startlocations=api_strpos($answer,'[');
-			$endlocations=api_strpos($answer,']');
+			$startlocations = api_strpos($answer, '[');
+			$endlocations = api_strpos($answer, ']');
 		}
 
-		$html .= 	'<tr>' . "\n"
-				.	'<td>' . "\n"
-		    	.	$answer  . "\n"
-	    		.	'</td>' . "\n"
-	    		.	'</tr>' . "\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
+		$html .= '<tr>'."\n"
+				.	'<td>'."\n"
+		    	.	$answer."\n"
+	    		.	'</td>'."\n"
+	    		.	'</tr>'."\n";
+		$html .= '</table></td></tr>'."\n";
+		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp, 0, -1).');'."\n";
+    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc, 0, -1).');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
     	$js .= $jstmpw;
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -423,7 +423,7 @@ 
     function export()
     {
     	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
   		// prepare list of right proposition to allow
 		// - easiest display
 		// - easiest randomisation if needed one day
@@ -432,12 +432,12 @@ 
 			$displayedRightList = array_values($this->rightList);
 		}
 		// get max length of displayed array
-		$arrayLength = max( count($this->leftList), count($this->rightList) );
+		$arrayLength = max(count($this->leftList), count($this->rightList));
 
-		$nbrAnswers=$this->selectNbrAnswers();
-		$cpt1='A';
-		$cpt2=1;
-		$Select=array();
+		$nbrAnswers = $this->selectNbrAnswers();
+		$cpt1 = 'A';
+		$cpt2 = 1;
+		$Select = array();
 		$qId = $this->questionJSId;
 		$s = '';
 		$jstmp = '';
@@ -445,74 +445,74 @@ 
         $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
         $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+		for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
 			$identifier = 'question_'.$qId.'_matching_';
-			$answer=$this->selectAnswer($answerId);
-			$answerCorrect=$this->isCorrect($answerId);
-			$weight=$this->selectWeighting($answerId);
+			$answer = $this->selectAnswer($answerId);
+			$answerCorrect = $this->isCorrect($answerId);
+			$weight = $this->selectWeighting($answerId);
 			$jstmp .= $answerId.',';
 
 			if (!$answerCorrect) {
 				// options (A, B, C, ...) that will be put into the list-box
-				$Select[$answerId]['Lettre']=$cpt1;
+				$Select[$answerId]['Lettre'] = $cpt1;
 				// answers that will be shown at the right side
 				$Select[$answerId]['Reponse'] = $answer;
 				$cpt1++;
 			} else {
-				$s.='<tr>'."\n";
-				$s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
+				$s .= '<tr>'."\n";
+				$s .= '<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
+				$s .= '<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
+				$s .= ' <option value="0">--</option>';
 	            // fills the list-box
-	            foreach($Select as $key=>$val)
+	            foreach ($Select as $key=>$val)
 	            {
-					$s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
+					$s .= '<option value="'.$key.'">'.$val['Lettre'].'</option>';
 				}  // end foreach()
 
-				$s.='</select>&nbsp;&nbsp;</td>'."\n";
-				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-					else $s.='&nbsp;';
-				$s.="</td>\n</tr>\n";
+				$s .= '</select>&nbsp;&nbsp;</td>'."\n";
+				$s .= '<td width="40%" valign="top">';
+				if (isset($Select[$cpt2])) $s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+					else $s .= '&nbsp;';
+				$s .= "</td>\n</tr>\n";
 
 				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
 
-				$my_weight=explode('@',$weight);
-				if (count($my_weight)==2) {
-					$weight=$my_weight[0];
+				$my_weight = explode('@', $weight);
+				if (count($my_weight) == 2) {
+					$weight = $my_weight[0];
 				} else {
-					$weight=$my_weight[0];
+					$weight = $my_weight[0];
 				}
 		    	$jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
 				$cpt2++;
 
 				// if the left side of the "matching" has been completely shown
-				if($answerId == $nbrAnswers)
+				if ($answerId == $nbrAnswers)
 				{
 					// if there remain answers to be shown on the right side
-					while(isset($Select[$cpt2]))
+					while (isset($Select[$cpt2]))
 					{
 						//$s.='<tr>'."\n";
 						//$s.='<td colspan="2">'."\n";
 						//$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
-						$s.='<tr>'."\n";
-						$s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
-						$s.='<td width="40%" valign="top">';
-						$s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.="</td>\n</tr>\n";
+						$s .= '<tr>'."\n";
+						$s .= '<td width="60%" colspan="2">&nbsp;</td>'."\n";
+						$s .= '<td width="40%" valign="top">';
+						$s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+						$s .= "</td>\n</tr>\n";
 						$cpt2++;
 					}	// end while()
 				}  // end if()
 			}
 		}
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
+    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc, 0, -1).');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
     	$js .= $jstmpw;
 		$html .= $s;
-		$html .= '</table></td></tr>' . "\n";
+		$html .= '</table></td></tr>'."\n";
 
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -549,7 +549,7 @@ 
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
     	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
     	$js .= $jstmpw;
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 /**
@@ -601,15 +601,15 @@ 
     function export()
     {
     	$js = $this->get_js_header();
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		// some javascript must be added for that kind of questions
 		$html .= '';
 
 		// Get the answers, make a list
-		$nbrAnswers=$this->selectNbrAnswers();
+		$nbrAnswers = $this->selectNbrAnswers();
 
 		$answer_list = '<div style="padding: 10px; margin-left: -8px; border: 1px solid #4271b5; height: 448px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
+		for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++)
 		{
 			$answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
 		}
@@ -658,11 +658,11 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></td></tr>' . "\n";
+		$html .= '</table></td></tr>'."\n";
 
 		// currently the free answers cannot be displayed, so ignore the textarea
 		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -693,7 +693,7 @@ 
     {
         $this->question = $question;
         $this->question->setAnswer();
-        $this->questionIdent = "QST_" . $question->id ;
+        $this->questionIdent = "QST_".$question->id;
         $this->standalone = $standalone;
     }
 
@@ -707,9 +707,9 @@ 
     {
         global $charset;
         $head = "";
-        if( $this->standalone)
+        if ($this->standalone)
         {
-            $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n";
+            $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>'."\n";
             $head .= '<html>'."\n";
         }
         return $head;
@@ -720,7 +720,7 @@ 
      *
      */
     function end_page() {
-        if($this->standalone){return '</html>';}
+        if ($this->standalone) {return '</html>'; }
         return '';
     }
 
@@ -728,7 +728,7 @@ 
      * Start document header
      */
     function start_header() {
-        if($this->standalone){return '<head>'. "\n";}
+        if ($this->standalone) {return '<head>'."\n"; }
         return '';
     }
 
@@ -755,7 +755,7 @@ 
      */
     function end_header()
     {
-        if($this->standalone){return '</head>'. "\n";}
+        if ($this->standalone) {return '</head>'."\n"; }
         return '';
     }
     /**
@@ -775,11 +775,11 @@ 
     function common_js()
     {
         $js = file_get_contents('../newscorm/js/api_wrapper.js');
-        $js .= 'var questions = new Array();' . "\n";
-        $js .= 'var questions_answers = new Array();' . "\n";
-        $js .= 'var questions_answers_correct = new Array();' . "\n";
-        $js .= 'var questions_types = new Array();' . "\n";
-        $js .= "\n" .
+        $js .= 'var questions = new Array();'."\n";
+        $js .= 'var questions_answers = new Array();'."\n";
+        $js .= 'var questions_answers_correct = new Array();'."\n";
+        $js .= 'var questions_types = new Array();'."\n";
+        $js .= "\n".
             '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
@@ -819,7 +819,7 @@ 
         //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
         //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
         $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-        if($this->standalone){return $js. "\n";}
+        if ($this->standalone) {return $js."\n"; }
         return '';
     }
 
@@ -829,7 +829,7 @@ 
      */
     function end_js()
     {
-        if($this->standalone){return '</script>'. "\n";}
+        if ($this->standalone) {return '</script>'."\n"; }
         return '';
     }
 
@@ -839,7 +839,7 @@ 
      */
     function start_body()
     {
-        if($this->standalone){return '<body>'. "\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n";}
+        if ($this->standalone) {return '<body>'."\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n"; }
         return '';
     }
 
@@ -849,7 +849,7 @@ 
      */
     function end_body()
     {
-        if($this->standalone){return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";}
+        if ($this->standalone) {return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n"; }
         return '';
     }
 
@@ -864,9 +864,9 @@ 
     function export()
     {
         $js = $html = '';
-        list($js,$html) = $this->question->export();
+        list($js, $html) = $this->question->export();
         //list($js,$html) = $this->question->answer->export();
-        if($this->standalone)
+        if ($this->standalone)
         {
             $res = $this->start_page()
                 . $this->start_header()
@@ -888,7 +888,7 @@ 
         }
         else
         {
-            return array($js,$html);
+            return array($js, $html);
         }
     }
 }
@@ -917,9 +917,9 @@ 
      * @param boolean $standalone Wether it should include XML tag and DTD line.
      * @return The XML as a string, or an empty string if there's no exercise with given ID.
      */
-    public static function export_exercise_to_scorm($exerciseId, $standalone=true) {
+    public static function export_exercise_to_scorm($exerciseId, $standalone = true) {
         $exercise = new Exercise();
-        if (! $exercise->read($exerciseId)) {
+        if (!$exercise->read($exerciseId)) {
             return '';
         }
         $ims = new ScormSection($exercise);
@@ -946,7 +946,7 @@ 
     function start_page() {
         global $charset;
         $head = $foot = "";
-        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n".'<html>'."\n";
+        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>'."\n".'<html>'."\n";
         return $head;
     }
 
@@ -962,7 +962,7 @@ 
      * Start document header
      */
     function start_header() {
-        return '<head>'. "\n";
+        return '<head>'."\n";
     }
 
     /**
@@ -984,7 +984,7 @@ 
      * End document header
      */
     function end_header() {
-        return '</head>'. "\n";
+        return '</head>'."\n";
     }
 
     /**
@@ -992,7 +992,7 @@ 
      *
      */
     function start_js() {
-        return '<script type="text/javascript" language="javascript">'. "\n";
+        return '<script type="text/javascript" language="javascript">'."\n";
     }
 
     /**
@@ -1002,11 +1002,11 @@ 
         $js = "\n";
         $js .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
         $js .= file_get_contents('../newscorm/js/api_wrapper.js');
-        $js .= 'var questions = new Array();' . "\n";
-        $js .= 'var questions_answers = new Array();' . "\n";
-        $js .= 'var questions_answers_correct = new Array();' . "\n";
-        $js .= 'var questions_types = new Array();' . "\n";
-        $js .= "\n" .
+        $js .= 'var questions = new Array();'."\n";
+        $js .= 'var questions_answers = new Array();'."\n";
+        $js .= 'var questions_answers_correct = new Array();'."\n";
+        $js .= 'var questions_types = new Array();'."\n";
+        $js .= "\n".
             '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
@@ -1053,7 +1053,7 @@ 
         //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
         //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
         $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-        return $js. "\n";
+        return $js."\n";
     }
 
     /**
@@ -1061,7 +1061,7 @@ 
      *
      */
     function end_js() {
-        return '</script>'. "\n";
+        return '</script>'."\n";
     }
 
     /**
@@ -1070,7 +1070,7 @@ 
      */
     function start_body()
     {
-        return '<body>'. "\n".
+        return '<body>'."\n".
         '<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>\n".
         '<form id="dokeos_scorm_form" method="post" action="">'."\n".
         '<table width="100%">'."\n";
@@ -1082,7 +1082,7 @@ 
      */
     function end_body()
     {
-        return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";
+        return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n";
     }
 
     /**
@@ -1099,11 +1099,11 @@ 
 
         $head = "";
         if ($this->standalone) {
-            $head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
-                . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
+            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
+                . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n";
         }
 
-        list($js,$html) = $this->export_questions();
+        list($js, $html) = $this->export_questions();
         //list($js,$html) = $this->question->answer->export();
         $res = $this->start_page()
             . $this->start_header()
@@ -1134,12 +1134,12 @@ 
         $js = $html = "";
         $js_id = 0;
         foreach ($this->exercise->selectQuestionList() as $q) {
-            list($jstmp,$htmltmp)= ScormQuestion::export_question($q, false, $js_id);
+            list($jstmp, $htmltmp) = ScormQuestion::export_question($q, false, $js_id);
             $js .= $jstmp."\n";
             $html .= $htmltmp."\n";
             ++$js_id;
         }
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 

Braces +8 added lines, -8 removed lines

@@ -327,8 +327,7 @@ 
 		if($this->response == 'TRUE')
 		{
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
-		}
-		else
+		} else
 		{
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
 		}
@@ -471,8 +470,11 @@ 
 
 				$s.='</select>&nbsp;&nbsp;</td>'."\n";
 				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-					else $s.='&nbsp;';
+				if(isset($Select[$cpt2])) {
+				    $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+				} else {
+					    $s.='&nbsp;';
+					}
 				$s.="</td>\n</tr>\n";
 
 				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
@@ -577,8 +579,7 @@ 
 			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
 	    	$header .= $jstmpw;
-		}
-		else
+		} else
 		{
 			$header = '';
 			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
@@ -885,8 +886,7 @@ 
                 . $this->end_body()
                 . $this->end_page();
             return $res;
-        }
-        else
+        } else
         {
             return array($js,$html);
         }

Indentation +428 added lines, -428 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @author Claro Team <cvs@claroline.net>
- * @author Yannick Warnier <yannick.warnier@beeznest.com>
- * @package chamilo.exercise.scorm
- */
+     * @author Claro Team <cvs@claroline.net>
+     * @author Yannick Warnier <yannick.warnier@beeznest.com>
+     * @package chamilo.exercise.scorm
+     */
 
 /**
  * The ScormQuestion class is a gateway to getting the answers exported
@@ -49,86 +49,86 @@ 
     }
 
     /**
-	 * Include the correct answer class and create answer
-	 */
-	public function setAnswer()
-	{
-		switch ($this->type) {
-			case MCUA:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+     * Include the correct answer class and create answer
+     */
+    public function setAnswer()
+    {
+        switch ($this->type) {
+            case MCUA:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MCMA:
+                break;
+            case MCMA:
             case GLOBAL_MULTIPLE_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case TF:
-				$this->answer = new ScormAnswerTrueFalse($this->id);
+                break;
+            case TF:
+                $this->answer = new ScormAnswerTrueFalse($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case FIB:
-				$this->answer = new ScormAnswerFillInBlanks($this->id);
+                break;
+            case FIB:
+                $this->answer = new ScormAnswerFillInBlanks($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MATCHING:
+                break;
+            case MATCHING:
             case MATCHING_DRAGGABLE:
-				$this->answer = new ScormAnswerMatching($this->id);
+                $this->answer = new ScormAnswerMatching($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
+                break;
             case ORAL_EXPRESSION:
-			case FREE_ANSWER:
-				$this->answer = new ScormAnswerFree($this->id);
+            case FREE_ANSWER:
+                $this->answer = new ScormAnswerFree($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                break;
+            case HOT_SPOT:
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MULTIPLE_ANSWER_COMBINATION:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+                break;
+            case MULTIPLE_ANSWER_COMBINATION:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
+                break;
             case HOT_SPOT_ORDER:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_DELINEATION:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                break;
+            case HOT_SPOT_DELINEATION:
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			default :
-				$this->answer = null;
+                break;
+            default :
+                $this->answer = null;
                 $this->answer->questionJSId = $this->js_id;
-				break;
-		}
+                break;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	function export()
-	{
-		$html = $this->getQuestionHTML();
-		$js   = $this->getQuestionJS();
+    function export()
+    {
+        $html = $this->getQuestionHTML();
+        $js   = $this->getQuestionJS();
 
-		if( is_object($this->answer) )
-		{
-			list($js2,$html2) = $this->answer->export();
-			$js .= $js2;
-			$html .= $html2;
-		}
+        if( is_object($this->answer) )
+        {
+            list($js2,$html2) = $this->answer->export();
+            $js .= $js2;
+            $html .= $html2;
+        }
 
-		return array($js,$html);
-	}
+        return array($js,$html);
+    }
 
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
 
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 
     /**
@@ -136,20 +136,20 @@ 
      */
     function getQuestionHTML()
     {
-    	$title			= $this->selectTitle();
-		$description	= $this->selectDescription();
-		$cols = 2;
-		$s='<tr>' .
-			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
-		   	$title.
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n" .
-		   	'<tr>' . "\n" .
-		   	'<td valign="top" colspan="'.$cols.'">' . "\n" .
-		   	'<i>'.$description.'</i>' . "\n" .
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n";
-		return $s;
+        $title			= $this->selectTitle();
+        $description	= $this->selectDescription();
+        $cols = 2;
+        $s='<tr>' .
+            '<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
+                $title.
+                '</td>' . "\n" .
+                '</tr>' . "\n" .
+                '<tr>' . "\n" .
+                '<td valign="top" colspan="'.$cols.'">' . "\n" .
+                '<i>'.$description.'</i>' . "\n" .
+                '</td>' . "\n" .
+                '</tr>' . "\n";
+        return $s;
     }
 
     /**
@@ -157,16 +157,16 @@ 
      */
     function getQuestionJS()
     {
-    	//$id = $this->id;
-    	$w = $this->selectWeighting();
-    	$s = 'questions.push('.$this->js_id.');'."\n";
-    	if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
-    	{ //put the max score to 0 to avoid discounting the points of
-    	  //non-exported quiz types in the SCORM
-    		$w=0;
-    	}
-    	$s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
-    	return $s;
+        //$id = $this->id;
+        $w = $this->selectWeighting();
+        $s = 'questions.push('.$this->js_id.');'."\n";
+        if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
+        { //put the max score to 0 to avoid discounting the points of
+            //non-exported quiz types in the SCORM
+            $w=0;
+        }
+        $s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
+        return $s;
     }
 }
 
@@ -177,107 +177,107 @@ 
  */
 class ScormAnswerMultipleChoice extends Answer
 {
-	/**
-	 * Return HTML code for possible answers
+    /**
+     * Return HTML code for possible answers
      */
-	function export()
-	{
-		$html = '';
-    	$js   = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		$type = $this->getQuestionType();
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-
-		//not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
+    function export()
+    {
+        $html = '';
+        $js   = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        $type = $this->getQuestionType();
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+
+        //not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
         //if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
-		if ($type == MCMA ) {
-        	//$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
-        	$id = 1;
-        	$jstmp = '';
-        	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
-			{
-				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
-				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
-		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
-		    	{
-		    		$jstmpc .= $i.',';
-		    	}
-		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
-		    	$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
-	    	if ($type == MCMA) {
-	    		$js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
-	    	} else {
-	    		$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-	    	}
-	    	$js .= $jstmpw;
+        if ($type == MCMA ) {
+            //$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            foreach( $this->answer as $i => $answer )
+            {
+                $identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
+                $html .=
+                    '<tr>' . "\n"
+                .	'<td align="center" width="5%">' . "\n"
+                .	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
+                .	'</td>' . "\n"
+                .	'<td width="95%">' . "\n"
+                .	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
+                .	'</td>' . "\n"
+                .	'</tr>' . "\n\n";
+                $jstmp .= $i.',';
+                if($this->correct[$i])
+                {
+                    $jstmpc .= $i.',';
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+            if ($type == MCMA) {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
+            } else {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+            }
+            $js .= $jstmpw;
         } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
-        		//To this items we show the ThisItemIsNotExportable
-        	    $qId = $this->questionJSId;
-		    	$js = '';
-		    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-				// some javascript must be added for that kind of questions
-				$html .= '<tr>' . "\n"
-						.	'<td>' . "\n"
-				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
-				    	.	'</td>' . "\n"
-				    	.	'</tr>' . "\n";
-				$html .= '</table></td></tr>' . "\n";
-				// currently the exact answers cannot be displayed, so ignore the textarea
-				$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-				$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-		    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-		    	$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-				$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-		    	$js .= $jstmpw;
-		        return array($js,$html);
+                //To this items we show the ThisItemIsNotExportable
+                $qId = $this->questionJSId;
+                $js = '';
+                $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+                // some javascript must be added for that kind of questions
+                $html .= '<tr>' . "\n"
+                        .	'<td>' . "\n"
+                        . '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
+                        .	'</td>' . "\n"
+                        .	'</tr>' . "\n";
+                $html .= '</table></td></tr>' . "\n";
+                // currently the exact answers cannot be displayed, so ignore the textarea
+                $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+                $js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+                $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+                $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+                $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+                $js .= $jstmpw;
+                return array($js,$html);
         } else {
-        	//$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
-        	$id = 1;
-        	$jstmp = '';
-        	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
-			{
-	        	$identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
-	        	$identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
-				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
-		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
-		    	{
-		    		$jstmpc .= $i;
-		    	}
-		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
-		    	$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
-	    	$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
-			$js .= $jstmpw;
+            //$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            foreach( $this->answer as $i => $answer )
+            {
+                $identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
+                $identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
+                $html .=
+                    '<tr>' . "\n"
+                .	'<td align="center" width="5%">' . "\n"
+                .	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
+                .	'</td>' . "\n"
+                .	'<td width="95%">' . "\n"
+                .	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
+                .	'</td>' . "\n"
+                .	'</tr>' . "\n\n";
+                $jstmp .= $i.',';
+                if($this->correct[$i])
+                {
+                    $jstmpc .= $i;
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
+            $js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
+            $js .= $jstmpw;
         }
-		$html .= '</table></td></tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
         return array($js,$html);
     }
 }
@@ -288,7 +288,7 @@ 
  */
 class ScormAnswerTrueFalse extends Answer
 {
-	/**
+    /**
      * Return the XML flow for the possible answers.
      * That's one <response_lid>, containing several <flow_label>
      *
@@ -296,46 +296,46 @@ 
      */
     function export()
     {
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">';
-		$identifier = 'question_'.$this->questionJSId.'_tf';
-		$identifier_true  = $identifier.'_true';
-		$identifier_false = $identifier.'_false';
-		$html .=
-    		'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
-    	.	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
-		.		'/>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'<td width="95%">' . "\n"
-    	.	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'</tr>' . "\n\n";
-    	$html .=
-			'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
-		.	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
-		.		'/>' . "\n"
-		.	'</td>' . "\n"
-		.	'<td width="95%">' . "\n"
-		.	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
-		.	'</td>' . "\n"
-		.	'</tr>' . "\n\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-		if($this->response == 'TRUE')
-		{
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
-		}
-		else
-		{
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
-		}
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
-    	$js .= $jstmpw;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        $identifier = 'question_'.$this->questionJSId.'_tf';
+        $identifier_true  = $identifier.'_true';
+        $identifier_false = $identifier.'_false';
+        $html .=
+            '<tr>' . "\n"
+        .	'<td align="center" width="5%">' . "\n"
+        .	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
+        .		'/>' . "\n"
+        .	'</td>' . "\n"
+        .	'<td width="95%">' . "\n"
+        .	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
+        .	'</td>' . "\n"
+        .	'</tr>' . "\n\n";
+        $html .=
+            '<tr>' . "\n"
+        .	'<td align="center" width="5%">' . "\n"
+        .	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
+        .		'/>' . "\n"
+        .	'</td>' . "\n"
+        .	'<td width="95%">' . "\n"
+        .	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
+        .	'</td>' . "\n"
+        .	'</tr>' . "\n\n";
+        $html .= '</table></td></tr>' . "\n";
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
+        if($this->response == 'TRUE')
+        {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
+        }
+        else
+        {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
+        }
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
+        $js .= $jstmpw;
 
         return array($js,$html);
     }
@@ -347,7 +347,7 @@ 
  */
 class ScormAnswerFillInBlanks extends Answer
 {
-	/**
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -355,57 +355,57 @@ 
      */
     function export()
     {
-    	global $charset;
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		// get all enclosed answers
-		$blankList = array();
-		// build replacement
-		$replacementList = array();
-		foreach( $this->answer as $i => $answer) {
-			$blankList[] = '['.$answer.']';
-		}
-		$answerCount = count($blankList);
-
-		// splits text and weightings that are joined with the character '::'
-		list($answer,$weight)=explode('::',$answer);
-		$weights = explode(',',$weight);
-		// because [] is parsed here we follow this procedure:
-		// 1. find everything between the [ and ] tags
-		$i=1;
-		$jstmp = '';
-		$jstmpc = '';
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$startlocations=api_strpos($answer,'[');
-		$endlocations=api_strpos($answer,']');
-		while($startlocations !== false && $endlocations !== false) {
-			$texstring=api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
-			$answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
-			$jstmp .= $i.',';
-			$jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
-				$my_weight=explode('@',$weights[$i-1]);
-				if (count($my_weight)==2) {
-					$weight_db=$my_weight[0];
-				} else {
-					$weight_db=$my_weight[0];
-				}
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
-			$i++;
-			$startlocations=api_strpos($answer,'[');
-			$endlocations=api_strpos($answer,']');
-		}
+        global $charset;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        // get all enclosed answers
+        $blankList = array();
+        // build replacement
+        $replacementList = array();
+        foreach( $this->answer as $i => $answer) {
+            $blankList[] = '['.$answer.']';
+        }
+        $answerCount = count($blankList);
+
+        // splits text and weightings that are joined with the character '::'
+        list($answer,$weight)=explode('::',$answer);
+        $weights = explode(',',$weight);
+        // because [] is parsed here we follow this procedure:
+        // 1. find everything between the [ and ] tags
+        $i=1;
+        $jstmp = '';
+        $jstmpc = '';
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $startlocations=api_strpos($answer,'[');
+        $endlocations=api_strpos($answer,']');
+        while($startlocations !== false && $endlocations !== false) {
+            $texstring=api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
+            $answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+            $jstmp .= $i.',';
+            $jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
+                $my_weight=explode('@',$weights[$i-1]);
+                if (count($my_weight)==2) {
+                    $weight_db=$my_weight[0];
+                } else {
+                    $weight_db=$my_weight[0];
+                }
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
+            $i++;
+            $startlocations=api_strpos($answer,'[');
+            $endlocations=api_strpos($answer,']');
+        }
 
-		$html .= 	'<tr>' . "\n"
-				.	'<td>' . "\n"
-		    	.	$answer  . "\n"
-	    		.	'</td>' . "\n"
-	    		.	'</tr>' . "\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
-    	$js .= $jstmpw;
+        $html .= 	'<tr>' . "\n"
+                .	'<td>' . "\n"
+                .	$answer  . "\n"
+                .	'</td>' . "\n"
+                .	'</tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
+        $js .= $jstmpw;
         return array($js,$html);
     }
 }
@@ -416,101 +416,101 @@ 
  */
 class ScormAnswerMatching extends Answer
 {
-	/**
+    /**
      * Export the question part as a matrix-choice, with only one possible answer per line.
      * @author Amand Tihon <amand@alrj.org>
      */
     function export()
     {
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-  		// prepare list of right proposition to allow
-		// - easiest display
-		// - easiest randomisation if needed one day
-		// (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
-		if (is_array($this->rightList)) {
-			$displayedRightList = array_values($this->rightList);
-		}
-		// get max length of displayed array
-		$arrayLength = max( count($this->leftList), count($this->rightList) );
-
-		$nbrAnswers=$this->selectNbrAnswers();
-		$cpt1='A';
-		$cpt2=1;
-		$Select=array();
-		$qId = $this->questionJSId;
-		$s = '';
-		$jstmp = '';
-		$jstmpc = '';
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+            // prepare list of right proposition to allow
+        // - easiest display
+        // - easiest randomisation if needed one day
+        // (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
+        if (is_array($this->rightList)) {
+            $displayedRightList = array_values($this->rightList);
+        }
+        // get max length of displayed array
+        $arrayLength = max( count($this->leftList), count($this->rightList) );
+
+        $nbrAnswers=$this->selectNbrAnswers();
+        $cpt1='A';
+        $cpt2=1;
+        $Select=array();
+        $qId = $this->questionJSId;
+        $s = '';
+        $jstmp = '';
+        $jstmpc = '';
         $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
         $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-			$identifier = 'question_'.$qId.'_matching_';
-			$answer=$this->selectAnswer($answerId);
-			$answerCorrect=$this->isCorrect($answerId);
-			$weight=$this->selectWeighting($answerId);
-			$jstmp .= $answerId.',';
-
-			if (!$answerCorrect) {
-				// options (A, B, C, ...) that will be put into the list-box
-				$Select[$answerId]['Lettre']=$cpt1;
-				// answers that will be shown at the right side
-				$Select[$answerId]['Reponse'] = $answer;
-				$cpt1++;
-			} else {
-				$s.='<tr>'."\n";
-				$s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
-	            // fills the list-box
-	            foreach($Select as $key=>$val)
-	            {
-					$s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
-				}  // end foreach()
-
-				$s.='</select>&nbsp;&nbsp;</td>'."\n";
-				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-					else $s.='&nbsp;';
-				$s.="</td>\n</tr>\n";
-
-				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
-
-				$my_weight=explode('@',$weight);
-				if (count($my_weight)==2) {
-					$weight=$my_weight[0];
-				} else {
-					$weight=$my_weight[0];
-				}
-		    	$jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
-				$cpt2++;
-
-				// if the left side of the "matching" has been completely shown
-				if($answerId == $nbrAnswers)
-				{
-					// if there remain answers to be shown on the right side
-					while(isset($Select[$cpt2]))
-					{
-						//$s.='<tr>'."\n";
-						//$s.='<td colspan="2">'."\n";
-						//$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
-						$s.='<tr>'."\n";
-						$s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
-						$s.='<td width="40%" valign="top">';
-						$s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.="</td>\n</tr>\n";
-						$cpt2++;
-					}	// end while()
-				}  // end if()
-			}
-		}
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
-    	$js .= $jstmpw;
-		$html .= $s;
-		$html .= '</table></td></tr>' . "\n";
+        for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+            $identifier = 'question_'.$qId.'_matching_';
+            $answer=$this->selectAnswer($answerId);
+            $answerCorrect=$this->isCorrect($answerId);
+            $weight=$this->selectWeighting($answerId);
+            $jstmp .= $answerId.',';
+
+            if (!$answerCorrect) {
+                // options (A, B, C, ...) that will be put into the list-box
+                $Select[$answerId]['Lettre']=$cpt1;
+                // answers that will be shown at the right side
+                $Select[$answerId]['Reponse'] = $answer;
+                $cpt1++;
+            } else {
+                $s.='<tr>'."\n";
+                $s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
+                $s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
+                $s.=' <option value="0">--</option>';
+                // fills the list-box
+                foreach($Select as $key=>$val)
+                {
+                    $s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
+                }  // end foreach()
+
+                $s.='</select>&nbsp;&nbsp;</td>'."\n";
+                $s.='<td width="40%" valign="top">';
+                if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                    else $s.='&nbsp;';
+                $s.="</td>\n</tr>\n";
+
+                $jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
+
+                $my_weight=explode('@',$weight);
+                if (count($my_weight)==2) {
+                    $weight=$my_weight[0];
+                } else {
+                    $weight=$my_weight[0];
+                }
+                $jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
+                $cpt2++;
+
+                // if the left side of the "matching" has been completely shown
+                if($answerId == $nbrAnswers)
+                {
+                    // if there remain answers to be shown on the right side
+                    while(isset($Select[$cpt2]))
+                    {
+                        //$s.='<tr>'."\n";
+                        //$s.='<td colspan="2">'."\n";
+                        //$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
+                        $s.='<tr>'."\n";
+                        $s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
+                        $s.='<td width="40%" valign="top">';
+                        $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                        $s.="</td>\n</tr>\n";
+                        $cpt2++;
+                    }	// end while()
+                }  // end if()
+            }
+        }
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
+        $js .= $jstmpw;
+        $html .= $s;
+        $html .= '</table></td></tr>' . "\n";
 
         return array($js,$html);
     }
@@ -522,7 +522,7 @@ 
  */
 class ScormAnswerFree extends Answer
 {
-	/**
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -531,67 +531,67 @@ 
      */
     function export()
     {
-    	//$qId = $this->questionJSId;
-    	$js = '';
-    	/*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        //$qId = $this->questionJSId;
+        $js = '';
+        /*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
 		// some javascript must be added for that kind of questions
 		$html .= '<tr><td>
 		    	<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_free" rows="20" cols="100"></textarea>
 		    	</td>
                 </tr>';
 		$html .= '</table></td></tr>';*/
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-    	$js .= $jstmpw;
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+        $js .= $jstmpw;
         return array($js,$html);
     }
 }
 /**
- * This class handles the SCORM export of hotpot questions
- * @package chamilo.exercise.scorm
- */
+     * This class handles the SCORM export of hotpot questions
+     * @package chamilo.exercise.scorm
+     */
 class ScormAnswerHotspot extends Answer
 {
-	/**
-	 * Returns the javascript code that goes with HotSpot exercises
-	 * @return string	The JavaScript code
-	 */
-	function get_js_header()
-	{
-		if ($this->standalone) {
-			$header = '<script type="text/javascript" language="javascript">';
-			$header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
-			$header .= '</script>';
-			//because this header closes so many times the <script> tag, we have to reopen our own
-			$header .= '<script type="text/javascript" language="javascript">'."\n";
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-	    	$header .= $jstmpw;
-		}
-		else
-		{
-			$header = '';
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
-	    	$header .= $jstmpw;
-		}
-		return $header;
-	}
-	/**
+    /**
+     * Returns the javascript code that goes with HotSpot exercises
+     * @return string	The JavaScript code
+     */
+    function get_js_header()
+    {
+        if ($this->standalone) {
+            $header = '<script type="text/javascript" language="javascript">';
+            $header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
+            $header .= '</script>';
+            //because this header closes so many times the <script> tag, we have to reopen our own
+            $header .= '<script type="text/javascript" language="javascript">'."\n";
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+            $header .= $jstmpw;
+        }
+        else
+        {
+            $header = '';
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
+            $header .= $jstmpw;
+        }
+        return $header;
+    }
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -600,22 +600,22 @@ 
      */
     function export()
     {
-    	$js = $this->get_js_header();
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		// some javascript must be added for that kind of questions
-		$html .= '';
+        $js = $this->get_js_header();
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        // some javascript must be added for that kind of questions
+        $html .= '';
 
-		// Get the answers, make a list
-		$nbrAnswers=$this->selectNbrAnswers();
+        // Get the answers, make a list
+        $nbrAnswers=$this->selectNbrAnswers();
 
-		$answer_list = '<div style="padding: 10px; margin-left: -8px; border: 1px solid #4271b5; height: 448px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
-		{
-			$answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
-		}
-		$answer_list .= '</ol></div>';
+        $answer_list = '<div style="padding: 10px; margin-left: -8px; border: 1px solid #4271b5; height: 448px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
+        for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
+        {
+            $answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
+        }
+        $answer_list .= '</ol></div>';
 
-		/*
+        /*
 		if(!$onlyAnswers)
 		{
 			$s="<tr>
@@ -633,11 +633,11 @@ 
 		}
 		*/
 
-		//$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
-		$canClick = true;
-		//$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
-		//echo $tes;
-		$relPath = api_get_path(REL_PATH);
+        //$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
+        $canClick = true;
+        //$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
+        //echo $tes;
+        $relPath = api_get_path(REL_PATH);
         $html .= <<<HTML
             <tr>
                 <td>
@@ -658,10 +658,10 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></td></tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
 
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
         return array($js,$html);
     }
 }

main/exercice/fill_blanks.class.php

Doc Comments +15 added lines, -14 removed lines

@@ -415,7 +415,7 @@ 
      * @param null $feedback_type
      * @param null $counter
      * @param null $score
-     * @return null|string
+     * @return string
      */
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
@@ -429,15 +429,16 @@ 
     }
 
     /**
-     * @param $separatorStartRegexp
-     * @param $separatorEndRegexp
-     * @param $correctItemRegexp
-     * @param $questionId
+     * @param string $separatorStartRegexp
+     * @param string $separatorEndRegexp
+     * @param string $correctItemRegexp
+     * @param integer $questionId
      * @param $correctItem
      * @param $attributes
-     * @param $answer
+     * @param string $answer
      * @param $listAnswersInfo
-     * @param $displayForStudent
+     * @param boolean $displayForStudent
+     * @param integer $inBlankNumber
      * @return string
      */
     public static function getFillTheBlankHtml(
@@ -736,11 +737,11 @@ 
     *  0  : student answer is correct
     * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
     *
-    * @param $testId
-    * @param $questionId
+    * @param integer $testId
+    * @param integer $questionId
     * @param $studentsIdList
-    * @param $startDate
-    * @param $endDate
+    * @param string $startDate
+    * @param string $endDate
     * @param bool $useLastAnswerredAttempt
     * @return array
     * (
@@ -917,7 +918,7 @@ 
      * return $text protected for use in regexp
      * @param string $text
      *
-     * @return mixed
+     * @return string
      */
     public static function getRegexpProtected($text)
     {
@@ -975,7 +976,7 @@ 
      * return the start separator for answer
      * @param string $number
      *
-     * @return mixed
+     * @return string
      */
     public static function getStartSeparator($number)
     {
@@ -988,7 +989,7 @@ 
      * return the end separator for answer
      * @param string $number
      *
-     * @return mixed
+     * @return string
      */
     public static function getEndSeparator($number)
     {

Indentation +68 added lines, -68 removed lines

@@ -729,43 +729,43 @@ 
     }
     
     /**
-    * Return an array of student state answers for fill the blank questions
-    * for each students that answered the question
-    * -2  : didn't answer
-    * -1  : student answer is wrong
-    *  0  : student answer is correct
-    * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
-    *
-    * @param $testId
-    * @param $questionId
-    * @param $studentsIdList
-    * @param $startDate
-    * @param $endDate
-    * @param bool $useLastAnswerredAttempt
-    * @return array
-    * (
-    *     [student_id] => Array
-    *         (
-    *             [first fill the blank for question] => -1
-    *             [second fill the blank for question] => 2
-    *             [third fill the blank for question] => -1
-    *         )
-    * )
-    */
+     * Return an array of student state answers for fill the blank questions
+     * for each students that answered the question
+     * -2  : didn't answer
+     * -1  : student answer is wrong
+     *  0  : student answer is correct
+     * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
+     *
+     * @param $testId
+     * @param $questionId
+     * @param $studentsIdList
+     * @param $startDate
+     * @param $endDate
+     * @param bool $useLastAnswerredAttempt
+     * @return array
+     * (
+     *     [student_id] => Array
+     *         (
+     *             [first fill the blank for question] => -1
+     *             [second fill the blank for question] => 2
+     *             [third fill the blank for question] => -1
+     *         )
+     * )
+     */
     public static function getFillTheBlankTabResult($testId, $questionId, $studentsIdList, $startDate, $endDate, $useLastAnswerredAttempt = true) {
 
-       $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-       $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-       $courseId = api_get_course_int_id();
+        $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $courseId = api_get_course_int_id();
 
-       require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
+        require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
 
-       // request to have all the answers of student for this question
-       // student may have doing it several time
-       // student may have not answered the bracket id, in this case, is result of the answer is empty
+        // request to have all the answers of student for this question
+        // student may have doing it several time
+        // student may have not answered the bracket id, in this case, is result of the answer is empty
 
-       // we got the less recent attempt first
-       $sql = '
+        // we got the less recent attempt first
+        $sql = '
            SELECT * FROM '.$tblTrackEAttempt.' tea
 
            LEFT JOIN '.$tblTrackEExercise.' tee
@@ -781,49 +781,49 @@ 
            ORDER BY user_id, tea.exe_id;
        ';
 
-       $res = Database::query($sql);
-       $tabUserResult = array();
-       $bracketNumber = 0;
-       // foreach attempts for all students starting with his older attempt
-       while ($data = Database::fetch_array($res)) {
-           $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
+        $res = Database::query($sql);
+        $tabUserResult = array();
+        $bracketNumber = 0;
+        // foreach attempts for all students starting with his older attempt
+        while ($data = Database::fetch_array($res)) {
+            $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
 
-           // for each bracket to find in this question
-           foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
+            // for each bracket to find in this question
+            foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
 
-               if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
-                   // student has answered this bracket, cool
-                   switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
-                       case self::FILL_THE_BLANK_MENU :
+                if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
+                    // student has answered this bracket, cool
+                    switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
+                        case self::FILL_THE_BLANK_MENU :
                            // get the indice of the choosen answer in the menu
                            // we know that the right answer is the first entry of the menu, ie 0
                            // (remember, menu entries are shuffled when taking the test)
                            $tabUserResult[$data['user_id']][$bracketNumber] = FillBlanks::getFillTheBlankMenuAnswerNum($tabAnswer['tabwords'][$bracketNumber], $tabAnswer['studentanswer'][$bracketNumber]);
-                           break;
-                       default :
+                            break;
+                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
-                           } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
-                           }
-                   }
-               } else {
-                   // student didn't answer this bracket
-                   if ($useLastAnswerredAttempt) {
-                       // if we take into account the last answered attempt
-                       if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
-                           $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                       }
-                   } else {
-                       // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                   }
-               }
-           }
-
-
-       }
-       return $tabUserResult;
+                                $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                            } else {
+                                $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                            }
+                    }
+                } else {
+                    // student didn't answer this bracket
+                    if ($useLastAnswerredAttempt) {
+                        // if we take into account the last answered attempt
+                        if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
+                            $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                        }
+                    } else {
+                        // we take the last attempt, even if the student answer the question before
+                        $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                    }
+                }
+            }
+
+
+        }
+        return $tabUserResult;
     }
 
 

Spacing +32 added lines, -32 removed lines

@@ -260,10 +260,10 @@ 
             ['id' => 'answer', 'onkeyup' => "javascript: updateBlanks(this);"],
             array('ToolbarSet' => 'TestQuestionDescription')
         );
-        $form->addRule('answer',get_lang('GiveText'),'required');
+        $form->addRule('answer', get_lang('GiveText'), 'required');
 
         //added multiple answers
-        $form->addElement('checkbox','multiple_answer','', get_lang('FillInBlankSwitchable'));
+        $form->addElement('checkbox', 'multiple_answer', '', get_lang('FillInBlankSwitchable'));
         $form->addElement(
             'select',
             'select_separator',
@@ -276,11 +276,11 @@ 
             null,
             '<input type="button" onclick="updateBlanks()" value="'.get_lang('RefreshBlanks').'" class="btn btn-default" />'
         );
-        $form->addElement('html','<div id="blanks_weighting"></div>');
+        $form->addElement('html', '<div id="blanks_weighting"></div>');
 
         global $text;
         // setting the save button here and not in the question class.php
-        $form->addElement('html','<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>');
+        $form->addElement('html', '<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>');
         $form->addButtonSave($text, 'submitQuestion');
 
         if (!empty($this->id)) {
@@ -320,7 +320,7 @@ 
         // remove spaces at the beginning and the end of text in square brackets
         $answer = preg_replace_callback(
             "/".$blankStartSeparatorRegexp."[^]]+".$blankEndSeparatorRegexp."/",
-            function ($matches) use ($blankStartSeparator, $blankEndSeparator) {
+            function($matches) use ($blankStartSeparator, $blankEndSeparator) {
                 $matchingResult = $matches[0];
                 $matchingResult = trim($matchingResult, $blankStartSeparator);
                 $matchingResult = trim($matchingResult, $blankEndSeparator);
@@ -365,7 +365,7 @@ 
         if ($nb > 0) {
             $answer .= '::';
             // weighting
-            for ($i=0; $i < $nb; ++$i) {
+            for ($i = 0; $i < $nb; ++$i) {
                 // enter the weighting of word $i
                 $answer .= $form->getSubmitValue('weighting['.$i.']');
                 // not the last word, add ","
@@ -378,7 +378,7 @@ 
 
             // input width
             $answer .= ":";
-            for ($i=0; $i < $nb; ++$i) {
+            for ($i = 0; $i < $nb; ++$i) {
                 // enter the width of input for word $i
                 $answer .= $form->getSubmitValue('sizeofinput['.$i.']');
                 // not the last word, add ","
@@ -403,7 +403,7 @@ 
 
         // Allow answers order switches
         $is_multiple = $form -> getSubmitValue('multiple_answer');
-        $answer.= '@'.$is_multiple;
+        $answer .= '@'.$is_multiple;
 
         $this->save();
         $objAnswer = new Answer($this->id);
@@ -420,7 +420,7 @@ 
     public function return_header($feedback_type = null, $counter = null, $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("Answer").'</th>
             </tr>';
@@ -464,13 +464,13 @@ 
                 // if display for student, shuffle the correct answer menu
                 $listMenu = self::getFillTheBlankMenuAnswers($inTeacherSolution, $displayForStudent);
                 $result .= '<select name="choice['.$questionId.'][]">';
-                for ($k=0; $k < count($listMenu); $k++) {
+                for ($k = 0; $k < count($listMenu); $k++) {
                     $selected = "";
                     if ($correctItem == $listMenu[$k]) {
                         $selected = " selected=selected ";
                     }
                     // if in teacher view, display the first item by default, which is the right answer
-                    if ($k==0 && !$displayForStudent) {
+                    if ($k == 0 && !$displayForStudent) {
                         $selected = " selected=selected ";
                     }
                     $optionMenu .= '<option '.$selected.' value="'.$listMenu[$k].'">'.$listMenu[$k].'</option>';
@@ -642,10 +642,10 @@ 
         if (count($listDetails) < 3) {
             $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = array();
-            for ($i=0; $i < count($listWeightings); $i++) {
+            for ($i = 0; $i < count($listWeightings); $i++) {
                 $listSizeOfInput[] = 200;
             }
-            $blankSeparatorNumber = 0;    // 0 is [...]
+            $blankSeparatorNumber = 0; // 0 is [...]
         } else {
             $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = explode(',', $listDetails[1]);
@@ -677,9 +677,9 @@ 
             // remove [ and ] in string
             array_walk(
                 $listWords[0],
-                function (&$value, $key, $tabBlankChar) {
+                function(&$value, $key, $tabBlankChar) {
                     $trimChars = "";
-                    for ($i=0; $i < count($tabBlankChar); $i++) {
+                    for ($i = 0; $i < count($tabBlankChar); $i++) {
                         $trimChars .= $tabBlankChar[$i];
                     }
                     $value = trim($value, $trimChars);
@@ -699,18 +699,18 @@ 
         // if student answer, the second [] is the student answer,
         // the third is if student scored or not
         $listBrackets = array();
-        $listWords =  array();
+        $listWords = array();
 
         if ($isStudentAnswer) {
-            for ($i=0; $i < count($listAnswerResults['tabwords']); $i++) {
+            for ($i = 0; $i < count($listAnswerResults['tabwords']); $i++) {
                 $listBrackets[] = $listAnswerResults['tabwordsbracket'][$i];
                 $listWords[] = $listAnswerResults['tabwords'][$i];
-                if ($i+1 < count($listAnswerResults['tabwords'])) {
+                if ($i + 1 < count($listAnswerResults['tabwords'])) {
                     // should always be
                     $i++;
                 }
                 $listAnswerResults['studentanswer'][] = $listAnswerResults['tabwords'][$i];
-                if ($i+1 < count($listAnswerResults['tabwords'])) {
+                if ($i + 1 < count($listAnswerResults['tabwords'])) {
                     // should always be
                     $i++;
                 }
@@ -802,9 +802,9 @@ 
                            break;
                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                               $tabUserResult[$data['user_id']][$bracketNumber] = 0; //  right answer
                            } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                               $tabUserResult[$data['user_id']][$bracketNumber] = -1; // wrong answer
                            }
                    }
                } else {
@@ -812,11 +812,11 @@ 
                    if ($useLastAnswerredAttempt) {
                        // if we take into account the last answered attempt
                        if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
-                           $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                           $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered
                        }
                    } else {
                        // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                       $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered
                    }
                }
            }
@@ -837,10 +837,10 @@ 
     {
         $outRes = 0;
         // for each student in group
-        foreach($resultList as $userId => $tabValue) {
+        foreach ($resultList as $userId => $tabValue) {
             $trouve = false;
             // for each bracket, if student has at leat one answer ( choice > -2) then he pass the question
-            foreach($tabValue as $i => $choice) {
+            foreach ($tabValue as $i => $choice) {
                 if ($choice > -2 && !$trouve) {
                     $outRes++;
                     $trouve = true;
@@ -862,7 +862,7 @@ 
         $separatorEnd = $listWithStudentAnswer['blankseparatorend'];
         // lets rebuild the sentence with [correct answer][student answer][answer is correct]
         $result = "";
-        for ($i=0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) {
+        for ($i = 0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) {
             $result .= $listWithStudentAnswer['commonwords'][$i];
             $result .= $listWithStudentAnswer['tabwordsbracket'][$i];
             $result .= $separatorStart.$listWithStudentAnswer['studentanswer'][$i].$separatorEnd;
@@ -944,7 +944,7 @@ 
             ")",
         ];
         $result = $text;
-        for ($i=0; $i < count($listRegexpCharacters); $i++) {
+        for ($i = 0; $i < count($listRegexpCharacters); $i++) {
             $result = str_replace($listRegexpCharacters[$i], "\\".$listRegexpCharacters[$i], $result);
         }
 
@@ -1006,7 +1006,7 @@ 
     {
         $listResults = array();
         $fillBlanksAllowedSeparator = self::getAllowedSeparator();
-        for ($i=0; $i < count($fillBlanksAllowedSeparator); $i++) {
+        for ($i = 0; $i < count($fillBlanksAllowedSeparator); $i++) {
             $listResults[] = $fillBlanksAllowedSeparator[$i][0]."...".$fillBlanksAllowedSeparator[$i][1];
         }
 
@@ -1024,7 +1024,7 @@ 
     {
         $listSeparators = self::getAllowedSeparator();
         $result = 0;
-        for ($i=0; $i < count($listSeparators); $i++) {
+        for ($i = 0; $i < count($listSeparators); $i++) {
             if ($listSeparators[$i][0] == $startSeparator &&
                 $listSeparators[$i][1] == $endSeparator
             ) {
@@ -1049,7 +1049,7 @@ 
 
         // rebuild the answer with good HTML style
         // this is the student answer, right or wrong
-        for ($i=0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) {
+        for ($i = 0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) {
             if ($listStudentAnswerInfo['studentscore'][$i] == 1) {
                 $listStudentAnswerInfo['studentanswer'][$i] = self::getHtmlRightAnswer(
                     $listStudentAnswerInfo['studentanswer'][$i],
@@ -1067,7 +1067,7 @@ 
 
 
         // rebuild the sentence with student answer inserted
-        for ($i=0; $i < count($listStudentAnswerInfo['commonwords']); $i++) {
+        for ($i = 0; $i < count($listStudentAnswerInfo['commonwords']); $i++) {
             $result .= isset($listStudentAnswerInfo['commonwords'][$i]) ? $listStudentAnswerInfo['commonwords'][$i] : '';
             $result .= isset($listStudentAnswerInfo['studentanswer'][$i]) ? $listStudentAnswerInfo['studentanswer'][$i] : '';
         }
@@ -1100,7 +1100,7 @@ 
                 $listPossibleAnswers = FillBlanks::getFillTheBlankMenuAnswers($correct, false);
                 $correctAnswerHtml .= "<span style='color: green'>".$listPossibleAnswers[0]."</span>";
                 $correctAnswerHtml .= " <span style='font-weight:normal'>(";
-                for ($i=1; $i < count($listPossibleAnswers); $i++) {
+                for ($i = 1; $i < count($listPossibleAnswers); $i++) {
                     $correctAnswerHtml .= $listPossibleAnswers[$i];
                     if ($i != count($listPossibleAnswers) - 1) {
                         $correctAnswerHtml .= " | ";