chamilo / chamilo-lms

main/lp/lp_edit.php

Indentation +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
 );
 $display_date = 'none';
 if (!empty($expired_on)) {
-	$display_date = 'block';
-	$defaults['activate_end_date_check'] = 1;
+    $display_date = 'block';
+    $defaults['activate_end_date_check'] = 1;
 }
 
 $form->addElement('html', '<div id="end_date_div" style="display:'.$display_date.';">');

main/admin/configure_extensions.php

Indentation +27 added lines, -27 removed lines

@@ -17,56 +17,56 @@ 
 $message = '';
 
 if (isset($_POST['activeExtension'])) {
-	switch ($_POST['extension_code']) {
-		case 'ppt2lp':
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+    switch ($_POST['extension_code']) {
+        case 'ppt2lp':
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="true"
 					WHERE variable="service_ppt2lp"
 					AND subkey="active"';
 
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			if (Database::affected_rows($rs)>0){
-				$message = get_lang('ServiceActivated');
-			}
+            if (Database::affected_rows($rs)>0){
+                $message = get_lang('ServiceActivated');
+            }
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['host']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="host"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['port']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="port"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['ftp_password']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="ftp_password"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['user']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="user"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['path_to_lzx']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="path_to_lzx"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['size']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="size"';
-			Database::query($sql);
-			break;
-	}
+            Database::query($sql);
+            break;
+    }
 }
 
 $listActiveServices = array();
@@ -77,13 +77,13 @@ 
 
 $rs = Database::query($sql);
 while($row = Database::fetch_array($rs)){
-	$listActiveServices[] = $row['variable'];
+    $listActiveServices[] = $row['variable'];
 }
 
 // javascript to handle accordion behaviour
 $javascript_message = '';
 if(!empty($message)){
-	$javascript_message = '
+    $javascript_message = '
 	document.getElementById("message").style.display = "block";
 	var timer = setTimeout(hideMessage, 5000);';
 }
@@ -135,9 +135,9 @@ 
 ?>
 <div id="message" style="display: none">
 	<?php
-	if(!empty($message))
-		Display::display_normal_message($message)
-	?>
+    if(!empty($message))
+        Display::display_normal_message($message)
+    ?>
 </div>
 
 <div id="content" align="center">
@@ -200,7 +200,7 @@ 
         </div>
     </div>
 	<?php
-	/*
+    /*
 	<!-- EPHORUS -->
 	<div id="main_ephorus">
 		<div id="extension_header_ephorus" class="accordion_header">

plugin/bbb/lib/bbb_api.php

Indentation +403 added lines, -403 removed lines

@@ -44,107 +44,107 @@ 
 
 class BigBlueButtonBN {
 
-	private $_securitySalt;
-	private $_bbbServerBaseUrl;
+    private $_securitySalt;
+    private $_bbbServerBaseUrl;
 
-	/* ___________ General Methods for the BigBlueButton Class __________ */
+    /* ___________ General Methods for the BigBlueButton Class __________ */
 
-	function __construct() {
-	/*
+    function __construct() {
+    /*
 	Establish just our basic elements in the constructor:
 	*/
-		// BASE CONFIGS - set these for your BBB server in config.php and they will
-		// simply flow in here via the constants:
-		$this->_securitySalt 		= CONFIG_SECURITY_SALT;
-		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
-	}
-
-	private function _processXmlResponse($url){
-	/*
+        // BASE CONFIGS - set these for your BBB server in config.php and they will
+        // simply flow in here via the constants:
+        $this->_securitySalt 		= CONFIG_SECURITY_SALT;
+        $this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
+    }
+
+    private function _processXmlResponse($url){
+    /*
 	A private utility method used by other public methods to process XML responses.
 	*/
-		if (extension_loaded('curl')) {
-			$ch = curl_init() or die ( curl_error($ch) );
-			$timeout = 10;
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-			$data = curl_exec( $ch );
-			curl_close( $ch );
-
-			if($data)
-				return (new SimpleXMLElement($data));
-			else
-				return false;
-		}
-		return (simplexml_load_file($url));
-	}
-
-	private function _requiredParam($param) {
-		/* Process required params and throw errors if we don't get values */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		elseif (!isset($param)) {
-			throw new Exception('Missing parameter.');
-		}
-		else {
-			throw new Exception(''.$param.' is required.');
-		}
-	}
-
-	private function _optionalParam($param) {
-		/* Pass most optional params through as set value, or set to '' */
-		/* Don't know if we'll use this one, but let's build it in case. */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		else {
-			$param = '';
-			return $param;
-		}
-	}
-
-	/* __________________ BBB ADMINISTRATION METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        if (extension_loaded('curl')) {
+            $ch = curl_init() or die ( curl_error($ch) );
+            $timeout = 10;
+            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt( $ch, CURLOPT_URL, $url );
+            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+            curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+            $data = curl_exec( $ch );
+            curl_close( $ch );
+
+            if($data)
+                return (new SimpleXMLElement($data));
+            else
+                return false;
+        }
+        return (simplexml_load_file($url));
+    }
+
+    private function _requiredParam($param) {
+        /* Process required params and throw errors if we don't get values */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        elseif (!isset($param)) {
+            throw new Exception('Missing parameter.');
+        }
+        else {
+            throw new Exception(''.$param.' is required.');
+        }
+    }
+
+    private function _optionalParam($param) {
+        /* Pass most optional params through as set value, or set to '' */
+        /* Don't know if we'll use this one, but let's build it in case. */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        else {
+            $param = '';
+            return $param;
+        }
+    }
+
+    /* __________________ BBB ADMINISTRATION METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- create
 	-- join
 	-- end
 	*/
 
