chamilo / chamilo-lms

main/document/record_audio.php

Indentation +43 added lines, -43 removed lines

@@ -18,11 +18,11 @@ 
 
 $document_data = DocumentManager::get_document_data_by_id($_GET['id'], api_get_course_id(), true);
 if (empty($document_data)) {
-	if (api_is_in_group()) {
-		$group_properties   = GroupManager::get_group_properties(api_get_group_id());
-		$document_id        = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']);
-		$document_data      = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
-	}
+    if (api_is_in_group()) {
+        $group_properties   = GroupManager::get_group_properties(api_get_group_id());
+        $document_id        = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']);
+        $document_data      = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
+    }
 }
 
 $document_id = $document_data['id'];
@@ -31,7 +31,7 @@ 
 //make some vars
 $wamidir = $dir;
 if ($wamidir == "/") {
-	$wamidir = "";
+    $wamidir = "";
 }
 $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/";
 $groupId = api_get_group_id();
@@ -41,48 +41,48 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO: clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-	$noPHP_SELF = true;
-	$group = GroupManager :: get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+    $noPHP_SELF = true;
+    $group = GroupManager :: get_group_properties($groupId);
+    $path = explode('/', $dir);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
-	api_not_allowed(true);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -90,26 +90,26 @@ 
 
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
 $counter = 0;
 if (isset($document_data['parents'])) {
-	foreach($document_data['parents'] as $document_sub_data) {
-		//fixing double group folder in breadcrumb
-		if (api_get_group_id()) {
-			if ($counter == 0) {
-				$counter++;
-				continue;
-			}
-		}
-		$interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
-		$counter++;
-	}
+    foreach($document_data['parents'] as $document_sub_data) {
+        //fixing double group folder in breadcrumb
+        if (api_get_group_id()) {
+            if ($counter == 0) {
+                $counter++;
+                continue;
+            }
+        }
+        $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
+        $counter++;
+    }
 }
 
 //make some vars
@@ -121,12 +121,12 @@ 
 $htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'swfobject/swfobject.js"></script>';
 
 $actions = Display::toolbarButton(
-	get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'),
-	'document.php?' . api_get_cidreq() . "&id=$document_id",
-	'arrow-left',
-	'default',
-	[],
-	false
+    get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'),
+    'document.php?' . api_get_cidreq() . "&id=$document_id",
+    'arrow-left',
+    'default',
+    [],
+    false
 );
 
 $template = new Template($nameTools);

main/inc/lib/extra_field.lib.php

Indentation +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
         'changeable',
         'filter',
         'extra_field_type',
-         /* Enable this when field_loggeable is introduced as a table field (2.0)
+            /* Enable this when field_loggeable is introduced as a table field (2.0)
         'field_loggeable',
          */
         'created_at'
@@ -808,7 +808,7 @@ 
                 foreach ($orderFields as $order) {
                     foreach ($extra as $field_details) {
                         if ($order == $field_details['variable']) {
-                           $newOrder[] = $field_details;
+                            $newOrder[] = $field_details;
                         }
                     }
                 }

main/session/session_export.php

Indentation +177 added lines, -177 removed lines

