Inspection of "Added Google Maps Plugin with a map to show extra..." - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Pull Request — 1.11.x (#1541)

by José

created 2016-12-08 23:05 UTC

Status

Indentation +177 added lines, -177 removed lines patch added patch discarded remove patch

@@ -37,11 +37,11 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 						$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 @@  discard block
 block discarded – undo
 							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 @@  discard block
 block discarded – undo
 							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 @@  discard block
 block discarded – undo
 $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());

Please login to merge, or discard this patch.

main/document/edit_document.php 1 patch

Indentation +186 added lines, -186 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
         $_GET['id'],
         api_get_course_id(),
         true,
-		0
+        0
     );
 
     if (!empty($sessionId) && empty($document_data)) {
@@ -93,13 +93,13 @@  discard block
 block discarded – undo
         );
     }
 
-	$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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
 );
 
 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 @@  discard block
 block discarded – undo
         '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 @@  discard block
 block discarded – undo
 
 //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 @@  discard block
 block discarded – undo
 /*	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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
 							);
 						}*/
 
-						/*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 @@  discard block
 block discarded – undo
 							}
 						}*/
 
-						// "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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
 */
 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 @@  discard block
 block discarded – undo
     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 => ''));
 }

Please login to merge, or discard this patch.

main/webservices/user_import/import.lib.php 1 patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

@@ -3,121 +3,121 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
  * @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;
 }

Please login to merge, or discard this patch.

main/exercise/unique_answer_no_option.class.php 1 patch

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

@@ -14,20 +14,20 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * 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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 
         $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 @@  discard block
 block discarded – undo
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

Please login to merge, or discard this patch.

main/exercise/hotspot_savescore.inc.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -25,8 +25,8 @@
 block discarded – undo
     // 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);

Please login to merge, or discard this patch.

main/exercise/hotspot_updatescore.inc.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -20,16 +20,16 @@
 block discarded – undo
 $exerciseId = $objExercise->selectId();
 if ($_GET['answerId'] == "0") { // click is NOT on a hotspot
     $hit = 0;
-	$answerId = $hotspotId;
+    $answerId = $hotspotId;
 
-	// remove from session
-	unset($_SESSION['exerciseResult'][$questionId][$answerId]);
+    // remove from session
+    unset($_SESSION['exerciseResult'][$questionId][$answerId]);
 } else { // user clicked ON a hotspot
-	$hit = 1;
-	$answerId = $hotspotId;
+    $hit = 1;
+    $answerId = $hotspotId;
 
-	// Save into session
-	$_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
+    // Save into session
+    $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
 }
 
 //round-up the coordinates

Please login to merge, or discard this patch.

main/user/add_users_to_session.php 1 patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

@@ -49,29 +49,29 @@  discard block
 block discarded – undo
     $extra_field_list = UserManager::get_extra_fields();
     $new_field_list = array();
     if (is_array($extra_field_list)) {
-    	foreach ($extra_field_list as $extra_field) {
-    		//if is enabled to filter and is a "<select>" field type
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
+        foreach ($extra_field_list as $extra_field) {
+            //if is enabled to filter and is a "<select>" field type
+            if ($extra_field[8]==1 && $extra_field[2]==4 ) {
                 $new_field_list[] = array(
                     'name' => $extra_field[3],
                     'variable' => $extra_field[1],
                     'data' => $extra_field[9],
                 );
-    		}
-    	}
+            }
+        }
     }
 
     function search_users($needle, $type)
     {
-    	global $id_session;
+        global $id_session;
 
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 
-    	$xajax_response = new xajaxResponse();
-    	$return = '';
+        $xajax_response = new xajaxResponse();
+        $return = '';
 
-    	if (!empty($needle) && !empty($type)) {
+        if (!empty($needle) && !empty($type)) {
 
             //normal behaviour
             if ($type == 'any_session' && $needle == 'false')  {
@@ -79,32 +79,32 @@  discard block
 block discarded – undo
                 $needle = '';
             }
 
-    		// xajax send utf8 datas... datas in db can be non-utf8 datas
-    		$charset = api_get_system_encoding();
-    		$needle = Database::escape_string($needle);
-    		$needle = api_convert_encoding($needle, $charset, 'utf-8');
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = Database::escape_string($needle);
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
 
-    		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
-    		$cond_user_id = '';
+            $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+            $cond_user_id = '';
 
             //Only for single & multiple
             if (in_array($type, array('single','multiple'))) {
-        		if (!empty($id_session)) {
-        		    $id_session = intval($id_session);
-        			// check id_user from session_rel_user table
-        			$sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
+                if (!empty($id_session)) {
+                    $id_session = intval($id_session);
+                    // check id_user from session_rel_user table
+                    $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
         			        WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
-        			$res = Database::query($sql);
-        			$user_ids = array();
-        			if (Database::num_rows($res) > 0) {
-        				while ($row = Database::fetch_row($res)) {
-        					$user_ids[] = (int)$row[0];
-        				}
-        			}
-        			if (count($user_ids) > 0) {
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
-        			}
-        		}
+                    $res = Database::query($sql);
+                    $user_ids = array();
+                    if (Database::num_rows($res) > 0) {
+                        while ($row = Database::fetch_row($res)) {
+                            $user_ids[] = (int)$row[0];
+                        }
+                    }
+                    if (count($user_ids) > 0) {
+                        $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
+                    }
+                }
             }
 
             switch ($type) {
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
                                 user.status <> 6 '.$cond_user_id.
                             $order_clause;
                     break;
-    		}
-    		if (api_is_multiple_url_enabled()) {
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-    			$access_url_id = api_get_current_access_url_id();
-    			if ($access_url_id != -1) {
+            }
+            if (api_is_multiple_url_enabled()) {
+                $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                $access_url_id = api_get_current_access_url_id();
+                if ($access_url_id != -1) {
                     switch ($type) {
                         case 'single':
                             $sql = 'SELECT user.user_id, username, lastname, firstname
@@ -178,36 +178,36 @@  discard block
 block discarded – undo
                                         user.status<>6 '.$cond_user_id.
                             $order_clause;
                             break;
-    				}
-    			}
-    		}
+                    }
+                }
+            }
 
-    		$rs = Database::query($sql);
+            $rs = Database::query($sql);
             $i=0;
-    		if ($type == 'single') {
-    			while ($user = Database::fetch_array($rs)) {
-    	            $i++;
-    	            if ($i<=10) {
-                		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
-    					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
-    	            } else {
-    	            	$return .= '...<br />';
-    	            }
-    			}
-
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
-    		} else {
-    			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
-    			while ($user = Database :: fetch_array($rs)) {
-    				$person_name = api_get_person_name($user['firstname'], $user['lastname']);
-    	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
-    			}
-    			$return .= '</select>';
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
-    		}
-    	}
+            if ($type == 'single') {
+                while ($user = Database::fetch_array($rs)) {
+                    $i++;
+                    if ($i<=10) {
+                        $person_name = api_get_person_name($user['firstname'], $user['lastname']);
+                        $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
+                    } else {
+                        $return .= '...<br />';
+                    }
+                }
+
+                $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+            } else {
+                $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
+                while ($user = Database :: fetch_array($rs)) {
+                    $person_name = api_get_person_name($user['firstname'], $user['lastname']);
+                    $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
+                }
+                $return .= '</select>';
+                $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+            }
+        }
 
-    	return $xajax_response;
+        return $xajax_response;
     }
 
     $xajax -> processRequests();
@@ -347,8 +347,8 @@  discard block
 block discarded – undo
 
         if ($use_extra_fields) {
             $final_result = array();
-           	if (count($extra_field_result)>1) {
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
+                if (count($extra_field_result)>1) {
+            for($i=0;$i<count($extra_field_result)-1;$i++) {
                     if (is_array($extra_field_result[$i+1])) {
                         $final_result = array_intersect(
                             $extra_field_result[$i],
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
                     'un' => $user['username']
                 );
                 unset($users[$uid]);
-    	}
+        }
         }
         unset($users); //clean to free memory
 
@@ -471,13 +471,13 @@  discard block
 block discarded – undo
     }
 
     if ($add_type === 'multiple') {
-    	$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-    	$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
+        $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
+        $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
     } else {
-    	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
-    	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+        $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
+        $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
     }
-    	$link_add_group = '<a href="usergroups.php">'.
+        $link_add_group = '<a href="usergroups.php">'.
             Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
     ?>
     <div class="actions">
@@ -487,30 +487,30 @@  discard block
 block discarded – undo
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
     <?php
     if ($add_type === 'multiple') {
-    	if (is_array($extra_field_list)) {
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
-    			echo '<h3>'.get_lang('FilterUsers').'</h3>';
-    			foreach ($new_field_list as $new_field) {
-    				echo $new_field['name'];
-    				$varname = 'field_'.$new_field['variable'];
-    				echo '&nbsp;<select name="'.$varname.'">';
-    				echo '<option value="0">--'.get_lang('Select').'--</option>';
-    				foreach	($new_field['data'] as $option) {
-    					$checked='';
-    					if (isset($_POST[$varname])) {
-    						if ($_POST[$varname] == $option[1]) {
-    							$checked = 'selected="true"';
-    						}
-    					}
-    					echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
-    				}
-    				echo '</select>';
-    				echo '&nbsp;&nbsp;';
-    			}
-    			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-    			echo '<br /><br />';
-    		}
-    	}
+        if (is_array($extra_field_list)) {
+            if (is_array($new_field_list) && count($new_field_list)>0 ) {
+                echo '<h3>'.get_lang('FilterUsers').'</h3>';
+                foreach ($new_field_list as $new_field) {
+                    echo $new_field['name'];
+                    $varname = 'field_'.$new_field['variable'];
+                    echo '&nbsp;<select name="'.$varname.'">';
+                    echo '<option value="0">--'.get_lang('Select').'--</option>';
+                    foreach	($new_field['data'] as $option) {
+                        $checked='';
+                        if (isset($_POST[$varname])) {
+                            if ($_POST[$varname] == $option[1]) {
+                                $checked = 'selected="true"';
+                            }
+                        }
+                        echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
+                    }
+                    echo '</select>';
+                    echo '&nbsp;&nbsp;';
+                }
+                echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+                echo '<br /><br />';
+            }
+        }
     }
     ?>
     <input type="hidden" name="form_sent" value="1" />
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
                 <div id="content_source">
                 <?php
                 if (!($add_type == 'multiple')) {
-                  ?>
+                    ?>
                   <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
                   <div id="ajax_list_users_single"></div>
                   <?php
@@ -542,12 +542,12 @@  discard block
 block discarded – undo
                 <div id="ajax_list_users_multiple">
                 <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5">
                   <?php
-                  foreach ($nosessionUsersList as $uid => $enreg) {
-                  ?>
+                    foreach ($nosessionUsersList as $uid => $enreg) {
+                    ?>
                       <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
                   <?php
-                  }
-                  ?>
+                    }
+                    ?>
                 </select>
                 </div>
                     <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
                 <?php
                 }
                 unset($nosessionUsersList);