-	public function getCreateMeetingUrl($creationParams) {
-		/*
+    public function getCreateMeetingUrl($creationParams) {
+        /*
 		USAGE:
 		(see $creationParams array in createMeetingArray method.)
 		*/
-		$this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
-		$this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
-		// Set up the basic creation URL:
-		$creationUrl = $this->_bbbServerBaseUrl."api/create?";
-		// Add params:
-		$params =
-		'name='.urlencode($this->_meetingName).
-		'&meetingID='.urlencode($this->_meetingId).
-		'&attendeePW='.urlencode($creationParams['attendeePw']).
-		'&moderatorPW='.urlencode($creationParams['moderatorPw']).
-		'&dialNumber='.urlencode($creationParams['dialNumber']).
-		'&voiceBridge='.urlencode($creationParams['voiceBridge']).
-		'&webVoice='.urlencode($creationParams['webVoice']).
-		'&logoutURL='.urlencode($creationParams['logoutUrl']).
-		'&maxParticipants='.urlencode($creationParams['maxParticipants']).
-		'&record='.urlencode($creationParams['record']).
-		'&duration='.urlencode($creationParams['duration']);
-		//'&meta_category='.urlencode($creationParams['meta_category']);
-		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
-			$params .= '&welcome='.urlencode($welcomeMessage);
-		// Return the complete URL:
-		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
-	}
-
-	public function createMeetingWithXmlResponseArray($creationParams) {
-		/*
+        $this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
+        $this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
+        // Set up the basic creation URL:
+        $creationUrl = $this->_bbbServerBaseUrl."api/create?";
+        // Add params:
+        $params =
+        'name='.urlencode($this->_meetingName).
+        '&meetingID='.urlencode($this->_meetingId).
+        '&attendeePW='.urlencode($creationParams['attendeePw']).
+        '&moderatorPW='.urlencode($creationParams['moderatorPw']).
+        '&dialNumber='.urlencode($creationParams['dialNumber']).
+        '&voiceBridge='.urlencode($creationParams['voiceBridge']).
+        '&webVoice='.urlencode($creationParams['webVoice']).
+        '&logoutURL='.urlencode($creationParams['logoutUrl']).
+        '&maxParticipants='.urlencode($creationParams['maxParticipants']).
+        '&record='.urlencode($creationParams['record']).
+        '&duration='.urlencode($creationParams['duration']);
+        //'&meta_category='.urlencode($creationParams['meta_category']);
+        $welcomeMessage = $creationParams['welcomeMsg'];
+        if(trim($welcomeMessage))
+            $params .= '&welcome='.urlencode($welcomeMessage);
+        // Return the complete URL:
+        return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
+    }
+
+    public function createMeetingWithXmlResponseArray($creationParams) {
+        /*
 		USAGE:
 		$creationParams = array(
 			'name' => 'Meeting Name',	-- A name for the meeting (or username)
@@ -162,34 +162,34 @@ 
 			'meta_category' => '', 		-- Use to pass additional info to BBB server. See API docs to enable.
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
+        $xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
-				return array(
-					'returncode' => $xml->returncode->__toString(),
-					'message' => $xml->message->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'meetingId' => $xml->meetingID->__toString(),
-					'attendeePw' => $xml->attendeePW->__toString(),
-					'moderatorPw' => $xml->moderatorPW->__toString(),
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
-					'createTime' => $xml->createTime->__toString()
-					);
-			else
-				return array(
-					'returncode' => $xml->returncode->__toString(),
-					'message' => $xml->message->__toString(),
-					'messageKey' => $xml->messageKey->__toString()
-					);
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getJoinMeetingURL($joinParams) {
-		/*
+            if($xml->meetingID)
+                return array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'message' => $xml->message->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'meetingId' => $xml->meetingID->__toString(),
+                    'attendeePw' => $xml->attendeePW->__toString(),
+                    'moderatorPw' => $xml->moderatorPW->__toString(),
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
+                    'createTime' => $xml->createTime->__toString()
+                    );
+            else
+                return array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'message' => $xml->message->__toString(),
+                    'messageKey' => $xml->messageKey->__toString()
+                    );
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getJoinMeetingURL($joinParams) {
+        /*
 		NOTE: At this point, we don't use a corresponding joinMeetingWithXmlResponse here because the API
 		doesn't respond on success, but you can still code that method if you need it. Or, you can take the URL
 		that's returned from this method and simply send your users off to that URL in your code.
@@ -203,249 +203,249 @@ 
 			'webVoiceConf' => ''		-- OPTIONAL - string
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
-		$this->_username = $this->_requiredParam($joinParams['username']);
-		$this->_password = $this->_requiredParam($joinParams['password']);
-		// Establish the basic join URL:
-		$joinUrl = $this->_bbbServerBaseUrl."api/join?";
-		// Add parameters to the URL:
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&fullName='.urlencode($this->_username).
-		'&password='.urlencode($this->_password).
-		'&userID='.urlencode($joinParams['userID']).
-		'&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
-		// Only use createTime if we really want to use it. If it's '', then don't pass it:
-		if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
-			$params .= '&createTime='.urlencode($joinParams['createTime']);
-		}
-		// Return the URL:
-		return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
-	}
-
-	public function getEndMeetingURL($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
+        $this->_username = $this->_requiredParam($joinParams['username']);
+        $this->_password = $this->_requiredParam($joinParams['password']);
+        // Establish the basic join URL:
+        $joinUrl = $this->_bbbServerBaseUrl."api/join?";
+        // Add parameters to the URL:
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&fullName='.urlencode($this->_username).
+        '&password='.urlencode($this->_password).
+        '&userID='.urlencode($joinParams['userID']).
+        '&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
+        // Only use createTime if we really want to use it. If it's '', then don't pass it:
+        if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
+            $params .= '&createTime='.urlencode($joinParams['createTime']);
+        }
+        // Return the URL:
+        return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
+    }
+
+    public function getEndMeetingURL($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($endParams['meetingId']);
-		$this->_password = $this->_requiredParam($endParams['password']);
-		$endUrl = $this->_bbbServerBaseUrl."api/end?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
-	}
-
-	public function endMeetingWithXmlResponseArray($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($endParams['meetingId']);
+        $this->_password = $this->_requiredParam($endParams['password']);
+        $endUrl = $this->_bbbServerBaseUrl."api/end?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
+    }
+
+    public function endMeetingWithXmlResponseArray($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
-		if ($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'message' => $xml->message->__toString(),
-				'messageKey' => $xml->messageKey->__toString()
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB MONITORING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
+        if ($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'message' => $xml->message->__toString(),
+                'messageKey' => $xml->messageKey->__toString()
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB MONITORING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- isMeetingRunning
 	-- getMeetings
 	-- getMeetingInfo
 	*/
 
-	public function getIsMeetingRunningUrl($meetingId) {
-		/* USAGE:
+    public function getIsMeetingRunningUrl($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$this->_meetingId = $this->_requiredParam($meetingId);
-		$runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId);
-		return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
-	}
-
-	public function isMeetingRunningWithXmlResponseArray($meetingId) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($meetingId);
+        $runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId);
+        return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
+    }
+
+    public function isMeetingRunningWithXmlResponseArray($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'running' => $xml->running->__toString() 	// -- Returns true/false.
-			);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getGetMeetingsUrl() {
-		/* Simply formulate the getMeetings URL
+        $xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'running' => $xml->running->__toString() 	// -- Returns true/false.
+            );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getGetMeetingsUrl() {
+        /* Simply formulate the getMeetings URL
 		We do this in a separate function so we have the option to just get this
 		URL and print it if we want for some reason.
 		*/
-		$getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
-		return $getMeetingsUrl;
-	}
+        $getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
+        return $getMeetingsUrl;
+    }
 