@@ -37,11 +37,11 @@ 
 set_time_limit(0);
 
 if (isset($_POST['formSent'])) {
-	$formSent = $_POST['formSent'];
-	$file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
-	$session_id = $_POST['session_id'];
-	if (empty($session_id)) {
-		$sql = "SELECT
+    $formSent = $_POST['formSent'];
+    $file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
+    $session_id = $_POST['session_id'];
+    if (empty($session_id)) {
+        $sql = "SELECT
 					s.id,
 					name,
 					id_coach,
@@ -55,84 +55,84 @@ 
 				ON $tbl_user.user_id = s.id_coach
 				ORDER BY id";
 
-		if (api_is_multiple_url_enabled()) {
-			$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-			$access_url_id = api_get_current_access_url_id();
-			if ($access_url_id != -1){
-			$sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
+        if (api_is_multiple_url_enabled()) {
+            $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $access_url_id = api_get_current_access_url_id();
+            if ($access_url_id != -1){
+            $sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
 					FROM $tbl_session s
 					INNER JOIN $tbl_session_rel_access_url as session_rel_url
 					ON (s.id= session_rel_url.session_id)
 					INNER JOIN $tbl_user u ON (u.user_id = s.id_coach)
 					WHERE access_url_id = $access_url_id
 					ORDER BY id";
-			}
-		}
+            }
+        }
 
-		$result = Database::query($sql);
-	} else {
-		$sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
+        $result = Database::query($sql);
+    } else {
+        $sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
 				FROM $tbl_session s
 				INNER JOIN $tbl_user
 					ON $tbl_user.user_id = s.id_coach
 				WHERE id='$session_id'";
-		$result = Database::query($sql);
-	}
+        $result = Database::query($sql);
+    }
 
-	if (Database::num_rows($result)) {
+    if (Database::num_rows($result)) {
 
 
 
-		$sessionListToExport = [];
+        $sessionListToExport = [];
 
-		if (in_array($file_type, ['csv', 'xls'])) {
+        if (in_array($file_type, ['csv', 'xls'])) {
 
-			$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
+            $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
 
-			$cvs = true;
-			$sessionListToExport[] = [
-				'SessionName',
-				'Coach',
-				'DateStart',
-				'DateEnd',
-				'Visibility',
-				'SessionCategory',
-				'Users',
-				'Courses'
-			];
-		} else {
-			if (!file_exists($archivePath)) {
-				mkdir($archivePath, api_get_permissions_for_new_directories(), true);
-			}
+            $cvs = true;
+            $sessionListToExport[] = [
+                'SessionName',
+                'Coach',
+                'DateStart',
+                'DateEnd',
+                'Visibility',
+                'SessionCategory',
+                'Users',
+                'Courses'
+            ];
+        } else {
+            if (!file_exists($archivePath)) {
+                mkdir($archivePath, api_get_permissions_for_new_directories(), true);
+            }
 
-			if (!file_exists($archivePath.'index.html')) {
-				$fp = fopen($archivePath.'index.html', 'w');
-				fputs($fp, '<html><head></head><body></body></html>');
-				fclose($fp);
-			}
+            if (!file_exists($archivePath.'index.html')) {
+                $fp = fopen($archivePath.'index.html', 'w');
+                fputs($fp, '<html><head></head><body></body></html>');
+                fclose($fp);
+            }
 
-			$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
-			while (file_exists($archivePath.$archiveFile)) {
-				$archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
-			}
+            $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
+            while (file_exists($archivePath.$archiveFile)) {
+                $archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
+            }
 
-			$cvs = false;
-			$fp = fopen($archivePath.$archiveFile, 'w');
-			fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
-		}
+            $cvs = false;
+            $fp = fopen($archivePath.$archiveFile, 'w');
+            fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
+        }
 
 
-		while ($row = Database::fetch_array($result)) {
-			$row['name'] = str_replace(';',',',$row['name']);
-			$row['username'] = str_replace(';',',',$row['username']);
-			$row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
-			$row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
-			$row['visibility'] = str_replace(';',',',$row['visibility']);
-			$row['session_category'] = str_replace(';',',',$row['session_category_id']);
+        while ($row = Database::fetch_array($result)) {
+            $row['name'] = str_replace(';',',',$row['name']);
+            $row['username'] = str_replace(';',',',$row['username']);
+            $row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
+            $row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
+            $row['visibility'] = str_replace(';',',',$row['visibility']);
+            $row['session_category'] = str_replace(';',',',$row['session_category_id']);
 
 
-			// users
-			$sql = "SELECT DISTINCT $tbl_user.username
+            // users
+            $sql = "SELECT DISTINCT $tbl_user.username
 					FROM $tbl_user
 					INNER JOIN $tbl_session_user
 					ON
@@ -140,33 +140,33 @@ 
 						$tbl_session_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
 						$tbl_session_user.session_id = '".$row['id']."'";
 
-			$rsUsers = Database::query($sql);
-			$users = '';
-			while ($rowUsers = Database::fetch_array($rsUsers)){
-				if($cvs){
-					$users .= str_replace(';',',',$rowUsers['username']).'|';
-				} else {
-					$users .= "\t\t<User>$rowUsers[username]</User>\n";
-				}
-			}
-
-			if (!empty($users) && $cvs) {
-				$users = api_substr($users, 0, api_strlen($users) - 1);
-			}
-
-			// Courses
-			$sql = "SELECT DISTINCT c.code, sc.id, c_id
+            $rsUsers = Database::query($sql);
+            $users = '';
+            while ($rowUsers = Database::fetch_array($rsUsers)){
+                if($cvs){
+                    $users .= str_replace(';',',',$rowUsers['username']).'|';
+                } else {
+                    $users .= "\t\t<User>$rowUsers[username]</User>\n";
+                }
+            }
+
+            if (!empty($users) && $cvs) {
+                $users = api_substr($users, 0, api_strlen($users) - 1);
+            }
+
+            // Courses
+            $sql = "SELECT DISTINCT c.code, sc.id, c_id
 					FROM $tbl_course c
 					INNER JOIN $tbl_session_course_user sc
 						ON c.id = sc.c_id
 						AND sc.session_id = '".$row['id']."'";
 
-			$rsCourses = Database::query($sql);
+            $rsCourses = Database::query($sql);
 
-			$courses = '';
-			while ($rowCourses = Database::fetch_array($rsCourses)) {
-				// get coachs from a course
-				$sql = "SELECT u.username
+            $courses = '';
+            while ($rowCourses = Database::fetch_array($rsCourses)) {
+                // get coachs from a course
+                $sql = "SELECT u.username
 						FROM $tbl_session_course_user scu
 						INNER JOIN $tbl_user u
 						ON u.user_id = scu.user_id
@@ -175,25 +175,25 @@ 
 							scu.session_id = '".$row['id']."' AND
 							scu.status = 2 ";
 
-				$rs_coachs = Database::query($sql);
-				$coachs = array();
-				while ($row_coachs = Database::fetch_array($rs_coachs)) {
-					$coachs[] = $row_coachs['username'];
-				}
-
-				$coachs = implode(",", $coachs);
-
-				if ($cvs) {
-					$courses .= str_replace(';',',',$rowCourses['code']);
-					$courses .= '['.str_replace(';',',',$coachs).'][';
-				} else {
-					$courses .= "\t\t<Course>\n";
-					$courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
-					$courses .= "\t\t\t<Coach>$coachs</Coach>\n";
-				}
-
-				// rel user courses
-				$sql = "SELECT DISTINCT u.username
+                $rs_coachs = Database::query($sql);
+                $coachs = array();
+                while ($row_coachs = Database::fetch_array($rs_coachs)) {
+                    $coachs[] = $row_coachs['username'];
+                }
+
+                $coachs = implode(",", $coachs);
+
+                if ($cvs) {
+                    $courses .= str_replace(';',',',$rowCourses['code']);
+                    $courses .= '['.str_replace(';',',',$coachs).'][';
+                } else {
+                    $courses .= "\t\t<Course>\n";
+                    $courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
+                    $courses .= "\t\t\t<Coach>$coachs</Coach>\n";
+                }
+
+                // rel user courses
+                $sql = "SELECT DISTINCT u.username
 						FROM $tbl_session_course_user scu
 						INNER JOIN $tbl_session_user su
 						ON
@@ -206,79 +206,79 @@ 
 							scu.c_id='".$rowCourses['c_id']."' AND
 							scu.session_id='".$row['id']."'";
 
-				$rsUsersCourse = Database::query($sql);
-				$userscourse = '';
-				while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
-					if ($cvs) {
-						$userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
-					} else {
-						$courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
-					}
-				}
-
-				if ($cvs) {
-					if (!empty($userscourse)) {
-						$userscourse = api_substr(
-							$userscourse,
-							0,
-							api_strlen($userscourse) - 1
-						);
-					}
-
-					$courses .= $userscourse.']|';
-				} else {
-					$courses .= "\t\t</Course>\n";
-				}
-			}
-
-			if (!empty($courses) && $cvs) {
-				$courses = api_substr($courses, 0, api_strlen($courses) - 1);
-			}
-			$add = $courses;
-
-			if (in_array($file_type, ['csv', 'xls'])) {
-				$sessionListToExport[] = [
-					$row['name'],
-					$row['username'],
-					$row['access_start_date'],
-					$row['access_end_date'],
-					$row['visibility'],
-					$row['session_category'],
-					$users,
-					$courses
-				];
-			} else {
-				$add = "\t<Session>\n"
-						 ."\t\t<SessionName>$row[name]</SessionName>\n"
-						 ."\t\t<Coach>$row[username]</Coach>\n"
-						 ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
-						 ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
-						 ."\t\t<Visibility>$row[visibility]</Visibility>\n"
-						 ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
-			}
-
-		 	if (!$cvs) {
-				$add .= "\t</Session>\n";
-				fputs($fp, $add);
-			}
-		}
-
-		switch ($file_type) {
-			case 'xml':
-				fputs($fp, "</Sessions>\n");
-				fclose($fp);
-				$errorMsg = get_lang('UserListHasBeenExported').'<br/>
+                $rsUsersCourse = Database::query($sql);
+                $userscourse = '';
+                while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
+                    if ($cvs) {
+                        $userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
+                    } else {
+                        $courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
+                    }
+                }
+
+                if ($cvs) {
+                    if (!empty($userscourse)) {
+                        $userscourse = api_substr(
+                            $userscourse,
+                            0,
+                            api_strlen($userscourse) - 1
+                        );
+                    }
+
+                    $courses .= $userscourse.']|';
+                } else {
+                    $courses .= "\t\t</Course>\n";
+                }
+            }
+
+            if (!empty($courses) && $cvs) {
+                $courses = api_substr($courses, 0, api_strlen($courses) - 1);
+            }
+            $add = $courses;
+
+            if (in_array($file_type, ['csv', 'xls'])) {
+                $sessionListToExport[] = [
+                    $row['name'],
+                    $row['username'],
+                    $row['access_start_date'],
+                    $row['access_end_date'],
+                    $row['visibility'],
+                    $row['session_category'],
+                    $users,
+                    $courses
+                ];
+            } else {
+                $add = "\t<Session>\n"
+                            ."\t\t<SessionName>$row[name]</SessionName>\n"
+                            ."\t\t<Coach>$row[username]</Coach>\n"
+                            ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
+                            ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
+                            ."\t\t<Visibility>$row[visibility]</Visibility>\n"
+                            ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
+            }
+
+                if (!$cvs) {
+                $add .= "\t</Session>\n";
+                fputs($fp, $add);
+            }
+        }
+
+        switch ($file_type) {
+            case 'xml':
+                fputs($fp, "</Sessions>\n");
+                fclose($fp);
+                $errorMsg = get_lang('UserListHasBeenExported').'<br/>
 				<a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
-				break;
-			case 'csv':
-				Export::arrayToCsv($sessionListToExport, $archiveFile);
-				exit;
-			case 'xls':
-				Export::arrayToXls($sessionListToExport, $archiveFile);
-				exit;
-				break;
-		}
-	}
+                break;
+            case 'csv':
+                Export::arrayToCsv($sessionListToExport, $archiveFile);
+                exit;
+            case 'xls':
+                Export::arrayToXls($sessionListToExport, $archiveFile);
+                exit;
+                break;
+        }
+    }
 }
 
 // display the header