-               ?>
+                ?>
             </div>
         </div>
 
@@ -582,13 +582,13 @@  discard block
 block discarded – undo
             <br />
             <br />
     		<?php
-    		if (isset($_GET['add'])) {
-    			echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+            if (isset($_GET['add'])) {
+                echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
             } else {
                 //@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
-    			echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
+                echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
             }
-    		?>
+            ?>
         </div>
         <div class="span5">
             <div class="multiple_select_header">

Please login to merge, or discard this patch.

src/Chamilo/CourseBundle/Component/CourseCopy/CourseSelectForm.php 1 patch

Indentation +243 added lines, -243 removed lines patch added patch discarded remove patch

@@ -17,13 +17,13 @@  discard block
 block discarded – undo
  */
 class CourseSelectForm
 {
-	/**
-	 * Display the form
+    /**
+     * Display the form
      * @param array $course
-	 * @param array $hidden_fields Hidden fields to add to the form.
-	 * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
-	 */
-	public static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
+     * @param array $hidden_fields Hidden fields to add to the form.
+     * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
+     */
+    public static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
     {
         global $charset;
         $resource_titles[RESOURCE_GRADEBOOK] = get_lang('Gradebook');
@@ -138,48 +138,48 @@  discard block
 block discarded – undo
             }
 		</script>
 		<?php
-		// get destination course title
-		if (!empty($hidden_fields['destination_course'])) {
+        // get destination course title
+        if (!empty($hidden_fields['destination_course'])) {
             $sessionTitle = !empty($hidden_fields['destination_session']) ? ' (' . api_get_session_name($hidden_fields['destination_session']) . ')' : null;
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
-			echo '<h3>';
-			echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle;
-			echo '</h3>';
-		}
+            echo '<h3>';
+            echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle;
+            echo '</h3>';
+        }
         echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
-		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
+        echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
         $icon = Display::returnIconPath('myprogress_bar.gif');
         echo '<div class="tool-backups-options">';
-		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.$icon.',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
-		echo '<input type="hidden" name="action" value="course_select_form"/>';
+        echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.$icon.',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
+        echo '<input type="hidden" name="action" value="course_select_form"/>';
 
-		if (!empty($hidden_fields['destination_course']) &&
+        if (!empty($hidden_fields['destination_course']) &&
             !empty($hidden_fields['origin_course']) &&
             !empty($hidden_fields['destination_session']) &&
             !empty($hidden_fields['origin_session'])
         ) {
-			echo '<input type="hidden" name="destination_course" 	value="'.$hidden_fields['destination_course'].'"/>';
-			echo '<input type="hidden" name="origin_course" 		value="'.$hidden_fields['origin_course'].'"/>';
-			echo '<input type="hidden" name="destination_session" 	value="'.$hidden_fields['destination_session'].'"/>';
-			echo '<input type="hidden" name="origin_session" 		value="'.$hidden_fields['origin_session'].'"/>';
-		}
+            echo '<input type="hidden" name="destination_course" 	value="'.$hidden_fields['destination_course'].'"/>';
+            echo '<input type="hidden" name="origin_course" 		value="'.$hidden_fields['origin_course'].'"/>';
+            echo '<input type="hidden" name="destination_session" 	value="'.$hidden_fields['destination_session'].'"/>';
+            echo '<input type="hidden" name="origin_session" 		value="'.$hidden_fields['origin_session'].'"/>';
+        }
 
-		$element_count = 0;
+        $element_count = 0;
         $forum_categories = array();
         $forums = array();
         $forum_topics = array();
 
         echo '<p>';
-		echo get_lang('SelectResources');
-		echo '</p>';
+        echo get_lang('SelectResources');
+        echo '</p>';
 
         Display::display_normal_message(get_lang('DontForgetToSelectTheMediaFilesIfYourResourceNeedIt'));
 
         foreach ($course->resources as $type => $resources) {
             if (count($resources) > 0) {
-				switch ($type) {
-					//Resources to avoid
-					case RESOURCE_FORUMCATEGORY:
+                switch ($type) {
+                    //Resources to avoid
+                    case RESOURCE_FORUMCATEGORY:
                         foreach ($resources as $id => $resource) {
                             $forum_categories[$id] = $resource;
                         }
@@ -206,30 +206,30 @@  discard block
 block discarded – undo
                         break;
                     default:
                         echo '<div class="item-backup" onclick="javascript:exp('."'$type'".');">';
-						echo '<em id="img_'.$type.'" class="fa fa-minus-square-o fa-lg" ></em>';
-						echo '<span class="title">'.$resource_titles[$type].'</span></div>';
-						echo '<div class="item-content" id="div_'.$type.'">';
-						if ($type == RESOURCE_LEARNPATH) {
-    						Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
-    						Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
-						}
-						if ($type == RESOURCE_DOCUMENT) {
+                        echo '<em id="img_'.$type.'" class="fa fa-minus-square-o fa-lg" ></em>';
+                        echo '<span class="title">'.$resource_titles[$type].'</span></div>';
+                        echo '<div class="item-content" id="div_'.$type.'">';
+                        if ($type == RESOURCE_LEARNPATH) {
+                            Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
+                            Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
+                        }
+                        if ($type == RESOURCE_DOCUMENT) {
                             if (api_get_setting('show_glossary_in_documents') != 'none') {
                                 Display::display_warning_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
                             }
-						}
+                        }
 
-						echo '<div class="well">';
+                        echo '<div class="well">';
 
                         echo '<div class="btn-group">';
-						echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
+                        echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
                         echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>";
-						echo '</div>';
+                        echo '</div>';
                         echo '<ul class="list-backups-options">';
-						foreach ($resources as $id => $resource) {
+                        foreach ($resources as $id => $resource) {
                             if ($resource) {
                                 echo '<li>';
-								// Event obj in 1.9.x in 1.10.x the class is CalendarEvent
+                                // Event obj in 1.9.x in 1.10.x the class is CalendarEvent
                                 Resource::setClassType($resource);
                                 echo '<label class="checkbox">';
                                 echo '<input type="checkbox" name="resource['.$type.']['.$id.']"  id="resource['.$type.']['.$id.']" />';
@@ -237,15 +237,15 @@  discard block
 block discarded – undo
                                 echo '</label>';
                                 echo '</li>';
                             }
-						}
+                        }
                         echo '</ul>';
-						echo '</div>';
-						echo '</div>';
-						echo '<script language="javascript">exp('."'$type'".')</script>';
-						$element_count++;
+                        echo '</div>';
+                        echo '</div>';
+                        echo '<script language="javascript">exp('."'$type'".')</script>';
+                        $element_count++;
                 }
-			}
-		}
+            }
+        }
 
         //Fixes forum order
         if (!empty($forum_categories)) {
@@ -301,66 +301,66 @@  discard block
 block discarded – undo
             echo '<script language="javascript">exp('."'$type'".')</script>';
         }
 
-		if ($avoid_serialize) {
-			/*Documents are avoided due the huge amount of memory that the serialize php function "eats"
+        if ($avoid_serialize) {
+            /*Documents are avoided due the huge amount of memory that the serialize php function "eats"
 			(when there are directories with hundred/thousand of files) */
-			// this is a known issue of serialize
-			$course->resources['document']= null;
-		}
+            // this is a known issue of serialize
+            $course->resources['document']= null;
+        }
 
-		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
+        echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
 
-		if (is_array($hidden_fields)) {
-			foreach ($hidden_fields as $key => $value) {
-				echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
-			}
-		}
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $key => $value) {
+                echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
+            }
+        }
 
         $recycleOption = isset($_POST['recycle_option']) ? true : false;
 
-		if (empty($element_count)) {
-		    Display::display_warning_message(get_lang('NoDataAvailable'));
-		} else {
-    		if (!empty($hidden_fields['destination_session'])) {
-    			echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'.
+        if (empty($element_count)) {
+            Display::display_warning_message(get_lang('NoDataAvailable'));
+        } else {
+            if (!empty($hidden_fields['destination_session'])) {
+                echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'.
                     get_lang('Ok').'</button>';
-    		} else {
+            } else {
                 if ($recycleOption) {
                     echo '<br /><button class="save" type="submit">'.
                         get_lang('Ok').'</button>';
                 } else {
-    			    echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
+                    echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
                     get_lang('Ok').'</button>';
                 }
-    		}
-		}
+            }
+        }
 