-	public function getMeetingsWithXmlResponseArray() {
-		/* USAGE:
+    public function getMeetingsWithXmlResponseArray() {
+        /* USAGE:
 		We don't need to pass any parameters with this one, so we just send the query URL off to BBB
 		and then handle the results that we get in the XML response.
 		*/
-		$xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
-		if($xml) {
-			// If we don't get a success code, stop processing and return just the returncode:
-			if ($xml->returncode != 'SUCCESS') {
-				$result = array(
-					'returncode' => $xml->returncode->__toString()
-				);
-				return $result;
-			}
-			elseif ($xml->messageKey == 'noMeetings') {
-				/* No meetings on server, so return just this info: */
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meetings. First return general response:
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				// Then interate through meeting results and return them as part of the array:
-				foreach ($xml->meetings->meeting as $m) {
-					$result[] = array(
-						'meetingId' => $m->meetingID->__toString(),
-						'meetingName' => $m->meetingName->__toString(),
-						'createTime' => $m->createTime->__toString(),
-						'attendeePw' => $m->attendeePW->__toString(),
-						'moderatorPw' => $m->moderatorPW->__toString(),
-						'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded->__toString(),
-						'running' => $m->running->__toString()
-					);
-				}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getMeetingInfoUrl($infoParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
+        if($xml) {
+            // If we don't get a success code, stop processing and return just the returncode:
+            if ($xml->returncode != 'SUCCESS') {
+                $result = array(
+                    'returncode' => $xml->returncode->__toString()
+                );
+                return $result;
+            }
+            elseif ($xml->messageKey == 'noMeetings') {
+                /* No meetings on server, so return just this info: */
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meetings. First return general response:
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                // Then interate through meeting results and return them as part of the array:
+                foreach ($xml->meetings->meeting as $m) {
+                    $result[] = array(
+                        'meetingId' => $m->meetingID->__toString(),
+                        'meetingName' => $m->meetingName->__toString(),
+                        'createTime' => $m->createTime->__toString(),
+                        'attendeePw' => $m->attendeePW->__toString(),
+                        'moderatorPw' => $m->moderatorPW->__toString(),
+                        'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded->__toString(),
+                        'running' => $m->running->__toString()
+                    );
+                }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getMeetingInfoUrl($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
-		$this->_password = $this->_requiredParam($infoParams['password']);
-		$infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
-	}
-
-	public function getMeetingInfoWithXmlResponseArray($infoParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
+        $this->_password = $this->_requiredParam($infoParams['password']);
+        $infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
+    }
+
+    public function getMeetingInfoWithXmlResponseArray($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meeting info:
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'meetingName' => $xml->meetingName->__toString(),
-					'meetingId' => $xml->meetingID->__toString(),
-					'createTime' => $xml->createTime->__toString(),
-					'voiceBridge' => $xml->voiceBridge->__toString(),
-					'attendeePw' => $xml->attendeePW->__toString(),
-					'moderatorPw' => $xml->moderatorPW->__toString(),
-					'running' => $xml->running->__toString(),
-					'recording' => $xml->recording->__toString(),
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
-					'startTime' => $xml->startTime->__toString(),
-					'endTime' => $xml->endTime->__toString(),
-					'participantCount' => $xml->participantCount->__toString(),
-					'maxUsers' => $xml->maxUsers->__toString(),
-					'moderatorCount' => $xml->moderatorCount->__toString(),
-				);
-				// Then interate through attendee results and return them as part of the array:
-				foreach ($xml->attendees->attendee as $a) {
-					$result[] = array(
-						'userId' => $a->userID->__toString(),
-						'fullName' => $a->fullName->__toString(),
-						'role' => $a->role->__toString()
-					);
-				}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB RECORDING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meeting info:
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'meetingName' => $xml->meetingName->__toString(),
+                    'meetingId' => $xml->meetingID->__toString(),
+                    'createTime' => $xml->createTime->__toString(),
+                    'voiceBridge' => $xml->voiceBridge->__toString(),
+                    'attendeePw' => $xml->attendeePW->__toString(),
+                    'moderatorPw' => $xml->moderatorPW->__toString(),
+                    'running' => $xml->running->__toString(),
+                    'recording' => $xml->recording->__toString(),
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded->__toString(),
+                    'startTime' => $xml->startTime->__toString(),
+                    'endTime' => $xml->endTime->__toString(),
+                    'participantCount' => $xml->participantCount->__toString(),
+                    'maxUsers' => $xml->maxUsers->__toString(),
+                    'moderatorCount' => $xml->moderatorCount->__toString(),
+                );
+                // Then interate through attendee results and return them as part of the array:
+                foreach ($xml->attendees->attendee as $a) {
+                    $result[] = array(
+                        'userId' => $a->userID->__toString(),
+                        'fullName' => $a->fullName->__toString(),
+                        'role' => $a->role->__toString()
+                    );
+                }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB RECORDING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- getRecordings
 	-- publishRecordings
 	-- deleteRecordings
 	*/
 
-	public function getRecordingsUrl($recordingParams) {
-		/* USAGE:
+    public function getRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
-		$params = 'meetingID='.urlencode($recordingParams['meetingId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
+        $params = 'meetingID='.urlencode($recordingParams['meetingId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function getRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function getRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
@@ -453,121 +453,121 @@ 
 		when creating a meeting, it will kick users out after the duration. Should
 		probably be required in user code when 'recording' is set to true.
 		*/
-		$xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and recording info:
-				$result = array(
-					'returncode' => $xml->returncode->__toString(),
-					'messageKey' => $xml->messageKey->__toString(),
-					'message' => $xml->message->__toString()
-				);
-
-				foreach ($xml->recordings->recording as $r) {
-					$result[] = array(
-						'recordId' => $r->recordID->__toString(),
-						'meetingId' => $r->meetingID->__toString(),
-						'name' => $r->name->__toString(),
-						'published' => $r->published->__toString(),
-						'startTime' => $r->startTime->__toString(),
-						'endTime' => $r->endTime->__toString(),
-						'playbackFormatType' => $r->playback->format->type->__toString(),
-						'playbackFormatUrl' => $r->playback->format->url->__toString(),
-						'playbackFormatLength' => $r->playback->format->length->__toString(),
-						'metadataTitle' => $r->metadata->title->__toString(),
-						'metadataSubject' => $r->metadata->subject->__toString(),
-						'metadataDescription' => $r->metadata->description->__toString(),
-						'metadataCreator' => $r->metadata->creator->__toString(),
-						'metadataContributor' => $r->metadata->contributor->__toString(),
-						'metadataLanguage' => $r->metadata->language->__toString(),
-						// Add more here as needed for your app depending on your
-						// use of metadata when creating recordings.
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getPublishRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and recording info:
+                $result = array(
+                    'returncode' => $xml->returncode->__toString(),
+                    'messageKey' => $xml->messageKey->__toString(),
+                    'message' => $xml->message->__toString()
+                );
+
+                foreach ($xml->recordings->recording as $r) {
+                    $result[] = array(
+                        'recordId' => $r->recordID->__toString(),
+                        'meetingId' => $r->meetingID->__toString(),
+                        'name' => $r->name->__toString(),
+                        'published' => $r->published->__toString(),
+                        'startTime' => $r->startTime->__toString(),
+                        'endTime' => $r->endTime->__toString(),
+                        'playbackFormatType' => $r->playback->format->type->__toString(),
+                        'playbackFormatUrl' => $r->playback->format->url->__toString(),
+                        'playbackFormatLength' => $r->playback->format->length->__toString(),
+                        'metadataTitle' => $r->metadata->title->__toString(),
+                        'metadataSubject' => $r->metadata->subject->__toString(),
+                        'metadataDescription' => $r->metadata->description->__toString(),
+                        'metadataCreator' => $r->metadata->creator->__toString(),
+                        'metadataContributor' => $r->metadata->contributor->__toString(),
+                        'metadataLanguage' => $r->metadata->language->__toString(),
+                        // Add more here as needed for your app depending on your
+                        // use of metadata when creating recordings.
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getPublishRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']).
-		'&publish='.urlencode($recordingParams['publish']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']).
+        '&publish='.urlencode($recordingParams['publish']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function publishRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function publishRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'published' => $xml->published->__toString() 	// -- Returns true/false.
-			);
-		}
-		else {
-			return null;
-		}
-
-
-	}
-
-	public function getDeleteRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'published' => $xml->published->__toString() 	// -- Returns true/false.
+            );
+        }
+        else {
+            return null;
+        }
+
+
+    }
+
+    public function getDeleteRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
-	}
-
-	public function deleteRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
+    }
+
+    public function deleteRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
 
-		$xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode->__toString(),
-				'deleted' => $xml->deleted->__toString() 	// -- Returns true/false.
-			);
-		}
-		else {
-			return null;
-		}
-
-	}
+        $xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode->__toString(),
+                'deleted' => $xml->deleted->__toString() 	// -- Returns true/false.
+            );
+        }
+        else {
+            return null;
+        }
+
+    }
 
 
 