@@ -288,26 +288,26 @@ 
 $sql = "SELECT id, name FROM $tbl_session ORDER BY name";
 
 if (api_is_multiple_url_enabled()) {
-	$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1){
-	$sql = "SELECT s.id, name FROM $tbl_session s
+    $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1){
+    $sql = "SELECT s.id, name FROM $tbl_session s
 			INNER JOIN $tbl_session_rel_access_url as session_rel_url
 			ON (s.id = session_rel_url.session_id)
 			WHERE access_url_id = $access_url_id
 			ORDER BY name";
-	}
+    }
 }
 $result = Database::query($sql);
 $Sessions = Database::store_result($result);
 
 echo '<div class="actions">';
 echo '<a href="../session/session_list.php">'.
-		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (!empty($errorMsg)) {
-	Display::display_normal_message($errorMsg, false); //main API
+    Display::display_normal_message($errorMsg, false); //main API
 }
 
 $form = new FormValidator('session_export', 'post', api_get_self());

main/document/edit_document.php

Indentation +186 added lines, -186 removed lines

@@ -69,7 +69,7 @@ 
 $sessionId = api_get_session_id();
 
 if (api_is_in_group()) {
-	$group_properties = GroupManager::get_group_properties($group_id);
+    $group_properties = GroupManager::get_group_properties($group_id);
 }
 
 $dir = '/';
@@ -81,7 +81,7 @@ 
         $_GET['id'],
         api_get_course_id(),
         true,
-		0
+        0
     );
 
     if (!empty($sessionId) && empty($document_data)) {
@@ -93,13 +93,13 @@ 
         );
     }
 