-		CourseSelectForm::display_hidden_quiz_questions($course);
-		CourseSelectForm::display_hidden_scorm_directories($course);
-		echo '</form>';
+        CourseSelectForm::display_hidden_quiz_questions($course);
+        CourseSelectForm::display_hidden_scorm_directories($course);
+        echo '</form>';
         echo '</div>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 
     /**
      * @param $course
      */
     public static function display_hidden_quiz_questions($course)
     {
-		if(is_array($course->resources)){
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					switch ($type) {
-						case RESOURCE_QUIZQUESTION:
-							foreach ($resources as $id => $resource) {
-								echo '<input type="hidden" name="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" id="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" value="On" />';
-							}
-							break;
-					}
-				}
-			}
-		}
-	}
+        if(is_array($course->resources)){
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    switch ($type) {
+                        case RESOURCE_QUIZQUESTION:
+                            foreach ($resources as $id => $resource) {
+                                echo '<input type="hidden" name="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" id="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" value="On" />';
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * @param $course
@@ -368,30 +368,30 @@  discard block
 block discarded – undo
     public static function display_hidden_scorm_directories($course)
     {
         if (is_array($course->resources)){
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					switch($type) {
-						case RESOURCE_SCORM:
-							foreach ($resources as $id => $resource) {
-								echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
-							}
-							break;
-					}
-				}
-			}
-		}
-	}
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    switch($type) {
+                        case RESOURCE_SCORM:
+                            foreach ($resources as $id => $resource) {
+                                echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Get the posted course
-	 * @param string $from who calls the function?
+    /**
+     * Get the posted course
+     * @param string $from who calls the function?
      * It can be copy_course, create_backup, import_backup or recycle_course
      * @param int $session_id
      * @param string $course_code
-	 * @return course The course-object with all resources selected by the user
-	 * in the form given by display_form(...)
-	 */
-	public static function get_posted_course($from = '', $session_id = 0, $course_code = '')
+     * @return course The course-object with all resources selected by the user
+     * in the form given by display_form(...)
+     */
+    public static function get_posted_course($from = '', $session_id = 0, $course_code = '')
     {
         $course = null;
 
@@ -401,30 +401,30 @@  discard block
 block discarded – undo
             return false;
         }
 
-		// Create the resource DOCUMENT objects
-		// Loading the results from the checkboxes of ethe javascript
-		$resource = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
+        // Create the resource DOCUMENT objects
+        // Loading the results from the checkboxes of ethe javascript
+        $resource = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
 
-		$course_info = api_get_course_info($course_code);
-		$table_doc = Database::get_course_table(TABLE_DOCUMENT);
-		$table_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
-		$course_id = $course_info['real_id'];
+        $course_info = api_get_course_info($course_code);
+        $table_doc = Database::get_course_table(TABLE_DOCUMENT);
+        $table_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
+        $course_id = $course_info['real_id'];
 
-		/* Searching the documents resource that have been set to null because
+        /* Searching the documents resource that have been set to null because
         $avoid_serialize is true in the display_form() function*/
-		if ($from === 'copy_course') {
-			if (is_array($resource)) {
-				$resource = array_keys($resource);
+        if ($from === 'copy_course') {
+            if (is_array($resource)) {
+                $resource = array_keys($resource);
 
-				foreach	($resource as $resource_item) {
+                foreach	($resource as $resource_item) {
 
-					$condition_session = '';
-					if (!empty($session_id)) {
-						$session_id = intval($session_id);
-						$condition_session = ' AND d.session_id ='.$session_id;
-					}
+                    $condition_session = '';
+                    if (!empty($session_id)) {
+                        $session_id = intval($session_id);
+                        $condition_session = ' AND d.session_id ='.$session_id;
+                    }
 
-					$sql = 'SELECT d.id, d.path, d.comment, d.title, d.filetype, d.size
+                    $sql = 'SELECT d.id, d.path, d.comment, d.title, d.filetype, d.size
 							FROM '.$table_doc.' d, '.$table_prop.' p
 							WHERE
 							    d.c_id = '.$course_id.' AND
@@ -433,8 +433,8 @@  discard block
 block discarded – undo
                                 p.ref = d.id AND p.visibility != 2 AND
                                 d.id = '.$resource_item.$condition_session.'
 							ORDER BY path';
-					$db_result = Database::query($sql);
-					while ($obj = Database::fetch_object($db_result)) {
+                    $db_result = Database::query($sql);
+                    while ($obj = Database::fetch_object($db_result)) {
                         $doc = new Document(
                             $obj->id,
                             $obj->path,
@@ -458,25 +458,25 @@  discard block
 block discarded – undo
                             }
                             $course->resources[RESOURCE_DOCUMENT][$resource_item]->item_properties = $all_properties;
                         }
-					}
-				}
-			}
-		}
+                    }
+                }
+            }
+        }
 
-		if (is_array($course->resources)) {
-			foreach ($course->resources as $type => $resources) {
+        if (is_array($course->resources)) {
+            foreach ($course->resources as $type => $resources) {
 
-				switch ($type) {
-					case RESOURCE_SURVEYQUESTION:
-						foreach($resources as $id => $obj) {
-						    if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
+                switch ($type) {
+                    case RESOURCE_SURVEYQUESTION:
+                        foreach($resources as $id => $obj) {
+                            if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
                                 is_array($_POST['resource'][RESOURCE_SURVEY]) &&
                                 !in_array($obj->survey_id, array_keys($_POST['resource'][RESOURCE_SURVEY]))
                             ) {
-								unset($course->resources[$type][$id]);
-							}
-						}
-						break;
+                                unset($course->resources[$type][$id]);
+                            }
+                        }
+                        break;
                     case RESOURCE_FORUMTOPIC:
                     case RESOURCE_FORUMPOST:
                        //Add post from topic
@@ -528,63 +528,63 @@  discard block
 block discarded – undo
                                 }
                             }
                         }
-					case RESOURCE_LINKCATEGORY:
-					case RESOURCE_FORUMCATEGORY:
-					case RESOURCE_QUIZQUESTION:
-					case RESOURCE_DOCUMENT:
-						// Mark folders to import which are not selected by the user to import,
-						// but in which a document was selected.
-						$documents = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
-						if (!empty($resources) && is_array($resources))
-							foreach ($resources as $id => $obj) {
-								if (isset($obj->file_type) && $obj->file_type == 'folder' &&
+                    case RESOURCE_LINKCATEGORY:
+                    case RESOURCE_FORUMCATEGORY:
+                    case RESOURCE_QUIZQUESTION:
+                    case RESOURCE_DOCUMENT:
+                        // Mark folders to import which are not selected by the user to import,
+                        // but in which a document was selected.
+                        $documents = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
+                        if (!empty($resources) && is_array($resources))
+                            foreach ($resources as $id => $obj) {
+                                if (isset($obj->file_type) && $obj->file_type == 'folder' &&
                                     !isset($_POST['resource'][RESOURCE_DOCUMENT][$id]) &&
                                     is_array($documents)
                                 ) {
-									foreach ($documents as $id_to_check => $post_value) {
-										$obj_to_check = $resources[$id_to_check];
-										$shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
-										if ($id_to_check != $id && $obj->path == $shared_path_part) {
-											$_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;
-											break;
-										}
-									}
-								}
-							}
-					default :
-						if (!empty($resources) && is_array($resources)) {
-							foreach ($resources as $id => $obj) {
-								$resource_is_used_elsewhere = $course->is_linked_resource($obj);
-								// check if document is in a quiz (audio/video)
-								if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
-									foreach($course->resources[RESOURCE_QUIZ] as $quiz) {
+                                    foreach ($documents as $id_to_check => $post_value) {
+                                        $obj_to_check = $resources[$id_to_check];
+                                        $shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
+                                        if ($id_to_check != $id && $obj->path == $shared_path_part) {
+                                            $_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                    default :
+                        if (!empty($resources) && is_array($resources)) {
+                            foreach ($resources as $id => $obj) {
+                                $resource_is_used_elsewhere = $course->is_linked_resource($obj);
+                                // check if document is in a quiz (audio/video)
+                                if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
+                                    foreach($course->resources[RESOURCE_QUIZ] as $quiz) {
                                         $quiz = $quiz->obj;
-										if (isset($quiz->media) && $quiz->media == $id) {
-											$resource_is_used_elsewhere = true;
-										}
-									}
-								}
-								if (!isset($_POST['resource'][$type][$id]) && !$resource_is_used_elsewhere) {
-									unset($course->resources[$type][$id]);
-								}
-							}
-						}
-				}
-			}
-		}
+                                        if (isset($quiz->media) && $quiz->media == $id) {
+                                            $resource_is_used_elsewhere = true;
+                                        }
+                                    }
+                                }
+                                if (!isset($_POST['resource'][$type][$id]) && !$resource_is_used_elsewhere) {
+                                    unset($course->resources[$type][$id]);
+                                }
+                            }
+                        }
+                }
+            }
+        }
 
-		return $course;
-	}
+        return $course;
+    }
 
-	/**
-	 * Display the form session export
+    /**
+     * Display the form session export
      * @param array $list_course
-	 * @param array $hidden_fields Hidden fields to add to the form.
+     * @param array $hidden_fields Hidden fields to add to the form.
      * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
-	 */
-	 public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
-     {
-         ?>
+     */
+        public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
+        {
+            ?>
 		<script>
 			function exp(item) {
 				el = document.getElementById('div_'+item);
@@ -626,68 +626,68 @@  discard block
 block discarded – undo
 		</script>
 		<?php
 
-		//get destination course title
-		if(!empty($hidden_fields['destination_course'])) {
-             if (!empty($hidden_fields['destination_session'])) {
-                 $sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')';
-             } else {
-                 $sessionTitle = null;
-             }
+        //get destination course title
+        if(!empty($hidden_fields['destination_course'])) {
+                if (!empty($hidden_fields['destination_session'])) {
+                    $sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')';
+                } else {
+                    $sessionTitle = null;
+                }
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
-			echo '<h3>';
-				echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle;
-			echo '</h3>';
-		}
+            echo '<h3>';
+                echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle;
+            echo '</h3>';
+        }
 
-		echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
-		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
+        echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
+        echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
         $icon = Display::returnIconPath('progress_bar.gif');
         echo '<div class="tool-backups-options">';
-		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.$icon.'\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
-		echo '<input type="hidden" name="action" value="course_select_form"/>';
-		foreach ($list_course as $course) {
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
+        echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.$icon.'\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
+        echo '<input type="hidden" name="action" value="course_select_form"/>';
+        foreach ($list_course as $course) {
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
                     echo '<div class="item-backup" onclick="javascript:exp('."'$course->code'".');">';
-					echo '<em id="img_'.$course->code.'" class="fa fa-minus-square-o fa-lg"></em>';
-					echo '<span class="title"> '.$course->code.'</span></div>';
-					echo '<div class="item-content" id="div_'.$course->code.'">';
-					echo '<blockquote>';
+                    echo '<em id="img_'.$course->code.'" class="fa fa-minus-square-o fa-lg"></em>';
+                    echo '<span class="title"> '.$course->code.'</span></div>';
+                    echo '<div class="item-content" id="div_'.$course->code.'">';
+                    echo '<blockquote>';
 
                     echo '<div class="btn-group">';
-					echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',true);\" >".get_lang('All')."</a>";
+                    echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',true);\" >".get_lang('All')."</a>";
                     echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',false);\" >".get_lang('None')."</a>";
-					echo '</div>';
+                    echo '</div>';
 
-					foreach ($resources as $id => $resource) {
-						echo '<label class="checkbox" for="resource['.$course->code.']['.$id.']">';
+                    foreach ($resources as $id => $resource) {
+                        echo '<label class="checkbox" for="resource['.$course->code.']['.$id.']">';
                         echo '<input type="checkbox" name="resource['.$course->code.']['.$id.']" id="resource['.$course->code.']['.$id.']"/>';
-						$resource->show();
-						echo '</label>';
-					}
-					echo '</blockquote>';
-					echo '</div>';
-					echo '<script type="text/javascript">exp('."'$course->code'".')</script>';
-				}
-			}
-		}
-		if ($avoid_serialize) {
-			//Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
-			// this is a known issue of serialize
-			$course->resources['document']= null;
-		}
-		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
-		if (is_array($hidden_fields)) {
-			foreach ($hidden_fields as $key => $value) {
-				echo "\n";
-				echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
-			}
-		}
-		echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.get_lang('Ok').'</button>';
-		CourseSelectForm :: display_hidden_quiz_questions($course);
-		CourseSelectForm :: display_hidden_scorm_directories($course);
-		echo '</form>';
+                        $resource->show();
+                        echo '</label>';
+                    }
+                    echo '</blockquote>';
+                    echo '</div>';
+                    echo '<script type="text/javascript">exp('."'$course->code'".')</script>';
+                }
+            }
+        }
+        if ($avoid_serialize) {
+            //Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
+            // this is a known issue of serialize
+            $course->resources['document']= null;
+        }
+        echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $key => $value) {
+                echo "\n";
+                echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
+            }
+        }
+        echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.get_lang('Ok').'</button>';
+        CourseSelectForm :: display_hidden_quiz_questions($course);
+        CourseSelectForm :: display_hidden_scorm_directories($course);
+        echo '</form>';
         echo '</div>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 }