main/inc/lib/certificate.lib.php

Indentation +8 added lines, -8 removed lines

@@ -253,12 +253,12 @@ 
     }
 
     /**
-    * update user info about certificate
-    * @param int $cat_id category id
-    * @param int $user_id user id
-    * @param string $path_certificate the path name of the certificate
-    * @return void
-    */
+     * update user info about certificate
+     * @param int $cat_id category id
+     * @param int $user_id user id
+     * @param string $path_certificate the path name of the certificate
+     * @return void
+     */
     public function update_user_info_about_certificate(
         $cat_id,
         $user_id,
@@ -418,8 +418,8 @@ 
     }
 
     /**
-    * Shows the student's certificate (HTML file)
-    */
+     * Shows the student's certificate (HTML file)
+     */
     public function show()
     {
         header('Content-Type: text/html; charset='. api_get_system_encoding());

main/exercise/export/aiken/aiken_classes.php

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@ 
 
 if (!function_exists('mime_content_type')) {
 
-	/**
-	 * @param string $filename
+    /**
+     * @param string $filename
      * @return string
-	 */
-	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);
+    }
 }
 
 /**
@@ -34,7 +34,7 @@ 
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);
-            	return $answer;
+                return $answer;
             default :
                 $answer = null;
                 break;
@@ -43,11 +43,11 @@ 
     }
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 

main/gradebook/lib/fe/dataform.class.php

Indentation +12 added lines, -12 removed lines

@@ -8,19 +8,19 @@
  */
 class DataForm extends FormValidator
 {
-	const TYPE_IMPORT = 1;
-	const TYPE_EXPORT = 2;
-	const TYPE_EXPORT_PDF = 3;
+    const TYPE_IMPORT = 1;
+    const TYPE_EXPORT = 2;
+    const TYPE_EXPORT_PDF = 3;
 
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1=import, 2=export
-	 * @param obj cat_obj the category object
-	 * @param obj res_obj the result object
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1=import, 2=export
+     * @param obj cat_obj the category object
+     * @param obj res_obj the result object
+     * @param string form name
+     * @param method
+     * @param action
+     */
     public function __construct($form_type, $form_name, $method = 'post', $action = null, $target = '', $locked_status)
     {
         parent:: __construct($form_name, $method, $action, $target);

main/exercise/result.php

Indentation +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     $htmlHeadXtra[] = '<style>
         body { background: none;}
     </style>';
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 
 $message = Session::read('attempt_remaining');

main/exercise/export/scorm/scorm_classes.php

Indentation +773 added lines, -773 removed lines

@@ -20,140 +20,140 @@ 
 {
     public $js_id;
     public $answer;
-	/**
-	 * Returns the HTML + JS flow corresponding to one question
-	 *
-	 * @param int $questionId The question ID
-	 * @param bool $standalone (ie including XML tag, DTD declaration, etc)
-	 * @param int  $js_id 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
+    /**
+     * Returns the HTML + JS flow corresponding to one question
+     *
+     * @param int $questionId The question ID
+     * @param bool $standalone (ie including XML tag, DTD declaration, etc)
+     * @param int  $js_id 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
      * @return string|array
-	 */
-	public static function export_question($questionId, $standalone = true, $js_id)
-	{
-		$question = new ScormQuestion();
-		$qst = $question->read($questionId);
-		if (!$qst) {
-			return '';
-		}
-		$question->id = $qst->id;
-		$question->js_id = $js_id;
-		$question->type = $qst->type;
-		$question->question = $qst->question;
-		$question->description = $qst->description;
-		$question->weighting=$qst->weighting;
-		$question->position=$qst->position;
-		$question->picture=$qst->picture;
-		$assessmentItem = new ScormAssessmentItem($question, $standalone);
-
-		return $assessmentItem->export();
-	}
-
-	/**
-	 * 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:
-			case GLOBAL_MULTIPLE_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_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);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case MATCHING:
-			case MATCHING_DRAGGABLE:
-			case DRAGGABLE:
-				$this->answer = new ScormAnswerMatching($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case ORAL_EXPRESSION:
-			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);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case MULTIPLE_ANSWER_COMBINATION:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_ORDER:
-				$this->answer = new ScormAnswerHotspot($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_DELINEATION:
-				$this->answer = new ScormAnswerHotspot($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			// not supported
-			case UNIQUE_ANSWER_NO_OPTION:
-			case MULTIPLE_ANSWER_TRUE_FALSE:
-			case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
-			case UNIQUE_ANSWER_IMAGE:
-			case CALCULATED_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			default:
-				$this->answer = new stdClass();
-				$this->answer->questionJSId = $this->js_id;
-				break;
-		}
-
-		return true;
-	}
-
-	function export()
-	{
-		$html = $this->getQuestionHTML();
-		$js = $this->getQuestionJS();
-
-		if (is_object($this->answer) && $this->answer instanceof Answer) {
-			list($js2, $html2) = $this->answer->export();
-			$js .= $js2;
-			$html .= $html2;
-		} else {
-			throw new \Exception('Question not supported. Exercise: '.$this->selectTitle());
-		}
-
-		return array($js, $html);
-	}
-
-	function createAnswersForm($form)
-	{
-		return true;
-	}
-
-	function processAnswersCreation($form)
-	{
-		return true;
-	}
-
-	/**
-	 * Returns an HTML-formatted question
-	 */
-	function getQuestionHTML()
-	{
+     */
+    public static function export_question($questionId, $standalone = true, $js_id)
+    {
+        $question = new ScormQuestion();
+        $qst = $question->read($questionId);
+        if (!$qst) {
+            return '';
+        }
+        $question->id = $qst->id;
+        $question->js_id = $js_id;
+        $question->type = $qst->type;
+        $question->question = $qst->question;
+        $question->description = $qst->description;
+        $question->weighting=$qst->weighting;
+        $question->position=$qst->position;
+        $question->picture=$qst->picture;
+        $assessmentItem = new ScormAssessmentItem($question, $standalone);
+
+        return $assessmentItem->export();
+    }
+
+    /**
+     * 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:
+            case GLOBAL_MULTIPLE_ANSWER:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_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);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case MATCHING:
+            case MATCHING_DRAGGABLE:
+            case DRAGGABLE:
+                $this->answer = new ScormAnswerMatching($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case ORAL_EXPRESSION:
+            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);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case MULTIPLE_ANSWER_COMBINATION:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case HOT_SPOT_ORDER:
+                $this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case HOT_SPOT_DELINEATION:
+                $this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            // not supported
+            case UNIQUE_ANSWER_NO_OPTION:
+            case MULTIPLE_ANSWER_TRUE_FALSE:
+            case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
+            case UNIQUE_ANSWER_IMAGE:
+            case CALCULATED_ANSWER:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            default:
+                $this->answer = new stdClass();
+                $this->answer->questionJSId = $this->js_id;
+                break;
+        }
+
+        return true;
+    }
+
+    function export()
+    {
+        $html = $this->getQuestionHTML();
+        $js = $this->getQuestionJS();
+
+        if (is_object($this->answer) && $this->answer instanceof Answer) {
+            list($js2, $html2) = $this->answer->export();
+            $js .= $js2;
+            $html .= $html2;
+        } else {
+            throw new \Exception('Question not supported. Exercise: '.$this->selectTitle());
+        }
+
+        return array($js, $html);
+    }
+
+    function createAnswersForm($form)
+    {
+        return true;
+    }
+
+    function processAnswersCreation($form)
+    {
+        return true;
+    }
+
+    /**
+     * Returns an HTML-formatted question
+     */
+    function getQuestionHTML()
+    {
         $title = $this->selectTitle();
         $description = $this->selectDescription();
-		$cols = 2;
-		$s = '<tr>
+        $cols = 2;
+        $s = '<tr>
 			<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">
 			'.$title.'
 			</td>
@@ -163,16 +163,16 @@ 
 			<i>'.$description.'</i>
 			</td>
 			</tr>';
-		return $s;
-	}
+        return $s;
+    }
 
-	/**
-	 * Return the JavaScript code bound to the question
-	 */
-	public function getQuestionJS()
-	{
-		$weight = $this->selectWeighting();
-		$js = 'questions.push('.$this->js_id.');'."\n";
+    /**
+     * Return the JavaScript code bound to the question
+     */
+    public function getQuestionJS()
+    {
+        $weight = $this->selectWeighting();
+        $js = 'questions.push('.$this->js_id.');'."\n";
 
         switch ($this->type) {
             case ORAL_EXPRESSION:
@@ -181,7 +181,7 @@ 
                 $script .= file_get_contents(api_get_path(LIBRARY_PATH) . 'wami-recorder/gui.js');
                 $js .= $script;*/
                 break;
-           case HOT_SPOT:
+            case HOT_SPOT:
                 //put the max score to 0 to avoid discounting the points of
                 //non-exported quiz types in the SCORM
                 $weight = 0;
@@ -189,8 +189,8 @@ 
         }
         $js .= 'questions_score_max['.$this->js_id.'] = '.$weight.";";
 
-		return $js;
-	}
+        return $js;
+    }
 }
 
 /**
@@ -200,29 +200,29 @@ 
  */
 class ScormAnswerMultipleChoice extends Answer
 {
-	/**
-	 * Return HTML code for possible answers
-	 */
-	function export()
-	{
-		$js = '';
-		$html = '<tr><td colspan="2"><table width="100%">';
-		$type = $this->getQuestionType();
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();';
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;';
+    /**
+     * Return HTML code for possible answers
+     */
+    function export()
+    {
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        $type = $this->getQuestionType();
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();';
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;';
 
         $jstmpw .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();';
 
-		//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) {
+        //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) {
             $id = 1;
-			$jstmp = '';
-			$jstmpc = '';
+            $jstmp = '';
+            $jstmpc = '';
             foreach ($this->answer as $i => $answer) {
-				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
-				$html .=
-					'<tr>
+                $identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
+                $html .=
+                    '<tr>
 					<td align="center" width="5%">
 					<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />
 					</td>
@@ -231,19 +231,19 @@ 
 					</td>
 					</tr>';
 
-				$jstmp .= $i.',';
+                $jstmp .= $i.',';
                 if ($this->correct[$i]) {
                     $jstmpc .= $i.',';
                 }
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
                 $jstmpw .= 'questions_answers_correct['.$this->questionJSId.']['.$i.'] = '.$this->correct[$i].';';
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
             $js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
-			$js .= $jstmpw;
-		} elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
-	    	$js = '';
+            $js .= $jstmpw;
+        } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
+            $js = '';
             $id = 1;
             $jstmp = '';
             $jstmpc = '';
@@ -270,15 +270,15 @@ 
             $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
             $js .= 'questions_types['.$this->questionJSId.'] = "exact";';
             $js .= $jstmpw;
-		} else {
-			$id = 1;
-			$jstmp = '';
-			$jstmpc = '';
+        } else {
+            $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>
+                $identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
+                $html .=
+                    '<tr>
 					<td align="center" width="5%">
 					<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="checkbox"/>
 					</td>
@@ -286,22 +286,22 @@ 
 					<label for="'.$identifier.'">' . Security::remove_XSS($this->answer[$i]) . '</label>
 					</td>
 					</tr>';
-				$jstmp .= $i.',';
+                $jstmp .= $i.',';
                 if ($this->correct[$i]) {
                     $jstmpc .= $i;
                 }
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
                 $jstmpw .= 'questions_answers_correct['.$this->questionJSId.']['.$i.'] = '.$this->correct[$i].';';
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
-			$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';';
-			$js .= $jstmpw;
-		}
-		$html .= '</table></td></tr>';
-
-		return array($js, $html);
-	}
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
+            $js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';';
+            $js .= $jstmpw;
+        }
+        $html .= '</table></td></tr>';
+
+        return array($js, $html);
+    }
 }
 
 /**
@@ -310,21 +310,21 @@ 
  */
 class ScormAnswerTrueFalse extends Answer
 {
-	/**
-	 * Return the XML flow for the possible answers.
-	 * That's one <response_lid>, containing several <flow_label>
-	 *
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	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>
+    /**
+     * Return the XML flow for the possible answers.
+     * That's one <response_lid>, containing several <flow_label>
+     *
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    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>
 				<td align="center" width="5%">
 				<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" />
 				</td>
@@ -332,8 +332,8 @@ 
 				<label for="'.$identifier_true.'">' . get_lang('True') . '</label>
 				</td>
 				</tr>';
-		$html .=
-			'<tr>
+        $html .=
+            '<tr>
 			<td align="center" width="5%">
 			<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" />
 			</td>
@@ -341,20 +341,20 @@ 
 			<label for="'.$identifier_false.'">' . get_lang('False') . '</label>
 			</td>
 			</tr></table></td></tr>';
-		$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);
-	}
+        $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);
+    }
 }
 
 /**
@@ -363,76 +363,76 @@ 
  */
 class ScormAnswerFillInBlanks extends Answer
 {
-	/**
-	 * Export the text with missing words.
-	 *
-	 * As a side effect, it stores two lists in the class :
-	 * the missing words and their respective weightings.
-	 */
-	function export()
-	{
-		global $charset;
-		$js = '';
-		$html = '<tr><td colspan="2"><table width="100%">';
-		// get all enclosed answers
-		$blankList = array();
-		// build replacement
-		$replacementList = array();
-		foreach ($this->answer as $i => $answer) {
-			$blankList[] = '['.$answer.']';
-		}
-
-		// 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(
+    /**
+     * Export the text with missing words.
+     *
+     * As a side effect, it stores two lists in the class :
+     * the missing words and their respective weightings.
+     */
+    function export()
+    {
+        global $charset;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        // get all enclosed answers
+        $blankList = array();
+        // build replacement
+        $replacementList = array();
+        foreach ($this->answer as $i => $answer) {
+            $blankList[] = '['.$answer.']';
+        }
+
+        // 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.',';
-			if (!empty($texstring)) {
-				$sub = api_substr($texstring, 1, -1);
-				if (!empty($sub)) {
-					$jstmpc .= "'" . api_htmlentities($sub, ENT_QUOTES, $charset) . "',";
-				}
-			}
+            if (!empty($texstring)) {
+                $sub = api_substr($texstring, 1, -1);
+                if (!empty($sub)) {
+                    $jstmpc .= "'" . api_htmlentities($sub, 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, ']');
-		}
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
+            $i++;
+            $startlocations = api_strpos($answer, '[');
+            $endlocations = api_strpos($answer, ']');
+        }
 
-		$html .= '<tr>
+        $html .= '<tr>
 			<td>
 			'.$answer.'
 			</td>
 			</tr></table></td></tr>';
-		$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;
+        $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);
+    }
 }
 
 /**
@@ -441,65 +441,65 @@ 
  */
 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%">';
-		// 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 ...)
-
-		// get max length of displayed array
-
-		$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>';
-				$s.='<td width="40%" valign="top"><b>'.$cpt2.'</b>.&nbsp;'.$answer."</td>";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
-				// fills the list-box
+    /**
+     * 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%">';
+        // 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 ...)
+
+        // get max length of displayed array
+
+        $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>';
+                $s.='<td width="40%" valign="top"><b>'.$cpt2.'</b>.&nbsp;'.$answer."</td>";
+                $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>';
-				$s.='<td width="40%" valign="top">';
+                $s.='</select>&nbsp;&nbsp;</td>';
+                $s.='<td width="40%" valign="top">';
                 if (isset($Select[$cpt2])) {
                     $s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
                 } else {
                     $s .= '&nbsp;';
                 }
-				$s.="</td></tr>";
+                $s.="</td></tr>";
 
-				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
+                $jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
 
                 $my_weight = explode('@', $weight);
                 if (count($my_weight) == 2) {
@@ -507,32 +507,32 @@ 
                 } 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>';
-						$s.= '<td width="60%" colspan="2">&nbsp;</td>';
-						$s.= '<td width="40%" valign="top">';
-						$s.= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.= "</td></tr>";
-						$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);
-	}
+                $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>';
+                        $s.= '<td width="60%" colspan="2">&nbsp;</td>';
+                        $s.= '<td width="40%" valign="top">';
+                        $s.= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                        $s.= "</td></tr>";
+                        $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);
+    }
 }
 
 /**
@@ -541,19 +541,19 @@ 
  */
 class ScormAnswerFree extends Answer
 {
-	/**
-	 * Export the text with missing words.
-	 *
-	 * As a side effect, it stores two lists in the class :
-	 * the missing words and their respective weightings.
-	 *
-	 */
-	function export()
-	{
-		$js = '';
+    /**
+     * Export the text with missing words.
+     *
+     * As a side effect, it stores two lists in the class :
+     * the missing words and their respective weightings.
+     *
+     */
+    function export()
+    {
+        $js = '';
         $identifier = 'question_'.$this->questionJSId.'_free';
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">';
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">';
         $type = $this->getQuestionType();
 
         if ($type == ORAL_EXPRESSION) {
@@ -565,21 +565,21 @@ 
             $layout = $template->get_template('document/record_audio.tpl');
             $html .= $template->fetch($layout);*/
 
-			$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+            $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
 
             return array($js, $html);
         }
 
         $html .= '<textarea minlength="20" name="'.$identifier.'" id="'.$identifier.'" ></textarea>';
         $html .= '</td></tr>';
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array();';
-		$js .= 'questions_answers_correct['.$this->questionJSId.'] = "";';
-		$js .= 'questions_types['.$this->questionJSId.'] = \'free\';';
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = "0";';
-		$js .= $jstmpw;
-
-		return array($js, $html);
-	}
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array();';
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = "";';
+        $js .= 'questions_types['.$this->questionJSId.'] = \'free\';';
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = "0";';
+        $js .= $jstmpw;
+
+        return array($js, $html);
+    }
 }
 /**
  * This class handles the SCORM export of hotpot questions
@@ -587,63 +587,63 @@ 
  */
 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>';
-			$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>';
-			$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 :
-	 * the missing words and their respective weightings.
-	 *
-	 */
-	function export()
-	{
-		$js = $this->get_js_header();
-		$html = '<tr><td colspan="2"><table width="100%">';
-		// some javascript must be added for that kind of questions
-		$html .= '';
-
-		// 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>';
+    /**
+     * Returns the javascript code that goes with HotSpot exercises
+     * @return string	The JavaScript code
+     */
+    function get_js_header()
+    {
+        if ($this->standalone) {
+            $header = '<script>';
+            $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>';
+            $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 :
+     * the missing words and their respective weightings.
+     *
+     */
+    function export()
+    {
+        $js = $this->get_js_header();
+        $html = '<tr><td colspan="2"><table width="100%">';
+        // some javascript must be added for that kind of questions
+        $html .= '';
+
+        // 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>';
-		$canClick = true;
-		$relPath = api_get_path(REL_PATH);
-		$html .= <<<HTML
+        $canClick = true;
+        $relPath = api_get_path(REL_PATH);
+        $html .= <<<HTML
             <tr>
                 <td>
                     <div id="hotspot-{$this->questionJSId}"></div>
@@ -663,13 +663,13 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></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>';
+        // 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);
+    }
 }
 
 /**
@@ -684,32 +684,32 @@ 
  */
 class ScormAssessmentItem
 {
-	public $question;
-	public $question_ident;
-	public $answer;
-	public $standalone;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param ScormQuestion $question The Question object we want to export.
-	 */
-	public function __construct($question, $standalone = false)
-	{
-		$this->question = $question;
-		$this->question->setAnswer();
-		$this->questionIdent = "QST_" . $question->id ;
-		$this->standalone = $standalone;
-	}
-
-	/**
-	 * Start the XML flow.
-	 *
-	 * This opens the <item> block, with correct attributes.
-	 *
-	 */
-	function start_page()
-	{
+    public $question;
+    public $question_ident;
+    public $answer;
+    public $standalone;
+
+    /**
+     * Constructor.
+     *
+     * @param ScormQuestion $question The Question object we want to export.
+     */
+    public function __construct($question, $standalone = false)
+    {
+        $this->question = $question;
+        $this->question->setAnswer();
+        $this->questionIdent = "QST_" . $question->id ;
+        $this->standalone = $standalone;
+    }
+
+    /**
+     * Start the XML flow.
+     *
+     * This opens the <item> block, with correct attributes.
+     *
+     */
+    function start_page()
+    {
         $head = '';
         if ($this->standalone) {
             $charset = 'UTF-8';
@@ -717,89 +717,89 @@ 
             $head .= '<html>';
         }
 
-		return $head;
-	}
+        return $head;
+    }
 
-	/**
-	 * End the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
+    /**
+     * End the XML flow, closing the </item> tag.
+     *
+     */
+    function end_page()
+    {
+        if ($this->standalone) {
+            return '</html>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Start document header
+     */
+    function start_header()
+    {
+        if ($this->standalone) {
+            return '<head>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    function css()
+    {
+        $css = '';
+        if ($this->standalone) {
+            $css = '<style type="text/css" media="screen, projection">';
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>'."\n";
+            $css .= '<style type="text/css" media="print">';
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>';
+        }
+
+        return $css;
+    }
+
+    /**
+     * End document header
+     */
+    function end_header()
+    {
+        if ($this->standalone) {
+            return '</head>';
+        }
+
+        return '';
+    }
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_js()
     {
-		if ($this->standalone) {
-			return '</html>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Start document header
-	 */
-	function start_header()
-	{
-		if ($this->standalone) {
-			return '<head>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	function css()
-	{
-		$css = '';
-		if ($this->standalone) {
-			$css = '<style type="text/css" media="screen, projection">';
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>'."\n";
-			$css .= '<style type="text/css" media="print">';
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>';
-		}
-
-		return $css;
-	}
-
-	/**
-	 * End document header
-	 */
-	function end_header()
-	{
-		if ($this->standalone) {
-			return '</head>';
-		}
-
-		return '';
-	}
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_js()
-	{
         $js = '<script type="text/javascript" src="assets/api_wrapper.js"></script>';
-		if ($this->standalone) {
-			return '<script>';
-		}
-		return $js;
-	}
-
-	/**
-	 * Common JS functions
-	 */
-	function common_js()
-	{
-		$js = 'var questions = new Array();';
-		$js .= 'var questions_answers = new Array();';
-		$js .= 'var questions_answers_correct = new Array();';
-		$js .= 'var questions_types = new Array();';
-		$js .= "\n" .
-			'/**
+        if ($this->standalone) {
+            return '<script>';
+        }
+        return $js;
+    }
+
+    /**
+     * Common JS functions
+     */
+    function common_js()
+    {
+        $js = 'var questions = new Array();';
+        $js .= 'var questions_answers = new Array();';
+        $js .= 'var questions_answers_correct = new Array();';
+        $js .= 'var questions_types = new Array();';
+        $js .= "\n" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -834,79 +834,79 @@ 
             	addEvent(window,\'unload\',unloadPage,false);
             }'."\n\n";
 
-		$js .= '';
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        $js .= '';
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
         if ($this->standalone) {
             return $js."\n";
         }
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js()
-	{
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js()
+    {
         if ($this->standalone) {
             return '</script>';
         }
 
         return '';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		if ($this->standalone) {
-			return '<body><form id="dokeos_scorm_form" method="post" action="">';
-		}
-
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		if ($this->standalone) {
-			return '<br /><input class="btn" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Export the question as a SCORM Item.
-	 * This is a default behaviour, some classes may want to override this.
-	 * @return string|array A string, the XML flow for an Item.
-	 */
-	function export()
-	{
-		list($js, $html) = $this->question->export();
-		if ($this->standalone) {
-			$res = $this->start_page()
-				. $this->start_header()
-				. $this->css()
-				. $this->start_js()
-				. $this->common_js()
-				. $js
-				. $this->end_js()
-				. $this->end_header()
-				. $this->start_body()
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        if ($this->standalone) {
+            return '<body><form id="dokeos_scorm_form" method="post" action="">';
+        }
+
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        if ($this->standalone) {
+            return '<br /><input class="btn" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Export the question as a SCORM Item.
+     * This is a default behaviour, some classes may want to override this.
+     * @return string|array A string, the XML flow for an Item.
+     */
+    function export()
+    {
+        list($js, $html) = $this->question->export();
+        if ($this->standalone) {
+            $res = $this->start_page()
+                . $this->start_header()
+                . $this->css()
+                . $this->start_js()
+                . $this->common_js()
+                . $js
+                . $this->end_js()
+                . $this->end_header()
+                . $this->start_body()
                 . $html
-				. $this->end_body()
-				. $this->end_page();
-			return $res;
-		} else {
-			return array($js, $html);
-		}
-	}
+                . $this->end_body()
+                . $this->end_page();
+            return $res;
+        } else {
+            return array($js, $html);
+        }
+    }
 }
 
 /**
@@ -923,103 +923,103 @@ 
  */
 class ScormSection
 {
-	public $exercise;
-	public $standalone;
-
-	/**
-	 * Send a complete exercise in SCORM format, from its ID
-	 *
-	 * @param Exercise $exercise The exercise to export
-	 * @param boolean $standalone Wether it should include XML tag and DTD line.
-	 * @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(Exercise $exercise, $standalone = true)
-	{
-		$ims = new ScormSection($exercise);
-		$xml = $ims->export($standalone);
-
-		return $xml;
-	}
-
-	/**
-	 * Constructor.
-	 * @param Exercise $exe The Exercise instance to export
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	public function __construct($exe)
-	{
-		$this->exercise = $exe;
-	}
-
-	/**
-	 * Start the XML flow.
-	 *
-	 * This opens the <item> block, with correct attributes.
-	 *
-	 */
-	function start_page()
-	{
+    public $exercise;
+    public $standalone;
+
+    /**
+     * Send a complete exercise in SCORM format, from its ID
+     *
+     * @param Exercise $exercise The exercise to export
+     * @param boolean $standalone Wether it should include XML tag and DTD line.
+     * @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(Exercise $exercise, $standalone = true)
+    {
+        $ims = new ScormSection($exercise);
+        $xml = $ims->export($standalone);
+
+        return $xml;
+    }
+
+    /**
+     * Constructor.
+     * @param Exercise $exe The Exercise instance to export
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    public function __construct($exe)
+    {
+        $this->exercise = $exe;
+    }
+
+    /**
+     * Start the XML flow.
+     *
+     * This opens the <item> block, with correct attributes.
+     *
+     */
+    function start_page()
+    {
         $charset = 'UTF-8';
-		$head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
-
-		return $head;
-	}
-
-	/**
-	 * End the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
-	{
-		return '</html>';
-	}
-
-	/**
-	 * Start document header
-	 */
-	function start_header()
-	{
-		return '<head>';
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	private function css()
-	{
-		return '';
-	}
-
-	/**
-	 * End document header
-	 */
+        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
+
+        return $head;
+    }
+
+    /**
+     * End the XML flow, closing the </item> tag.
+     *
+     */
+    function end_page()
+    {
+        return '</html>';
+    }
+
+    /**
+     * Start document header
+     */
+    function start_header()
+    {
+        return '<head>';
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    private function css()
+    {
+        return '';
+    }
+
+    /**
+     * End document header
+     */
     private function end_header()
-	{
-		return '</head>';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
+    {
+        return '</head>';
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
     private function start_js()
-	{
-		return '<script>';
-	}
-
-	/**
-	 * Common JS functions
-	 */
-	public function common_js()
-	{
-		$js = file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.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" .
-			'/**
+    {
+        return '<script>';
+    }
+
+    /**
+     * Common JS functions
+     */
+    public function common_js()
+    {
+        $js = file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.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" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -1061,76 +1061,76 @@ 
             }
             '."\n";
 
-		$js .= '';
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-		return $js. "\n";
-	}
+        $js .= '';
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        return $js. "\n";
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js()
+    {
+        return '</script>';
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        return '<body>'.
+        '<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>".
+        '<form id="dokeos_scorm_form" method="post" action="">'.
+        '<table width="100%">';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        return '</table><br /><input class="btn btn-primary" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
+    }
 
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js()
+    /**
+     * Export the question as a SCORM 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 string string, the XML flow for an Item.
+     */
+    function export()
     {
-		return '</script>';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		return '<body>'.
-		'<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>".
-		'<form id="dokeos_scorm_form" method="post" action="">'.
-		'<table width="100%">';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		return '</table><br /><input class="btn btn-primary" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
-	}
-
-	/**
-	 * Export the question as a SCORM 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 string string, the XML flow for an Item.
-	 */
-	function export()
-	{
-		global $charset;
-
-		$head = '';
-		if ($this->standalone) {
-			$head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
-				. '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
-		}
-
-		list($js, $html) = $this->export_questions();
-		$res = $this->start_page()
-			. $this->start_header()
-			. $this->css()
+        global $charset;
+
+        $head = '';
+        if ($this->standalone) {
+            $head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
+                . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
+        }
+
+        list($js, $html) = $this->export_questions();
+        $res = $this->start_page()
+            . $this->start_header()
+            . $this->css()
             . $this->globalAssets()
-			. $this->start_js()
-			. $this->common_js()
-			. $js
-			. $this->end_js()
-			. $this->end_header()
-			. $this->start_body()
-			. $html
-			. $this->end_body()
-			. $this->end_page();
-
-		return $res;
-	}
+            . $this->start_js()
+            . $this->common_js()
+            . $js
+            . $this->end_js()
+            . $this->end_header()
+            . $this->start_body()
+            . $html
+            . $this->end_body()
+            . $this->end_page();
+
+        return $res;
+    }
 
     /**
      * @return string
@@ -1144,21 +1144,21 @@ 
         return $assets;
     }
 
-	/**
-	 * Export the questions, as a succession of <items>
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	function export_questions()
-	{
-		$js = $html = "";
-		$js_id = 0;
-		foreach ($this->exercise->selectQuestionList() as $q) {
-			list($jstmp, $htmltmp)= ScormQuestion::export_question($q, false, $js_id);
-			$js .= $jstmp."\n";
-			$html .= $htmltmp."\n";
-			++$js_id;
-		}
-
-		return array($js, $html);
-	}
+    /**
+     * Export the questions, as a succession of <items>
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    function export_questions()
+    {
+        $js = $html = "";
+        $js_id = 0;
+        foreach ($this->exercise->selectQuestionList() as $q) {
+            list($jstmp, $htmltmp)= ScormQuestion::export_question($q, false, $js_id);
+            $js .= $jstmp."\n";
+            $html .= $htmltmp."\n";
+            ++$js_id;
+        }
+
+        return array($js, $html);
+    }
 }

main/ticket/tickets.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
         echo '<div class="actions" >';
         echo '<a href="' . api_get_path(WEB_CODE_PATH) . 'ticket/new_ticket.php?project_id='.$projectId.'">' .
                 Display::return_icon('add.png', get_lang('Add'), '', '32') .
-             '</a>';
+                '</a>';
         echo '</div>';
     }
 }