-	$document_id = $document_data['id'];
-	$file = $document_data['path'];
-	$parent_id = DocumentManager::get_document_id($course_info, dirname($file));
-	$dir = dirname($document_data['path']);
-	$dir_original = $dir;
-	$doc = basename($file);
-	$readonly = $document_data['readonly'];
+    $document_id = $document_data['id'];
+    $file = $document_data['path'];
+    $parent_id = DocumentManager::get_document_id($course_info, dirname($file));
+    $dir = dirname($document_data['path']);
+    $dir_original = $dir;
+    $doc = basename($file);
+    $readonly = $document_data['readonly'];
 }
 
 if (empty($document_data)) {
@@ -121,7 +121,7 @@ 
 
 // Level correction for group documents.
 if (!empty($group_properties['directory'])) {
-	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
+    $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
 }
 $relative_url = '';
 for ($i = 0; $i < ($count_dir); $i++) {
@@ -143,13 +143,13 @@ 
 );
 
 if ($is_certificate_mode) {
-	$editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
-	$editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
-	$editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
+    $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
+    $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/';
+    $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
 }
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId);
 $noPHP_SELF = true;
 
 /*	Other initialization code */
@@ -162,8 +162,8 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
         'name' => get_lang('GroupSpace'),
     );
-	$group_document = true;
-	$noPHP_SELF = true;
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 if (!$is_certificate_mode) {
@@ -197,9 +197,9 @@ 
 
 //TODO:check the below code and his funcionality
 if (!api_is_allowed_to_edit()) {
-	if (DocumentManager::check_readonly($course_info, $user_id, $file)) {
-		api_not_allowed();
-	}
+    if (DocumentManager::check_readonly($course_info, $user_id, $file)) {
+        api_not_allowed();
+    }
 }
 
 /* MAIN TOOL CODE */
@@ -207,18 +207,18 @@ 
 /*	Code to change the comment	*/
 
 if (isset($_POST['comment'])) {
-	// Fixing the path if it is wrong
-	$comment = trim($_POST['comment']);
-	$title = trim($_POST['title']);
+    // Fixing the path if it is wrong
+    $comment = trim($_POST['comment']);
+    $title = trim($_POST['title']);
 
     // Just in case see BT#3525
     if (empty($title)) {
-		$title = $document_data['title'];
-	}
+        $title = $document_data['title'];
+    }
 
-	if (empty($title)) {
-		$title = get_document_title($_POST['filename']);
-	}
+    if (empty($title)) {
+        $title = get_document_title($_POST['filename']);
+    }
 
     if (!empty($document_id)) {
         $params = [
@@ -230,43 +230,43 @@ 
             $params,
             ['c_id = ? AND id = ?' => [$course_id, $document_id]]
         );
-		Display::addFlash(Display::return_message(get_lang('fileModified')));
+        Display::addFlash(Display::return_message(get_lang('fileModified')));
     }
 }
 
 /*	WYSIWYG HTML EDITOR - Program Logic */
 if ($is_allowed_to_edit) {
-	if (isset($_POST['formSent']) && $_POST['formSent'] == 1) {
+    if (isset($_POST['formSent']) && $_POST['formSent'] == 1) {
 
-		$filename = stripslashes($_POST['filename']);
+        $filename = stripslashes($_POST['filename']);
         $extension = $_POST['extension'];
-		$content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null;
-		$content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY);
+        $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null;
+        $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY);
 
         if ($dir == '/') {
             $dir = '';
         }
 
-		$file = $dir.'/'.$filename.'.'.$extension;
-		$read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
-		$read_only_flag = empty($read_only_flag) ? 0 : 1;
+        $file = $dir.'/'.$filename.'.'.$extension;
+        $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
+        $read_only_flag = empty($read_only_flag) ? 0 : 1;
 
-		if (empty($filename)) {
+        if (empty($filename)) {
             Display::addFlash(Display::return_message(get_lang('NoFileName'), 'warning'));
-		} else {
+        } else {
 
-		    $file_size = filesize($document_data['absolute_path']);
+            $file_size = filesize($document_data['absolute_path']);
 
-			if ($read_only_flag == 0) {
-				if (!empty($content)) {
-					if ($fp = @fopen($document_data['absolute_path'], 'w')) {
-						// For flv player, change absolute path temporarily to prevent from erasing it in the following lines
-						$content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content);
- 						fputs($fp, $content);
-						fclose($fp);
+            if ($read_only_flag == 0) {
+                if (!empty($content)) {
+                    if ($fp = @fopen($document_data['absolute_path'], 'w')) {
+                        // For flv player, change absolute path temporarily to prevent from erasing it in the following lines
+                        $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content);
+                            fputs($fp, $content);
+                        fclose($fp);
 
                         $filepath = $document_data['absolute_parent_path'];
-						/*
+                        /*
 						if (!is_dir($filepath.'css')) {
 							mkdir($filepath.'css', api_get_permissions_for_new_directories());
 							$doc_id = add_document($_course, $dir.'css', 'folder', 0, 'css');
@@ -296,7 +296,7 @@ 
 							);
 						}*/
 
-						/*if (!is_file($filepath.'css/frames.css')) {
+                        /*if (!is_file($filepath.'css/frames.css')) {
 							$platform_theme = api_get_setting('stylesheets');
 							if (file_exists(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css')) {
 								copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css', $filepath.'css/frames.css');
@@ -334,54 +334,54 @@ 
 							}
 						}*/
 
-						// "WHAT'S NEW" notification: update table item_property
-						$document_id = DocumentManager::get_document_id($_course, $file);
-
-						if ($document_id) {
-							update_existing_document(
-								$_course,
-								$document_id,
-								$file_size,
-								$read_only_flag
-							);
-							api_item_property_update(
-								$_course,
-								TOOL_DOCUMENT,
-								$document_id,
-								'DocumentUpdated',
-								api_get_user_id(),
-								null,
-								null,
-								null,
-								null,
-								$sessionId
-							);
-							// Update parent folders
-							item_property_update_on_folder(
-								$_course,
-								$dir,
-								api_get_user_id()
-							);
-							header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':''));
-							exit;
-						} else {
+                        // "WHAT'S NEW" notification: update table item_property
+                        $document_id = DocumentManager::get_document_id($_course, $file);
+
+                        if ($document_id) {
+                            update_existing_document(
+                                $_course,
+                                $document_id,
+                                $file_size,
+                                $read_only_flag
+                            );
+                            api_item_property_update(
+                                $_course,
+                                TOOL_DOCUMENT,
+                                $document_id,
+                                'DocumentUpdated',
+                                api_get_user_id(),
+                                null,
+                                null,
+                                null,
+                                null,
+                                $sessionId
+                            );
+                            // Update parent folders
+                            item_property_update_on_folder(
+                                $_course,
+                                $dir,
+                                api_get_user_id()
+                            );
+                            header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':''));
+                            exit;
+                        } else {
                             Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning'));
-						}
-					} else {
+                        }
+                    } else {
                         Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning'));
-					}
-				} else {
-					if ($document_id) {
+                    }
+                } else {
+                    if ($document_id) {
                         update_existing_document($_course, $document_id, $file_size, $read_only_flag);
-					}
-				}
-			} else {
+                    }
+                }
+            } else {
                 if ($document_id) {
                     update_existing_document($_course, $document_id, $file_size, $read_only_flag);
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 // Replace relative paths by absolute web paths (e.g. './' => 'http://www.chamilo.org/courses/ABC/document/')
@@ -435,35 +435,35 @@ 
         api_get_group_id()
     )
 ) {
-	$action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq();
+    $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq();
     if ($is_certificate_mode) {
         $action .= '&curdirpath=/certificates&selectcat=1';
     }
-	$form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical'));
-
-	// Form title
-	$form->addElement('header', $nameTools);
-	$form->addElement('hidden', 'filename');
-	$form->addElement('hidden', 'extension');
-	$form->addElement('hidden', 'file_path');
-	$form->addElement('hidden', 'commentPath');
-	$form->addElement('hidden', 'showedit');
-	$form->addElement('hidden', 'origin');
-	$form->addElement('hidden', 'origin_opt');
+    $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical'));
+
+    // Form title
+    $form->addElement('header', $nameTools);
+    $form->addElement('hidden', 'filename');
+    $form->addElement('hidden', 'extension');
+    $form->addElement('hidden', 'file_path');
+    $form->addElement('hidden', 'commentPath');
+    $form->addElement('hidden', 'showedit');
+    $form->addElement('hidden', 'origin');
+    $form->addElement('hidden', 'origin_opt');
     $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 
-	$defaults['title'] = $document_data['title'];
+    $defaults['title'] = $document_data['title'];
 
-	$form->addElement('hidden', 'formSent');
-	$defaults['formSent'] = 1;
+    $form->addElement('hidden', 'formSent');
+    $defaults['formSent'] = 1;
 
-	$read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
+    $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null;
 
-	// Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor.
-	// This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573
-	$defaults['content'] = str_replace('<!--[', '<!-- [', $content);
+    // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor.
+    // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573
+    $defaults['content'] = str_replace('<!--[', '<!-- [', $content);
 
-	// HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved.
+    // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved.
 
     $showSystemFolders = api_get_course_setting('show_system_folders');
     $condition = stripos($dir, '/HotPotatoes_files') === false;
@@ -471,44 +471,44 @@ 
         $condition = true;
     }
 
-	if (($extension == 'htm' || $extension == 'html') && $condition) {
-		if (empty($readonly) && $readonly == 0) {
+    if (($extension == 'htm' || $extension == 'html') && $condition) {
+        if (empty($readonly) && $readonly == 0) {
             $form->addHtmlEditor('content', '', true, true, $editorConfig);
-		}
-	}
+        }
+    }
 
-	if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) {
-		// Updated on field
+    if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) {
+        // Updated on field
         $display_date = date_to_str_ago($last_edit_date).
-			' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>';
-		$form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
-	}
+            ' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>';
+        $form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
+    }
 