Please login to merge, or discard this patch.

main/upload/upload.document.php 1 patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -47,9 +47,9 @@  discard block
 block discarded – undo
  */
 //user has submitted a file
 if (isset($_FILES['user_upload'])) {
-	$upload_ok = process_uploaded_file($_FILES['user_upload']);
-	if ($upload_ok) {
-		//file got on the server without problems, now process it
+    $upload_ok = process_uploaded_file($_FILES['user_upload']);
+    if ($upload_ok) {
+        //file got on the server without problems, now process it
         $new_path = handle_uploaded_document(
             $_course,
             $_FILES['user_upload'],
@@ -61,21 +61,21 @@  discard block
 block discarded – undo
             $_POST['unzip'],
             $_POST['if_exists']
         );
-    	$new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
-    	$new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
+        $new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
+        $new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
 
-    	if ($new_path && ($new_comment || $new_title))
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
-        	$table_document = Database::get_course_table(TABLE_DOCUMENT);
-        	$ct = '';
+        if ($new_path && ($new_comment || $new_title))
+        if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
+            $table_document = Database::get_course_table(TABLE_DOCUMENT);
+            $ct = '';
             if ($new_comment) {
                 $ct .= ", comment='$new_comment'";
             }
             if ($new_title) {
                 $ct .= ", title='$new_title'";
             }
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
-    	}
+            Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        }
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
         if ($missing_files) {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
 //they want to create a directory
 if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
     $added_slash = $path == '/' ? '' : '/';
-	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
+    $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
         api_get_user_id(),
@@ -153,15 +153,15 @@  discard block
 block discarded – undo
 }
 
 if (isset($_GET['createdir'])) {
-	//create the form that asks for the directory name
-	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
-	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
-	$new_folder_text .= '<input type="text" name="dirname"/>';
-	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
-	$new_folder_text .= '</form>';
-	//show the form
-	Display::display_normal_message($new_folder_text);
+    //create the form that asks for the directory name
+    $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
+    $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
+    $new_folder_text .= get_lang('NewDir') .' ';
+    $new_folder_text .= '<input type="text" name="dirname"/>';
+    $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
+    $new_folder_text .= '</form>';
+    //show the form
+    Display::display_normal_message($new_folder_text);
 } else {	//give them a link to create a directory
 ?>
 	<p>

Please login to merge, or discard this patch.

		@@ -37,11 +37,11 @@ discard block
		block discarded – undo
37	37	set_time_limit(0);
38	38
39	39	if (isset($_POST['formSent'])) {
40		- $formSent = $_POST['formSent'];
41		- $file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
42		- $session_id = $_POST['session_id'];
43		- if (empty($session_id)) {
44		- $sql = "SELECT
	40	+ $formSent = $_POST['formSent'];
	41	+ $file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
	42	+ $session_id = $_POST['session_id'];
	43	+ if (empty($session_id)) {
	44	+ $sql = "SELECT
45	45	s.id,
46	46	name,
47	47	id_coach,
		@@ -55,84 +55,84 @@ discard block
		block discarded – undo
55	55	ON $tbl_user.user_id = s.id_coach
56	56	ORDER BY id";
57	57
58		- if (api_is_multiple_url_enabled()) {
59		- $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
60		- $access_url_id = api_get_current_access_url_id();
61		- if ($access_url_id != -1){
62		- $sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
	58	+ if (api_is_multiple_url_enabled()) {
	59	+ $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
	60	+ $access_url_id = api_get_current_access_url_id();
	61	+ if ($access_url_id != -1){
	62	+ $sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
63	63	FROM $tbl_session s
64	64	INNER JOIN $tbl_session_rel_access_url as session_rel_url
65	65	ON (s.id= session_rel_url.session_id)
66	66	INNER JOIN $tbl_user u ON (u.user_id = s.id_coach)
67	67	WHERE access_url_id = $access_url_id
68	68	ORDER BY id";
69		- }
70		- }
	69	+ }
	70	+ }
71	71
72		- $result = Database::query($sql);
73		- } else {
74		- $sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
	72	+ $result = Database::query($sql);
	73	+ } else {
	74	+ $sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
75	75	FROM $tbl_session s
76	76	INNER JOIN $tbl_user
77	77	ON $tbl_user.user_id = s.id_coach
78	78	WHERE id='$session_id'";
79		- $result = Database::query($sql);
80		- }
	79	+ $result = Database::query($sql);
	80	+ }
81	81
82		- if (Database::num_rows($result)) {
	82	+ if (Database::num_rows($result)) {
83	83
84	84
85	85
86		- $sessionListToExport = [];
	86	+ $sessionListToExport = [];
87	87
88		- if (in_array($file_type, ['csv', 'xls'])) {
	88	+ if (in_array($file_type, ['csv', 'xls'])) {
89	89
90		- $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
	90	+ $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
91	91
92		- $cvs = true;
93		- $sessionListToExport[] = [
94		- 'SessionName',
95		- 'Coach',
96		- 'DateStart',
97		- 'DateEnd',
98		- 'Visibility',
99		- 'SessionCategory',
100		- 'Users',
101		- 'Courses'
102		- ];
103		- } else {
104		- if (!file_exists($archivePath)) {
105		- mkdir($archivePath, api_get_permissions_for_new_directories(), true);
106		- }
	92	+ $cvs = true;
	93	+ $sessionListToExport[] = [
	94	+ 'SessionName',
	95	+ 'Coach',
	96	+ 'DateStart',
	97	+ 'DateEnd',
	98	+ 'Visibility',
	99	+ 'SessionCategory',
	100	+ 'Users',
	101	+ 'Courses'
	102	+ ];
	103	+ } else {
	104	+ if (!file_exists($archivePath)) {
	105	+ mkdir($archivePath, api_get_permissions_for_new_directories(), true);
	106	+ }
107	107
108		- if (!file_exists($archivePath.'index.html')) {
109		- $fp = fopen($archivePath.'index.html', 'w');
110		- fputs($fp, '<html><head></head><body></body></html>');
111		- fclose($fp);
112		- }
	108	+ if (!file_exists($archivePath.'index.html')) {
	109	+ $fp = fopen($archivePath.'index.html', 'w');
	110	+ fputs($fp, '<html><head></head><body></body></html>');
	111	+ fclose($fp);
	112	+ }
113	113
114		- $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
115		- while (file_exists($archivePath.$archiveFile)) {
116		- $archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
117		- }
	114	+ $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type;
	115	+ while (file_exists($archivePath.$archiveFile)) {
	116	+ $archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type;
	117	+ }
118	118
119		- $cvs = false;
120		- $fp = fopen($archivePath.$archiveFile, 'w');
121		- fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
122		- }
	119	+ $cvs = false;
	120	+ $fp = fopen($archivePath.$archiveFile, 'w');
	121	+ fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n");
	122	+ }
123	123
124	124
125		- while ($row = Database::fetch_array($result)) {
126		- $row['name'] = str_replace(';',',',$row['name']);
127		- $row['username'] = str_replace(';',',',$row['username']);
128		- $row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
129		- $row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
130		- $row['visibility'] = str_replace(';',',',$row['visibility']);
131		- $row['session_category'] = str_replace(';',',',$row['session_category_id']);
	125	+ while ($row = Database::fetch_array($result)) {
	126	+ $row['name'] = str_replace(';',',',$row['name']);
	127	+ $row['username'] = str_replace(';',',',$row['username']);
	128	+ $row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
	129	+ $row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
	130	+ $row['visibility'] = str_replace(';',',',$row['visibility']);
	131	+ $row['session_category'] = str_replace(';',',',$row['session_category_id']);
132	132
133	133
134		- // users
135		- $sql = "SELECT DISTINCT $tbl_user.username
	134	+ // users
	135	+ $sql = "SELECT DISTINCT $tbl_user.username
136	136	FROM $tbl_user
137	137	INNER JOIN $tbl_session_user
138	138	ON
		@@ -140,33 +140,33 @@ discard block
		block discarded – undo
140	140	$tbl_session_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
141	141	$tbl_session_user.session_id = '".$row['id']."'";
142	142
143		- $rsUsers = Database::query($sql);
144		- $users = '';
145		- while ($rowUsers = Database::fetch_array($rsUsers)){
146		- if($cvs){
147		- $users .= str_replace(';',',',$rowUsers['username']).'\|';
148		- } else {
149		- $users .= "\t\t<User>$rowUsers[username]</User>\n";
150		- }
151		- }
152		-
153		- if (!empty($users) && $cvs) {
154		- $users = api_substr($users, 0, api_strlen($users) - 1);
155		- }
156		-
157		- // Courses
158		- $sql = "SELECT DISTINCT c.code, sc.id, c_id
	143	+ $rsUsers = Database::query($sql);
	144	+ $users = '';
	145	+ while ($rowUsers = Database::fetch_array($rsUsers)){
	146	+ if($cvs){
	147	+ $users .= str_replace(';',',',$rowUsers['username']).'\|';
	148	+ } else {
	149	+ $users .= "\t\t<User>$rowUsers[username]</User>\n";
	150	+ }
	151	+ }
	152	+
	153	+ if (!empty($users) && $cvs) {
	154	+ $users = api_substr($users, 0, api_strlen($users) - 1);
	155	+ }
	156	+
	157	+ // Courses
	158	+ $sql = "SELECT DISTINCT c.code, sc.id, c_id
159	159	FROM $tbl_course c
160	160	INNER JOIN $tbl_session_course_user sc
161	161	ON c.id = sc.c_id
162	162	AND sc.session_id = '".$row['id']."'";
163	163
164		- $rsCourses = Database::query($sql);
	164	+ $rsCourses = Database::query($sql);
165	165
166		- $courses = '';
167		- while ($rowCourses = Database::fetch_array($rsCourses)) {
168		- // get coachs from a course
169		- $sql = "SELECT u.username
	166	+ $courses = '';
	167	+ while ($rowCourses = Database::fetch_array($rsCourses)) {
	168	+ // get coachs from a course
	169	+ $sql = "SELECT u.username
170	170	FROM $tbl_session_course_user scu
171	171	INNER JOIN $tbl_user u
172	172	ON u.user_id = scu.user_id
		@@ -175,25 +175,25 @@ discard block
		block discarded – undo
175	175	scu.session_id = '".$row['id']."' AND
176	176	scu.status = 2 ";
177	177
178		- $rs_coachs = Database::query($sql);
179		- $coachs = array();
180		- while ($row_coachs = Database::fetch_array($rs_coachs)) {
181		- $coachs[] = $row_coachs['username'];
182		- }
183		-
184		- $coachs = implode(",", $coachs);
185		-
186		- if ($cvs) {
187		- $courses .= str_replace(';',',',$rowCourses['code']);
188		- $courses .= '['.str_replace(';',',',$coachs).'][';
189		- } else {
190		- $courses .= "\t\t<Course>\n";
191		- $courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
192		- $courses .= "\t\t\t<Coach>$coachs</Coach>\n";
193		- }
194		-
195		- // rel user courses
196		- $sql = "SELECT DISTINCT u.username
	178	+ $rs_coachs = Database::query($sql);
	179	+ $coachs = array();
	180	+ while ($row_coachs = Database::fetch_array($rs_coachs)) {
	181	+ $coachs[] = $row_coachs['username'];
	182	+ }
	183	+
	184	+ $coachs = implode(",", $coachs);
	185	+
	186	+ if ($cvs) {
	187	+ $courses .= str_replace(';',',',$rowCourses['code']);
	188	+ $courses .= '['.str_replace(';',',',$coachs).'][';
	189	+ } else {
	190	+ $courses .= "\t\t<Course>\n";
	191	+ $courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
	192	+ $courses .= "\t\t\t<Coach>$coachs</Coach>\n";
	193	+ }
	194	+
	195	+ // rel user courses
	196	+ $sql = "SELECT DISTINCT u.username
197	197	FROM $tbl_session_course_user scu
198	198	INNER JOIN $tbl_session_user su
199	199	ON
		@@ -206,79 +206,79 @@ discard block
		block discarded – undo
206	206	scu.c_id='".$rowCourses['c_id']."' AND
207	207	scu.session_id='".$row['id']."'";
208	208
209		- $rsUsersCourse = Database::query($sql);
210		- $userscourse = '';
211		- while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
212		- if ($cvs) {
213		- $userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
214		- } else {
215		- $courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
216		- }
217		- }
218		-
219		- if ($cvs) {
220		- if (!empty($userscourse)) {
221		- $userscourse = api_substr(
222		- $userscourse,
223		- 0,
224		- api_strlen($userscourse) - 1
225		- );
226		- }
227		-
228		- $courses .= $userscourse.']\|';
229		- } else {
230		- $courses .= "\t\t</Course>\n";
231		- }
232		- }
233		-
234		- if (!empty($courses) && $cvs) {
235		- $courses = api_substr($courses, 0, api_strlen($courses) - 1);
236		- }
237		- $add = $courses;
238		-
239		- if (in_array($file_type, ['csv', 'xls'])) {
240		- $sessionListToExport[] = [
241		- $row['name'],
242		- $row['username'],
243		- $row['access_start_date'],
244		- $row['access_end_date'],
245		- $row['visibility'],
246		- $row['session_category'],
247		- $users,
248		- $courses
249		- ];
250		- } else {
251		- $add = "\t<Session>\n"
252		- ."\t\t<SessionName>$row[name]</SessionName>\n"
253		- ."\t\t<Coach>$row[username]</Coach>\n"
254		- ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
255		- ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
256		- ."\t\t<Visibility>$row[visibility]</Visibility>\n"
257		- ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
258		- }
259		-
260		- if (!$cvs) {
261		- $add .= "\t</Session>\n";
262		- fputs($fp, $add);
263		- }
264		- }
265		-
266		- switch ($file_type) {
267		- case 'xml':
268		- fputs($fp, "</Sessions>\n");
269		- fclose($fp);
270		- $errorMsg = get_lang('UserListHasBeenExported').'<br/>
	209	+ $rsUsersCourse = Database::query($sql);
	210	+ $userscourse = '';
	211	+ while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
	212	+ if ($cvs) {
	213	+ $userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
	214	+ } else {
	215	+ $courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
	216	+ }
	217	+ }
	218	+
	219	+ if ($cvs) {
	220	+ if (!empty($userscourse)) {
	221	+ $userscourse = api_substr(
	222	+ $userscourse,
	223	+ 0,
	224	+ api_strlen($userscourse) - 1
	225	+ );
	226	+ }
	227	+
	228	+ $courses .= $userscourse.']\|';
	229	+ } else {
	230	+ $courses .= "\t\t</Course>\n";
	231	+ }
	232	+ }
	233	+
	234	+ if (!empty($courses) && $cvs) {
	235	+ $courses = api_substr($courses, 0, api_strlen($courses) - 1);
	236	+ }
	237	+ $add = $courses;
	238	+
	239	+ if (in_array($file_type, ['csv', 'xls'])) {
	240	+ $sessionListToExport[] = [
	241	+ $row['name'],
	242	+ $row['username'],
	243	+ $row['access_start_date'],
	244	+ $row['access_end_date'],
	245	+ $row['visibility'],
	246	+ $row['session_category'],
	247	+ $users,
	248	+ $courses
	249	+ ];
	250	+ } else {
	251	+ $add = "\t<Session>\n"
	252	+ ."\t\t<SessionName>$row[name]</SessionName>\n"
	253	+ ."\t\t<Coach>$row[username]</Coach>\n"
	254	+ ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
	255	+ ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
	256	+ ."\t\t<Visibility>$row[visibility]</Visibility>\n"
	257	+ ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
	258	+ }
	259	+
	260	+ if (!$cvs) {
	261	+ $add .= "\t</Session>\n";
	262	+ fputs($fp, $add);
	263	+ }
	264	+ }
	265	+
	266	+ switch ($file_type) {
	267	+ case 'xml':
	268	+ fputs($fp, "</Sessions>\n");
	269	+ fclose($fp);
	270	+ $errorMsg = get_lang('UserListHasBeenExported').'<br/>
271	271	<a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
272		- break;
273		- case 'csv':
274		- Export::arrayToCsv($sessionListToExport, $archiveFile);
275		- exit;
276		- case 'xls':
277		- Export::arrayToXls($sessionListToExport, $archiveFile);
278		- exit;
279		- break;
280		- }
281		- }
	272	+ break;
	273	+ case 'csv':
	274	+ Export::arrayToCsv($sessionListToExport, $archiveFile);
	275	+ exit;
	276	+ case 'xls':
	277	+ Export::arrayToXls($sessionListToExport, $archiveFile);
	278	+ exit;
	279	+ break;
	280	+ }
	281	+ }
282	282	}
283	283
284	284	// display the header
		@@ -288,26 +288,26 @@ discard block
		block discarded – undo