-	$form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
+    $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
 
-	if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
-		$checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
-		if ($readonly == 1) {
-			$checked->setChecked(true);
-		}
-	}
+    if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
+        $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
+        if ($readonly == 1) {
+            $checked->setChecked(true);
+        }
+    }
 
-	if ($is_certificate_mode) {
-		$form->addButtonUpdate(get_lang('SaveCertificate'));
+    if ($is_certificate_mode) {
+        $form->addButtonUpdate(get_lang('SaveCertificate'));
     } else {
-		$form->addButtonUpdate(get_lang('SaveDocument'));
+        $form->addButtonUpdate(get_lang('SaveDocument'));
     }
 
-	$defaults['filename'] = $filename;
-	$defaults['extension'] = $extension;
-	$defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null;
-	$defaults['commentPath'] = $file;
-	$defaults['renameTo'] = $file_name;
-	$defaults['comment'] = $document_data['comment'];
-	$defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
-	$defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null;
+    $defaults['filename'] = $filename;
+    $defaults['extension'] = $extension;
+    $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null;
+    $defaults['commentPath'] = $file;
+    $defaults['renameTo'] = $file_name;
+    $defaults['comment'] = $document_data['comment'];
+    $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null;
+    $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null;
 
-	$form->setDefaults($defaults);
+    $form->setDefaults($defaults);
 
     show_return(
         $parent_id,
@@ -518,25 +518,25 @@ 
         $is_certificate_mode
     );
 
-	if ($is_certificate_mode) {
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
-			api_get_user_id(),
-			api_get_course_id()
-		);
-		$str_info = '';
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
-			$str_info .= $info_value.'<br/>';
-		}
-		$create_certificate=get_lang('CreateCertificateWithTags');
-		Display::display_normal_message(
-			$create_certificate.': <br /><br />'.$str_info,
-			false
-		);
-	}
-
-	if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
-		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
-	}
+    if ($is_certificate_mode) {
+        $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
+            api_get_user_id(),
+            api_get_course_id()
+        );
+        $str_info = '';
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
+            $str_info .= $info_value.'<br/>';
+        }
+        $create_certificate=get_lang('CreateCertificateWithTags');
+        Display::display_normal_message(
+            $create_certificate.': <br /><br />'.$str_info,
+            false
+        );
+    }
+
+    if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
+        Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
+    }
     // HTML-editor
     echo '<div class="page-create">
             <div class="row" style="overflow:hidden">
@@ -563,26 +563,26 @@ 
 */
 function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc)
 {
-	$file_name_for_change = $base_work_dir.$dir.$source_file;
+    $file_name_for_change = $base_work_dir.$dir.$source_file;
     $rename_to = disable_dangerous_file($rename_to); // Avoid renaming to .htaccess file
-	$rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API
-
-	if ($rename_to) {
-		if (isset($dir) && $dir != '') {
-			$source_file = $dir.$source_file;
-			$new_full_file_name = dirname($source_file).'/'.$rename_to;
-		} else {
-			$source_file = '/'.$source_file;
-			$new_full_file_name = '/'.$rename_to;
-		}
-
-		update_db_info('update', $source_file, $new_full_file_name); // fileManage API
+    $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API
+
+    if ($rename_to) {
+        if (isset($dir) && $dir != '') {
+            $source_file = $dir.$source_file;
+            $new_full_file_name = dirname($source_file).'/'.$rename_to;
+        } else {
+            $source_file = '/'.$source_file;
+            $new_full_file_name = '/'.$rename_to;
+        }
+
+        update_db_info('update', $source_file, $new_full_file_name); // fileManage API
         Display::addFlash(Display::return_message(get_lang('fileModified')));
 
-		return true;
-	} else {
+        return true;
+    } else {
         Display::addFlash(Display::return_message(get_lang('FileExists')));
-	}
+    }
 }
 
 //return button back to
@@ -595,32 +595,32 @@ 
     global $parent_id;
     $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id;
 
-	if ($is_certificate_mode) {
-		$selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
-		$actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
+    if ($is_certificate_mode) {
+        $selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : '');
+        $actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
-	} elseif($call_from_tool=='slideshow') {
-		$actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
+    } elseif($call_from_tool=='slideshow') {
+        $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.
             Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>';
-	} elseif($call_from_tool=='editdraw') {
-		$actionsLeft .= '<a href="'.$url.'">'.
+    } elseif($call_from_tool=='editdraw') {
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
-	} elseif($call_from_tool=='editodf') {
+        $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>';
+    } elseif($call_from_tool=='editodf') {
         $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>';
         $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
     } elseif($call_from_tool=='editpaint'){
-		$actionsLeft .= '<a href="'.$url.'">'.
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>';
-		$actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
-	} else {
-		$actionsLeft .= '<a href="'.$url.'">'.
+        $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>';
+    } else {
+        $actionsLeft .= '<a href="'.$url.'">'.
             Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>';
-	}
+    }
     
     echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
 }

main/exercise/answer.class.php

Indentation +324 added lines, -324 removed lines

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

main/exercise/export/scorm/scorm_classes.php