288	288	$sql = "SELECT id, name FROM $tbl_session ORDER BY name";
289	289
290	290	if (api_is_multiple_url_enabled()) {
291		- $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
292		- $access_url_id = api_get_current_access_url_id();
293		- if ($access_url_id != -1){
294		- $sql = "SELECT s.id, name FROM $tbl_session s
	291	+ $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
	292	+ $access_url_id = api_get_current_access_url_id();
	293	+ if ($access_url_id != -1){
	294	+ $sql = "SELECT s.id, name FROM $tbl_session s
295	295	INNER JOIN $tbl_session_rel_access_url as session_rel_url
296	296	ON (s.id = session_rel_url.session_id)
297	297	WHERE access_url_id = $access_url_id
298	298	ORDER BY name";
299		- }
	299	+ }
300	300	}
301	301	$result = Database::query($sql);
302	302	$Sessions = Database::store_result($result);
303	303
304	304	echo '<div class="actions">';
305	305	echo '<a href="../session/session_list.php">'.
306		- Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
	306	+ Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>';
307	307	echo '</div>';
308	308
309	309	if (!empty($errorMsg)) {
310		- Display::display_normal_message($errorMsg, false); //main API
	310	+ Display::display_normal_message($errorMsg, false); //main API
311	311	}
312	312
313	313	$form = new FormValidator('session_export', 'post', api_get_self());

		@@ -3,121 +3,121 @@ discard block
		block discarded – undo