Indentation +777 added lines, -777 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()
+    {
+        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 the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
+    /**
+     * 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,107 +923,107 @@ 
  */
 class ScormSection
 {
-	public $exercise;
-	public $standalone;
-
-	/**
-	 * Send a complete exercise in SCORM format, from its ID
-	 *
-	 * @param int $exerciseId The exercise to exporte
-	 * @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($exerciseId, $standalone = true)
-	{
-		$exercise = new Exercise();
-		if (!$exercise->read($exerciseId)) {
-			return '';
-		}
-		$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 int $exerciseId The exercise to exporte
+     * @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($exerciseId, $standalone = true)
+    {
+        $exercise = new Exercise();
+        if (!$exercise->read($exerciseId)) {
+            return '';
+        }
+        $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
@@ -1065,76 +1065,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
@@ -1148,21 +1148,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/webservices/user_import/import.lib.php

Indentation +104 added lines, -104 removed lines

@@ -3,121 +3,121 @@ 
  * Validates imported data.
  */
 function validate_data($users) {
-	global $defined_auth_sources;
-	$errors = array ();
-	$usernames = array ();
-	if(is_array($users)) {
-		foreach ($users as $index => $user) {
-			// 1. Check whether mandatory fields have been set.
-			$mandatory_fields = array ('LastName', 'FirstName');
-			if (api_get_setting('registration', 'email') == 'true') {
-				$mandatory_fields[] = 'Email';
-			}
-			foreach ($mandatory_fields as $key => $field) {
-				if (!isset ($user[$field]) || strlen($user[$field]) == 0) {
-					$user['error'] = get_lang($field.'Mandatory');
-					$errors[] = $user;
-				}
-			}
-			// 2. Check username.
-			if (!UserManager::is_username_empty($user['UserName'])) {
-				// 2.1. Check whether username was used twice in the import file.
-				if (isset($usernames[$user['UserName']])) {
-					$user['error'] = get_lang('UserNameUsedTwice');
-					$errors[] = $user;
-				}
-				$usernames[$user['UserName']] = 1;
-				// 2.2. Check whether username is allready in use in database.
-				if (!UserManager::is_username_available($user['UserName'])) {
-					$user['error'] = get_lang('UserNameNotAvailable');
-					$errors[] = $user;
-				}
-				// 2.3. Check whether username is too long.
-				if (UserManager::is_username_too_long($user['UserName'])) {
-					$user['error'] = get_lang('UserNameTooLong');
-					$errors[] = $user;
-				}
-			}
-			// 3. Check status.
-			if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
-				$user['error'] = get_lang('WrongStatus');
-				$errors[] = $user;
-			}
-			// 5. Check authentication source.
-			if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
-				if (!in_array($user['AuthSource'], $defined_auth_sources)) {
-					$user['error'] = get_lang('AuthSourceNotAvailable');
-					$errors[] = $user;
-				}
-			}
-		}
-	}
-	return $errors;
+    global $defined_auth_sources;
+    $errors = array ();
+    $usernames = array ();
+    if(is_array($users)) {
+        foreach ($users as $index => $user) {
+            // 1. Check whether mandatory fields have been set.
+            $mandatory_fields = array ('LastName', 'FirstName');
+            if (api_get_setting('registration', 'email') == 'true') {
+                $mandatory_fields[] = 'Email';
+            }
+            foreach ($mandatory_fields as $key => $field) {
+                if (!isset ($user[$field]) || strlen($user[$field]) == 0) {
+                    $user['error'] = get_lang($field.'Mandatory');
+                    $errors[] = $user;
+                }
+            }
+            // 2. Check username.
+            if (!UserManager::is_username_empty($user['UserName'])) {
+                // 2.1. Check whether username was used twice in the import file.
+                if (isset($usernames[$user['UserName']])) {
+                    $user['error'] = get_lang('UserNameUsedTwice');
+                    $errors[] = $user;
+                }
+                $usernames[$user['UserName']] = 1;
+                // 2.2. Check whether username is allready in use in database.
+                if (!UserManager::is_username_available($user['UserName'])) {
+                    $user['error'] = get_lang('UserNameNotAvailable');
+                    $errors[] = $user;
+                }
+                // 2.3. Check whether username is too long.
+                if (UserManager::is_username_too_long($user['UserName'])) {
+                    $user['error'] = get_lang('UserNameTooLong');
+                    $errors[] = $user;
+                }
+            }
+            // 3. Check status.
+            if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
+                $user['error'] = get_lang('WrongStatus');
+                $errors[] = $user;
+            }
+            // 5. Check authentication source.
+            if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
+                if (!in_array($user['AuthSource'], $defined_auth_sources)) {
+                    $user['error'] = get_lang('AuthSourceNotAvailable');
+                    $errors[] = $user;
+                }
+            }
+        }
+    }
+    return $errors;
 }
 
 /**
  * Adds missing user-information (which isn't required, like password, username, etc).
  */
 function complete_missing_data($user) {
-	// 1. Create a username if necessary.
-	if (UserManager::is_username_empty($user['UserName'])) {
-		$user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']);
-	}
-	// 2. Generate a password if necessary.
-	if (!isset ($user['Password']) || strlen($user['Password']) == 0) {
-		$user['Password'] = api_generate_password();
-	}
-	// 3. set status if not allready set.
-	if (!isset ($user['Status']) || strlen($user['Status']) == 0) {
-		$user['Status'] = 'user';
-	}
-	// 4. Set authsource if not allready set.
-	if (!isset ($user['AuthSource']) || strlen($user['AuthSource']) == 0) {
-		$user['AuthSource'] = PLATFORM_AUTH_SOURCE;
-	}
-	return $user;
+    // 1. Create a username if necessary.
+    if (UserManager::is_username_empty($user['UserName'])) {
+        $user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']);
+    }
+    // 2. Generate a password if necessary.
+    if (!isset ($user['Password']) || strlen($user['Password']) == 0) {
+        $user['Password'] = api_generate_password();
+    }
+    // 3. set status if not allready set.
+    if (!isset ($user['Status']) || strlen($user['Status']) == 0) {
+        $user['Status'] = 'user';
+    }
+    // 4. Set authsource if not allready set.
+    if (!isset ($user['AuthSource']) || strlen($user['AuthSource']) == 0) {
+        $user['AuthSource'] = PLATFORM_AUTH_SOURCE;
+    }
+    return $user;
 }
 
 /**
  * Save the imported data
  */
 function save_data($users) {
-	$user_table = Database :: get_main_table(TABLE_MAIN_USER);
-	if(is_array($users)) {
-		foreach ($users as $index => $user) {
-			$user = complete_missing_data($user);
+    $user_table = Database :: get_main_table(TABLE_MAIN_USER);
+    if(is_array($users)) {
+        foreach ($users as $index => $user) {
+            $user = complete_missing_data($user);
 
-			$user['Status'] = api_status_key($user['Status']);
+            $user['Status'] = api_status_key($user['Status']);
 
-			$user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']);
-			foreach ($user['Courses'] as $index => $course) {
-				if(CourseManager :: course_exists($course))
-					CourseManager :: subscribe_user($user_id, $course,$user['Status']);
-			}
+            $user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']);
+            foreach ($user['Courses'] as $index => $course) {
+                if(CourseManager :: course_exists($course))
+                    CourseManager :: subscribe_user($user_id, $course,$user['Status']);
+            }
 
-			// TODO: Hard-coded French texts.
+            // TODO: Hard-coded French texts.
 
-			// Qualite
-			if (!empty($user['Qualite'])) {
-				UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
-			}
+            // Qualite
+            if (!empty($user['Qualite'])) {
+                UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
+            }
 
-			// Categorie
-			if (!empty($user['Categorie'])) {
-				UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
-			}
+            // Categorie
+            if (!empty($user['Categorie'])) {
+                UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
+            }
 
-			// Etat
-			if (!empty($user['Etat'])) {
-				UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
-			}
+            // Etat
+            if (!empty($user['Etat'])) {
+                UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
+            }
 
-			// Niveau
-			if (!empty($user['Niveau'])) {
-				UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
-			}
-		}
-	}
+            // Niveau
+            if (!empty($user['Niveau'])) {
+                UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
+            }
+        }
+    }
 }
 
 /**
@@ -126,12 +126,12 @@ 
  * @return array All userinformation read from the file
  */
 function parse_csv_data($file) {
-	$users = Import :: csvToArray($file);
-	foreach ($users as $index => $user) {
-		if (isset ($user['Courses'])) {
-			$user['Courses'] = explode('|', trim($user['Courses']));
-		}
-		$users[$index] = $user;
-	}
-	return $users;
+    $users = Import :: csvToArray($file);
+    foreach ($users as $index => $user) {
+        if (isset ($user['Courses'])) {
+            $user['Courses'] = explode('|', trim($user['Courses']));
+        }
+        $users[$index] = $user;
+    }
+    return $users;
 }