3	3	* Validates imported data.
4	4	*/
5	5	function validate_data($users) {
6		- global $defined_auth_sources;
7		- $errors = array ();
8		- $usernames = array ();
9		- if(is_array($users)) {
10		- foreach ($users as $index => $user) {
11		- // 1. Check whether mandatory fields have been set.
12		- $mandatory_fields = array ('LastName', 'FirstName');
13		- if (api_get_setting('registration', 'email') == 'true') {
14		- $mandatory_fields[] = 'Email';
15		- }
16		- foreach ($mandatory_fields as $key => $field) {
17		- if (!isset ($user[$field]) \|\| strlen($user[$field]) == 0) {
18		- $user['error'] = get_lang($field.'Mandatory');
19		- $errors[] = $user;
20		- }
21		- }
22		- // 2. Check username.
23		- if (!UserManager::is_username_empty($user['UserName'])) {
24		- // 2.1. Check whether username was used twice in the import file.
25		- if (isset($usernames[$user['UserName']])) {
26		- $user['error'] = get_lang('UserNameUsedTwice');
27		- $errors[] = $user;
28		- }
29		- $usernames[$user['UserName']] = 1;
30		- // 2.2. Check whether username is allready in use in database.
31		- if (!UserManager::is_username_available($user['UserName'])) {
32		- $user['error'] = get_lang('UserNameNotAvailable');
33		- $errors[] = $user;
34		- }
35		- // 2.3. Check whether username is too long.
36		- if (UserManager::is_username_too_long($user['UserName'])) {
37		- $user['error'] = get_lang('UserNameTooLong');
38		- $errors[] = $user;
39		- }
40		- }
41		- // 3. Check status.
42		- if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
43		- $user['error'] = get_lang('WrongStatus');
44		- $errors[] = $user;
45		- }
46		- // 5. Check authentication source.
47		- if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
48		- if (!in_array($user['AuthSource'], $defined_auth_sources)) {
49		- $user['error'] = get_lang('AuthSourceNotAvailable');
50		- $errors[] = $user;
51		- }
52		- }
53		- }
54		- }
55		- return $errors;
	6	+ global $defined_auth_sources;
	7	+ $errors = array ();
	8	+ $usernames = array ();
	9	+ if(is_array($users)) {
	10	+ foreach ($users as $index => $user) {
	11	+ // 1. Check whether mandatory fields have been set.
	12	+ $mandatory_fields = array ('LastName', 'FirstName');
	13	+ if (api_get_setting('registration', 'email') == 'true') {
	14	+ $mandatory_fields[] = 'Email';
	15	+ }
	16	+ foreach ($mandatory_fields as $key => $field) {
	17	+ if (!isset ($user[$field]) \|\| strlen($user[$field]) == 0) {
	18	+ $user['error'] = get_lang($field.'Mandatory');
	19	+ $errors[] = $user;
	20	+ }
	21	+ }
	22	+ // 2. Check username.
	23	+ if (!UserManager::is_username_empty($user['UserName'])) {
	24	+ // 2.1. Check whether username was used twice in the import file.
	25	+ if (isset($usernames[$user['UserName']])) {
	26	+ $user['error'] = get_lang('UserNameUsedTwice');
	27	+ $errors[] = $user;
	28	+ }
	29	+ $usernames[$user['UserName']] = 1;
	30	+ // 2.2. Check whether username is allready in use in database.
	31	+ if (!UserManager::is_username_available($user['UserName'])) {
	32	+ $user['error'] = get_lang('UserNameNotAvailable');
	33	+ $errors[] = $user;
	34	+ }
	35	+ // 2.3. Check whether username is too long.
	36	+ if (UserManager::is_username_too_long($user['UserName'])) {
	37	+ $user['error'] = get_lang('UserNameTooLong');
	38	+ $errors[] = $user;
	39	+ }
	40	+ }
	41	+ // 3. Check status.
	42	+ if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
	43	+ $user['error'] = get_lang('WrongStatus');
	44	+ $errors[] = $user;
	45	+ }
	46	+ // 5. Check authentication source.
	47	+ if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
	48	+ if (!in_array($user['AuthSource'], $defined_auth_sources)) {
	49	+ $user['error'] = get_lang('AuthSourceNotAvailable');
	50	+ $errors[] = $user;
	51	+ }
	52	+ }
	53	+ }
	54	+ }
	55	+ return $errors;
56	56	}
57	57
58	58	/**
59	59	* Adds missing user-information (which isn't required, like password, username, etc).
60	60	*/
61	61	function complete_missing_data($user) {
62		- // 1. Create a username if necessary.
63		- if (UserManager::is_username_empty($user['UserName'])) {
64		- $user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']);
65		- }
66		- // 2. Generate a password if necessary.
67		- if (!isset ($user['Password']) \|\| strlen($user['Password']) == 0) {
68		- $user['Password'] = api_generate_password();
69		- }
70		- // 3. set status if not allready set.
71		- if (!isset ($user['Status']) \|\| strlen($user['Status']) == 0) {
72		- $user['Status'] = 'user';
73		- }
74		- // 4. Set authsource if not allready set.
75		- if (!isset ($user['AuthSource']) \|\| strlen($user['AuthSource']) == 0) {
76		- $user['AuthSource'] = PLATFORM_AUTH_SOURCE;
77		- }
78		- return $user;
	62	+ // 1. Create a username if necessary.
	63	+ if (UserManager::is_username_empty($user['UserName'])) {
	64	+ $user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']);
	65	+ }
	66	+ // 2. Generate a password if necessary.
	67	+ if (!isset ($user['Password']) \|\| strlen($user['Password']) == 0) {
	68	+ $user['Password'] = api_generate_password();
	69	+ }
	70	+ // 3. set status if not allready set.
	71	+ if (!isset ($user['Status']) \|\| strlen($user['Status']) == 0) {
	72	+ $user['Status'] = 'user';
	73	+ }
	74	+ // 4. Set authsource if not allready set.
	75	+ if (!isset ($user['AuthSource']) \|\| strlen($user['AuthSource']) == 0) {
	76	+ $user['AuthSource'] = PLATFORM_AUTH_SOURCE;
	77	+ }
	78	+ return $user;
79	79	}
80	80
81	81	/**
82	82	* Save the imported data
83	83	*/
84	84	function save_data($users) {
85		- $user_table = Database :: get_main_table(TABLE_MAIN_USER);
86		- if(is_array($users)) {
87		- foreach ($users as $index => $user) {
88		- $user = complete_missing_data($user);
	85	+ $user_table = Database :: get_main_table(TABLE_MAIN_USER);
	86	+ if(is_array($users)) {
	87	+ foreach ($users as $index => $user) {
	88	+ $user = complete_missing_data($user);
89	89
90		- $user['Status'] = api_status_key($user['Status']);
	90	+ $user['Status'] = api_status_key($user['Status']);
91	91
92		- $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']);
93		- foreach ($user['Courses'] as $index => $course) {
94		- if(CourseManager :: course_exists($course))
95		- CourseManager :: subscribe_user($user_id, $course,$user['Status']);
96		- }
	92	+ $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']);
	93	+ foreach ($user['Courses'] as $index => $course) {
	94	+ if(CourseManager :: course_exists($course))
	95	+ CourseManager :: subscribe_user($user_id, $course,$user['Status']);
	96	+ }
97	97
98		- // TODO: Hard-coded French texts.
	98	+ // TODO: Hard-coded French texts.
99	99
100		- // Qualite
101		- if (!empty($user['Qualite'])) {
102		- UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
103		- }
	100	+ // Qualite
	101	+ if (!empty($user['Qualite'])) {
	102	+ UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
	103	+ }
104	104
105		- // Categorie
106		- if (!empty($user['Categorie'])) {
107		- UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
108		- }
	105	+ // Categorie
	106	+ if (!empty($user['Categorie'])) {
	107	+ UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
	108	+ }
109	109
110		- // Etat
111		- if (!empty($user['Etat'])) {
112		- UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
113		- }
	110	+ // Etat
	111	+ if (!empty($user['Etat'])) {
	112	+ UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
	113	+ }
114	114
115		- // Niveau
116		- if (!empty($user['Niveau'])) {
117		- UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
118		- }
119		- }
120		- }
	115	+ // Niveau
	116	+ if (!empty($user['Niveau'])) {
	117	+ UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
	118	+ }
	119	+ }
	120	+ }
121	121	}
122	122
123	123	/**
		@@ -126,12 +126,12 @@ discard block
		block discarded – undo
126	126	* @return array All userinformation read from the file
127	127	*/
128	128	function parse_csv_data($file) {
129		- $users = Import :: csvToArray($file);
130		- foreach ($users as $index => $user) {
131		- if (isset ($user['Courses'])) {
132		- $user['Courses'] = explode('\|', trim($user['Courses']));
133		- }
134		- $users[$index] = $user;
135		- }
136		- return $users;
	129	+ $users = Import :: csvToArray($file);
	130	+ foreach ($users as $index => $user) {
	131	+ if (isset ($user['Courses'])) {
	132	+ $user['Courses'] = explode('\|', trim($user['Courses']));
	133	+ }
	134	+ $users[$index] = $user;
	135	+ }
	136	+ return $users;
137	137	}

		@@ -14,20 +14,20 @@ discard block
		block discarded – undo
14	14	*/
15	15	class UniqueAnswerNoOption extends Question
16	16	{
17		- public static $typePicture = 'mcuao.png';
18		- public static $explanationLangVar = 'UniqueAnswerNoOption';
	17	+ public static $typePicture = 'mcuao.png';
	18	+ public static $explanationLangVar = 'UniqueAnswerNoOption';
19	19
20		- /**
21		- * Constructor
22		- */
23		- public function __construct()
	20	+ /**
	21	+ * Constructor
	22	+ */
	23	+ public function __construct()
24	24	{
25		- parent::__construct();
26		- $this -> type = UNIQUE_ANSWER_NO_OPTION;
27		- $this -> isContent = $this-> getIsContent();
28		- }
	25	+ parent::__construct();
	26	+ $this -> type = UNIQUE_ANSWER_NO_OPTION;
	27	+ $this -> isContent = $this-> getIsContent();
	28	+ }
29	29
30		- /**
	30	+ /**
31	31	* function which redifines Question::createAnswersForm
32	32	* @param the formvalidator instance
33	33	* @param the answers number to display
		@@ -283,37 +283,37 @@ discard block
		block discarded – undo
283	283	}
284	284
285	285	/**
286		- * Function which creates the form to create / edit the answers of the question
287		- * @param the formvalidator instance
288		- * @param the answers number to display
289		- */
290		- function processAnswersCreation($form)
	286	+ * Function which creates the form to create / edit the answers of the question
	287	+ * @param the formvalidator instance
	288	+ * @param the answers number to display
	289	+ */
	290	+ function processAnswersCreation($form)
291	291	{
292		- $questionWeighting = $nbrGoodAnswers = 0;
293		- $correct = $form -> getSubmitValue('correct');
294		- $objAnswer = new Answer($this->id);
295		- $nb_answers = $form -> getSubmitValue('nb_answers');
296		- $minus = 1;
297		- if ($form -> getSubmitValue('new_question')) {
298		- $minus = 0;
299		- }
300		-
301		- for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
302		- $position = trim($form -> getSubmitValue('position['.$i.']'));
303		- $answer = trim($form -> getSubmitValue('answer['.$i.']'));
	292	+ $questionWeighting = $nbrGoodAnswers = 0;
	293	+ $correct = $form -> getSubmitValue('correct');
	294	+ $objAnswer = new Answer($this->id);
	295	+ $nb_answers = $form -> getSubmitValue('nb_answers');
	296	+ $minus = 1;
	297	+ if ($form -> getSubmitValue('new_question')) {
	298	+ $minus = 0;
	299	+ }
	300	+
	301	+ for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
	302	+ $position = trim($form -> getSubmitValue('position['.$i.']'));
	303	+ $answer = trim($form -> getSubmitValue('answer['.$i.']'));
304	304	$comment = trim($form -> getSubmitValue('comment['.$i.']'));
305	305	$weighting = trim($form -> getSubmitValue('weighting['.$i.']'));
306	306	$scenario = $form -> getSubmitValue('scenario');
307	307
308		- //$list_destination = $form -> getSubmitValue('destination'.$i);
309		- //$destination_str = $form -> getSubmitValue('destination'.$i);
	308	+ //$list_destination = $form -> getSubmitValue('destination'.$i);
	309	+ //$destination_str = $form -> getSubmitValue('destination'.$i);
310	310
311		- $try = $scenario['try'.$i];
	311	+ $try = $scenario['try'.$i];
312	312	$lp = $scenario['lp'.$i];
313		- $destination = $scenario['destination'.$i];
314		- $url = trim($scenario['url'.$i]);
	313	+ $destination = $scenario['destination'.$i];
	314	+ $url = trim($scenario['url'.$i]);
315	315
316		- /*
	316	+ /*
317	317	How we are going to parse the destination value
318	318
319	319	here we parse the destination value which is a string
		@@ -326,41 +326,41 @@ discard block
		block discarded – undo
326	326	selected_questions= ids of questions
327	327	url= an url
328	328	*/
329		- /*
	329	+ /*
330	330	$destination_str='';
331	331	foreach ($list_destination as $destination_id)
332	332	{
333	333	$destination_str.=$destination_id.';';
334	334	}*/
335	335
336		- $goodAnswer= ($correct == $i) ? true : false;
	336	+ $goodAnswer= ($correct == $i) ? true : false;
337	337
338		- if ($goodAnswer) {
339		- $nbrGoodAnswers++;
340		- $weighting = abs($weighting);
341		- if($weighting > 0) {
	338	+ if ($goodAnswer) {
	339	+ $nbrGoodAnswers++;
	340	+ $weighting = abs($weighting);
	341	+ if($weighting > 0) {
342	342	$questionWeighting += $weighting;
343	343	}
344		- }
	344	+ }
345	345
346		- if (empty($try))
347		- $try=0;
	346	+ if (empty($try))
	347	+ $try=0;
348	348
349		- if (empty($lp)) {
350		- $lp=0;
351		- }
	349	+ if (empty($lp)) {
	350	+ $lp=0;
	351	+ }
352	352
353		- if (empty($destination)) {
354		- $destination=0;
355		- }
	353	+ if (empty($destination)) {
	354	+ $destination=0;
	355	+ }
356	356
357		- if ($url=='') {
358		- $url=0;
359		- }
	357	+ if ($url=='') {
	358	+ $url=0;
	359	+ }
360	360
361		- //1@@1;2;@@2;4;4;@@http://www.chamilo.org
362		- $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
363		- $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
	361	+ //1@@1;2;@@2;4;4;@@http://www.chamilo.org
	362	+ $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
	363	+ $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
364	364	}
365	365
366	366	//Create 666 answer
		@@ -373,18 +373,18 @@ discard block
		block discarded – undo
373	373
374	374	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
375	375
376		- // saves the answers into the data base
	376	+ // saves the answers into the data base
377	377	$objAnswer -> save();
378	378
379	379	// sets the total weighting of the question
380	380	$this -> updateWeighting($questionWeighting);
381	381	$this -> save();
382		- }
	382	+ }
383	383
384		- function return_header($feedback_type = null, $counter = null, $score = null)
	384	+ function return_header($feedback_type = null, $counter = null, $score = null)
385	385	{
386		- $header = parent::return_header($feedback_type, $counter, $score);
387		- $header .= '<table class="'.$this->question_table_class .'">
	386	+ $header = parent::return_header($feedback_type, $counter, $score);
	387	+ $header .= '<table class="'.$this->question_table_class .'">
388	388	<tr>
389	389	<th>'.get_lang("Choice").'</th>
390	390	<th>'. get_lang("ExpectedChoice").'</th>
		@@ -392,5 +392,5 @@ discard block
		block discarded – undo
392	392	$header .= '<th>'.get_lang("Comment").'</th>';
393	393	$header .= '</tr>';
394	394	return $header;
395		- }
	395	+ }
396	396	}

		@@ -25,8 +25,8 @@
		block discarded – undo
25	25	// user clicked ON a hotspot
26	26	$hit = 1;
27	27	$answerId = api_substr($_GET['answerId'],22,2);
28		- // Save into session
29		- $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
	28	+ // Save into session
	29	+ $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
30	30	}
31	31	//round-up the coordinates
32	32	$coords = explode('/',$coordinates);

		@@ -20,16 +20,16 @@
		block discarded – undo
20	20	$exerciseId = $objExercise->selectId();
21	21	if ($_GET['answerId'] == "0") { // click is NOT on a hotspot
22	22	$hit = 0;
23		- $answerId = $hotspotId;
	23	+ $answerId = $hotspotId;
24	24
25		- // remove from session
26		- unset($_SESSION['exerciseResult'][$questionId][$answerId]);
	25	+ // remove from session
	26	+ unset($_SESSION['exerciseResult'][$questionId][$answerId]);
27	27	} else { // user clicked ON a hotspot
28		- $hit = 1;
29		- $answerId = $hotspotId;
	28	+ $hit = 1;
	29	+ $answerId = $hotspotId;
30	30
31		- // Save into session
32		- $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
	31	+ // Save into session
	32	+ $_SESSION['exerciseResult'][$questionId][$answerId] = $hit;
33	33	}
34	34
35	35	//round-up the coordinates

		@@ -49,29 +49,29 @@ discard block
		block discarded – undo
49	49	$extra_field_list = UserManager::get_extra_fields();
50	50	$new_field_list = array();
51	51	if (is_array($extra_field_list)) {
52		- foreach ($extra_field_list as $extra_field) {
53		- //if is enabled to filter and is a "<select>" field type
54		- if ($extra_field[8]==1 && $extra_field[2]==4 ) {
	52	+ foreach ($extra_field_list as $extra_field) {
	53	+ //if is enabled to filter and is a "<select>" field type
	54	+ if ($extra_field[8]==1 && $extra_field[2]==4 ) {
55	55	$new_field_list[] = array(
56	56	'name' => $extra_field[3],
57	57	'variable' => $extra_field[1],
58	58	'data' => $extra_field[9],
59	59	);
60		- }
61		- }
	60	+ }
	61	+ }
62	62	}
63	63
64	64	function search_users($needle, $type)
65	65	{
66		- global $id_session;
	66	+ global $id_session;
67	67
68	68	$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
69	69	$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
70	70
71		- $xajax_response = new xajaxResponse();
72		- $return = '';
	71	+ $xajax_response = new xajaxResponse();
	72	+ $return = '';
73	73
74		- if (!empty($needle) && !empty($type)) {
	74	+ if (!empty($needle) && !empty($type)) {
75	75
76	76	//normal behaviour
77	77	if ($type == 'any_session' && $needle == 'false') {
		@@ -79,32 +79,32 @@ discard block
		block discarded – undo
79	79	$needle = '';
80	80	}
81	81
82		- // xajax send utf8 datas... datas in db can be non-utf8 datas
83		- $charset = api_get_system_encoding();
84		- $needle = Database::escape_string($needle);
85		- $needle = api_convert_encoding($needle, $charset, 'utf-8');
	82	+ // xajax send utf8 datas... datas in db can be non-utf8 datas
	83	+ $charset = api_get_system_encoding();
	84	+ $needle = Database::escape_string($needle);
	85	+ $needle = api_convert_encoding($needle, $charset, 'utf-8');
86	86
87		- $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
88		- $cond_user_id = '';
	87	+ $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
	88	+ $cond_user_id = '';
89	89
90	90	//Only for single & multiple
91	91	if (in_array($type, array('single','multiple'))) {
92		- if (!empty($id_session)) {
93		- $id_session = intval($id_session);
94		- // check id_user from session_rel_user table
95		- $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
	92	+ if (!empty($id_session)) {
	93	+ $id_session = intval($id_session);
	94	+ // check id_user from session_rel_user table
	95	+ $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
96	96	WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
97		- $res = Database::query($sql);
98		- $user_ids = array();
99		- if (Database::num_rows($res) > 0) {
100		- while ($row = Database::fetch_row($res)) {
101		- $user_ids[] = (int)$row[0];
102		- }
103		- }
104		- if (count($user_ids) > 0) {
105		- $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
106		- }
107		- }
	97	+ $res = Database::query($sql);
	98	+ $user_ids = array();
	99	+ if (Database::num_rows($res) > 0) {
	100	+ while ($row = Database::fetch_row($res)) {
	101	+ $user_ids[] = (int)$row[0];
	102	+ }
	103	+ }
	104	+ if (count($user_ids) > 0) {
	105	+ $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
	106	+ }
	107	+ }
108	108	}
109	109
110	110	switch ($type) {
		@@ -136,11 +136,11 @@ discard block
		block discarded – undo
136	136	user.status <> 6 '.$cond_user_id.
137	137	$order_clause;
138	138	break;
139		- }
140		- if (api_is_multiple_url_enabled()) {
141		- $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
142		- $access_url_id = api_get_current_access_url_id();
143		- if ($access_url_id != -1) {
	139	+ }
	140	+ if (api_is_multiple_url_enabled()) {
	141	+ $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
	142	+ $access_url_id = api_get_current_access_url_id();
	143	+ if ($access_url_id != -1) {
144	144	switch ($type) {
145	145	case 'single':
146	146	$sql = 'SELECT user.user_id, username, lastname, firstname
		@@ -178,36 +178,36 @@ discard block
		block discarded – undo
178	178	user.status<>6 '.$cond_user_id.
179	179	$order_clause;
180	180	break;
181		- }
182		- }
183		- }
	181	+ }
	182	+ }
	183	+ }
184	184
185		- $rs = Database::query($sql);
	185	+ $rs = Database::query($sql);
186	186	$i=0;
187		- if ($type == 'single') {
188		- while ($user = Database::fetch_array($rs)) {
189		- $i++;
190		- if ($i<=10) {
191		- $person_name = api_get_person_name($user['firstname'], $user['lastname']);
192		- $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
193		- } else {
194		- $return .= '...<br />';
195		- }
196		- }
197		-
198		- $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
199		- } else {
200		- $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
201		- while ($user = Database :: fetch_array($rs)) {
202		- $person_name = api_get_person_name($user['firstname'], $user['lastname']);
203		- $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
204		- }
205		- $return .= '</select>';
206		- $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
207		- }
208		- }
	187	+ if ($type == 'single') {
	188	+ while ($user = Database::fetch_array($rs)) {
	189	+ $i++;
	190	+ if ($i<=10) {
	191	+ $person_name = api_get_person_name($user['firstname'], $user['lastname']);
	192	+ $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
	193	+ } else {
	194	+ $return .= '...<br />';
	195	+ }
	196	+ }
	197	+
	198	+ $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
	199	+ } else {
	200	+ $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
	201	+ while ($user = Database :: fetch_array($rs)) {
	202	+ $person_name = api_get_person_name($user['firstname'], $user['lastname']);
	203	+ $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
	204	+ }
	205	+ $return .= '</select>';
	206	+ $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
	207	+ }
	208	+ }