main/exercise/unique_answer_no_option.class.php

Indentation +61 added lines, -61 removed lines

@@ -14,20 +14,20 @@ 
  */
 class UniqueAnswerNoOption extends Question
 {
-	public static $typePicture = 'mcuao.png';
-	public static $explanationLangVar = 'UniqueAnswerNoOption';
+    public static $typePicture = 'mcuao.png';
+    public static $explanationLangVar = 'UniqueAnswerNoOption';
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
+    /**
+     * Constructor
+     */
+    public function __construct()
     {
-		parent::__construct();
-		$this -> type = UNIQUE_ANSWER_NO_OPTION;
-		$this -> isContent = $this-> getIsContent();
-	}
+        parent::__construct();
+        $this -> type = UNIQUE_ANSWER_NO_OPTION;
+        $this -> isContent = $this-> getIsContent();
+    }
 
-	/**
+    /**
      * function which redifines Question::createAnswersForm
      * @param the formvalidator instance
      * @param the answers number to display
@@ -283,37 +283,37 @@ 
     }
 
     /**
-	 * Function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 * @param the answers number to display
-	 */
-	function processAnswersCreation($form)
+     * Function which creates the form to create / edit the answers of the question
+     * @param the formvalidator instance
+     * @param the answers number to display
+     */
+    function processAnswersCreation($form)
     {
-		$questionWeighting = $nbrGoodAnswers = 0;
-		$correct = $form -> getSubmitValue('correct');
-		$objAnswer = new Answer($this->id);
-		$nb_answers = $form -> getSubmitValue('nb_answers');
-		$minus = 1;
-		if ($form -> getSubmitValue('new_question')) {
-		    $minus = 0;
-		}
-
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
+        $questionWeighting = $nbrGoodAnswers = 0;
+        $correct = $form -> getSubmitValue('correct');
+        $objAnswer = new Answer($this->id);
+        $nb_answers = $form -> getSubmitValue('nb_answers');
+        $minus = 1;
+        if ($form -> getSubmitValue('new_question')) {
+            $minus = 0;
+        }
+
+        for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
+            $position   = trim($form -> getSubmitValue('position['.$i.']'));
+            $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
             $scenario   = $form -> getSubmitValue('scenario');
 
-           	//$list_destination = $form -> getSubmitValue('destination'.$i);
-           	//$destination_str = $form -> getSubmitValue('destination'.$i);
+                //$list_destination = $form -> getSubmitValue('destination'.$i);
+                //$destination_str = $form -> getSubmitValue('destination'.$i);
 
- 		    $try           = $scenario['try'.$i];
+                $try           = $scenario['try'.$i];
             $lp            = $scenario['lp'.$i];
- 			$destination   = $scenario['destination'.$i];
- 			$url           = trim($scenario['url'.$i]);
+                $destination   = $scenario['destination'.$i];
+                $url           = trim($scenario['url'.$i]);
 
- 			/*
+                /*
  			How we are going to parse the destination value
 
 			here we parse the destination value which is a string
@@ -326,41 +326,41 @@ 
 			selected_questions= ids of questions
 			url= an url
 			*/
-			/*
+            /*
  			$destination_str='';
  			foreach ($list_destination as $destination_id)
  			{
  				$destination_str.=$destination_id.';';
  			}*/
 
-        	$goodAnswer= ($correct == $i) ? true : false;
+            $goodAnswer= ($correct == $i) ? true : false;
 
-        	if ($goodAnswer) {
-        		$nbrGoodAnswers++;
-        		$weighting = abs($weighting);
-        		if($weighting > 0) {
+            if ($goodAnswer) {
+                $nbrGoodAnswers++;
+                $weighting = abs($weighting);
+                if($weighting > 0) {
                     $questionWeighting += $weighting;
                 }
-        	}
+            }
 
- 			if (empty($try))
- 				$try=0;
+                if (empty($try))
+                    $try=0;
 
- 			if (empty($lp)) {
- 				$lp=0;
- 			}
+                if (empty($lp)) {
+                    $lp=0;
+                }
 
- 			if (empty($destination)) {
- 				$destination=0;
- 			}
+                if (empty($destination)) {
+                    $destination=0;
+                }
 
- 			if ($url=='') {
- 				$url=0;
- 			}
+                if ($url=='') {
+                    $url=0;
+                }
 
- 			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+                //1@@1;2;@@2;4;4;@@http://www.chamilo.org
+            $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
+            $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
         }
 
         //Create 666 answer
@@ -373,18 +373,18 @@ 
 
         $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
 
-    	// saves the answers into the data base
+        // saves the answers into the data base
         $objAnswer -> save();
 
         // sets the total weighting of the question
         $this -> updateWeighting($questionWeighting);
         $this -> save();
-	}
+    }
 
-	function return_header($feedback_type = null, $counter = null, $score = null)
+    function return_header($feedback_type = null, $counter = null, $score = null)
     {
-	    $header = parent::return_header($feedback_type, $counter, $score);
-	    $header .= '<table class="'.$this->question_table_class .'">
+        $header = parent::return_header($feedback_type, $counter, $score);
+        $header .= '<table class="'.$this->question_table_class .'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
@@ -392,5 +392,5 @@ 
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

main/exercise/hotspot_savescore.inc.php

Indentation +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
     // user clicked ON a hotspot
     $hit = 1;
     $answerId = api_substr($_GET['answerId'],22,2);
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 //round-up the coordinates
 $coords = explode('/',$coordinates);