209	209
210		- return $xajax_response;
	210	+ return $xajax_response;
211	211	}
212	212
213	213	$xajax -> processRequests();
		@@ -347,8 +347,8 @@ discard block
		block discarded – undo
347	347
348	348	if ($use_extra_fields) {
349	349	$final_result = array();
350		- if (count($extra_field_result)>1) {
351		- for($i=0;$i<count($extra_field_result)-1;$i++) {
	350	+ if (count($extra_field_result)>1) {
	351	+ for($i=0;$i<count($extra_field_result)-1;$i++) {
352	352	if (is_array($extra_field_result[$i+1])) {
353	353	$final_result = array_intersect(
354	354	$extra_field_result[$i],
		@@ -426,7 +426,7 @@ discard block
		block discarded – undo
426	426	'un' => $user['username']
427	427	);
428	428	unset($users[$uid]);
429		- }
	429	+ }
430	430	}
431	431	unset($users); //clean to free memory
432	432
		@@ -471,13 +471,13 @@ discard block
		block discarded – undo
471	471	}
472	472
473	473	if ($add_type === 'multiple') {
474		- $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
475		- $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
	474	+ $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
	475	+ $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
476	476	} else {
477		- $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
478		- $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
	477	+ $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
	478	+ $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
479	479	}
480		- $link_add_group = '<a href="usergroups.php">'.
	480	+ $link_add_group = '<a href="usergroups.php">'.
481	481	Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
482	482	?>
483	483	<div class="actions">
		@@ -487,30 +487,30 @@ discard block
		block discarded – undo
487	487	<?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
488	488	<?php
489	489	if ($add_type === 'multiple') {
490		- if (is_array($extra_field_list)) {
491		- if (is_array($new_field_list) && count($new_field_list)>0 ) {
492		- echo '<h3>'.get_lang('FilterUsers').'</h3>';
493		- foreach ($new_field_list as $new_field) {
494		- echo $new_field['name'];
495		- $varname = 'field_'.$new_field['variable'];
496		- echo ' <select name="'.$varname.'">';
497		- echo '<option value="0">--'.get_lang('Select').'--</option>';
498		- foreach ($new_field['data'] as $option) {
499		- $checked='';
500		- if (isset($_POST[$varname])) {
501		- if ($_POST[$varname] == $option[1]) {
502		- $checked = 'selected="true"';
503		- }
504		- }
505		- echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
506		- }
507		- echo '</select>';
508		- echo '  ';
509		- }
510		- echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
511		- echo '<br /><br />';
512		- }
513		- }
	490	+ if (is_array($extra_field_list)) {
	491	+ if (is_array($new_field_list) && count($new_field_list)>0 ) {
	492	+ echo '<h3>'.get_lang('FilterUsers').'</h3>';
	493	+ foreach ($new_field_list as $new_field) {
	494	+ echo $new_field['name'];
	495	+ $varname = 'field_'.$new_field['variable'];
	496	+ echo ' <select name="'.$varname.'">';
	497	+ echo '<option value="0">--'.get_lang('Select').'--</option>';
	498	+ foreach ($new_field['data'] as $option) {
	499	+ $checked='';
	500	+ if (isset($_POST[$varname])) {
	501	+ if ($_POST[$varname] == $option[1]) {
	502	+ $checked = 'selected="true"';
	503	+ }
	504	+ }
	505	+ echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
	506	+ }
	507	+ echo '</select>';
	508	+ echo '  ';
	509	+ }
	510	+ echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
	511	+ echo '<br /><br />';
	512	+ }
	513	+ }
514	514	}
515	515	?>
516	516	<input type="hidden" name="form_sent" value="1" />
		@@ -533,7 +533,7 @@ discard block
		block discarded – undo
533	533	<div id="content_source">
534	534	<?php
535	535	if (!($add_type == 'multiple')) {
536		- ?>
	536	+ ?>
537	537	<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
538	538	<div id="ajax_list_users_single"></div>
539	539	<?php
		@@ -542,12 +542,12 @@ discard block
		block discarded – undo
542	542	<div id="ajax_list_users_multiple">
543	543	<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5">
544	544	<?php
545		- foreach ($nosessionUsersList as $uid => $enreg) {
546		- ?>
	545	+ foreach ($nosessionUsersList as $uid => $enreg) {
	546	+ ?>
547	547	<option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
548	548	<?php
549		- }
550		- ?>
	549	+ }
	550	+ ?>
551	551	</select>
552	552	</div>
553	553	<input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
		@@ -555,7 +555,7 @@ discard block
		block discarded – undo
555	555	<?php
556	556	}
557	557	unset($nosessionUsersList);
558		- ?>
	558	+ ?>
559	559	</div>
560	560	</div>
561	561
		@@ -582,13 +582,13 @@ discard block
		block discarded – undo
582	582	<br />
583	583	<br />
584	584	<?php
585		- if (isset($_GET['add'])) {
586		- echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
	585	+ if (isset($_GET['add'])) {
	586	+ echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
587	587	} else {
588	588	//@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
589		- echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
	589	+ echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
590	590	}
591		- ?>
	591	+ ?>
592	592	</div>
593	593	<div class="span5">
594	594	<div class="multiple_select_header">

		@@ -47,9 +47,9 @@ discard block
		block discarded – undo
47	47	*/
48	48	//user has submitted a file
49	49	if (isset($_FILES['user_upload'])) {
50		- $upload_ok = process_uploaded_file($_FILES['user_upload']);
51		- if ($upload_ok) {
52		- //file got on the server without problems, now process it
	50	+ $upload_ok = process_uploaded_file($_FILES['user_upload']);
	51	+ if ($upload_ok) {
	52	+ //file got on the server without problems, now process it
53	53	$new_path = handle_uploaded_document(
54	54	$_course,
55	55	$_FILES['user_upload'],
		@@ -61,21 +61,21 @@ discard block
		block discarded – undo
61	61	$_POST['unzip'],
62	62	$_POST['if_exists']
63	63	);
64		- $new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
65		- $new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
	64	+ $new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
	65	+ $new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
66	66
67		- if ($new_path && ($new_comment \|\| $new_title))
68		- if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
69		- $table_document = Database::get_course_table(TABLE_DOCUMENT);
70		- $ct = '';
	67	+ if ($new_path && ($new_comment \|\| $new_title))
	68	+ if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
	69	+ $table_document = Database::get_course_table(TABLE_DOCUMENT);
	70	+ $ct = '';
71	71	if ($new_comment) {
72	72	$ct .= ", comment='$new_comment'";
73	73	}
74	74	if ($new_title) {
75	75	$ct .= ", title='$new_title'";
76	76	}
77		- Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
78		- }
	77	+ Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
	78	+ }
79	79	//check for missing images in html files
80	80	$missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
81	81	if ($missing_files) {
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	//they want to create a directory
134	134	if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
135	135	$added_slash = $path == '/' ? '' : '/';
136		- $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
	136	+ $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
137	137	$created_dir = create_unexisting_directory(
138	138	$_course,
139	139	api_get_user_id(),
		@@ -153,15 +153,15 @@ discard block
		block discarded – undo
153	153	}
154	154
155	155	if (isset($_GET['createdir'])) {
156		- //create the form that asks for the directory name
157		- $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
158		- $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
159		- $new_folder_text .= get_lang('NewDir') .' ';
160		- $new_folder_text .= '<input type="text" name="dirname"/>';
161		- $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
162		- $new_folder_text .= '</form>';
163		- //show the form
164		- Display::display_normal_message($new_folder_text);
	156	+ //create the form that asks for the directory name
	157	+ $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
	158	+ $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
	159	+ $new_folder_text .= get_lang('NewDir') .' ';
	160	+ $new_folder_text .= '<input type="text" name="dirname"/>';
	161	+ $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
	162	+ $new_folder_text .= '</form>';
	163	+ //show the form
	164	+ Display::display_normal_message($new_folder_text);
165	165	} else { //give them a link to create a directory
166	166	?>
167	167	<p>

chamilo / chamilo-lms

Pull Request — 1.11.x (#1541)

Status

Category

Indentation +177 added lines, -177 removed lines patch added patch discarded remove patch

Indentation +186 added lines, -186 removed lines patch added patch discarded remove patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +104 added lines, -104 removed lines patch added patch discarded remove patch

Indentation +243 added lines, -243 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch