-
+
diff --git a/main/admin/session_course_edit.php b/main/admin/session_course_edit.php
index 3e3856b2b3..f067d62953 100755
--- a/main/admin/session_course_edit.php
+++ b/main/admin/session_course_edit.php
@@ -1,9 +1,11 @@
"session_course_list.php?id_session=$id_sessio
$arr_infos = array();
if (isset($_POST['formSent']) && $_POST['formSent']) {
- $formSent=1;
+ $formSent = 1;
// get all tutor by course_code in the session
- $sql = "SELECT id_user FROM $tbl_session_rel_course_rel_user
- WHERE id_session = '$id_session' AND course_code = '".Database::escape_string($course_code)."' AND status = 2";
+ $sql = "SELECT user_id
+ FROM $tbl_session_rel_course_rel_user
+ WHERE session_id = '$id_session' AND c_id = '".$courseId."' AND status = 2";
$rs_coachs = Database::query($sql);
$coachs_course_session = array();
@@ -61,7 +69,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
foreach ($id_coachs as $id_coach) {
$id_coach = intval($id_coach);
- $rs1 = SessionManager::set_coach_to_course_session($id_coach, $id_session, $course_code);
+ $rs1 = SessionManager::set_coach_to_course_session($id_coach, $id_session, $courseId);
}
// set status to 0 other tutors from multiple list
@@ -71,30 +79,29 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$rs2 = SessionManager::set_coach_to_course_session(
$nocoach_user_id,
$id_session,
- $course_code,
+ $courseId,
true
);
}
header('Location: '.Security::remove_XSS($_GET['page']).'?id_session='.$id_session);
exit();
-
}
} else {
- $sql = "SELECT id_user FROM $tbl_session_rel_course_rel_user
- WHERE id_session = '$id_session' AND course_code = '".Database::escape_string($course_code)."' AND status = 2 ";
+ $sql = "SELECT user_id FROM $tbl_session_rel_course_rel_user
+ WHERE session_id = '$id_session' AND c_id = '".$courseId."' AND status = 2 ";
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
while ($infos = Database::fetch_array($rs)) {
- $arr_infos[] = $infos['id_user'];
+ $arr_infos[] = $infos['user_id'];
}
}
}
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
-global $_configuration;
-if ($_configuration['multiple_access_urls']) {
+
+if (api_is_multiple_url_enabled()) {
$tbl_access_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
$sql="SELECT u.user_id,lastname,firstname,username
diff --git a/main/admin/session_course_list.php b/main/admin/session_course_list.php
index 341738206b..cd760062be 100755
--- a/main/admin/session_course_list.php
+++ b/main/admin/session_course_list.php
@@ -43,9 +43,9 @@ if ($action == 'delete') {
}
$idChecked = $my_temp;
$idChecked="'".implode("','", $idChecked)."'";
- $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)");
+ $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
$nbr_affected_rows=Database::affected_rows($result);
- Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code IN($idChecked)");
+ Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
}
header('Location: '.api_get_self().'?id_session='.$id_session.'&sort='.$sort);
@@ -55,7 +55,11 @@ if ($action == 'delete') {
$limit = 20;
$from = $page * $limit;
-$sql = "SELECT code, title, nbr_users FROM $tbl_session_rel_course, $tbl_course WHERE course_code=code AND id_session='$id_session' ORDER BY $sort LIMIT $from,".($limit+1);
+$sql = "SELECT c.id, c.code, c.title, nbr_users
+ FROM $tbl_session_rel_course, $tbl_course c
+ WHERE c_id = c.id AND session_id='$id_session'
+ ORDER BY $sort
+ LIMIT $from,".($limit+1);
$result=Database::query($sql);
$Courses=Database::store_result($result);
$tool_name = api_htmlentities($session_name,ENT_QUOTES,$charset).' : '.get_lang('CourseListInSession');
@@ -76,14 +80,18 @@ $tableHeader[] = array(get_lang('NbUsers'));
$tableHeader[] = array(get_lang('Actions'));
$tableCourses = array();
-foreach($Courses as $key=>$enreg) {
+
+foreach ($Courses as $key=>$enreg) {
$course = array();
- $course[] = '';
+ $course[] = '';
$course[] = api_htmlentities($enreg['title'],ENT_QUOTES,$charset);
$course[] = ''.$enreg['nbr_users'].' '.get_lang('Users').'';
- $course[] = ''.Display::return_icon('course_home.gif', get_lang('Course')).'
- '.Display::return_icon('edit.gif', get_lang('Edit')).'
- '.Display::return_icon('delete.gif', get_lang('Delete')).'';
+ $course[] = ''.
+ Display::return_icon('course_home.gif', get_lang('Course')).'
+ '.
+ Display::return_icon('edit.png', get_lang('Edit')).'
+ '.
+ Display::return_icon('delete.png', get_lang('Delete')).'';
$tableCourses[] = $course;
}
echo '
diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php
index c5a78c5367..37670da4cb 100755
--- a/main/admin/session_course_user_list.php
+++ b/main/admin/session_course_user_list.php
@@ -22,7 +22,10 @@ if (empty($id_session )) {
api_not_allowed();
}
-$course_code = Database::escape_string(trim($_GET['course_code']));
+$course_code = Database::escape_string(trim($_GET['course_code']));
+$courseInfo = api_get_course_info($course_code);
+$courseId = $courseInfo['real_id'];
+
$page = isset($_GET['page']) ? intval($_GET['page']) : null;
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
$default_sort = api_sort_by_first_name() ? 'firstname':'lastname';
@@ -41,9 +44,9 @@ if (is_array($idChecked)) {
$sql = "SELECT s.name, c.title
FROM $tbl_session_rel_course src
- INNER JOIN $tbl_session s ON s.id = src.id_session
- INNER JOIN $tbl_course c ON c.code = src.course_code
- WHERE src.id_session='$id_session' AND src.course_code='$course_code' ";
+ INNER JOIN $tbl_session s ON s.id = src.session_id
+ INNER JOIN $tbl_course c ON c.id = src.c_id
+ WHERE src.session_id='$id_session' AND src.c_id='$courseId' ";
$result = Database::query($sql);
if (!list($session_name,$course_title) = Database::fetch_row($result)) {
@@ -55,12 +58,16 @@ switch ($action) {
case 'delete':
if (is_array($idChecked) && count($idChecked)>0) {
array_map('intval', $idChecked);
- $idChecked = implode(',',$idChecked);
+ $idChecked = implode(',', $idChecked);
}
if (!empty($idChecked)) {
- $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='".$course_code."' AND id_user IN($idChecked)");
+ $sql = "DELETE FROM $tbl_session_rel_course_rel_user
+ WHERE session_id='$id_session' AND c_id='".$courseId."' AND user_id IN($idChecked)";
+ $result = Database::query($sql);
$nbr_affected_rows = Database::affected_rows($result);
- Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE id_session='$id_session' AND course_code='".$course_code."'");
+ $sql = "UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows
+ WHERE session_id='$id_session' AND c_id='".$courseId."'";
+ Database::query($sql);
}
header('Location: '.api_get_self().'?id_session='.$id_session.'&course_code='.urlencode($course_code).'&sort='.$sort);
exit();
@@ -77,12 +84,12 @@ $limit = 20;
$from = $page * $limit;
$is_western_name_order = api_is_western_name_order();
$sql = "SELECT DISTINCT
- u.user_id,".($is_western_name_order ? 'u.firstname, u.lastname' : 'u.lastname, u.firstname').", u.username, scru.id_user as is_subscribed
+ u.user_id,".($is_western_name_order ? 'u.firstname, u.lastname' : 'u.lastname, u.firstname').", u.username, scru.user_id as is_subscribed
FROM $tbl_session_rel_user s
- INNER JOIN $tbl_user u ON (u.user_id=s.id_user)
+ INNER JOIN $tbl_user u ON (u.user_id=s.user_id)
LEFT JOIN $tbl_session_rel_course_rel_user scru
- ON (s.id_session = scru.id_session AND s.id_user = scru.id_user AND scru.course_code = '".$course_code."' )
- WHERE s.id_session='$id_session'
+ ON (s.session_id = scru.session_id AND s.user_id = scru.user_id AND scru.c_id = '".$courseId."' )
+ WHERE s.session_id='$id_session'
ORDER BY $sort $direction
LIMIT $from,".($limit+1);
diff --git a/main/admin/session_export.php b/main/admin/session_export.php
index 7c452e96ef..8a42107b90 100755
--- a/main/admin/session_export.php
+++ b/main/admin/session_export.php
@@ -1,114 +1,114 @@
'index.php',"name" => get_lang('PlatformAdmin'));
set_time_limit(0);
-if ($_POST['formSent']) {
+if (isset($_POST['formSent'])) {
$formSent = $_POST['formSent'];
$file_type = ($_POST['file_type'] == 'csv')?'csv':'xml';
$session_id = $_POST['session_id'];
if (empty($session_id)) {
- $sql = "SELECT id,name,id_coach,username,date_start,date_end,visibility,session_category_id FROM $tbl_session INNER JOIN $tbl_user
- ON $tbl_user.user_id = $tbl_session.id_coach ORDER BY id";
-
+ $sql = "SELECT
+ s.id,
+ name,
+ id_coach,
+ username,
+ date_start,
+ date_end,
+ visibility,
+ session_category_id
+ FROM $tbl_session s
+ INNER JOIN $tbl_user
+ ON $tbl_user.user_id = s.id_coach
+ ORDER BY id";
- if ($_configuration['multiple_access_urls']) {
+ 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 id, name,id_coach,username,date_start,date_end,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";
-
+ $sql = "SELECT s.id, name,id_coach,username,date_start,date_end,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 id,name,username,date_start,date_end,visibility,session_category_id
- FROM $tbl_session
+
+ $result = Database::query($sql);
+ } else {
+ $sql = "SELECT s.id,name,username,date_start,date_end,visibility,session_category_id
+ FROM $tbl_session s
INNER JOIN $tbl_user
- ON $tbl_user.user_id = $tbl_session.id_coach
+ ON $tbl_user.user_id = s.id_coach
WHERE id='$session_id'";
-
$result = Database::query($sql);
-
}
- if(Database::num_rows($result))
- {
- if(!file_exists($archivePath))
- {
+ if (Database::num_rows($result)) {
+ 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');
-
+ if (!file_exists($archivePath.'index.html')) {
+ $fp = fopen($archivePath.'index.html','w');
fputs($fp,'');
-
fclose($fp);
}
$archiveFile='export_sessions_'.$session_id.'_'.date('Y-m-d_H-i-s').'.'.$file_type;
- while( file_exists($archivePath.$archiveFile))
- {
+ while( file_exists($archivePath.$archiveFile)) {
$archiveFile='export_users_'.$session_id.'_'.date('Y-m-d_H-i-s').'_'.uniqid('').'.'.$file_type;
}
- $fp=fopen($archivePath.$archiveFile,'w');
- if($file_type == 'csv')
- {
+ $fp = fopen($archivePath.$archiveFile, 'w');
+
+ if ($file_type == 'csv') {
$cvs = true;
fputs($fp,"SessionName;Coach;DateStart;DateEnd;Visibility;SessionCategory;Users;Courses;\n");
- }
- else
- {
+ } else {
$cvs = false;
fputs($fp, "\n \n");
}
- while($row=Database::fetch_array($result))
- {
+ while($row=Database::fetch_array($result)) {
$add = '';
$row['name'] = str_replace(';',',',$row['name']);
$row['username'] = str_replace(';',',',$row['username']);
@@ -116,10 +116,9 @@ if ($_POST['formSent']) {
$row['date_end'] = str_replace(';',',',$row['date_end']);
$row['visibility'] = str_replace(';',',',$row['visibility']);
$row['session_category'] = str_replace(';',',',$row['session_category_id']);
- if($cvs){
+ if ($cvs) {
$add.= $row['name'].';'.$row['username'].';'.$row['date_start'].';'.$row['date_end'].';'.$row['visibility'].';'.$row['session_category'].';';
- }
- else {
+ } else {
$add = "\t\n"
."\t\t$row[name]\n"
."\t\t$row[username]\n"
@@ -130,14 +129,17 @@ if ($_POST['formSent']) {
}
//users
- $sql = "SELECT DISTINCT $tbl_user.username FROM $tbl_user
+ $sql = "SELECT DISTINCT $tbl_user.username
+ FROM $tbl_user
INNER JOIN $tbl_session_user
- ON $tbl_user.user_id = $tbl_session_user.id_user AND $tbl_session_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
- AND $tbl_session_user.id_session = '".$row['id']."'";
+ ON
+ $tbl_user.user_id = $tbl_session_user.user_id AND
+ $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)){
+ while ($rowUsers = Database::fetch_array($rsUsers)){
if($cvs){
$users .= str_replace(';',',',$rowUsers['username']).'|';
}
@@ -145,7 +147,8 @@ if ($_POST['formSent']) {
$users .= "\t\t$rowUsers[username]\n";
}
}
- if(!empty($users) && $cvs)
+
+ if (!empty($users) && $cvs)
$users = api_substr($users , 0, api_strlen($users)-1);
if($cvs)
@@ -154,23 +157,25 @@ if ($_POST['formSent']) {
$add .= $users;
//courses
- $sql = "SELECT DISTINCT $tbl_course.code
- FROM $tbl_course
- INNER JOIN $tbl_session_course_user
- ON $tbl_course.code = $tbl_session_course_user.course_code
- AND $tbl_session_course_user.id_session = '".$row['id']."'";
+ $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);
$courses = '';
- while($rowCourses = Database::fetch_array($rsCourses)){
-
+ 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.id_user
- WHERE scu.course_code = '{$rowCourses['code']}'
- AND scu.id_session = '".$row['id']."' AND scu.status = 2 ";
+ INNER JOIN $tbl_user u
+ ON u.user_id = scu.user_id
+ WHERE
+ scu.c_id = '{$rowCourses['c_id']}' AND
+ scu.session_id = '".$row['id']."' AND
+ scu.status = 2 ";
$rs_coachs = Database::query($sql);
$coachs = array();
@@ -180,11 +185,10 @@ if ($_POST['formSent']) {
$coachs = implode(",",$coachs);
- if($cvs){
+ if ($cvs) {
$courses .= str_replace(';',',',$rowCourses['code']);
$courses .= '['.str_replace(';',',',$coachs).'][';
- }
- else {
+ } else {
$courses .= "\t\t\n";
$courses .= "\t\t\t$rowCourses[code]\n";
$courses .= "\t\t\t$coachs\n";
@@ -193,26 +197,35 @@ if ($_POST['formSent']) {
// rel user courses
$sql = "SELECT DISTINCT u.username
FROM $tbl_session_course_user scu
- INNER JOIN $tbl_session_user su ON scu.id_user = su.id_user AND scu.id_session = su.id_session AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
+ INNER JOIN $tbl_session_user su
+ ON
+ scu.user_id = su.user_id AND
+ scu.session_id = su.session_id AND
+ su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user u
- ON scu.id_user = u.user_id
- AND scu.course_code='".$rowCourses['code']."'
- AND scu.id_session='".$row['id']."'";
+ ON
+ scu.user_id = u.user_id AND
+ 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){
+ while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){
+ if ($cvs) {
$userscourse .= str_replace(';',',',$rowUsersCourse['username']).',';
- }
- else {
+ } else {
$courses .= "\t\t\t$rowUsersCourse[username]\n";
}
}
- if($cvs){
- if(!empty($userscourse))
- $userscourse = api_substr($userscourse , 0, api_strlen($userscourse)-1);
+
+ if ($cvs) {
+ if (!empty($userscourse)) {
+ $userscourse = api_substr(
+ $userscourse,
+ 0,
+ api_strlen($userscourse) - 1
+ );
+ }
$courses .= $userscourse.']|';
}
@@ -225,7 +238,7 @@ if ($_POST['formSent']) {
$courses = api_substr($courses , 0, api_strlen($courses)-1);
$add .= $courses;
- if($cvs) {
+ if ($cvs) {
$breakline = api_is_windows_os()?"\r\n":"\n";
$add .= ";$breakline";
} else {
@@ -249,14 +262,15 @@ Display::display_header($tool_name);
//select of sessions
$sql = "SELECT id, name FROM $tbl_session ORDER BY name";
-if ($_configuration['multiple_access_urls']) {
- $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+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 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";
+ $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);
diff --git a/main/admin/session_import.php b/main/admin/session_import.php
index f06ef1e0c0..4353085613 100755
--- a/main/admin/session_import.php
+++ b/main/admin/session_import.php
@@ -37,7 +37,6 @@ set_time_limit(0);
$purification_option_for_usernames = false;
$inserted_in_course = array();
-global $_configuration;
$warn = null;
if (isset($_POST['formSent']) && $_POST['formSent']) {
if (isset($_FILES['import_file']['tmp_name']) &&
@@ -278,15 +277,14 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$rs_session = Database::query($sql_session);
$session_id = Database::query("SELECT id FROM $tbl_session WHERE name='$session_name'");
list($session_id) = Database::fetch_array($session_id);
- Database::query("DELETE FROM $tbl_session_user WHERE id_session='$session_id'");
- Database::query("DELETE FROM $tbl_session_course WHERE id_session='$session_id'");
- Database::query("DELETE FROM $tbl_session_course_user WHERE id_session='$session_id'");
+ Database::query("DELETE FROM $tbl_session_user WHERE session_id ='$session_id'");
+ Database::query("DELETE FROM $tbl_session_course WHERE session_id='$session_id'");
+ Database::query("DELETE FROM $tbl_session_course_user WHERE session_id='$session_id'");
}
}
// Associate the session with access_url.
- global $_configuration;
- if ($_configuration['multiple_access_urls']) {
+ if (api_is_multiple_url_enabled()) {
$access_url_id = api_get_current_access_url_id();
UrlManager::add_session_to_url($session_id, $access_url_id);
} else {
@@ -301,8 +299,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$user_id = UserManager::get_user_id_from_username($username);
if ($user_id !== false) {
$sql = "INSERT IGNORE INTO $tbl_session_user SET
- id_user='$user_id',
- id_session = '$session_id'";
+ user_id ='$user_id',
+ session_id = '$session_id'";
$rs_user = Database::query($sql);
$user_counter++;
}
@@ -315,15 +313,15 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if (CourseManager::course_exists($course_code)) {
// If the course exists we continue.
$course_info = CourseManager::get_course_information($course_code);
+ $courseId = $course_info['c_id'];
- $session_course_relation = SessionManager::relation_session_course_exist($session_id, $course_code);
+ $session_course_relation = SessionManager::relation_session_course_exist($session_id, $courseId);
if (!$session_course_relation) {
$sql_course = "INSERT INTO $tbl_session_course SET
- course_code = '$course_code',
- id_session='$session_id'";
+ c_id = '$courseId',
+ session_id='$session_id'";
$rs_course = Database::query($sql_course);
- $course_info = api_get_course_info($course['code']);
- SessionManager::installCourse($id_session, $course_info['real_id']);
+ SessionManager::installCourse($id_session, $courseId);
}
$course_coaches = explode(',', $node_course->Coach);
@@ -334,9 +332,9 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$coach_id = UserManager::get_user_id_from_username($course_coach);
if ($coach_id !== false) {
$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
- id_user='$coach_id',
- course_code='$course_code',
- id_session = '$session_id',
+ user_id='$coach_id',
+ c_id = '$courseId',
+ session_id = '$session_id',
status = 2 ";
$rs_coachs = Database::query($sql);
} else {
@@ -353,23 +351,23 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if ($user_id !== false) {
// Adding to session_rel_user table.
$sql = "INSERT IGNORE INTO $tbl_session_user SET
- id_user='$user_id',
- id_session = '$session_id'";
+ user_id ='$user_id',
+ session_id = '$session_id'";
$rs_user = Database::query($sql);
$user_counter++;
// Adding to session_rel_user_rel_course table.
$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
- id_user='$user_id',
- course_code='$course_code',
- id_session = '$session_id'";
+ user_id = '$user_id',
+ c_id = '$courseId',
+ session_id = '$session_id'";
$rs_users = Database::query($sql);
$users_in_course_counter++;
} else {
$error_message .= get_lang('UserDoesNotExist').' : '.$username.'
';
}
}
- $update_session_course = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE course_code='$course_code'";
- Database::query($update_session_course);
+ $sql = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE c_id='$courseId'";
+ Database::query($sql);
$inserted_in_course[$course_code] = $course_info['title'];
}
@@ -382,13 +380,15 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if ($vcourse['code'] == $course_code) {
// Ignore, this has already been inserted.
} else {
+ $course_info = api_get_course_info($course['code']);
+ $courseId = $course_info['real_id'];
$sql_course = "INSERT INTO $tbl_session_course SET
- course_code = '".$vcourse['code']."',
- id_session='$session_id'";
+ c_id = '".$courseId."',
+ session_id='$session_id'";
$rs_course = Database::query($sql_course);
- $course_info = api_get_course_info($course['code']);
- SessionManager::installCourse($id_session, $course_info['real_id']);
+
+ SessionManager::installCourse($id_session, $courseId);
$course_coaches = explode(",",$node_course->Coach);
@@ -398,9 +398,9 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$coach_id = UserManager::get_user_id_from_username($course_coach);
if ($coach_id !== false) {
$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
- id_user='$coach_id',
- course_code='{$vcourse['code']}',
- id_session = '$session_id',
+ user_id='$coach_id',
+ c_id = $courseId,
+ session_id = '$session_id',
status = 2 ";
$rs_coachs = Database::query($sql);
} else {
@@ -417,25 +417,24 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if ($user_id !== false) {
// Adding to session_rel_user table.
$sql = "INSERT IGNORE INTO $tbl_session_user SET
- id_user='$user_id',
- id_session = '$session_id'";
+ user_id ='$user_id',
+ session_id = '$session_id'";
$rs_user = Database::query($sql);
$user_counter++;
// Adding to session_rel_user_rel_course table.
$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
- id_user='$user_id',
- course_code='{$vcourse['code']}',
- id_session = '$session_id'";
+ user_id ='$user_id',
+ c_id ='$courseId',
+ session_id = '$session_id'";
$rs_users = Database::query($sql);
$users_in_course_counter++;
} else {
$error_message .= get_lang('UserDoesNotExist').' : '.$username.'
';
}
}
- $update_session_course = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE course_code='$course_code'";
- Database::query($update_session_course);
+ $sql = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE c_id='$courseId'";
+ Database::query($sql);
$inserted_in_course[$course_code] = $course_info['title'];
-
}
$inserted_in_course[$vcourse['code']] = $vcourse['title'];
}
diff --git a/main/admin/session_list.php b/main/admin/session_list.php
index da7ebc2de4..7e21960b31 100755
--- a/main/admin/session_list.php
+++ b/main/admin/session_list.php
@@ -18,7 +18,7 @@ $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
$idChecked = isset($_REQUEST['idChecked']) ? $_REQUEST['idChecked'] : null;
if ($action == 'delete') {
- SessionManager::delete_session($idChecked);
+ SessionManager::delete($idChecked);
header('Location: session_list.php');
exit();
} elseif ($action == 'copy') {
@@ -49,8 +49,9 @@ $courseId = isset($_GET['course_id']) ? $_GET['course_id'] : null;
if (!empty($courseId)) {
$courseInfo = api_get_course_info_by_id($courseId);
$parents = getParentsToString($courseInfo['categoryCode']);
- $courseList[] = array('id' => $courseInfo['id'], 'text' => $parents.$courseInfo['title']);
+ $courseList[] = array('id' => $courseInfo['code'], 'text' => $parents.$courseInfo['title']);
}
+
$sessionFilter->addElement('select_ajax', 'course_name', get_lang('SearchCourse'), null, array('url' => $url, 'defaults' => $courseList));
$url = api_get_self();
$actions = '
diff --git a/main/admin/session_user_import.php b/main/admin/session_user_import.php
index 3fc395ff4f..76553a0cee 100755
--- a/main/admin/session_user_import.php
+++ b/main/admin/session_user_import.php
@@ -39,7 +39,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$send_mail = $_POST['sendMail'] ? 1 : 0;
// CSV
- $users = Import::csv_to_array($_FILES['import_file']['tmp_name']);
+ $users = Import::csvToArray($_FILES['import_file']['tmp_name']);
$user_list = array();
foreach ($users as $user_data) {
$username = $user_data['username'];
diff --git a/main/admin/skill_badge_create.php b/main/admin/skill_badge_create.php
index b7b8450096..e05d1a4d4c 100644
--- a/main/admin/skill_badge_create.php
+++ b/main/admin/skill_badge_create.php
@@ -95,7 +95,7 @@ $interbreadcrumb = array(
);
$tpl = new Template(get_lang('CreateBadge'));
-$tpl->assign('platformAdminEmail', get_setting('emailAdministrator'));
+$tpl->assign('platformAdminEmail', api_get_setting('emailAdministrator'));
$tpl->assign('skill', $skill);
$contentTemplate = $tpl->get_template('skill/badge_create.tpl');
diff --git a/main/admin/skill_badge_list.php b/main/admin/skill_badge_list.php
index 303ecfcfef..59501fb1cc 100644
--- a/main/admin/skill_badge_list.php
+++ b/main/admin/skill_badge_list.php
@@ -39,7 +39,7 @@ $interbreadcrumb = array(
$tpl = new Template(get_lang('Skills'));
$tpl->assign('errorMessage', $errorMessage);
-$tpl->assign('platformAdminEmail', get_setting('emailAdministrator'));
+$tpl->assign('platformAdminEmail', api_get_setting('emailAdministrator'));
$tpl->assign('skills', $skills);
$contentTemplate = $tpl->get_template('skill/badge_list.tpl');
diff --git a/main/admin/skills_import.php b/main/admin/skills_import.php
index 35e8c1bb9e..5f87e5a9db 100755
--- a/main/admin/skills_import.php
+++ b/main/admin/skills_import.php
@@ -83,7 +83,7 @@ function save_data($skills)
*/
function parse_csv_data($file)
{
- $skills = Import :: csv_to_array($file);
+ $skills = Import :: csvToArray($file);
foreach ($skills as $index => $skill) {
$skills[$index] = $skill;
}
diff --git a/main/admin/special_exports.php b/main/admin/special_exports.php
index b45dcc0995..c053bd34f8 100755
--- a/main/admin/special_exports.php
+++ b/main/admin/special_exports.php
@@ -1,5 +1,6 @@
* @package chamilo.include.export
*/
+
// including the global file
$cidReset = true;
require_once '../inc/global.inc.php';
@@ -204,7 +206,7 @@ function fullexportspecial(){
$code_course = '';
$list_course = array();
$zip_folder = new PclZip($FileZip['TEMP_FILE_ZIP']);
- $list_course = Database::get_course_list();
+ $list_course = CourseManager::get_course_list();
$tbl_document = Database::get_course_table(TABLE_DOCUMENT);
$tbl_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
@@ -217,7 +219,7 @@ function fullexportspecial(){
} else {
$querypath = $FileZip['PATH'];
}
- $course_id = $_course['real_id'];
+ $course_id = $_course['real_id'];
//Add tem to the zip file course
$sql = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
@@ -232,15 +234,18 @@ function fullexportspecial(){
while ($rows_course_file = Database::fetch_assoc($query)) {
$rows_course_file['path'];
$zip_folder->add($FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'],
- PCLZIP_OPT_ADD_PATH, $_course['directory'],
- PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory']."/document".$FileZip['PATH_REMOVE']
- );
+ PCLZIP_OPT_ADD_PATH, $_course['directory'],
+ PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory']."/document".$FileZip['PATH_REMOVE']
+ );
}
//Add tem to the zip file session course
$code_course = $_course['code'];
- $sql_session = "SELECT id, name, course_code FROM $tbl_session_course
- INNER JOIN $tbl_session ON id_session = id
- WHERE course_code = '$code_course' ";
+ $sql_session = "SELECT s.id, name, c_id
+ FROM $tbl_session_course sc
+ INNER JOIN $tbl_session s
+ ON sc.session_id = s.id
+ WHERE c_id = '$course_id' ";
+
$query_session = Database::query($sql_session);
while ($rows_session = Database::fetch_assoc($query_session)) {
$session_id = $rows_session['id'];
@@ -255,21 +260,22 @@ function fullexportspecial(){
$query_session_doc = Database::query($sql_session_doc);
while ($rows_course_session_file = Database::fetch_assoc($query_session_doc)) {
$zip_folder->add($FileZip['PATH_COURSE'].$_course['directory'].'/document'.$rows_course_session_file['path'],
- PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$rows_session['name'],
- PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory'].'/document'.$FileZip['PATH_REMOVE']
- );
+ PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$rows_session['name'],
+ PCLZIP_OPT_REMOVE_PATH, $FileZip['PATH_COURSE'].$_course['directory'].'/document'.$FileZip['PATH_REMOVE']
+ );
}
}
}
+
$name = rename_zip($FileZip);
- if($name === false){
+ if ($name === false){
$export = false;
return false;
- }else{
+ } else {
$export = true;
return $name;
}
- }else{
+ } else {
Display::display_error_message(get_lang('ErrorMsgSpecialExport')); //main API
$export = false;
return false;
diff --git a/main/admin/subscribe_user2course.php b/main/admin/subscribe_user2course.php
index ab9e0b534e..d2452413b5 100755
--- a/main/admin/subscribe_user2course.php
+++ b/main/admin/subscribe_user2course.php
@@ -1,5 +1,6 @@
0 ? "(code IN('".implode("','", $courses)."')) DESC," : "")." visual_code";
if (api_is_multiple_url_enabled()) {
- $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+ $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
$sql = "SELECT code, visual_code, title
FROM $tbl_course as course
INNER JOIN $tbl_course_rel_access_url course_rel_url
- ON (course_rel_url.course_code= course.code)
+ ON (course_rel_url.c_id = course.id)
WHERE
access_url_id = $access_url_id AND
(visual_code LIKE '".$first_letter_course."%' )
@@ -226,19 +227,19 @@ $db_courses = Database::store_result($result);
unset($result);
if (api_is_multiple_url_enabled()) {
- $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+ $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
$sqlNbCours = " SELECT course_rel_user.course_code, course.title
FROM $tbl_course_user as course_rel_user
INNER JOIN $tbl_course as course
- ON course.code = course_rel_user.course_code
+ ON course.id = course_rel_user.c_id
INNER JOIN $tbl_course_rel_access_url course_rel_url
- ON (course_rel_url.course_code= course.code)
+ ON (course_rel_url.c_id = course.id)
WHERE
access_url_id = $access_url_id AND
- course_rel_user.user_id='".$_user['user_id']."' AND
+ course_rel_user.user_id='".api_get_user_id()."' AND
course_rel_user.status='1'
ORDER BY course.title";
}
diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php
index 3084d897da..223f08c3f3 100644
--- a/main/admin/teacher_time_report.php
+++ b/main/admin/teacher_time_report.php
@@ -80,10 +80,10 @@ if (!empty($selectedCourse)) {
);
}
- $sessionsByCourse = SessionManager::get_session_by_course($selectedCourse);
+ $sessionsByCourse = SessionManager::get_session_by_course($course['real_id']);
foreach ($sessionsByCourse as $session) {
- $coaches = CourseManager::get_coachs_from_course($session['id'], $selectedCourse);
+ $coaches = CourseManager::get_coachs_from_course($session['id'], $course['real_id']);
if ($coaches) {
foreach ($coaches as $coach) {
@@ -138,7 +138,7 @@ if (!empty($selectedSession)) {
'name' => $course['title']
);
- $coaches = CourseManager::get_coachs_from_course($selectedSession, $course['code']);
+ $coaches = CourseManager::get_coachs_from_course($selectedSession, $course['id']);
if ($coaches) {
foreach ($coaches as $coach) {
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index 23588d62b5..4141875381 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -339,7 +339,8 @@ if( $form->validate()) {
$hr_dept_id,
$extra,
null,
- $send_mail
+ $send_mail,
+ $platform_admin
);
Security::clear_token();
@@ -379,9 +380,6 @@ if( $form->validate()) {
foreach ($extra as $key => $value) {
UserManager::update_extra_field_value($user_id, $key, $value);
}
- if ($platform_admin) {
- UserManager::add_user_as_admin($user_id);
- }
$message = get_lang('UserAdded');
}
if (isset($user['submit_plus'])) {
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index 2cd638aed2..6915f9fae5 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -97,7 +97,12 @@ $extra_data = UserManager :: get_extra_user_data($user_id, true);
$user_data = array_merge($user_data, $extra_data);
// Create the form
-$form = new FormValidator('user_edit', 'post', '', '', array('style' => 'width: 60%; float: '.($text_dir == 'rtl' ? 'right;' : 'left;')));
+$form = new FormValidator(
+ 'user_edit',
+ 'post',
+ '',
+ ''
+);
$form->addElement('header', '', $tool_name);
$form->addElement('hidden', 'user_id', $user_id);
@@ -131,7 +136,7 @@ $form->applyFilter('official_code', 'html_filter');
$form->applyFilter('official_code', 'trim');
// Email
-$form->addElement('text', 'email', get_lang('Email'), array('size' => '40'));
+$form->addElement('text', 'email', get_lang('Email'));
$form->addRule('email', get_lang('EmailWrong'), 'email');
if (api_get_setting('registration', 'email') == 'true') {
$form->addRule('email', get_lang('EmailWrong'), 'required');
@@ -144,7 +149,7 @@ if (api_get_setting('login_is_email') == 'true') {
// OpenID
if (api_get_setting('openid_authentication') == 'true') {
- $form->addElement('text', 'openid', get_lang('OpenIDURL'), array('size' => '40'));
+ $form->addElement('text', 'openid', get_lang('OpenIDURL'));
}
// Phone
@@ -159,7 +164,6 @@ if (strlen($user_data['picture_uri']) > 0) {
}
// Username
-
if (api_get_setting('login_is_email') != 'true') {
$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
$form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
@@ -220,23 +224,6 @@ $form->addElement(
$display = isset($user_data['status']) && ($user_data['status'] == STUDENT || (isset($_POST['status']) && $_POST['status'] == STUDENT)) ? 'block' : 'none';
-/*
-$form->addElement('html', '');
-$drh_select = $form->addElement('select', 'hr_dept_id', get_lang('Drh'), array(), 'id="drh_select"');
-$drh_list = UserManager :: get_user_list(array('status' => DRH), api_sort_by_first_name() ? array('firstname', 'lastname') : array('lastname', 'firstname'));
-
-if (count($drh_list) == 0) {
- $drh_select->addOption('- '.get_lang('ThereIsNotStillAResponsible', '').' -', 0);
-} else {
- $drh_select->addOption('- '.get_lang('SelectAResponsible').' -', 0);
-}
-
-foreach($drh_list as $drh) {
- $drh_select->addOption(api_get_person_name($drh['firstname'], $drh['lastname']), $drh['user_id']);
-}
-$form->addElement('html', ' ');
-*/
-
// Platform admin
if (api_is_platform_admin()) {
$group = array();
diff --git a/main/admin/user_export.php b/main/admin/user_export.php
index 85c2406222..2832641e79 100755
--- a/main/admin/user_export.php
+++ b/main/admin/user_export.php
@@ -31,9 +31,10 @@ if (api_is_multiple_url_enabled()) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
- $sql = "SELECT code,visual_code,title FROM $course_table as c
+ $sql = "SELECT code,visual_code,title
+ FROM $course_table as c
INNER JOIN $tbl_course_rel_access_url as course_rel_url
- ON (c.code = course_rel_url.course_code)
+ ON (c.id = course_rel_url.c_id)
WHERE access_url_id = $access_url_id
ORDER BY visual_code";
}
@@ -59,6 +60,8 @@ if ($form->validate()) {
$export = $form->exportValues();
$file_type = $export['file_type'];
$course_code = Database::escape_string($export['course_code']);
+ $courseInfo = api_get_course_info($course_code);
+ $courseId = $courseInfo['real_id'];
$sql = "SELECT u.user_id AS UserId,
u.lastname AS LastName,
@@ -71,7 +74,12 @@ if ($form->validate()) {
u.official_code AS OfficialCode,
u.phone AS Phone";
if (strlen($course_code) > 0) {
- $sql .= " FROM $user_table u, $course_user_table cu WHERE u.user_id = cu.user_id AND course_code = '$course_code' AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." ORDER BY lastname,firstname";
+ $sql .= " FROM $user_table u, $course_user_table cu
+ WHERE
+ u.user_id = cu.user_id AND
+ cu.c_id = '$courseId' AND
+ cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
+ ORDER BY lastname,firstname";
$filename = 'export_users_'.$course_code.'_'.date('Y-m-d_H-i-s');
} else {
global $_configuration;
@@ -119,11 +127,11 @@ if ($form->validate()) {
switch($file_type) {
case 'xml':
- Export::export_table_xml($data,$filename,'Contact','Contacts');
+ Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
exit;
break;
case 'csv':
- Export::export_table_csv($data,$filename);
+ Export::arrayToCsv($data,$filename);
exit;
break;
}
diff --git a/main/admin/user_import.php b/main/admin/user_import.php
index 3ba8101dc3..119580b7ad 100644
--- a/main/admin/user_import.php
+++ b/main/admin/user_import.php
@@ -247,7 +247,7 @@ function save_data($users)
*/
function parse_csv_data($file)
{
- $users = Import :: csv_to_array($file);
+ $users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset ($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));
diff --git a/main/admin/user_information.php b/main/admin/user_information.php
index 3cf4c6c1b8..e53301600b 100755
--- a/main/admin/user_information.php
+++ b/main/admin/user_information.php
@@ -154,12 +154,11 @@ if (count($sessions) > 0) {
$csvContent[] = array($session_item['session_name']);
$csvContent[] = $headerList;
-
foreach ($session_item['courses'] as $my_course) {
$courseInfo = api_get_course_info($my_course['code']);
$sessionStatus = SessionManager::get_user_status_in_session(
$user['user_id'],
- $my_course['code'],
+ $courseInfo['real_id'],
$id_session
);
$status = null;
@@ -258,9 +257,11 @@ $courseToolInformationTotal = null;
/**
* Show the courses in which this user is subscribed
*/
-$sql = 'SELECT * FROM '.$table_course_user.' cu, '.$table_course.' c'.
- ' WHERE cu.user_id = '.$user['user_id'].' AND cu.course_code = c.code '.
- ' AND cu.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' ';
+$sql = 'SELECT * FROM '.$table_course_user.' cu, '.$table_course.' c
+ WHERE
+ cu.user_id = '.$user['user_id'].' AND
+ cu.c_id = c.id AND
+ cu.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' ';
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
$header = array(
@@ -283,14 +284,15 @@ if (Database::num_rows($res) > 0) {
$data = array();
$courseToolInformationTotal = null;
while ($course = Database::fetch_object($res)) {
- $courseInfo = api_get_course_info($course->code);
+ $courseInfo = api_get_course_info_by_id($course->c_id);
+ $courseCode = $courseInfo['code'];
$courseToolInformation = null;
- $tools = ''.Display::return_icon('synthese_view.gif', get_lang('Overview')).''.
+ $tools = ''.Display::return_icon('synthese_view.gif', get_lang('Overview')).''.
''.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'' .
- ''.Display::return_icon('edit.gif', get_lang('Edit')).'';
+ ''.Display::return_icon('edit.gif', get_lang('Edit')).'';
if ($course->status == STUDENT) {
- $tools .= ''.
+ $tools .= ''.
Display::return_icon('delete.png', get_lang('Delete')).'';
}
@@ -309,7 +311,7 @@ if (Database::num_rows($res) > 0) {
);
$row = array(
- Display::url($course->code, $courseInfo['course_public_url']),
+ Display::url($courseCode, $courseInfo['course_public_url']),
$course->title,
$course->status == STUDENT ? get_lang('Student') : get_lang('Teacher'),
$timeSpent,
@@ -391,7 +393,7 @@ if (isset($_GET['action'])) {
}
break;
case 'export':
- Export :: export_table_csv_utf8($csvContent, 'user_information_'.$user);
+ Export :: arrayToCsv($csvContent, 'user_information_'.$user);
exit;
break;
}
diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php
index 28b0d8af56..8a4c5a5457 100755
--- a/main/admin/user_move_stats.php
+++ b/main/admin/user_move_stats.php
@@ -5,6 +5,7 @@
* User move script (to move between courses and sessions)
* @package chamilo.admin
*/
+
$cidReset = true;
require_once '../inc/global.inc.php';
$this_section=SECTION_PLATFORM_ADMIN;
@@ -359,8 +360,8 @@ if (isset($_REQUEST['load_ajax'])) {
$created_dir = '/'.$created_dir;
$now = api_get_utc_datetime();
//Creating directory
- $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION . " SET " .
- "url = '".$created_dir."',
+ $sql_add_publication = "INSERT INTO " . $TBL_STUDENT_PUBLICATION . " SET
+ url = '".$created_dir."',
c_id = $course_id,
title = '".$parent_data['title']."',
description = '".$parent_data['description']." folder_moved_from_session_id_$origin_session_id ',
@@ -581,15 +582,16 @@ $htmlHeadXtra[] = '';
function get_courses_list_by_user_id_based_in_exercises($user_id) {
- $TABLETRACK_EXERCICES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+ $TABLETRACK_EXERCICES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$user_id = intval($user_id);
- //$sql = "SELECT DISTINCT exe_user_id, c_id, session_id as id_session FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id GROUP BY exe_user_id, c_id ORDER by exe_user_id, c_id ASC";
- $sql = "SELECT DISTINCT exe_user_id, c_id, session_id as id_session
- FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id ORDER by exe_user_id, c_id ASC";
+ $sql = "SELECT DISTINCT exe_user_id, c_id, session_id
+ FROM $TABLETRACK_EXERCICES
+ WHERE exe_user_id = $user_id
+ ORDER by exe_user_id, c_id ASC";
$res = Database::query($sql);
$course_list = array();
- while($row = Database::fetch_array($res,'ASSOC')) {
+ while ($row = Database::fetch_array($res,'ASSOC')) {
$course_list []= $row;
}
return $course_list;
@@ -641,7 +643,7 @@ foreach ($session_list as $session_data) {
$combinations = array();
if (!empty($user_list)) {
- foreach ($user_list as $user) {
+ foreach ($user_list as $user) {
$user_id = $user['user_id'];
$name = $user['firstname'].' '.$user['lastname'];
$course_list_registered = CourseManager::get_courses_list_by_user_id(
@@ -652,22 +654,22 @@ if (!empty($user_list)) {
$new_course_list = array();
foreach ($course_list_registered as $course_reg) {
- if (empty($course_reg['id_session'])) {
- $course_reg['id_session'] = 0;
+ if (empty($course_reg['session_id'])) {
+ $course_reg['session_id'] = 0;
}
// Recover the code for historical reasons. If it can be proven
// that the code can be safely replaced by c_id in the following
// PHP code, feel free to do so
- $courseInfo = api_get_course_info_by_id($course_reg['c_id']);
+ $courseInfo = api_get_course_info_by_id($course_reg['real_id']);
$course_reg['code'] = $courseInfo['code'];
- $new_course_list[] = $course_reg['code'].'_'.$course_reg['id_session'];
+ $new_course_list[] = $course_reg['code'].'_'.$course_reg['session_id'];
}
$course_list = get_courses_list_by_user_id_based_in_exercises($user_id);
if (is_array($course_list) && !empty($course_list)) {
foreach ($course_list as $my_course) {
- $key = $my_course['code'].'_'.$my_course['id_session'];
+ $key = $my_course['code'].'_'.$my_course['session_id'];
if (!in_array($key, $new_course_list)) {
$my_course['not_registered'] = 1;
diff --git a/main/admin/user_update_import.php b/main/admin/user_update_import.php
index 083dba728a..9315f13118 100644
--- a/main/admin/user_update_import.php
+++ b/main/admin/user_update_import.php
@@ -244,7 +244,7 @@ function updateUsers($users)
*/
function parse_csv_data($file)
{
- $users = Import :: csv_to_array($file);
+ $users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset ($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));
diff --git a/main/admin/usergroup_export.php b/main/admin/usergroup_export.php
index 0bfe5a35e1..98df29476d 100755
--- a/main/admin/usergroup_export.php
+++ b/main/admin/usergroup_export.php
@@ -28,7 +28,7 @@ if ($form->validate()) {
$data = $userGroup->getDataToExport();
$data = array_merge($header, $data);
$filename = 'export_classes_'.api_get_local_time();
- Export::export_table_csv($data, $filename);
+ Export::arrayToCsv($data, $filename);
exit;
}
diff --git a/main/admin/usergroup_import.php b/main/admin/usergroup_import.php
index 0b1143fce0..66f3467883 100755
--- a/main/admin/usergroup_import.php
+++ b/main/admin/usergroup_import.php
@@ -103,7 +103,7 @@ $form->addGroup($group, '', get_lang('FileType'), '
');
$form->addButtonImport(get_lang('Import'));
if ($form->validate()) {
- $classes = Import::csv_to_array($_FILES['import_file']['tmp_name']);
+ $classes = Import::csvToArray($_FILES['import_file']['tmp_name']);
$errors = validate_data($classes);
if (count($errors) == 0) {
$number_of_added_classes = save_data($classes);
diff --git a/main/admin/usergroup_user_import.php b/main/admin/usergroup_user_import.php
index 333d7dc443..8b9188a2af 100755
--- a/main/admin/usergroup_user_import.php
+++ b/main/admin/usergroup_user_import.php
@@ -118,7 +118,7 @@ function save_data($users_classes, $deleteUsersNotInList = false) {
* @return array All course-information read from the file
*/
function parse_csv_data($file) {
- $courses = Import::csv_to_array($file);
+ $courses = Import::csvToArray($file);
return $courses;
}
$cidReset = true;
diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php
index 70eed68b07..2e81a13597 100755
--- a/main/admin/usergroups.php
+++ b/main/admin/usergroups.php
@@ -104,9 +104,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'add') {
// Setting the form elements
$form->addElement('header', get_lang('Add'));
$form->addElement('text', 'name', get_lang('Name'), array('size' => '70', 'id' => 'name'));
- //$form->applyFilter('note_title', 'html_filter');
$form->addHtmlEditor('description', get_lang('Description'), false, false, array('Width' => '95%', 'Height' => '250'));
- //$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="add"');
$form->addButtonCreate(get_lang('Add'));
// Setting the rules
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 1bb070e6ec..ba2cb60260 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -411,47 +411,6 @@ switch ($action) {
if (!empty($_GET['remind_inactive'])) {
$to[] = 'USER:'.intval($_GET['remind_inactive']);
}
-/*
-if (api_is_allowed_to_edit(false,true) OR
- (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
-) {
-
- //
- if (!empty($_GET['action']) and $_GET['action']=='modify' AND isset($_GET['id'])) {
- if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
- api_not_allowed();
- }
-
- // RETRIEVE THE CONTENT OF THE ANNOUNCEMENT TO MODIFY
- $id = intval($_GET['id']);
-
- if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
- $sql = "SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id = '$id'";
- $rs = Database::query($sql);
- $myrow = Database::fetch_array($rs);
- $last_id = $id;
- $userUpload = isset($_FILES['user_upload']) ? $_FILES['user_upload'] : null;
- $edit_attachment = AnnouncementManager::edit_announcement_attachment_file(
- $last_id,
- $userUpload,
- $file_comment
- );
-
- if ($myrow) {
- $announcement_to_modify = $myrow['id'];
- $content_to_modify = $myrow['content'];
- $title_to_modify = $myrow['title'];
-
- if ($originalresource!=="no") {
- $to = AnnouncementManager::load_edit_users("announcement", $announcement_to_modify);
- }
- $display_announcement_list = false;
- }
- }
- }
-}*/
-
-$htmlHeadXtra[] = AnnouncementManager::to_javascript();
if (!empty($group_id)) {
$group_properties = GroupManager :: get_group_properties($group_id);
diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php
index 7b20dd73f5..2d47444138 100755
--- a/main/attendance/attendance_controller.php
+++ b/main/attendance/attendance_controller.php
@@ -179,6 +179,7 @@ class AttendanceController
public function attendanceSetVisible($attendanceId)
{
$attendance = new Attendance();
+ $affectedRows = null;
if (!empty($attendanceId)) {
$affectedRows = $attendance->changeVisibility($attendanceId, 1);
}
@@ -289,7 +290,7 @@ class AttendanceController
}
if (api_is_allowed_to_edit(null, true) ||
- api_is_coach(api_get_session_id(), api_get_course_id()) ||
+ api_is_coach(api_get_session_id(), api_get_course_int_id()) ||
$isDrhOfCourse
) {
$data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id);
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index 9234f2f1f7..8ff3976c84 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -17,7 +17,7 @@ $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
);
if (api_is_allowed_to_edit(null, true) ||
- api_is_coach(api_get_session_id(), api_get_course_id()) ||
+ api_is_coach(api_get_session_id(), api_get_course_int_id()) ||
$isDrhOfCourse
) {
$param_gradebook = '';
diff --git a/main/auth/cas/authcas.php b/main/auth/cas/authcas.php
index 66a31c29ad..853f83f10d 100755
--- a/main/auth/cas/authcas.php
+++ b/main/auth/cas/authcas.php
@@ -16,7 +16,7 @@ require_once(api_get_path(SYS_PATH).'main/auth/external_login/functions.inc.php'
*
**/
function cas_configured() {
- global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
+ global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
$res = false;
if (!empty($cas_auth_ver) && !empty($cas_auth_server) && !empty($cas_auth_port)) {
$res = true;
@@ -33,7 +33,7 @@ function cas_configured() {
function cas_is_authenticated()
{
- global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
+ global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
global $PHPCAS_CLIENT;
global $logout;
@@ -42,13 +42,13 @@ function cas_is_authenticated()
}
- if (!is_object($PHPCAS_CLIENT) )
+ if (!is_object($PHPCAS_CLIENT) )
{
phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
phpCAS::setNoCasServerValidation();
}
- $auth = phpCAS::checkAuthentication();
-
+ $auth = phpCAS::checkAuthentication();
+
if ($auth) {
$login= trim(phpCAS::getUser());
/*
@@ -85,7 +85,7 @@ function cas_is_authenticated()
if (!$logout){
// get user info from username
$tab_user_info = UserManager::get_user_info($login);
-
+
// user found in the chamilo database
if (is_array($tab_user_info)) {
// if option is on we update user automatically from ldap server
@@ -105,13 +105,13 @@ function cas_is_authenticated()
// if option is on we can ADD user automatically from ldap server or by modify own profil
$user_added = false;
switch (api_get_setting("cas_add_user_activate")) {
- case PLATFORM_AUTH_SOURCE :
+ case PLATFORM_AUTH_SOURCE :
// user will have to modify firstname, lastname, email in chamilo profil edit
$userdata = get_lang("EditInProfil");
UserManager::create_user($userdata, $userdata, '5', $userdata, $login, 'casplaceholder', '','','','',CAS_AUTH_SOURCE);
$user_added = $login;
break;
- case LDAP_AUTH_SOURCE :
+ case LDAP_AUTH_SOURCE :
// user info are read from ldap connexion
// get user info from ldap server
// user has already been authenticated by CAS
@@ -137,8 +137,8 @@ function cas_is_authenticated()
// "FROM $user_table ".
// "WHERE username = '$login' ";
//
-// $result = api_sql_query($sql,__FILE__,__LINE__);
-// if(mysql_num_rows($result) == 0) {
+// $result = Database::query($sql,__FILE__,__LINE__);
+// if(mysql_num_rows($result) == 0) {
// require_once(api_get_path(SYS_PATH).'main/inc/lib/usermanager.lib.php');
// $rnumber=rand(0,256000);
// UserManager::create_user($firstName, $lastName, $status, $email, $login, md5('casplaceholder'.$rnumber), $official_code='',$language='',$phone='',$picture_uri='',$auth_source = PLATFORM_AUTH_SOURCE);
@@ -153,8 +153,8 @@ function cas_is_authenticated()
// }
return $login;
}
- else
- {
+ else
+ {
return false;
}
}
diff --git a/main/auth/courses_controller.php b/main/auth/courses_controller.php
index 3cbb61946b..37acbd0087 100755
--- a/main/auth/courses_controller.php
+++ b/main/auth/courses_controller.php
@@ -245,7 +245,10 @@ class CoursesController
*/
public function change_course_category($course_code, $category_id)
{
- $result = $this->model->store_changecoursecategory($course_code, $category_id);
+ $courseInfo = api_get_course_info($course_code);
+ $courseId = $courseInfo['real_id'];
+
+ $result = $this->model->updateCourseCategory($courseId, $category_id);
$message = '';
if ($result) {
$message = get_lang('EditCourseCategorySucces');
diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index b68efbabe0..de0e856d7a 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -30,7 +30,7 @@ if (!empty($_SESSION['user_language_choice'])) {
} elseif (!empty($_SESSION['_user']['language'])) {
$user_selected_language = $_SESSION['_user']['language'];
} else {
- $user_selected_language = get_setting('platformLanguage');
+ $user_selected_language = api_get_setting('platformLanguage');
}
$form = new FormValidator('registration');
diff --git a/main/auth/ldap/authldap.php b/main/auth/ldap/authldap.php
index 31d15a2224..30d62b943c 100755
--- a/main/auth/ldap/authldap.php
+++ b/main/auth/ldap/authldap.php
@@ -426,9 +426,9 @@ function ldap_get_number_of_users() {
* @author Mustapha Alouani
*/
function ldap_get_user_data($from, $number_of_items, $column, $direction) {
-
+
global $extldap_user_correspondance;
-
+
$users = array();
$is_western_name_order = api_is_western_name_order();
if (isset($_GET['submit'])) {
@@ -554,40 +554,39 @@ function ldap_add_user_to_session($UserList, $id_session) {
$id_session = (int) $id_session;
// Once users are imported in the users base, we can assign them to the session
- $result=Database::query("SELECT course_code FROM $tbl_session_rel_course " .
- "WHERE id_session='$id_session'");
+ $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'");
$CourseList=array();
while ($row=Database::fetch_array($result)) {
- $CourseList[]=$row['course_code'];
+ $CourseList[]=$row['c_id'];
}
foreach ($CourseList as $enreg_course) {
foreach ($UserList as $enreg_user) {
$enreg_user = (int) $enreg_user;
Database::query("INSERT IGNORE ".
" INTO $tbl_session_rel_course_rel_user ".
- "(id_session,course_code,id_user) VALUES ".
+ "(session_id,c_id,user_id) VALUES ".
"('$id_session','$enreg_course','$enreg_user')");
}
- $sql = "SELECT COUNT(id_user) as nbUsers ".
+ $sql = "SELECT COUNT(user_id) as nbUsers ".
" FROM $tbl_session_rel_course_rel_user " .
- " WHERE id_session='$id_session' ".
- " AND course_code='$enreg_course'";
+ " WHERE session_id='$id_session' ".
+ " AND c_id='$enreg_course'";
$rs = Database::query($sql);
list($nbr_users) = Database::fetch_array($rs);
Database::query("UPDATE $tbl_session_rel_course ".
" SET nbr_users=$nbr_users " .
- " WHERE id_session='$id_session' ".
- " AND course_code='$enreg_course'");
+ " WHERE session_id='$id_session' ".
+ " AND c_id='$enreg_course'");
}
foreach ($UserList as $enreg_user) {
$enreg_user = (int) $enreg_user;
Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
- " (id_session, id_user) " .
+ " (session_id, user_id) " .
" VALUES('$id_session','$enreg_user')");
}
// We update the number of users in the session
- $sql = "SELECT COUNT(id_user) as nbUsers FROM $tbl_session_rel_user ".
- " WHERE id_session='$id_session' ".
+ $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
+ " WHERE session_id='$id_session' ".
" AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
$rs = Database::query($sql);
list($nbr_users) = Database::fetch_array($rs);
diff --git a/main/auth/shibboleth/app/shibboleth.class.php b/main/auth/shibboleth/app/shibboleth.class.php
index b5a81ba20e..4d54a7b59a 100755
--- a/main/auth/shibboleth/app/shibboleth.class.php
+++ b/main/auth/shibboleth/app/shibboleth.class.php
@@ -98,7 +98,7 @@ class Shibboleth
/*
* Tests if the user tried to login directly in a protected course before to come here
* (this variable could be set in the modified code of /chamilo/inc/lib/main_api.lib.php)
- *
+ *
* Note:
* this part was added to give the possibility to access Chamilo directly on a course URL from a link diplayed in a portal.
* This is not a direct Shibboleth related functionnality, but this could be used in a shibbolethized
@@ -109,7 +109,7 @@ class Shibboleth
*/
}
if ($url) {
- //needed to log the user in his courses. Normally it is done by visiting /chamilo/index.php
+ //needed to log the user in his courses. Normally it is done by visiting /chamilo/index.php
// $include_path = api_get_path(INCLUDE_PATH);
// require("$include_path/local.inc.php");
//
@@ -160,7 +160,7 @@ class Shibboleth
/**
* Infer the rights/status the user can have in Chamilo based on his affiliation attribute
*
- * @param ShibbolethUser $user
+ * @param ShibbolethUser $user
* @return The Chamilo user status, one of TEACHER, STUDENT or UNKNOWN
*/
public static function infer_user_status($user)
@@ -200,9 +200,9 @@ class Shibboleth
/**
* Return true if the user can ask for a greater status than student.
* This happens for staff members.
- *
+ *
* @param ShibbolethUser $user
- * @return boolean
+ * @return boolean
*/
public static function infer_status_request($user)
{
@@ -242,9 +242,9 @@ class Shibboleth
$signagure = << 'confirmation',
@@ -119,7 +120,7 @@ if (isset($_POST['assign_task_edit_submit'])) {
$blog_id,
$_POST['task_user_id'],
$_POST['task_task_id'],
- $_POST['task_year'] . "-" . $_POST['task_month'] . "-" . $_POST['task_day'],
+ $_POST['task_day'],
$_POST['old_user_id'],
$_POST['old_task_id'],
$_POST['old_target_date']
@@ -219,9 +220,8 @@ if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
/*
DISPLAY
*/
-$htmlHeadXtra[] = '';
-// Set bredcrumb
+// Set breadcrumb
switch ($action) {
case 'new_post' :
$nameTools = get_lang('NewPost');
@@ -426,20 +426,19 @@ switch ($action) {
break;
case 'manage_tasks' :
if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
- if (isset($_GET['do']) && $_GET['do'] == 'add')
- {
- Blog :: display_new_task_form($blog_id);
+ if (isset($_GET['do']) && $_GET['do'] == 'add') {
+ Blog:: display_new_task_form($blog_id);
}
- if (isset($_GET['do']) && $_GET['do'] == 'assign')
- {
- Blog :: display_assign_task_form($blog_id);
+ if (isset($_GET['do']) && $_GET['do'] == 'assign') {
+ Blog:: display_assign_task_form($blog_id);
}
- if (isset($_GET['do']) && $_GET['do'] == 'edit')
- {
- Blog :: display_edit_task_form($blog_id, intval($_GET['task_id']));
+ if (isset($_GET['do']) && $_GET['do'] == 'edit') {
+ Blog:: display_edit_task_form(
+ $blog_id,
+ intval($_GET['task_id'])
+ );
}
- if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment')
- {
+ if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
}
Blog :: display_task_list($blog_id);
diff --git a/main/blog/calendar.php b/main/blog/calendar.php
deleted file mode 100755
index 65521034d2..0000000000
--- a/main/blog/calendar.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-Calendar
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/blog/tbl_change.js b/main/blog/tbl_change.js
deleted file mode 100755
index 1ecabb6e83..0000000000
--- a/main/blog/tbl_change.js
+++ /dev/null
@@ -1,159 +0,0 @@
-var day;
-var month;
-var year;
-var hour;
-var minute;
-var second;
-var clock_set = 0;
-
-/**
- * Opens calendar window.
- *
- * @param string form name
- * @param string field name
- */
-function openCalendar(form, field) {
- window.open("./calendar.php", "calendar", "width=260,height=250,status=no");
- day = eval("document." + form + "." + field + "day.options["+ "document." + form + "." + field + "day.selectedIndex].value");
- month = eval("document." + form + "." + field + "month.options["+ "document." + form + "." + field + "month.selectedIndex].value");
- month = month-1;
- year = eval("document." + form + "." + field + "year.options["+ "document." + form + "." + field + "year.selectedIndex].value");
- formName = form;
- fieldName =field;
-}
-
-/**
- * Formats number to two digits.
- *
- * @param int number to format.
- */
-function formatNum2(i, valtype) {
- f = (i < 10 ? '0' : '') + i;
- if (valtype && valtype != '') {
- switch(valtype) {
- case 'month':
- f = (f > 12 ? 12 : f);
- break;
-
- case 'day':
- f = (f > 31 ? 31 : f);
- break;
- }
- }
-
- return f;
-}
-
-/**
- * Formats number to four digits.
- *
- * @param int number to format.
- */
-function formatNum4(i) {
- return (i < 1000 ? i < 100 ? i < 10 ? '000' : '00' : '0' : '') + i;
-}
-
-/**
- * Initializes calendar window.
- */
-function initCalendar() {
- if (!year && !month && !day) {
- day = window.opener.day;
- month = window.opener.month;
- year = window.opener.year;
- if (isNaN(year) || isNaN(month) || isNaN(day) || day == 0) {
- dt = new Date();
- year = dt.getFullYear();
- month = dt.getMonth();
- day = dt.getDate();
- }
- } else {
- /* Moving in calendar */
- if (month > 11) {
- month = 0;
- year++;
- }
- if (month < 0) {
- month = 11;
- year--;
- }
- }
-
- if (document.getElementById) {
- cnt = document.getElementById("calendar_data");
- } else if (document.all) {
- cnt = document.all["calendar_data"];
- }
-
- cnt.innerHTML = "";
-
- str = ""
-
- //heading table
- str += '| ';
- str += '« ';
- str += month_names[month];
- str += ' »';
- str += ' | ';
- str += '« ';
- str += year;
- str += ' »';
- str += ' |
|---|
';
-
- str += '';
- for (i = 0; i < 7; i++) {
- str += "| " + day_names[i] + " | ";
- }
- str += " ";
-
- var firstDay = new Date(year, month, 1).getDay();
- var lastDay = new Date(year, month + 1, 0).getDate();
-
- str += "";
-
- dayInWeek = 0;
- for (i = 0; i < firstDay; i++) {
- str += "| | ";
- dayInWeek++;
- }
- for (i = 1; i <= lastDay; i++) {
- if (dayInWeek == 7) {
- str += " ";
- dayInWeek = 0;
- }
-
- dispmonth = 1 + month;
- actVal = formatNum4(year) + "-" + formatNum2(dispmonth, 'month') + "-" + formatNum2(i, 'day');
- if (i == day) {
- style = ' class="selected"';
- } else {
- style = '';
- }
- str += "" + i + ""
- dayInWeek++;
- }
- for (i = dayInWeek; i < 7; i++) {
- str += "| | ";
- }
-
- str += "
";
-
- cnt.innerHTML = str;
-}
-
-/**
- * Returns date from calendar.
- *
- * @param string date text
- */
-function returnDate(d,m,y) {
- cmd = "window.opener.document."+window.opener.formName+"."+window.opener.fieldName+"day.selectedIndex = "+(d-1);
- eval(cmd);
- cmd = "window.opener.document."+window.opener.formName+"."+window.opener.fieldName+"month.selectedIndex = "+m;
- eval(cmd);
- date = new Date();
- year = date.getFullYear()-1;
- cmd = "window.opener.document."+window.opener.formName+"."+window.opener.fieldName+"year.selectedIndex = "+(y-year);
- eval(cmd);
- window.close();
-}
diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index a5be16136c..4b3c9a98ec 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -5,7 +5,7 @@
* @package chamilo.calendar
*/
-use \ChamiloSession as Session;
+use ChamiloSession as Session;
// use anonymous mode when accessing this course tool
$use_anonymous = true;
@@ -63,7 +63,7 @@ $nameTools = get_lang('Agenda');
Event::event_access_tool(TOOL_CALENDAR_EVENT);
// permission stuff - also used by loading from global in agenda.inc.php
-$is_allowed_to_edit = api_is_allowed_to_edit(false, true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous());
+$is_allowed_to_edit = api_is_allowed_to_edit(false, true) || (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous());
$agenda = new Agenda();
$agenda->type = $type;
$actions = $agenda->displayActions('calendar');
@@ -88,10 +88,10 @@ $agenda->type = $event_type;
$message = null;
$content = null;
-if (api_is_allowed_to_edit(false, true) OR
+if (api_is_allowed_to_edit(false, true) ||
(api_get_course_setting('allow_user_edit_agenda') &&
!api_is_anonymous() &&
- api_is_allowed_to_session_edit(false, true)) OR
+ api_is_allowed_to_session_edit(false, true)) ||
GroupManager::user_has_access(api_get_user_id(), $group_id, GroupManager::GROUP_TOOL_CALENDAR) &&
GroupManager::is_tutor_of_group(api_get_user_id(), $group_id)
) {
@@ -239,7 +239,7 @@ if (api_is_allowed_to_edit(false, true) OR
header("Location: $agendaUrl");
exit;
} else {
- $content = $form->return_form();
+ $content = $form->returnForm();
}
break;
case 'importical':
diff --git a/main/calendar/agenda_list.php b/main/calendar/agenda_list.php
index ad10cebbec..6e0fbc443a 100755
--- a/main/calendar/agenda_list.php
+++ b/main/calendar/agenda_list.php
@@ -14,7 +14,7 @@ $interbreadcrumb[] = array(
$agenda = new Agenda();
$type = isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
$agenda->setType($type);
-$events = $agenda->get_events(
+$events = $agenda->getEvents(
null,
null,
api_get_course_int_id(),
diff --git a/main/calendar/calendar.php b/main/calendar/calendar.php
deleted file mode 100755
index dbaa8453c7..0000000000
--- a/main/calendar/calendar.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-Calendar
-
-
-
-
-
-
-
-
-
-
-
diff --git a/main/calendar/tbl_change.js b/main/calendar/tbl_change.js
deleted file mode 100755
index 8104ea1790..0000000000
--- a/main/calendar/tbl_change.js
+++ /dev/null
@@ -1,159 +0,0 @@
-var day;
-var month;
-var year;
-var hour;
-var minute;
-var second;
-var clock_set = 0;
-
-/**
- * Opens calendar window.
- *
- * @param string form name
- * @param string field name
- */
-function openCalendar(form, field) {
- window.open("./calendar.php", "calendar", "width=260,height=250,status=no,toolbar=no");
- day = eval("document." + form + "." + field + "day.options["+ "document." + form + "." + field + "day.selectedIndex].value");
- month = eval("document." + form + "." + field + "month.options["+ "document." + form + "." + field + "month.selectedIndex].value");
- month = month-1;
- year = eval("document." + form + "." + field + "year.options["+ "document." + form + "." + field + "year.selectedIndex].value");
- formName = form;
- fieldName =field;
-}
-
-/**
- * Formats number to two digits.
- *
- * @param int number to format.
- */
-function formatNum2(i, valtype) {
- f = (i < 10 ? '0' : '') + i;
- if (valtype && valtype != '') {
- switch(valtype) {
- case 'month':
- f = (f > 12 ? 12 : f);
- break;
-
- case 'day':
- f = (f > 31 ? 31 : f);
- break;
- }
- }
-
- return f;
-}
-
-/**
- * Formats number to four digits.
- *
- * @param int number to format.
- */
-function formatNum4(i) {
- return (i < 1000 ? i < 100 ? i < 10 ? '000' : '00' : '0' : '') + i;
-}
-
-/**
- * Initializes calendar window.
- */
-function initCalendar() {
- if (!year && !month && !day) {
- day = window.opener.day;
- month = window.opener.month;
- year = window.opener.year;
- if (isNaN(year) || isNaN(month) || isNaN(day) || day == 0) {
- dt = new Date();
- year = dt.getFullYear();
- month = dt.getMonth();
- day = dt.getDate();
- }
- } else {
- /* Moving in calendar */
- if (month > 11) {
- month = 0;
- year++;
- }
- if (month < 0) {
- month = 11;
- year--;
- }
- }
-
- if (document.getElementById) {
- cnt = document.getElementById("calendar_data");
- } else if (document.all) {
- cnt = document.all["calendar_data"];
- }
-
- cnt.innerHTML = "";
-
- str = ""
-
- //heading table
- str += '| ';
- str += '« ';
- str += month_names[month];
- str += ' »';
- str += ' | ';
- str += '« ';
- str += year;
- str += ' »';
- str += ' |
|---|
';
-
- str += '';
- for (i = 0; i < 7; i++) {
- str += "| " + day_names[i] + " | ";
- }
- str += " ";
-
- var firstDay = new Date(year, month, 1).getDay();
- var lastDay = new Date(year, month + 1, 0).getDate();
-
- str += "";
-
- dayInWeek = 0;
- for (i = 0; i < firstDay; i++) {
- str += "| | ";
- dayInWeek++;
- }
- for (i = 1; i <= lastDay; i++) {
- if (dayInWeek == 7) {
- str += " ";
- dayInWeek = 0;
- }
-
- dispmonth = 1 + month;
- actVal = formatNum4(year) + "-" + formatNum2(dispmonth, 'month') + "-" + formatNum2(i, 'day');
- if (i == day) {
- style = ' class="selected"';
- } else {
- style = '';
- }
- str += "" + i + ""
- dayInWeek++;
- }
- for (i = dayInWeek; i < 7; i++) {
- str += "| | ";
- }
-
- str += "
";
-
- cnt.innerHTML = str;
-}
-
-/**
- * Returns date from calendar.
- *
- * @param string date text
- */
-function returnDate(d,m,y) {
- cmd = "window.opener.document."+window.opener.formName+"."+window.opener.fieldName+"day.selectedIndex = "+(d-1);
- eval(cmd);
- cmd = "window.opener.document."+window.opener.formName+"."+window.opener.fieldName+"month.selectedIndex = "+m;
- eval(cmd);
- date = new Date();
- year = date.getFullYear()-1;
- cmd = "window.opener.document."+window.opener.formName+"."+window.opener.fieldName+"year.selectedIndex = "+(y-year);
- eval(cmd);
- window.close();
-}
diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php
index 555af169af..86f38f164d 100755
--- a/main/chat/chat_whoisonline.php
+++ b/main/chat/chat_whoisonline.php
@@ -12,6 +12,7 @@ define('FRAME', 'online');
require_once '../inc/global.inc.php';
$course = api_get_course_id();
+$courseInfo = api_get_course_info();
$group_id = api_get_group_id();
$session_id = api_get_session_id();
$user_id = api_get_user_id();
@@ -50,13 +51,14 @@ if (!empty($course)) {
if (empty($session_id)) {
$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email,t3.status
FROM $tbl_user t1, $tbl_chat_connected t2, $tbl_course_user t3
- WHERE t2.c_id = $course_id AND
- t1.user_id=t2.user_id AND
- t3.user_id=t2.user_id AND
- t3.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
- t3.course_code = '".$_course['sysCode']."' AND
- t2.last_connection>'".$date_inter."' $extra_condition
- ORDER BY username";
+ WHERE
+ t2.c_id = $course_id AND
+ t1.user_id=t2.user_id AND
+ t3.user_id=t2.user_id AND
+ t3.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
+ t3.c_id = '".$courseInfo['real_id']."' AND
+ t2.last_connection>'".$date_inter."' $extra_condition
+ ORDER BY username";
$result = Database::query($query);
$users = Database::store_result($result);
} else {
@@ -65,9 +67,11 @@ if (!empty($course)) {
FROM $tbl_user t1, $tbl_chat_connected t2, $tbl_session_course_user t3
WHERE
t2.c_id = $course_id AND
- t1.user_id=t2.user_id AND t3.id_user=t2.user_id AND
- t3.id_session = '".$session_id."' AND
- t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
+ t1.user_id=t2.user_id AND t3.user_id=t2.user_id AND
+ t3.session_id = '".$session_id."' AND
+ t3.c_id = '".$_course['real_id']."' AND
+ t2.last_connection>'".$date_inter."' $extra_condition
+ ORDER BY username";
$result = Database::query($query);
while ($learner = Database::fetch_array($result)) {
$users[$learner['user_id']] = $learner;
@@ -76,8 +80,14 @@ if (!empty($course)) {
// select session coach
$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email
FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session t3
- WHERE t2.c_id = $course_id AND
- t1.user_id=t2.user_id AND t3.id_coach=t2.user_id AND t3.id = '".$session_id."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
+ WHERE
+ t2.c_id = $course_id AND
+ t1.user_id=t2.user_id AND
+ t3.id_coach=t2.user_id AND
+ t3.id = '".$session_id."' AND
+ t2.last_connection > '".$date_inter."'
+ $extra_condition
+ ORDER BY username";
$result = Database::query($query);
if ($coach = Database::fetch_array($result)) {
$users[$coach['user_id']] = $coach;
@@ -87,12 +97,13 @@ if (!empty($course)) {
$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email
FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3
WHERE
- t2.c_id = $course_id AND
- t1.user_id=t2.user_id
- AND t3.id_user=t2.user_id AND t3.status=2
- AND t3.id_session = '".$session_id."'
- AND t3.course_code = '".$_course['sysCode']."'
- AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
+ t2.c_id = $course_id AND
+ t1.user_id=t2.user_id
+ AND t3.user_id =t2.user_id AND t3.status=2
+ AND t3.session_id = '".$session_id."'
+ AND t3.c_id = '".$course_id."'
+ AND t2.last_connection>'".$date_inter."' $extra_condition
+ ORDER BY username";
$result = Database::query($query);
$course_coaches = array();
diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php
index b625938f23..5a057b4bdb 100644
--- a/main/course_description/course_description_controller.php
+++ b/main/course_description/course_description_controller.php
@@ -35,7 +35,7 @@ class CourseDescriptionController
$course_description->set_session_id($session_id);
$data = array();
$course_description_data = $course_description->get_description_data();
- $data['descriptions'] = $course_description_data['descriptions'];
+ $data['descriptions'] = isset($course_description_data['descriptions']) ? $course_description_data['descriptions'] : '';
$data['default_description_titles'] = $course_description->get_default_description_title();
$data['default_description_title_editable'] = $course_description->get_default_description_title_editable();
$data['default_description_icon'] = $course_description->get_default_description_icon();
@@ -45,6 +45,7 @@ class CourseDescriptionController
if (!is_array($data['descriptions'])) {
$data['descriptions'] = array($data['descriptions']);
}
+
foreach ($data['descriptions'] as $description) {
if (!empty($description['content'])
&& strpos($description['content'], 'set_session_id($session_id);
$data = array();
$data['id'] = $id;
+ $affected_rows = null;
+ $message = array();
if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
if (!empty($_POST['title']) && !empty($_POST['contentDescription'])) {
$check = Security::check_token();
@@ -85,7 +88,7 @@ class CourseDescriptionController
}
$description_type = $_POST['description_type'];
$id = $_POST['id'];
- $progress = $_POST['progress'];
+ $progress = isset($_POST['progress']) ? $_POST['progress'] : '';
$course_description->set_description_type($description_type);
$course_description->set_title($title);
$course_description->set_content($content);
@@ -137,7 +140,7 @@ class CourseDescriptionController
if (isset($_GET['id_session'])) {
$session_id = intval($_GET['id_session']);
}
- $course_description_data = $course_description->get_data_by_id(
+ $course_description_data = $course_description->get_data_by_id(
$id,
null,
$session_id
@@ -146,7 +149,7 @@ class CourseDescriptionController
$data['description_title'] = $course_description_data['description_title'];
$data['description_content'] = $course_description_data['description_content'];
$data['progress'] = $course_description_data['progress'];
- $data['descriptions'] = $course_description->get_data_by_description_type(
+ $data['descriptions'] = $course_description->get_data_by_description_type(
$description_type,
null,
$session_id
diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index f17c222885..e40d83cae8 100755
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@@ -31,6 +31,7 @@ $currentCourseRepository = $_course['path'];
$is_allowedToEdit = $is_courseAdmin || $is_platformAdmin;
$course_code = api_get_course_id();
+$courseId = api_get_course_int_id();
$course_access_settings = CourseManager:: get_access_settings($course_code);
//LOGIC FUNCTIONS
@@ -62,7 +63,7 @@ $s_tutor = Database::result($q_tutor, 0, 'tutor_name');
$target_name = api_sort_by_first_name() ? 'firstname' : 'lastname';
$s_sql_course_titular = "SELECT DISTINCT username, lastname, firstname
FROM $tbl_user as user, $tbl_course_user as course_rel_user
- WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND course_code='".$course_code."'
+ WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND c_id ='".$courseId."'
ORDER BY ".$target_name." ASC";
$q_result_titulars = Database::query($s_sql_course_titular);
@@ -414,7 +415,7 @@ if ($form->validate() && is_settings_editable()) {
$updateValues = $form->exportValues();
$visibility = $updateValues['visibility'];
- $deletePicture = $updateValues['delete_picture'];
+ $deletePicture = isset($updateValues['delete_picture']) ? $updateValues['delete_picture'] : '';
if ($deletePicture) {
CourseManager::deleteCoursePicture($course_code);
@@ -476,6 +477,8 @@ if ($form->validate() && is_settings_editable()) {
$updateValues[$index] = Database::escape_string($value);
}
+ $activeLegal = isset($updateValues['activate_legal']) ? $updateValues['activate_legal'] : '';
+
$table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
$sql = "UPDATE $table_course SET
title = '".$updateValues['title']."',
@@ -487,7 +490,7 @@ if ($form->validate() && is_settings_editable()) {
subscribe = '".$updateValues['subscribe']."',
unsubscribe = '".$updateValues['unsubscribe']."',
legal = '".$updateValues['legal']."',
- activate_legal = '".$updateValues['activate_legal']."',
+ activate_legal = '".$activeLegal."',
registration_code = '".$updateValues['course_registration_password']."'
WHERE code = '".$course_code."'";
Database::query($sql);
diff --git a/main/course_info/legal.php b/main/course_info/legal.php
index e6f8baf0da..189ff4f066 100755
--- a/main/course_info/legal.php
+++ b/main/course_info/legal.php
@@ -120,7 +120,7 @@ if (empty($session_id)) {
header('Location: '.$url);
}
- $userStatus = SessionManager::get_user_status_in_session($user_id, $course_code, $session_id);
+ $userStatus = SessionManager::get_user_status_in_session($user_id, $course_info['real_id'], $session_id);
if (isset($userStatus) || api_check_user_access_to_legal($course_info['visibility'])) {
$user_accepted_legal = CourseManager::is_user_accepted_legal(
diff --git a/main/course_progress/index.php b/main/course_progress/index.php
index c2238176b6..a2045090e3 100755
--- a/main/course_progress/index.php
+++ b/main/course_progress/index.php
@@ -78,7 +78,7 @@ $thematic = new Thematic();
// thematic controller object
$thematic_controller = new ThematicController();
-
+$thematic_data = [];
if (!empty($thematic_id)) {
// thematic data by id
$thematic_data = $thematic->get_thematic_list($thematic_id);
@@ -197,7 +197,12 @@ if ($action == 'thematic_details') {
}
if ($action == 'thematic_plan_list' || $action == 'thematic_plan_delete') {
$interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl'));
- $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].') ');
+ if (!empty($thematic_data)) {
+ $interbreadcrumb[] = array(
+ 'url' => '#',
+ 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].') '
+ );
+ }
}
if ($action == 'thematic_plan_add' || $action == 'thematic_plan_edit') {
$interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl'));
diff --git a/main/course_progress/thematic_controller.php b/main/course_progress/thematic_controller.php
index 7bb540fea6..399b91a7ee 100755
--- a/main/course_progress/thematic_controller.php
+++ b/main/course_progress/thematic_controller.php
@@ -113,7 +113,7 @@ class ThematicController
case 'thematic_import_select':
break;
case 'thematic_import':
- $csv_import_array = Import::csv_to_array($_FILES['file']['tmp_name'], 'horizontal');
+ $csv_import_array = Import::csvToArray($_FILES['file']['tmp_name']);
if (isset($_POST['replace']) && $_POST['replace']) {
// Remove current thematic.
@@ -126,22 +126,35 @@ class ThematicController
// Import the progress.
$current_thematic = null;
- foreach ($csv_import_array as $data) {
- foreach ($data as $key => $item) {
- if ($key == 'title') {
- $thematic->set_thematic_attributes(null, $item[0], $item[1], api_get_session_id());
+ foreach ($csv_import_array as $item) {
+ $key = $item['type'];
+ switch ($key) {
+ case 'title':
+ $thematic->set_thematic_attributes(null, $item['data1'], $item['data2'], api_get_session_id());
$current_thematic = $thematic->thematic_save();
$description_type = 0;
- }
- if ($key == 'plan') {
- $thematic->set_thematic_plan_attributes($current_thematic, $item[0], $item[1], $description_type);
+ break;
+ case 'plan':
+ $thematic->set_thematic_plan_attributes(
+ $current_thematic,
+ $item['data1'],
+ $item['data2'],
+ $description_type
+ );
$thematic->thematic_plan_save();
$description_type++;
- }
- if ($key == 'progress') {
- $thematic->set_thematic_advance_attributes(null, $current_thematic, 0, $item[2], $item[0], $item[1]);
+ break;
+ case 'progress':
+ $thematic->set_thematic_advance_attributes(
+ null,
+ $current_thematic,
+ 0,
+ $item['data3'],
+ $item['data1'],
+ $item['data2']
+ );
$thematic->thematic_advance_save();
- }
+ break;
}
}
$action = 'thematic_details';
@@ -149,6 +162,7 @@ class ThematicController
case 'thematic_export':
$list = $thematic->get_thematic_list();
$csv = array();
+ $csv[] = array('type', 'data1', 'data2', 'data3');
foreach ($list as $theme) {
$csv[] = array('title', $theme['title'], $theme['content']);
$data = $thematic->get_thematic_plan_data($theme['id']);
@@ -164,7 +178,7 @@ class ThematicController
}
}
}
- Export::export_table_csv($csv);
+ Export::arrayToCsv($csv);
exit;
// Don't continue building a normal page.
return;
diff --git a/main/coursecopy/classes/Announcement.class.php b/main/coursecopy/classes/Announcement.class.php
index cb51922c9a..605f4e6135 100755
--- a/main/coursecopy/classes/Announcement.class.php
+++ b/main/coursecopy/classes/Announcement.class.php
@@ -30,15 +30,15 @@ class Announcement extends Resource
* Has the e-mail been sent?
*/
public $email_sent;
-
+
public $attachment_path;
-
+
public $attachment_filename;
-
+
public $attachment_size;
-
+
public $attachment_comment;
-
+
/**
* Create a new announcement
* @param int $id
@@ -47,22 +47,22 @@ class Announcement extends Resource
* @param string $date
* @param int display_order
*/
- function Announcement($id, $title, $content, $date, $display_order, $email_sent, $path, $filename, $size, $comment)
+ function __construct($id, $title, $content, $date, $display_order, $email_sent, $path, $filename, $size, $comment)
{
- parent::Resource($id,RESOURCE_ANNOUNCEMENT);
-
+ parent::__construct($id,RESOURCE_ANNOUNCEMENT);
+
$this->content = $content;
$this->title = $title;
$this->date = $date;
$this->display_order = $display_order;
- $this->email_sent = $email_sent;
-
+ $this->email_sent = $email_sent;
+
$this->attachment_path = $path;
$this->attachment_filename = $filename;
$this->attachment_size = $size;
- $this->attachment_comment = $comment;
+ $this->attachment_comment = $comment;
}
-
+
/**
* Show this announcement
*/
diff --git a/main/coursecopy/classes/Attendance.class.php b/main/coursecopy/classes/Attendance.class.php
index b7b32ed18f..2a4301a022 100755
--- a/main/coursecopy/classes/Attendance.class.php
+++ b/main/coursecopy/classes/Attendance.class.php
@@ -20,7 +20,7 @@ class Attendance extends Resource
*/
public function __construct($params)
{
- parent::Resource($params['id'], RESOURCE_ATTENDANCE);
+ parent::__construct($params['id'], RESOURCE_ATTENDANCE);
$this->params = $params;
}
diff --git a/main/coursecopy/classes/Course.class.php b/main/coursecopy/classes/Course.class.php
index 7de03fe85e..7a4185cd9f 100755
--- a/main/coursecopy/classes/Course.class.php
+++ b/main/coursecopy/classes/Course.class.php
@@ -24,11 +24,11 @@ class Course
*/
public function __construct()
{
- $this->resources = array();
- $this->code = '';
- $this->path = '';
- $this->backup_path = '';
- $this->encoding = api_get_system_encoding();
+ $this->resources = array();
+ $this->code = '';
+ $this->path = '';
+ $this->backup_path = '';
+ $this->encoding = api_get_system_encoding();
}
/**
diff --git a/main/coursecopy/classes/CourseBuilder.class.php b/main/coursecopy/classes/CourseBuilder.class.php
index 24ae800035..b882953aa7 100755
--- a/main/coursecopy/classes/CourseBuilder.class.php
+++ b/main/coursecopy/classes/CourseBuilder.class.php
@@ -80,15 +80,9 @@ class CourseBuilder
$this->course = new Course();
$this->course->code = $_course['official_code'];
$this->course->type = $type;
- $this->course->path = api_get_path(
- SYS_COURSE_PATH
- ).$_course['path'].'/';
- $this->course->backup_path = api_get_path(
- SYS_COURSE_PATH
- ).$_course['path'];
- $this->course->encoding = api_get_system_encoding(
- ); //current platform encoding
- $this->course->db_name = $_course['dbName'];
+ $this->course->path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/';
+ $this->course->backup_path = api_get_path(SYS_COURSE_PATH).$_course['path'];
+ $this->course->encoding = api_get_system_encoding();
$this->course->info = $_course;
}
@@ -219,12 +213,15 @@ class CourseBuilder
$session_condition = api_get_session_condition(
$session_id,
true,
- true
+ true,
+ 'd.session_id'
);
} else {
$session_condition = api_get_session_condition(
$session_id,
- true
+ true,
+ false,
+ 'd.session_id'
);
}
@@ -442,22 +439,36 @@ class CourseBuilder
$session_condition = api_get_session_condition(
$session_id,
true,
- true
+ true,
+ 'l.session_id'
);
} else {
$session_condition = api_get_session_condition(
$session_id,
- true
+ true,
+ false,
+ 'l.session_id'
);
}
$sql = "SELECT l.id, l.title, l.url, l.description, l.category_id, l.on_homepage
FROM $table l, $table_prop p
- WHERE l.c_id = $course_id AND p.c_id = $course_id AND p.ref=l.id AND p.tool = '".TOOL_LINK."' AND p.visibility != 2 $session_condition
+ WHERE
+ l.c_id = $course_id AND
+ p.c_id = $course_id AND
+ p.ref=l.id AND
+ p.tool = '".TOOL_LINK."' AND
+ p.visibility != 2 $session_condition
ORDER BY l.display_order";
} else {
$sql = "SELECT l.id, l.title, l.url, l.description, l.category_id, l.on_homepage
FROM $table l, $table_prop p
- WHERE l.c_id = $course_id AND p.c_id = $course_id AND p.ref=l.id AND p.tool = '".TOOL_LINK."' AND p.visibility != 2 AND l.session_id = 0
+ WHERE
+ l.c_id = $course_id AND
+ p.c_id = $course_id AND
+ p.ref=l.id AND
+ p.tool = '".TOOL_LINK."' AND
+ p.visibility != 2 AND
+ l.session_id = 0
ORDER BY l.display_order";
}
@@ -622,15 +633,17 @@ class CourseBuilder
// Building normal tests.
$sql = "SELECT * FROM $table_que WHERE c_id = $course_id ";
+ $result = Database::query($sql);
- $db_result = Database::query($sql);
- while ($obj = Database::fetch_object($db_result)) {
+ while ($obj = Database::fetch_object($result)) {
// find the question category
+
// @todo : need to be adapted for multi category questions in 1.10
- $question_category_id = Testcategory::getCategoryForQuestion(
+ $question_category_id = TestCategory::getCategoryForQuestion(
$obj->id,
$course_id
);
+
// build the backup resource question object
$question = new QuizQuestion(
$obj->id,
@@ -644,7 +657,9 @@ class CourseBuilder
$obj->extra,
$question_category_id
);
- $sql = 'SELECT * FROM '.$table_ans.' WHERE c_id = '.$course_id.' AND question_id = '.$obj->id;
+
+ $sql = 'SELECT * FROM '.$table_ans.'
+ WHERE c_id = '.$course_id.' AND question_id = '.$obj->id;
$db_result2 = Database::query($sql);
while ($obj2 = Database::fetch_object($db_result2)) {
@@ -703,11 +718,11 @@ class CourseBuilder
)
";
- $db_result = Database::query($sql);
- if (Database::num_rows($db_result) > 0) {
+ $result = Database::query($sql);
+ if (Database::num_rows($result) > 0) {
$build_orphan_questions = true;
$orphanQuestionIds = array();
- while ($obj = Database::fetch_object($db_result)) {
+ while ($obj = Database::fetch_object($result)) {
// Orphan questions
if (!empty($obj->question_id)) {
@@ -718,7 +733,7 @@ class CourseBuilder
if (!isset($this->course->resources[$obj->id])) {
// find the question category
// @todo : need to be adapted for multi category questions in 1.10
- $question_category_id = Testcategory::getCategoryForQuestion(
+ $question_category_id = TestCategory::getCategoryForQuestion(
$obj->id,
$course_id
);
@@ -856,12 +871,12 @@ class CourseBuilder
$course_id = api_get_course_int_id();
// get all test category in course
- $tab_test_categories_id = Testcategory::getCategoryListInfo(
+ $tab_test_categories_id = TestCategory::getCategoryListInfo(
"id",
$course_id
);
foreach ($tab_test_categories_id as $test_category_id) {
- $test_category = new Testcategory($test_category_id);
+ $test_category = new TestCategory($test_category_id);
$copy_course_test_category = new CourseCopyTestcategory(
$test_category_id,
$test_category->name,
@@ -954,7 +969,7 @@ class CourseBuilder
$id_list = array()
) {
$table = Database:: get_course_table(TABLE_ANNOUNCEMENT);
- $course_id = api_get_course_int_id();
+ $courseId = api_get_course_int_id();
$sessionCondition = api_get_session_condition(
$session_id,
@@ -962,22 +977,27 @@ class CourseBuilder
$with_base_content
);
- $sql = 'SELECT * FROM '.$table.' WHERE c_id = '.$course_id.' '.$sessionCondition;
+ $sql = 'SELECT * FROM '.$table.' WHERE c_id = '.$courseId.' '.$sessionCondition;
$db_result = Database::query($sql);
$table_attachment = Database:: get_course_table(
TABLE_ANNOUNCEMENT_ATTACHMENT
);
while ($obj = Database::fetch_object($db_result)) {
- $sql = 'SELECT path, comment, filename, size FROM '.$table_attachment.' WHERE c_id = '.$course_id.' AND announcement_id = '.$obj->id.'';
+
+ $sql = 'SELECT path, comment, filename, size
+ FROM '.$table_attachment.'
+ WHERE c_id = '.$courseId.' AND announcement_id = '.$obj->id.'';
$result = Database::query($sql);
$attachment_obj = Database::fetch_object($result);
$att_path = $att_filename = $att_size = $atth_comment = '';
+
if (!empty($attachment_obj)) {
$att_path = $attachment_obj->path;
$att_filename = $attachment_obj->filename;
$att_size = $attachment_obj->size;
$atth_comment = $attachment_obj->comment;
}
+
$announcement = new Announcement(
$obj->id,
$obj->title,
@@ -991,7 +1011,6 @@ class CourseBuilder
$atth_comment
);
$this->course->add_resource($announcement);
-
}
}
@@ -1297,9 +1316,12 @@ class CourseBuilder
$this->course->encoding = api_get_system_encoding(
); //current platform encoding
$code_course = $_course['code'];
- $sql_session = "SELECT id, name, course_code FROM $tbl_session_course
- INNER JOIN $tbl_session ON id_session = id
- WHERE course_code = '$code_course' ";
+ $courseId = $_course['real_id'];
+ $sql_session = "SELECT s.id, name, c_id
+ FROM $tbl_session_course sc
+ INNER JOIN $tbl_session s
+ ON sc.session_id = s.id
+ WHERE sc.c_id = '$courseId' ";
$query_session = Database::query($sql_session);
while ($rows_session = Database::fetch_assoc($query_session)) {
$session = new CourseSession(
@@ -1465,11 +1487,13 @@ class CourseBuilder
$with_base_content
);
- $sql = 'SELECT * FROM '.$table_attendance.' WHERE c_id = '.$course_id.' '.$sessionCondition;
+ $sql = 'SELECT * FROM '.$table_attendance.'
+ WHERE c_id = '.$course_id.' '.$sessionCondition;
$db_result = Database::query($sql);
while ($row = Database::fetch_array($db_result, 'ASSOC')) {
$obj = new Attendance($row);
- $sql = 'SELECT * FROM '.$table_attendance_calendar.' WHERE c_id = '.$course_id.' AND attendance_id = '.$row['id'];
+ $sql = 'SELECT * FROM '.$table_attendance_calendar.'
+ WHERE c_id = '.$course_id.' AND attendance_id = '.$row['id'];
$result = Database::query($sql);
while ($sub_row = Database::fetch_array($result, 'ASSOC')) {
diff --git a/main/coursecopy/classes/CourseCopyLearnpath.class.php b/main/coursecopy/classes/CourseCopyLearnpath.class.php
index 813574f0b1..c4856ff72f 100755
--- a/main/coursecopy/classes/CourseCopyLearnpath.class.php
+++ b/main/coursecopy/classes/CourseCopyLearnpath.class.php
@@ -108,7 +108,7 @@ class CourseCopyLearnpath extends Resource
* @param string $visibility
* @param array $items
*/
- public function CourseCopyLearnpath(
+ public function __construct(
$id,
$type,
$name,
@@ -137,7 +137,7 @@ class CourseCopyLearnpath extends Resource
$session_id,
$items
) {
- parent::Resource($id,RESOURCE_LEARNPATH);
+ parent::__construct($id, RESOURCE_LEARNPATH);
$this->lp_type = $type;
$this->name = $name;
$this->path = $path;
diff --git a/main/coursecopy/classes/CourseCopyTestCategory.php b/main/coursecopy/classes/CourseCopyTestCategory.php
index 5b3efa70f3..b515248bd4 100755
--- a/main/coursecopy/classes/CourseCopyTestCategory.php
+++ b/main/coursecopy/classes/CourseCopyTestCategory.php
@@ -25,8 +25,9 @@ class CourseCopyTestcategory extends Resource
* @param string $title
* @param string $description
*/
- function CourseCopyTestcategory($id, $title, $description) {
- parent::Resource($id, RESOURCE_TEST_CATEGORY);
+ public function __construct($id, $title, $description)
+ {
+ parent::__construct($id, RESOURCE_TEST_CATEGORY);
$this->title = $title;
$this->description = $description;
}
diff --git a/main/coursecopy/classes/CourseDescription.class.php b/main/coursecopy/classes/CourseDescription.class.php
index 42946b7aa2..6517786ed6 100755
--- a/main/coursecopy/classes/CourseDescription.class.php
+++ b/main/coursecopy/classes/CourseDescription.class.php
@@ -13,24 +13,25 @@ class CourseDescription extends Resource
/**
* The title
*/
- var $title;
+ public $title;
/**
* The content
*/
- var $content;
+ public $content;
/**
* The description type
*/
- var $description_type;
+ public $description_type;
+
/**
* Create a new course description
* @param int $id
* @param string $title
* @param string $content
*/
- function __construct($id,$title,$content,$description_type)
+ public function __construct($id,$title,$content,$description_type)
{
- parent::Resource($id,RESOURCE_COURSEDESCRIPTION);
+ parent::__construct($id,RESOURCE_COURSEDESCRIPTION);
$this->title = $title;
$this->content = $content;
$this->description_type = $description_type;
diff --git a/main/coursecopy/classes/CourseRecycler.class.php b/main/coursecopy/classes/CourseRecycler.class.php
index 3d68cf5c06..417e4328f4 100755
--- a/main/coursecopy/classes/CourseRecycler.class.php
+++ b/main/coursecopy/classes/CourseRecycler.class.php
@@ -21,7 +21,7 @@ class CourseRecycler
* @param course $course The course-object which contains the items to
* delete
*/
- public function CourseRecycler($course)
+ public function __construct($course)
{
$this->course = $course;
$this->course_info = api_get_course_info($this->course->code);
@@ -459,7 +459,7 @@ class CourseRecycler
{
if (isset($this->course->resources[RESOURCE_TEST_CATEGORY])) {
foreach ($this->course->resources[RESOURCE_TEST_CATEGORY] as $tab_test_cat) {
- $obj_cat = new Testcategory($tab_test_cat->source_id);
+ $obj_cat = new TestCategory($tab_test_cat->source_id);
$obj_cat->removeCategory();
}
}
diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php
index 2ebb12d97d..3e68a7eab1 100755
--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
@@ -90,9 +90,9 @@ class CourseRestorer
} else {
$this->course_origin_id = null;
}
- $this->file_option = FILE_RENAME;
- $this->set_tools_invisible_by_default = false;
- $this->skip_content = array();
+ $this->file_option = FILE_RENAME;
+ $this->set_tools_invisible_by_default = false;
+ $this->skip_content = array();
}
/**
@@ -198,7 +198,7 @@ class CourseRestorer
$condition_session = "";
if (!empty($session_id)) {
- $condition_session = " , id_session='".intval($session_id)."'";
+ $condition_session = " , session_id ='".intval($session_id)."'";
}
foreach ($this->course->resources as $type => $resources) {
@@ -818,7 +818,7 @@ class CourseRestorer
if (file_exists($path.$document->path)) {
switch ($this->file_option) {
- case FILE_OVERWRITE :
+ case FILE_OVERWRITE:
rmdirr($path.$document->path);
copyDirTo(
$this->course->backup_path . '/' . $document->path,
@@ -1123,11 +1123,15 @@ class CourseRestorer
$tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO);
$resources = $this->course->resources;
foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) {
- $sql = "DELETE FROM ".$tool_intro_table." WHERE c_id = ".$this->destination_course_id." AND id='".self::DBUTF8escapestring($tool_intro->id)."'";
+ $sql = "DELETE FROM ".$tool_intro_table."
+ WHERE c_id = ".$this->destination_course_id." AND id='".self::DBUTF8escapestring($tool_intro->id)."'";
Database::query($sql);
$tool_intro->intro_text = DocumentManager::replace_urls_inside_content_html_from_copy_course($tool_intro->intro_text,$this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']);
- $sql = "INSERT INTO ".$tool_intro_table." SET c_id = ".$this->destination_course_id." , id='".self::DBUTF8escapestring($tool_intro->id)."', intro_text = '".self::DBUTF8escapestring($tool_intro->intro_text)."'";
- $sql.= ", session_id = $sessionId";
+ $sql = "INSERT INTO ".$tool_intro_table." SET
+ c_id = ".$this->destination_course_id.",
+ id='".self::DBUTF8escapestring($tool_intro->id)."',
+ intro_text = '".self::DBUTF8escapestring($tool_intro->intro_text)."'
+ session_id = $sessionId";
Database::query($sql);
$this->course->resources[RESOURCE_TOOL_INTRO][$id]->destination_id = Database::insert_id();
@@ -1156,7 +1160,12 @@ class CourseRestorer
$result=Database::query($sql);
list($orderMax)=Database::fetch_array($result,'NUM');
$display_order=$orderMax+1;
- $sql = "INSERT INTO ".$link_cat_table." SET c_id = ".$this->destination_course_id." , category_title = '".self::DBUTF8escapestring($link_cat->title)."', description='".self::DBUTF8escapestring($link_cat->description)."', display_order='".$display_order."' $condition_session ";
+ $sql = "INSERT INTO $link_cat_table SET
+ c_id = ".$this->destination_course_id.",
+ category_title = '".self::DBUTF8escapestring($link_cat->title)."',
+ description = '".self::DBUTF8escapestring($link_cat->description)."',
+ display_order = '".$display_order."'
+ $condition_session ";
Database::query($sql);
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_LINKCATEGORY][$id]->destination_id = $new_id;
@@ -1190,8 +1199,8 @@ class CourseRestorer
content = '".self::DBUTF8escapestring($event->content)."',
all_day = '".$event->all_day."',
start_date = '".$event->start_date."',
- end_date = '".$event->end_date."'";
- $sql.= ", session_id = $sessionId";
+ end_date = '".$event->end_date."',
+ session_id = $sessionId";
Database::query($sql);
$new_event_id = Database::insert_id();
@@ -1205,7 +1214,9 @@ class CourseRestorer
if (!empty($this->course->orig)) {
$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
- $sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id;
+ $sql = 'SELECT path, comment, size, filename
+ FROM '.$table_attachment.'
+ WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id;
$attachment_event = Database::query($sql);
$attachment_event = Database::fetch_object($attachment_event);
@@ -1215,7 +1226,13 @@ class CourseRestorer
//$copy_result = true;
if ($copy_result) {
$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
- $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($attachment_event->comment)."', size = '".$attachment_event->size."', filename = '".$attachment_event->filename."' , agenda_id = '".$new_event_id."' ";
+ $sql = "INSERT INTO ".$table_attachment." SET
+ c_id = ".$this->destination_course_id.",
+ path = '".self::DBUTF8escapestring($new_filename)."',
+ comment = '".self::DBUTF8escapestring($attachment_event->comment)."',
+ size = '".$attachment_event->size."',
+ filename = '".$attachment_event->filename."',
+ agenda_id = '".$new_event_id."' ";
Database::query($sql);
}
}
@@ -1226,7 +1243,13 @@ class CourseRestorer
$copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename);
if ($copy_result) {
$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
- $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($event->attachment_comment)."', size = '".$event->attachment_size."', filename = '".$event->attachment_filename."' , agenda_id = '".$new_event_id."' ";
+ $sql = "INSERT INTO ".$table_attachment." SET
+ c_id = ".$this->destination_course_id.",
+ path = '".self::DBUTF8escapestring($new_filename)."',
+ comment = '".self::DBUTF8escapestring($event->attachment_comment)."',
+ size = '".$event->attachment_size."',
+ filename = '".$event->attachment_filename."',
+ agenda_id = '".$new_event_id."' ";
Database::query($sql);
}
}
@@ -1266,7 +1289,12 @@ class CourseRestorer
$session_id = intval($session_id);
$condition_session = " , session_id = '$session_id' ";
}
- $sql = "INSERT INTO ".$table." SET c_id = ".$this->destination_course_id." , description_type = '".self::DBUTF8escapestring($cd->description_type)."',title = '".self::DBUTF8escapestring($cd->title)."', content = '".self::DBUTF8escapestring($description_content)."' $condition_session";
+ $sql = "INSERT INTO ".$table." SET
+ c_id = ".$this->destination_course_id." ,
+ description_type = '".self::DBUTF8escapestring($cd->description_type)."',
+ title = '".self::DBUTF8escapestring($cd->title)."',
+ content = '".self::DBUTF8escapestring($description_content)."'
+ $condition_session";
Database::query($sql);
$this->course->resources[RESOURCE_COURSEDESCRIPTION][$id]->destination_id = Database::insert_id();
}
@@ -1294,18 +1322,17 @@ class CourseRestorer
);
$sql = "INSERT INTO ".$table." " ."SET
- c_id = ".$this->destination_course_id." ,
- title = '".self::DBUTF8escapestring($announcement->title)."'," .
- "content = '".self::DBUTF8escapestring($announcement->content)."', " .
- "end_date = '".$announcement->date."', " .
- "display_order = '".$announcement->display_order."', " .
- "email_sent = '".$announcement->email_sent."', "
- . "session_id = $sessionId";
+ c_id = ".$this->destination_course_id.",
+ title = '".self::DBUTF8escapestring($announcement->title)."',
+ content = '".self::DBUTF8escapestring($announcement->content)."',
+ end_date = '".$announcement->date."',
+ display_order = '".$announcement->display_order."',
+ email_sent = '".$announcement->email_sent."',
+ session_id = $sessionId";
Database::query($sql);
$new_announcement_id = Database::insert_id();
$this->course->resources[RESOURCE_ANNOUNCEMENT][$id]->destination_id = $new_announcement_id;
-
$origin_path = $this->course->backup_path.'/upload/announcements/';
$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/';
@@ -1314,30 +1341,49 @@ class CourseRestorer
$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
- $sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND announcement_id = '.$id;
+ $sql = 'SELECT path, comment, size, filename
+ FROM '.$table_attachment.'
+ WHERE c_id = '.$this->destination_course_id.' AND announcement_id = '.$id;
$attachment_event = Database::query($sql);
$attachment_event = Database::fetch_object($attachment_event);
- if (file_exists($origin_path.$attachment_event->path) && !is_dir($origin_path.$attachment_event->path) ) {
+ if (file_exists($origin_path.$attachment_event->path) &&
+ !is_dir($origin_path.$attachment_event->path)
+ ) {
$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
$copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename);
//error_log($destination_path.$new_filename); error_log($copy_result);
//$copy_result = true;
if ($copy_result) {
$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
- $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($attachment_event->comment)."', size = '".$attachment_event->size."', filename = '".$attachment_event->filename."' , announcement_id = '".$new_announcement_id."' ";
+ $sql = "INSERT INTO ".$table_attachment." SET
+ c_id = ".$this->destination_course_id.",
+ path = '".self::DBUTF8escapestring($new_filename)."',
+ comment = '".self::DBUTF8escapestring($attachment_event->comment)."',
+ size = '".$attachment_event->size."',
+ filename = '".$attachment_event->filename."',
+ announcement_id = '".$new_announcement_id."'
+ ";
Database::query($sql);
}
}
} else {
// get the info of the file
- if(!empty($announcement->attachment_path) && is_file($origin_path.$announcement->attachment_path) && is_readable($origin_path.$announcement->attachment_path)) {
+ if (!empty($announcement->attachment_path) &&
+ is_file($origin_path.$announcement->attachment_path) &&
+ is_readable($origin_path.$announcement->attachment_path)
+ ) {
$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
$copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename);
if ($copy_result) {
$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
- $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($announcement->attachment_comment)."', size = '".$announcement->attachment_size."', filename = '".$announcement->attachment_filename."' , announcement_id = '".$new_announcement_id."' ";
+ $sql = "INSERT INTO ".$table_attachment." SET
+ c_id = ".$this->destination_course_id." ,
+ path = '".self::DBUTF8escapestring($new_filename)."',
+ comment = '".self::DBUTF8escapestring($announcement->attachment_comment)."',
+ size = '".$announcement->attachment_size."', filename = '".$announcement->attachment_filename."',
+ announcement_id = '".$new_announcement_id."' ";
Database::query($sql);
}
}
@@ -1685,25 +1731,25 @@ class CourseRestorer
$title = $CourseCopyTestcategory->title;
$description = $CourseCopyTestcategory->description;
- if (Testcategory::category_exists_with_title($title)) {
+ if (TestCategory::category_exists_with_title($title)) {
switch ($this->file_option) {
case FILE_SKIP:
//Do nothing
break;
case FILE_RENAME:
$new_title = $title."_";
- while (Testcategory::category_exists_with_title(
+ while (TestCategory::category_exists_with_title(
$new_title
)) {
$new_title .= "_";
}
- $test_category = new Testcategory(0, $new_title, $description);
+ $test_category = new TestCategory(0, $new_title, $description);
$new_id = $test_category->addCategoryInBDD();
$tab_test_category_id_old_new[$CourseCopyTestcategory->source_id] = $new_id;
break;
case FILE_OVERWRITE:
- $id = Testcategory::get_category_id_for_title($title);
- $my_cat = new Testcategory($id);
+ $id = TestCategory::get_category_id_for_title($title);
+ $my_cat = new TestCategory($id);
$my_cat->name = $title;
$my_cat->modifyCategory();
$tab_test_category_id_old_new[$CourseCopyTestcategory->source_id] = $id;
@@ -1711,7 +1757,7 @@ class CourseRestorer
}
} else {
// create a new test_category
- $test_category = new Testcategory(0, $title, $description);
+ $test_category = new TestCategory(0, $title, $description);
$new_id = $test_category->addCategoryInBDD();
$tab_test_category_id_old_new[$CourseCopyTestcategory->source_id] = $new_id;
}
@@ -1728,7 +1774,7 @@ class CourseRestorer
$new_quiz_question_id = $resources[RESOURCE_QUIZQUESTION][$id]->destination_id;
$question_category = $CourseCopyQuestion->question_category;
if ($question_category > 0) {
- Testcategory::add_category_for_question_id(
+ TestCategory::add_category_for_question_id(
$tab_test_category_id_old_new[$question_category],
$new_quiz_question_id,
$course_id
@@ -1877,9 +1923,9 @@ class CourseRestorer
// if the survey is shared => also delete the shared content
if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
- survey_manager::delete_survey($survey_data['survey_share'], true,$this->destination_course_id);
+ SurveyManager::delete_survey($survey_data['survey_share'], true,$this->destination_course_id);
}
- $return = survey_manager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
+ $return = SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
//Insert the new source survey
Database::query($sql);
diff --git a/main/coursecopy/classes/CourseSelectForm.class.php b/main/coursecopy/classes/CourseSelectForm.class.php
index 60c9230851..dfcc6445b4 100755
--- a/main/coursecopy/classes/CourseSelectForm.class.php
+++ b/main/coursecopy/classes/CourseSelectForm.class.php
@@ -561,9 +561,9 @@ class CourseSelectForm
* @param array $hidden_fiels Hidden fields to add to the form.
* @param boolean the document array will be serialize. This is used in the course_copy.php file
*/
- 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)
{
-?>
+ ?>
";
// Variables
diff --git a/main/dropbox/dropbox_class.inc.php b/main/dropbox/dropbox_class.inc.php
index bac703a691..1cccfc40d4 100755
--- a/main/dropbox/dropbox_class.inc.php
+++ b/main/dropbox/dropbox_class.inc.php
@@ -145,9 +145,14 @@ class Dropbox_Work
Database::query($sql);
$this->id = Database::insert_id(); // Get automatically inserted id
+ if ($this->id) {
+ $sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
+ Database::query($sql);
+ }
}
- $sql = "SELECT count(file_id) as count FROM ".$dropbox_cnf['tbl_person']."
+ $sql = "SELECT count(file_id) as count
+ FROM ".$dropbox_cnf['tbl_person']."
WHERE c_id = $course_id AND file_id = ".intval($this->id)." AND user_id = ".$this->uploader_id;
$result = Database::query($sql);
$row = Database::fetch_array($result);
@@ -155,11 +160,13 @@ class Dropbox_Work
// Insert entries into person table
$sql = "INSERT INTO ".$dropbox_cnf['tbl_person']." (c_id, file_id, user_id)
- VALUES ($course_id,
- ".intval($this->id)."
- , ".intval($this->uploader_id)."
- )";
+ VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
Database::query($sql);
+ /*$id = Database::insert_id();
+ if ($id) {
+ $sql = "UPDATE ".$dropbox_cnf['tbl_person']." SET id = iid WHERE iid = {$this->id}";
+ Database::query($sql);
+ }*/
}
}
@@ -211,7 +218,8 @@ class Dropbox_Work
// Getting the feedback on the work.
if ($action == 'viewfeedback' AND $this->id == $_GET['id']) {
$feedback2 = array();
- $sql_feedback = "SELECT * FROM ".$dropbox_cnf['tbl_feedback']." WHERE c_id = $course_id AND file_id='".$id."' ORDER BY feedback_id ASC";
+ $sql_feedback = "SELECT * FROM ".$dropbox_cnf['tbl_feedback']."
+ WHERE c_id = $course_id AND file_id='".$id."' ORDER BY feedback_id ASC";
$result = Database::query($sql_feedback);
while ($row_feedback = Database::fetch_array($result)) {
$row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
@@ -337,7 +345,7 @@ class Dropbox_SentWork extends Dropbox_Work
*
* @param unknown_type $id
*/
- function _createExistingSentWork ($id)
+ function _createExistingSentWork($id)
{
$dropbox_cnf = getDropboxConf();
$id = intval($id);
@@ -367,7 +375,8 @@ class Dropbox_SentWork extends Dropbox_Work
'name' => $user_info['complete_name'],
'user_id' => $dest_user_id,
'feedback_date' => $res['feedback_date'],
- 'feedback' => $res['feedback']);
+ 'feedback' => $res['feedback']
+ );
}
}
}
@@ -392,7 +401,8 @@ class Dropbox_Person
* @param bool $isCourseTutor
* @return Dropbox_Person
*/
- function Dropbox_Person($userId, $isCourseAdmin, $isCourseTutor) {
+ function Dropbox_Person($userId, $isCourseAdmin, $isCourseTutor)
+ {
$course_id = api_get_course_int_id();
// Fill in properties
@@ -413,7 +423,8 @@ class Dropbox_Person
// Find all entries where this person is the recipient
$sql = "SELECT DISTINCT r.file_id, r.cat_id
- FROM $post_tbl r INNER JOIN $person_tbl p
+ FROM $post_tbl r
+ INNER JOIN $person_tbl p
ON (r.file_id = p.file_id AND r.c_id = $course_id AND p.c_id = $course_id )
WHERE
p.user_id = ".intval($this->userId)." AND
@@ -427,7 +438,8 @@ class Dropbox_Person
}
// Find all entries where this person is the sender/uploader
$sql = "SELECT DISTINCT f.id
- FROM $file_tbl f INNER JOIN $person_tbl p
+ FROM $file_tbl f
+ INNER JOIN $person_tbl p
ON (f.id = p.file_id AND f.c_id = $course_id AND p.c_id = $course_id)
WHERE
f.uploader_id = ".intval($this->userId)." AND
@@ -455,7 +467,9 @@ class Dropbox_Person
$sort = $this->_orderBy;
$aval = $a->$sort;
$bval = $b->$sort;
- if ($sort == 'recipients') { // The recipients property is an array so we do the comparison based on the first item of the recipients array
+ if ($sort == 'recipients') {
+ // The recipients property is an array so we do the comparison based
+ // on the first item of the recipients array
$aval = $aval[0]['name'];
$bval = $bval[0]['name'];
}
@@ -507,7 +521,8 @@ class Dropbox_Person
* $sort can be lastDate, firstDate, title, size, ...
* @param unknown_type $sort
*/
- function orderReceivedWork($sort) {
+ function orderReceivedWork($sort)
+ {
switch($sort) {
case 'lastDate':
$this->_orderBy = 'last_upload_date';
@@ -537,14 +552,18 @@ class Dropbox_Person
/**
* Deletes all the received work of this person
*/
- function deleteAllReceivedWork () {
+ function deleteAllReceivedWork()
+ {
$course_id = api_get_course_int_id();
$dropbox_cnf = getDropboxConf();
// Delete entries in person table concerning received works
foreach ($this->receivedWork as $w) {
- Database::query("DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'");
+ $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
+ WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
+ Database::query($sql);
}
- removeUnusedFiles(); // Check for unused files
+ // Check for unused files
+ removeUnusedFiles();
}
/**
@@ -591,7 +610,8 @@ class Dropbox_Person
}
}
// Delete entries in person table concerning received works
- $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
+ $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
+ WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
Database::query($sql);
removeUnusedFiles(); // Check for unused files
}
@@ -605,7 +625,9 @@ class Dropbox_Person
$dropbox_cnf = getDropboxConf();
//delete entries in person table concerning sent works
foreach ($this->sentWork as $w) {
- Database::query("DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'");
+ $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
+ WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
+ Database::query($sql);
removeMoreIfMailing($w->id);
}
removeUnusedFiles(); // Check for unused files
@@ -638,7 +660,8 @@ class Dropbox_Person
}
//$file_id = $this->sentWork[$index]->id;
// Delete entries in person table concerning sent works
- Database::query("DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'");
+ $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
+ Database::query($sql);
removeMoreIfMailing($id);
removeUnusedFiles(); // Check for unused files
}
@@ -684,7 +707,15 @@ class Dropbox_Person
if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) {
$ownerid = getUserOwningThisMailing($ownerid);
}
- api_item_property_update($_course, TOOL_DROPBOX, $this->receivedWork[$wi]->id, 'DropboxFileUpdated', $this->userId, null, $ownerid) ;
+ api_item_property_update(
+ $_course,
+ TOOL_DROPBOX,
+ $this->receivedWork[$wi]->id,
+ 'DropboxFileUpdated',
+ $this->userId,
+ null,
+ $ownerid
+ );
}
@@ -701,7 +732,9 @@ class Dropbox_Person
switch ($type) {
case 'uploader_id':
if ($work->uploader_id == $value ||
- ($work->uploader_id > $dropbox_cnf['mailingIdBase'] && getUserOwningThisMailing($work->uploader_id) == $value)) {
+ ($work->uploader_id > $dropbox_cnf['mailingIdBase'] &&
+ getUserOwningThisMailing($work->uploader_id) == $value)
+ ) {
$new_received_work[] = $work;
}
break;
diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index 7e8ccbbca1..501ce12053 100755
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -7,7 +7,7 @@
* to one file -- Patrick Cool , Ghent University
* @author Julio Montoya adding c_id support
*/
-use \ChamiloSession as Session;
+use ChamiloSession as Session;
$this_section = SECTION_COURSES;
@@ -541,7 +541,7 @@ function display_add_form($dropbox_unid, $viewReceivedCategory, $viewSentCategor
|| $dropbox_person -> isCourseAdmin
|| dropbox_cnf('allowStudentToStudent')
|| $current_user['status'] != 5 // Always allow teachers.
- || $current_user['tutor_id'] == 1 // Always allow tutors.
+ || $current_user['is_tutor'] == 1 // Always allow tutors.
) && $current_user['user_id'] != $_user['user_id']) { // Don't include yourself.
if ($current_user['user_id'] == $current_user_id) {
continue;
@@ -879,9 +879,8 @@ function store_add_dropbox()
if ($b_send_mail) {
foreach ($new_work_recipients as $recipient_id) {
$recipent_temp = UserManager :: get_user_info_by_id($recipient_id);
- $plugin = new AppPlugin();
$additionalParameters = array(
- 'smsType' => constant($plugin->getSMSPluginName().'::NEW_FILE_SHARED_COURSE_BY'),
+ 'smsType' => SmsPlugin::NEW_FILE_SHARED_COURSE_BY,
'userId' => $recipient_id,
'courseTitle' => $_course['title'],
'userUsername' => $recipent_temp['username']
@@ -923,35 +922,6 @@ function store_add_dropbox()
return get_lang('FileUploadSucces');
}
-
-
-/**
-* This function displays the firstname and lastname of the user as a link to the user tool.
-*
-* @see this is the same function as in the new forum, so this probably has to move to a user library.
-*
-* @todo move this function to the user library (there is a duplicate in work.lib.php)
-*
-* @author Patrick Cool , Ghent University
-* @version march 2006
-*/
-function display_user_link_work($user_id, $name = '') {
- if ($user_id != 0) {
- if (empty($name)) {
- $table_user = Database::get_main_table(TABLE_MAIN_USER);
- $sql = "SELECT * FROM $table_user WHERE user_id = ".intval($user_id)."";
- $result = Database::query($sql);
- $row = Database::fetch_array($result);
- return ''.api_get_person_name($row['firstname'], $row['lastname']).'';
- } else {
- $user_id = intval($user_id);
- return ''.Security::remove_XSS($name).'';
- }
- } else {
- return $name.' ('.get_lang('Anonymous').')';
- }
-}
-
/**
* this function transforms the array containing all the feedback into something visually attractive.
*
@@ -980,7 +950,8 @@ function feedback($array) {
*/
function format_feedback($feedback)
{
- $output = display_user_link_work($feedback['author_user_id']);
+ $userInfo = api_get_user_info($feedback['author_user_id']);
+ $output = UserManager::getUserProfileLink($userInfo);
$output .= ' '.api_convert_and_format_date($feedback['feedback_date'], DATE_TIME_FORMAT_LONG).'
';
$output .= ''.nl2br($feedback['feedback']).'
';
return $output;
diff --git a/main/dropbox/index.php b/main/dropbox/index.php
index 0a78a21a41..8fc2a22782 100755
--- a/main/dropbox/index.php
+++ b/main/dropbox/index.php
@@ -531,7 +531,8 @@ if ($action != 'add') {
$dropbox_file_data[] = format_file_size($file_size);
$receivers_celldata = null;
foreach ($dropbox_file->recipients as $recipient) {
- $receivers_celldata = display_user_link_work($recipient['user_id'], $recipient['name']).', '.$receivers_celldata;
+ $userInfo = api_get_user_info($recipient['user_id']);
+ $receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
}
$receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
$dropbox_file_data[] = $receivers_celldata;
diff --git a/main/exercice/testcategory.class.php b/main/exercice/TestCategory.php
old mode 100755
new mode 100644
similarity index 89%
rename from main/exercice/testcategory.class.php
rename to main/exercice/TestCategory.php
index e0e2f09181..c647555128
--- a/main/exercice/testcategory.class.php
+++ b/main/exercice/TestCategory.php
@@ -2,12 +2,12 @@
/* For licensing terms, see /license.txt */
/**
- * Class Testcategory
+ * Class TestCategory
* @author hubert.borderiou
* @author Julio Montoya - several fixes
* @todo rename to ExerciseCategory
*/
-class Testcategory
+class TestCategory
{
public $id;
public $name;
@@ -23,10 +23,10 @@ class Testcategory
* @param string $in_name
* @param string $in_description
*/
- public function Testcategory($in_id=0, $in_name = '', $in_description="")
+ public function __construct($in_id=0, $in_name = '', $in_description="")
{
if ($in_id != 0 && $in_name == "") {
- $tmpobj = new Testcategory();
+ $tmpobj = new TestCategory();
$tmpobj->getCategory($in_id);
$this->id = $tmpobj->id;
$this->name = $tmpobj->name;
@@ -39,7 +39,7 @@ class Testcategory
}
/**
- * return the Testcategory object with id=in_id
+ * return the TestCategory object with id=in_id
* @param $in_id
*/
public function getCategory($in_id)
@@ -58,7 +58,7 @@ class Testcategory
}
/**
- * add Testcategory in the database if name doesn't already exists
+ * add TestCategory in the database if name doesn't already exists
*/
public function addCategoryInBDD()
{
@@ -75,19 +75,26 @@ class Testcategory
// lets add in BDD if not the same name
if ($data_verif['nb'] <= 0) {
$c_id = api_get_course_int_id();
- $sql = "INSERT INTO $t_cattable VALUES ('$c_id', '', '$v_name', '$v_description')";
+ $sql = "INSERT INTO $t_cattable (c_id, title, description) VALUES ('$c_id','$v_name', '$v_description')";
Database::query($sql);
$new_id = Database::insert_id();
- // add test_category in item_property table
- $course_code = api_get_course_id();
- $course_info = api_get_course_info($course_code);
- api_item_property_update(
- $course_info,
- TOOL_TEST_CATEGORY,
- $new_id,
- 'TestCategoryAdded',
- api_get_user_id()
- );
+
+ if ($new_id) {
+
+ $sql = "UPDATE $t_cattable SET id = iid WHERE iid = $new_id";
+ Database::query($sql);
+
+ // add test_category in item_property table
+ $course_code = api_get_course_id();
+ $course_info = api_get_course_info($course_code);
+ api_item_property_update(
+ $course_info,
+ TOOL_TEST_CATEGORY,
+ $new_id,
+ 'TestCategoryAdded',
+ api_get_user_id()
+ );
+ }
return $new_id;
} else {
@@ -117,7 +124,13 @@ class Testcategory
// item_property update
$course_code = api_get_course_id();
$course_info = api_get_course_info($course_code);
- api_item_property_update($course_info, TOOL_TEST_CATEGORY, $this->id, 'TestCategoryDeleted', api_get_user_id());
+ api_item_property_update(
+ $course_info,
+ TOOL_TEST_CATEGORY,
+ $this->id,
+ 'TestCategoryDeleted',
+ api_get_user_id()
+ );
return true;
}
}
@@ -162,6 +175,7 @@ class Testcategory
WHERE category_id=$in_id AND c_id=".api_get_course_int_id();
$res = Database::query($sql);
$row = Database::fetch_array($res);
+
return $row['nb'];
}
@@ -175,11 +189,11 @@ class Testcategory
echo "";
}
-
/**
* Return an array of all Category objects in the database
- If in_field=="" Return an array of all category objects in the database
- Otherwise, return an array of all in_field value in the database (in_field = id or name or description)
+ * If in_field=="" Return an array of all category objects in the database
+ * Otherwise, return an array of all in_field value
+ * in the database (in_field = id or name or description)
*/
public static function getCategoryListInfo($in_field="", $in_courseid="")
{
@@ -193,7 +207,7 @@ class Testcategory
$sql = "SELECT * FROM $t_cattable WHERE c_id=$in_courseid ORDER BY title ASC";
$res = Database::query($sql);
while ($row = Database::fetch_array($res)) {
- $tmpcat = new Testcategory($row['id'], $row['title'], $row['description']);
+ $tmpcat = new TestCategory($row['id'], $row['title'], $row['description']);
$tabres[] = $tmpcat;
}
} else {
@@ -207,9 +221,9 @@ class Testcategory
}
/**
- * Return the testcategory id for question with question_id = $in_questionid
- * In this version, a question has only 1 testcategory.
- * Return the testcategory id, 0 if none
+ * Return the TestCategory id for question with question_id = $in_questionid
+ * In this version, a question has only 1 TestCategory.
+ * Return the TestCategory id, 0 if none
* @param int $questionId
* @param int $courseId
*
@@ -230,6 +244,7 @@ class Testcategory
$data = Database::fetch_array($res);
$result = $data['category_id'];
}
+
return $result;
}
@@ -238,7 +253,7 @@ class Testcategory
*/
public static function isQuestionHasCategory($in_questionid)
{
- if (Testcategory::getCategoryForQuestion($in_questionid) > 0) {
+ if (TestCategory::getCategoryForQuestion($in_questionid) > 0) {
return true;
}
return false;
@@ -254,7 +269,7 @@ class Testcategory
if (empty($in_courseid) || $in_courseid=="") {
$in_courseid = api_get_course_int_id();
}
- $catid = Testcategory::getCategoryForQuestion($in_questionid, $in_courseid);
+ $catid = TestCategory::getCategoryForQuestion($in_questionid, $in_courseid);
$result = ""; // result
$t_cattable = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$catid = intval($catid);
@@ -264,6 +279,7 @@ class Testcategory
if (Database::num_rows($res) > 0) {
$result = $data['title'];
}
+
return $result;
}
@@ -276,17 +292,18 @@ class Testcategory
public static function getListOfCategoriesIDForTest($in_testid)
{
// parcourir les questions d'un test, recup les categories uniques dans un tableau
- $tabcat = array();
+ $result = array();
$quiz = new Exercise();
$quiz->read($in_testid);
$tabQuestionList = $quiz->selectQuestionList();
// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ???
for ($i=1; $i <= count($tabQuestionList); $i++) {
- if (!in_array(Testcategory::getCategoryForQuestion($tabQuestionList[$i]), $tabcat)) {
- $tabcat[] = Testcategory::getCategoryForQuestion($tabQuestionList[$i]);
+ if (!in_array(TestCategory::getCategoryForQuestion($tabQuestionList[$i]), $result)) {
+ $result[] = TestCategory::getCategoryForQuestion($tabQuestionList[$i]);
}
}
- return $tabcat;
+
+ return $result;
}
/**
@@ -301,7 +318,7 @@ class Testcategory
$tabcatName = array();
$tabcatID = self::getListOfCategoriesIDForTest($in_testid);
for ($i=0; $i < count($tabcatID); $i++) {
- $cat = new Testcategory($tabcatID[$i]);
+ $cat = new TestCategory($tabcatID[$i]);
$tabcatName[$cat->id] = $cat->name;
}
return $tabcatName;
@@ -315,7 +332,7 @@ class Testcategory
*/
public static function getNumberOfCategoriesForTest($in_testid)
{
- return count(Testcategory::getListOfCategoriesIDForTest($in_testid));
+ return count(TestCategory::getListOfCategoriesIDForTest($in_testid));
}
/**
@@ -332,7 +349,7 @@ class Testcategory
$tabQuestionList = $quiz->selectQuestionList();
// the array given by selectQuestionList start at indice 1 and not at indice 0 !!! ? ? ?
for ($i=1; $i <= count($tabQuestionList); $i++) {
- if (Testcategory::getCategoryForQuestion($tabQuestionList[$i]) == $in_categoryid) {
+ if (TestCategory::getCategoryForQuestion($tabQuestionList[$i]) == $in_categoryid) {
$nbCatResult++;
}
}
@@ -348,10 +365,10 @@ class Testcategory
public static function getNumberOfQuestionRandomByCategory($in_testid, $in_nbrandom)
{
$nbquestionresult = 0;
- $tabcatid = Testcategory::getListOfCategoriesIDForTest($in_testid);
+ $tabcatid = TestCategory::getListOfCategoriesIDForTest($in_testid);
for ($i=0; $i < count($tabcatid); $i++) {
if ($tabcatid[$i] > 0) { // 0 = no category for this questio
- $nbQuestionInThisCat = Testcategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
+ $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
if ($nbQuestionInThisCat > $in_nbrandom) {
$nbquestionresult += $in_nbrandom;
}
@@ -373,7 +390,7 @@ class Testcategory
if (empty($in_courseid) || $in_courseid=="") {
$in_courseid = api_get_course_int_id();
}
- $tabcatobject = Testcategory::getCategoryListInfo("", $in_courseid);
+ $tabcatobject = TestCategory::getCategoryListInfo("", $in_courseid);
$tabresult = array("0"=>get_lang('NoCategorySelected'));
for ($i=0; $i < count($tabcatobject); $i++) {
$tabresult[$tabcatobject[$i]->id] = $tabcatobject[$i]->name;
@@ -446,9 +463,9 @@ class Testcategory
$in_display_category_name = $objExercise->display_category_name;
}
$content = null;
- if (Testcategory::getCategoryNameForQuestion($in_questionID) != "" && ($in_display_category_name == 1 || !$is_student)) {
+ if (TestCategory::getCategoryNameForQuestion($in_questionID) != "" && ($in_display_category_name == 1 || !$is_student)) {
$content .= '";
}
return $content;
@@ -479,7 +496,7 @@ class Testcategory
$tabResult = array();
$tabCatName = array(); // tab of category name
while (list($cat_id, $tabquestion) = each($in_tab)) {
- $catTitle = new Testcategory($cat_id);
+ $catTitle = new TestCategory($cat_id);
$tabCatName[$cat_id] = $catTitle->name;
}
reset($in_tab);
@@ -528,10 +545,10 @@ class Testcategory
{
$res_num_max = 0;
// foreach question
- $tabcatid = Testcategory::getListOfCategoriesIDForTest($in_testid);
+ $tabcatid = TestCategory::getListOfCategoriesIDForTest($in_testid);
for ($i=0; $i < count($tabcatid); $i++) {
if ($tabcatid[$i] > 0) { // 0 = no category for this question
- $nbQuestionInThisCat = Testcategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
+ $nbQuestionInThisCat = TestCategory::getNumberOfQuestionsInCategoryForTest($in_testid, $tabcatid[$i]);
if ($nbQuestionInThisCat > $res_num_max) {
$res_num_max = $nbQuestionInThisCat;
}
@@ -551,7 +568,7 @@ class Testcategory
if (empty($category_list)) {
return null;
}
- $category_name_list = Testcategory::getListOfCategoriesNameForTest($exercise_id);
+ $category_name_list = TestCategory::getListOfCategoriesNameForTest($exercise_id);
$table = new HTML_Table(array('class' => 'data_table'));
$table->setHeaderContents(0, 0, get_lang('Categories'));
@@ -603,7 +620,7 @@ class Testcategory
*/
public static function category_exists_with_title($in_name)
{
- $tab_test_category = Testcategory::getCategoryListInfo("title");
+ $tab_test_category = TestCategory::getCategoryListInfo("title");
foreach ($tab_test_category as $title) {
if ($title == $in_name) {
return true;
@@ -646,7 +663,7 @@ class Testcategory
$tbl_reltable = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
// if question doesn't have a category
// @todo change for 1.10 when a question can have several categories
- if (Testcategory::getCategoryForQuestion($in_question_id, $in_course_c_id) == 0 && $in_question_id > 0 && $in_course_c_id > 0) {
+ if (TestCategory::getCategoryForQuestion($in_question_id, $in_course_c_id) == 0 && $in_question_id > 0 && $in_course_c_id > 0) {
$sql = "INSERT INTO $tbl_reltable VALUES (".intval($in_course_c_id).", ".intval($in_question_id).", ".intval($in_category_id).")";
Database::query($sql);
}
@@ -666,9 +683,9 @@ class Testcategory
$courseId = intval($courseId);
if (empty($sessionId)) {
- $sessionCondition = api_get_session_condition($sessionId, true, false, 'i.id_session');
+ $sessionCondition = api_get_session_condition($sessionId, true, false, 'i.session_id');
} else {
- $sessionCondition = api_get_session_condition($sessionId, true, true, 'i.id_session');
+ $sessionCondition = api_get_session_condition($sessionId, true, true, 'i.session_id');
}
if (empty($courseId)) {
@@ -699,7 +716,7 @@ class Testcategory
$html = null;
foreach ($categories as $category) {
- $tmpobj = new Testcategory($category['id']);
+ $tmpobj = new TestCategory($category['id']);
$nb_question = $tmpobj->getCategoryQuestionsNumber();
$rowname = self::protectJSDialogQuote($category['title']);
$nb_question_label = $nb_question == 1 ? $nb_question . ' ' . get_lang('Question') : $nb_question . ' ' . get_lang('Questions');
diff --git a/main/exercice/addlimits.php b/main/exercice/addlimits.php
index 0909c7a760..3279f7782c 100755
--- a/main/exercice/addlimits.php
+++ b/main/exercice/addlimits.php
@@ -18,8 +18,7 @@ api_protect_course_script();
$dsp_percent = false;
$debug=0;
-if($debug>0)
-{
+if($debug>0) {
echo str_repeat(' ',0).'Entered exercise_result.php'."
\n";var_dump($_POST);
}
// general parameters passed via POST/GET
diff --git a/main/exercice/admin.php b/main/exercice/admin.php
index c34bde4cc0..c11be1c3ec 100755
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
@@ -212,12 +212,12 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
api_not_allowed();
}
// saves the object into the session
- Session::write('objQuestion',$objQuestion);
+ Session::write('objQuestion', $objQuestion);
}
}
// checks if the object exists
- if(is_object($objQuestion)) {
+ if (is_object($objQuestion)) {
// gets the question ID
$questionId = $objQuestion->selectId();
}
@@ -226,7 +226,7 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
// if cancelling an exercise
if ($cancelExercise) {
// existing exercise
- if($exerciseId) {
+ if ($exerciseId) {
unset($modifyExercise);
} else {
// new exercise
@@ -239,7 +239,7 @@ if ($cancelExercise) {
// if cancelling question creation/modification
if ($cancelQuestion) {
// if we are creating a new question from the question pool
- if(!$exerciseId && !$questionId) {
+ if (!$exerciseId && !$questionId) {
// goes back to the question pool
header('Location: question_pool.php');
exit();
diff --git a/main/exercice/answer.class.php b/main/exercice/answer.class.php
index 01ce374d98..b1a7ebc1be 100755
--- a/main/exercice/answer.class.php
+++ b/main/exercice/answer.class.php
@@ -6,8 +6,8 @@
* Allows to instantiate an object of type Answer
* 5 arrays are created to receive the attributes of each answer belonging to a specified question
* @package chamilo.exercise
+ *
* @author Olivier Brouckaert
- * @package chamilo.exercise
*/
class Answer
{
@@ -31,7 +31,7 @@ class Answer
public $new_position;
public $new_hotspot_coordinates;
public $new_hotspot_type;
-
+ public $autoId;
public $nbrAnswers;
public $new_nbrAnswers;
public $new_destination; // id of the next question if feedback option is set to Directfeedback
@@ -41,30 +41,31 @@ class Answer
* constructor of the class
*
* @author Olivier Brouckaert
- * @param integer Question ID that answers belong to
+ * @param int $questionId that answers belong to
+ * @param int $course_id
*/
- function Answer($questionId, $course_id = null)
+ public function __construct($questionId, $course_id = null)
{
- $this->questionId = intval($questionId);
- $this->answer = array();
- $this->correct = array();
- $this->comment = array();
- $this->weighting = array();
- $this->position = array();
- $this->hotspot_coordinates = array();
- $this->hotspot_type = array();
- $this->destination = array();
+ $this->questionId = intval($questionId);
+ $this->answer = array();
+ $this->correct = array();
+ $this->comment = array();
+ $this->weighting = array();
+ $this->position = array();
+ $this->hotspot_coordinates = array();
+ $this->hotspot_type = array();
+ $this->destination = array();
// clears $new_* arrays
$this->cancel();
if (!empty($course_id)) {
- $course_info = api_get_course_info_by_id($course_id);
+ $courseInfo = api_get_course_info_by_id($course_id);
} else {
- $course_info = api_get_course_info();
+ $courseInfo = api_get_course_info();
}
- $this->course = $course_info;
- $this->course_id = $course_info['real_id'];
+ $this->course = $courseInfo;
+ $this->course_id = $courseInfo['real_id'];
// fills arrays
$objExercise = new Exercise($this->course_id);
@@ -82,16 +83,17 @@ class Answer
*
* @author Olivier Brouckaert
*/
- function cancel() {
- $this->new_answer = array();
- $this->new_correct = array();
- $this->new_comment = array();
- $this->new_weighting = array();
- $this->new_position = array();
- $this->new_hotspot_coordinates = array();
- $this->new_hotspot_type = array();
- $this->new_nbrAnswers = 0;
- $this->new_destination = array();
+ public function cancel()
+ {
+ $this->new_answer = array();
+ $this->new_correct = array();
+ $this->new_comment = array();
+ $this->new_weighting = array();
+ $this->new_position = array();
+ $this->new_hotspot_coordinates = array();
+ $this->new_hotspot_type = array();
+ $this->new_nbrAnswers = 0;
+ $this->new_destination = array();
}
/**
@@ -142,16 +144,18 @@ class Answer
$questionId = $this->questionId;
$sql="SELECT id FROM
- $TBL_ANSWER WHERE c_id = {$this->course_id} AND question_id ='".$questionId."'";
+ $TBL_ANSWER
+ WHERE c_id = {$this->course_id} AND question_id ='".$questionId."'";
$result = Database::query($sql);
$id = array();
// while a record is found
if (Database::num_rows($result) > 0) {
while ($object = Database::fetch_array($result)) {
- $id[] = $object['id'];
+ $id[] = $object['id'];
}
}
+
return $id;
}
@@ -161,7 +165,7 @@ class Answer
* @param string DESC or ASC
* @author Frederic Vauthier
*/
- function readOrderedBy($field, $order='ASC')
+ public function readOrderedBy($field, $order='ASC')
{
$field = Database::escape_string($field);
if (empty($field)) {
@@ -188,30 +192,30 @@ class Answer
$i = 1;
// while a record is found
$doubt_data = null;
- while($object = Database::fetch_object($result)) {
+ while ($object = Database::fetch_object($result)) {
if ($question_type['type'] == UNIQUE_ANSWER_NO_OPTION && $object->position == 666) {
$doubt_data = $object;
continue;
}
- $this->answer[$i] = $object->answer;
- $this->correct[$i] = $object->correct;
- $this->comment[$i] = $object->comment;
- $this->weighting[$i] = $object->ponderation;
- $this->position[$i] = $object->position;
- $this->destination[$i] = $object->destination;
- $this->autoId[$i] = $object->id_auto;
- $i++;
+ $this->answer[$i] = $object->answer;
+ $this->correct[$i] = $object->correct;
+ $this->comment[$i] = $object->comment;
+ $this->weighting[$i] = $object->ponderation;
+ $this->position[$i] = $object->position;
+ $this->destination[$i] = $object->destination;
+ $this->autoId[$i] = $object->id_auto;
+ $i++;
}
if ($question_type['type'] == UNIQUE_ANSWER_NO_OPTION && !empty($doubt_data)) {
- $this->answer[$i] = $doubt_data->answer;
- $this->correct[$i] = $doubt_data->correct;
- $this->comment[$i] = $doubt_data->comment;
- $this->weighting[$i] = $doubt_data->ponderation;
- $this->position[$i] = $doubt_data->position;
- $this->destination[$i] = $doubt_data->destination;
- $this->autoId[$i] = $doubt_data->id_auto;
- $i++;
+ $this->answer[$i] = $doubt_data->answer;
+ $this->correct[$i] = $doubt_data->correct;
+ $this->comment[$i] = $doubt_data->comment;
+ $this->weighting[$i] = $doubt_data->ponderation;
+ $this->position[$i] = $doubt_data->position;
+ $this->destination[$i] = $doubt_data->destination;
+ $this->autoId[$i] = $doubt_data->id_auto;
+ $i++;
}
$this->nbrAnswers = $i-1;
}
@@ -222,7 +226,7 @@ class Answer
* @author Juan Carlos Ra�a
* @return integer - answer num
*/
- function selectAutoId($id)
+ public function selectAutoId($id)
{
return isset($this->autoId[$id]) ? $this->autoId[$id] : null;
}
@@ -233,7 +237,7 @@ class Answer
* @author Olivier Brouckaert
* @return integer - number of answers
*/
- function selectNbrAnswers()
+ public function selectNbrAnswers()
{
return $this->nbrAnswers;
}
@@ -244,7 +248,7 @@ class Answer
* @author Olivier Brouckaert
* @return integer - the question ID
*/
- function selectQuestionId()
+ public function selectQuestionId()
{
return $this->questionId;
}
@@ -255,7 +259,7 @@ class Answer
* @author Julio Montoya
* @return integer - the question ID
*/
- function selectDestination($id)
+ public function selectDestination($id)
{
return isset($this->destination[$id]) ? $this->destination[$id] : null;
}
@@ -267,25 +271,29 @@ class Answer
* @param - integer $id - answer ID
* @return string - answer title
*/
- function selectAnswer($id)
- {
- return isset($this->answer[$id]) ? $this->answer[$id] : null;
+ public function selectAnswer($id)
+ {
+ return isset($this->answer[$id]) ? $this->answer[$id] : null;
}
/**
* return array answer by id else return a bool
*/
- function selectAnswerByAutoId($auto_id) {
+ public function selectAnswerByAutoId($auto_id)
+ {
$TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
$auto_id = intval($auto_id);
- $sql="SELECT id, answer, id_auto FROM $TBL_ANSWER WHERE c_id = {$this->course_id} AND id_auto='$auto_id'";
+ $sql = "SELECT id, answer, id_auto FROM $TBL_ANSWER
+ WHERE c_id = {$this->course_id} AND id_auto='$auto_id'";
$rs = Database::query($sql);
if (Database::num_rows($rs) > 0) {
$row = Database::fetch_array($rs);
+
return $row;
}
+
return false;
}
@@ -296,20 +304,26 @@ class Answer
* @param - integer $id - answer ID
* @return bool - answer title
*/
- function selectAnswerIdByPosition($pos) {
+ public function selectAnswerIdByPosition($pos)
+ {
foreach ($this->position as $k => $v) {
- if ($v != $pos) { continue; }
+ if ($v != $pos) {
+ continue;
+ }
+
return $k;
}
+
return false;
}
/**
* Returns a list of answers
* @author Yannick Warnier
- * @return array List of answers where each answer is an array of (id, answer, comment, grade) and grade=weighting
+ * @return array List of answers where each answer is an array
+ * of (id, answer, comment, grade) and grade=weighting
*/
- function getAnswersList($decode = false)
+ public function getAnswersList($decode = false)
{
$list = array();
for($i = 1; $i<=$this->nbrAnswers;$i++){
@@ -333,16 +347,19 @@ class Answer
);
}
}
+
return $list;
}
+
/**
* Returns a list of grades
* @author Yannick Warnier
* @return array List of grades where grade=weighting (?)
*/
- function getGradesList() {
+ public function getGradesList()
+ {
$list = array();
- for($i = 0; $i<$this->nbrAnswers;$i++){
+ for ($i = 0; $i<$this->nbrAnswers;$i++){
if(!empty($this->answer[$i])){
$list[$i] = $this->weighting[$i];
}
@@ -355,14 +372,17 @@ class Answer
* @author Yannick Warnier
* @return integer The type of the question this answer is bound to
*/
- function getQuestionType() {
+ public function getQuestionType()
+ {
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
- $sql = "SELECT type FROM $TBL_QUESTIONS WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
+ $sql = "SELECT type FROM $TBL_QUESTIONS
+ WHERE c_id = {$this->course_id} AND id = '".$this->questionId."'";
$res = Database::query($sql);
- if(Database::num_rows($res)<=0){
+ if (Database::num_rows($res)<=0){
return null;
}
$row = Database::fetch_array($res);
+
return $row['type'];
}
@@ -374,7 +394,7 @@ class Answer
* @param - integer $id - answer ID
* @return integer - 0 if bad answer, not 0 if good answer
*/
- function isCorrect($id)
+ public function isCorrect($id)
{
return isset($this->correct[$id]) ? $this->correct[$id] : null;
}
@@ -386,7 +406,7 @@ class Answer
* @param - integer $id - answer ID
* @return string - answer comment
*/
- function selectComment($id)
+ public function selectComment($id)
{
return isset($this->comment[$id]) ? $this->comment[$id] : null;
}
@@ -398,7 +418,7 @@ class Answer
* @param - integer $id - answer ID
* @return integer - answer weighting
*/
- function selectWeighting($id)
+ public function selectWeighting($id)
{
return isset($this->weighting[$id]) ? $this->weighting[$id] : null;
}
@@ -422,7 +442,7 @@ class Answer
* @param integer Answer ID
* @return integer Answer position
*/
- function selectHotspotCoordinates($id)
+ public function selectHotspotCoordinates($id)
{
return isset($this->hotspot_coordinates[$id]) ? $this->hotspot_coordinates[$id] : null;
}
@@ -434,7 +454,7 @@ class Answer
* @param integer Answer ID
* @return integer Answer position
*/
- function selectHotspotType($id)
+ public function selectHotspotType($id)
{
return isset($this->hotspot_type[$id]) ? $this->hotspot_type[$id] : null;
}
@@ -443,26 +463,35 @@ class Answer
* Creates a new answer
*
* @author Olivier Brouckaert
- * @param string answer title
- * @param integer 0 if bad answer, not 0 if good answer
- * @param string answer comment
- * @param integer answer weighting
- * @param integer answer position
- * @param coordinates Coordinates for hotspot exercises (optional)
- * @param integer Type for hotspot exercises (optional)
+ * @param string $answer answer title
+ * @param integer $correct 0 if bad answer, not 0 if good answer
+ * @param string $comment answer comment
+ * @param integer $weighting answer weighting
+ * @param integer $position answer position
+ * @param array $new_hotspot_coordinates Coordinates for hotspot exercises (optional)
+ * @param integer $new_hotspot_type Type for hotspot exercises (optional)
+ * @param string $destination
*/
- function createAnswer($answer,$correct,$comment,$weighting, $position, $new_hotspot_coordinates = null, $new_hotspot_type = null, $destination='')
- {
+ public function createAnswer(
+ $answer,
+ $correct,
+ $comment,
+ $weighting,
+ $position,
+ $new_hotspot_coordinates = null,
+ $new_hotspot_type = null,
+ $destination = ''
+ ) {
$this->new_nbrAnswers++;
- $id=$this->new_nbrAnswers;
- $this->new_answer[$id]=$answer;
- $this->new_correct[$id]=$correct;
- $this->new_comment[$id]=$comment;
- $this->new_weighting[$id]=$weighting;
- $this->new_position[$id]=$position;
- $this->new_hotspot_coordinates[$id]=$new_hotspot_coordinates;
- $this->new_hotspot_type[$id]=$new_hotspot_type;
- $this->new_destination[$id] = $destination;
+ $id = $this->new_nbrAnswers;
+ $this->new_answer[$id] = $answer;
+ $this->new_correct[$id] = $correct;
+ $this->new_comment[$id] = $comment;
+ $this->new_weighting[$id] = $weighting;
+ $this->new_position[$id] = $position;
+ $this->new_hotspot_coordinates[$id] = $new_hotspot_coordinates;
+ $this->new_hotspot_type[$id] = $new_hotspot_type;
+ $this->new_destination[$id] = $destination;
}
/**
@@ -479,23 +508,24 @@ class Answer
* @param string $hotspot_coordinates
* @param string $hotspot_type
*/
- function updateAnswers($answer, $comment, $correct, $weighting, $position, $destination, $hotspot_coordinates, $hotspot_type)
+ public function updateAnswers($autoId, $answer, $comment, $correct, $weighting, $position, $destination, $hotspot_coordinates, $hotspot_type)
{
- $TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
- $idAnswer = $this->selectAnswerId();
- $id = $this->getQuestionType() == 3 ? $idAnswer[0] : Database::escape_string($position);
- $questionId=$this->questionId;
- $sql = "UPDATE $TBL_REPONSES SET
- answer = '".Database::escape_string($answer)."',
- comment = '".Database::escape_string($comment)."',
- correct = '".Database::escape_string($correct)."',
- ponderation = '".Database::escape_string($weighting)."',
- position = '".Database::escape_string($position)."',
- destination = '".Database::escape_string($destination)."',
- hotspot_coordinates = '".Database::escape_string($hotspot_coordinates)."',
- hotspot_type = '".Database::escape_string($hotspot_type)."'
- WHERE c_id = {$this->course_id} AND id = '$id'
- AND question_id = ".intval($questionId)."";
+ $answerTable = Database :: get_course_table(TABLE_QUIZ_ANSWER);
+ //$id = $this->getQuestionType() == FILL_IN_BLANKS ? $idAnswer[0] : Database::escape_string($position);
+ $autoId = intval($autoId);
+
+ $sql = "UPDATE $answerTable SET
+ answer = '".Database::escape_string($answer)."',
+ comment = '".Database::escape_string($comment)."',
+ correct = '".Database::escape_string($correct)."',
+ ponderation = '".Database::escape_string($weighting)."',
+ position = '".Database::escape_string($position)."',
+ destination = '".Database::escape_string($destination)."',
+ hotspot_coordinates = '".Database::escape_string($hotspot_coordinates)."',
+ hotspot_type = '".Database::escape_string($hotspot_type)."'
+ WHERE
+ id_auto = $autoId";
+
Database::query($sql);
}
@@ -504,34 +534,50 @@ class Answer
*
* @author Olivier Brouckaert
*/
- function save()
+ public function save()
{
- $TBL_REPONSES = Database::get_course_table(TABLE_QUIZ_ANSWER);
- $questionId = intval($this->questionId);
+ $answerTable = Database::get_course_table(TABLE_QUIZ_ANSWER);
+ $questionId = intval($this->questionId);
$c_id = $this->course['real_id'];
- // inserts new answers into data base
- $flag = 0;
- $sql = "INSERT INTO $TBL_REPONSES (c_id, id, question_id, answer, correct, comment, ponderation, position, hotspot_coordinates, hotspot_type, destination) VALUES ";
- for ($i=1;$i <= $this->new_nbrAnswers; $i++) {
-
- $answer = Database::escape_string($this->new_answer[$i]);
- $correct = Database::escape_string($this->new_correct[$i]);
- $comment = Database::escape_string($this->new_comment[$i]);
- $weighting = Database::escape_string($this->new_weighting[$i]);
- $position = Database::escape_string($this->new_position[$i]);
- $hotspot_coordinates = Database::escape_string($this->new_hotspot_coordinates[$i]);
- $hotspot_type = Database::escape_string($this->new_hotspot_type[$i]);
- $destination = Database::escape_string($this->new_destination[$i]);
+ $correctList = [];
+ $answerList = [];
+
+ for ($i=1; $i <= $this->new_nbrAnswers; $i++) {
+ $answer = $this->new_answer[$i];
+ $correct = $this->new_correct[$i];
+ $comment = $this->new_comment[$i];
+ $weighting = $this->new_weighting[$i];
+ $position = $this->new_position[$i];
+ $hotspot_coordinates = $this->new_hotspot_coordinates[$i];
+ $hotspot_type = $this->new_hotspot_type[$i];
+ $destination = $this->new_destination[$i];
+ $autoId = $this->selectAutoId($i);
if (!(isset($this->position[$i]))) {
- $flag = 1;
- $sql.="($c_id, '$i','$questionId','$answer','$correct','$comment','$weighting','$position','$hotspot_coordinates','$hotspot_type','$destination'),";
+ $params = [
+ 'c_id' => $c_id,
+ 'question_id' => $questionId,
+ 'answer' => $answer,
+ 'correct' => $correct,
+ 'comment' => $comment,
+ 'ponderation' => $weighting,
+ 'position' => $position,
+ 'hotspot_coordinates' => $hotspot_coordinates,
+ 'hotspot_type' => $hotspot_type,
+ 'destination' => $destination
+ ];
+ $autoId = Database::insert($answerTable, $params);
+ if ($autoId) {
+ $sql = "UPDATE $answerTable SET id = id_auto WHERE id_auto = $autoId";
+ Database::query($sql);
+ }
} else {
// https://support.chamilo.org/issues/6558
// function updateAnswers already escape_string, error if we do it twice.
// Feed function updateAnswers with none escaped strings
$this->updateAnswers(
+ $autoId,
$this->new_answer[$i],
$this->new_comment[$i],
$this->new_correct[$i],
@@ -542,34 +588,69 @@ class Answer
$this->new_hotspot_type[$i]
);
}
+
+ $answerList[$i] = $autoId;
+ if ($correct) {
+ $correctList[$autoId] = array('id' => $i, 'correct' => $correct);
+ }
}
- if ($flag == 1) {
- $sql = api_substr($sql,0,-1);
- Database::query($sql);
+ if (!empty($correctList)) {
+ foreach ($correctList as $autoId => $data) {
+ $correct = $data['correct'];
+
+ if (isset($answerList[$correct])) {
+ $correct = $answerList[$correct];
+ }
+
+ $sql = "UPDATE $answerTable
+ SET correct = $correct
+ WHERE
+ id_auto = $autoId
+ ";
+ Database::query($sql);
+
+ }
}
+
+ /*if (!empty($answerList)) {
+ foreach ($answerList as $autoId => $counterId) {
+ $sql = "UPDATE $answerTable SET answer = $autoId
+ WHERE
+ answer = $counterId AND
+ c_id = $c_id AND
+ question_id = $questionId
+ ";
+
+ Database::query($sql);
+ }
+ }*/
+
if (count($this->position) > $this->new_nbrAnswers) {
- $i = $this->new_nbrAnswers+1;
+ $i = $this->new_nbrAnswers + 1;
while ($this->position[$i]) {
$position = $this->position[$i];
- $sql = "DELETE FROM $TBL_REPONSES WHERE c_id = {$this->course_id} AND question_id = '".($questionId)."' AND position ='$position'";
+ $sql = "DELETE FROM $answerTable
+ WHERE
+ c_id = {$this->course_id} AND
+ question_id = '".$questionId."' AND
+ position ='$position'";
Database::query($sql);
$i++;
}
-
}
// moves $new_* arrays
- $this->answer=$this->new_answer;
- $this->correct=$this->new_correct;
- $this->comment=$this->new_comment;
- $this->weighting=$this->new_weighting;
- $this->position=$this->new_position;
- $this->hotspot_coordinates=$this->new_hotspot_coordinates;
- $this->hotspot_type=$this->new_hotspot_type;
-
- $this->nbrAnswers=$this->new_nbrAnswers;
- $this->destination=$this->new_destination;
+ $this->answer = $this->new_answer;
+ $this->correct = $this->new_correct;
+ $this->comment = $this->new_comment;
+ $this->weighting = $this->new_weighting;
+ $this->position = $this->new_position;
+ $this->hotspot_coordinates = $this->new_hotspot_coordinates;
+ $this->hotspot_type = $this->new_hotspot_type;
+
+ $this->nbrAnswers = $this->new_nbrAnswers;
+ $this->destination = $this->new_destination;
// clears $new_* arrays
$this->cancel();
@@ -582,14 +663,14 @@ class Answer
* @param int question id
* @param array destination course info (result of the function api_get_course_info() )
*/
- function duplicate($newQuestionId, $course_info = null) {
+ public function duplicate($newQuestionId, $course_info = null)
+ {
if (empty($course_info)) {
$course_info = $this->course;
- } else {
- $course_info = $course_info;
}
$TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
+ $fixed_list = array();
if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE || self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE) {
@@ -605,7 +686,6 @@ class Answer
$destination_options = Question::readQuestionOption($newQuestionId, $course_info['real_id']);
$i=0;
- $fixed_list = array();
if (!empty($destination_options)) {
foreach($destination_options as $item) {
$fixed_list[$new_option_list[$i]] = $item['id'];
@@ -617,33 +697,54 @@ class Answer
// if at least one answer
if ($this->nbrAnswers) {
// inserts new answers into data base
- $sql = "INSERT INTO $TBL_REPONSES (c_id, id,question_id,answer,correct,comment, ponderation,position,hotspot_coordinates,hotspot_type,destination) VALUES";
$c_id = $course_info['real_id'];
for ($i=1;$i <= $this->nbrAnswers;$i++) {
if ($this->course['id'] != $course_info['id']) {
- $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course($this->answer[$i],$this->course['id'], $course_info['id']) ;
- $this->comment[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course($this->comment[$i],$this->course['id'], $course_info['id']) ;
+ $this->answer[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $this->answer[$i],
+ $this->course['id'],
+ $course_info['id']
+ );
+ $this->comment[$i] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
+ $this->comment[$i],
+ $this->course['id'],
+ $course_info['id']
+ );
}
- $answer = Database::escape_string($this->answer[$i]);
- $correct = Database::escape_string($this->correct[$i]);
+ $answer = $this->answer[$i];
+ $correct = $this->correct[$i];
if (self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE || self::getQuestionType() == MULTIPLE_ANSWER_TRUE_FALSE ) {
$correct = $fixed_list[intval($correct)];
}
- $comment = Database::escape_string($this->comment[$i]);
- $weighting = Database::escape_string($this->weighting[$i]);
- $position = Database::escape_string($this->position[$i]);
- $hotspot_coordinates = Database::escape_string($this->hotspot_coordinates[$i]);
- $hotspot_type = Database::escape_string($this->hotspot_type[$i]);
- $destination = Database::escape_string($this->destination[$i]);
- $sql.="($c_id, '$i','$newQuestionId','$answer','$correct','$comment'," .
- "'$weighting','$position','$hotspot_coordinates','$hotspot_type','$destination'),";
+ $comment = $this->comment[$i];
+ $weighting = $this->weighting[$i];
+ $position = $this->position[$i];
+ $hotspot_coordinates = $this->hotspot_coordinates[$i];
+ $hotspot_type = $this->hotspot_type[$i];
+ $destination = $this->destination[$i];
+
+ $params = [
+ 'c_id' => $c_id,
+ 'question_id' =>$newQuestionId,
+ 'answer' => $answer,
+ 'correct' => $correct,
+ 'comment' => $comment,
+ 'ponderation' => $weighting,
+ 'position' => $position,
+ 'hotspot_coordinates' => $hotspot_coordinates,
+ 'hotspot_type' => $hotspot_type,
+ 'destination' => $destination
+ ];
+ $id = Database::insert($TBL_REPONSES, $params);
+ if ($id) {
+ $sql = "UPDATE $TBL_REPONSES SET id = id_auto WHERE id_auto = $id";
+ Database::query($sql);
+ }
}
- $sql = api_substr($sql,0,-1);
- Database::query($sql);
- }
+ }
}
}
diff --git a/main/exercice/calculated_answer.class.php b/main/exercice/calculated_answer.class.php
index 11baef8259..01cf8fcc7b 100644
--- a/main/exercice/calculated_answer.class.php
+++ b/main/exercice/calculated_answer.class.php
@@ -15,9 +15,9 @@ class CalculatedAnswer extends Question
/**
* Constructor
*/
- public function CalculatedAnswer()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this -> type = CALCULATED_ANSWER;
$this -> isContent = $this-> getIsContent();
}
@@ -31,7 +31,7 @@ class CalculatedAnswer extends Question
$defaults = array();
if (!empty($this->id)) {
- $objAnswer = new answer($this->id);
+ $objAnswer = new Answer($this->id);
$preArray = explode('@@', $objAnswer->selectAnswer(1));
$defaults['formula'] = array_pop($preArray);
@@ -162,7 +162,6 @@ class CalculatedAnswer extends Question
global $text, $class;
// setting the save button here and not in the question class.php
- //$form->addElement('style_submit_button', 'submitQuestion', $text, 'class="'.$class.'"');
$form->addButtonSave($text, 'submitQuestion');
if (!empty($this->id)) {
@@ -230,7 +229,7 @@ class CalculatedAnswer extends Question
$auxAnswer .= " [".$result."]@@".$formula;
}
$this->save();
- $objAnswer = new answer($this->id);
+ $objAnswer = new Answer($this->id);
$objAnswer->createAnswer($auxAnswer, 1, '', $this->weighting, null);
$objAnswer->position = array();
$objAnswer->save();
diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index 9d704e96dc..20c43f47ee 100755
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -364,25 +364,24 @@ $condition_session = api_get_session_condition($session_id, true, true);
// Only for administrators
if ($is_allowedToEdit) {
- $total_sql = "SELECT count(id) as count FROM $TBL_EXERCICES
+ $total_sql = "SELECT count(iid) as count FROM $TBL_EXERCICES
WHERE c_id = $courseId AND active<>'-1' $condition_session ";
$sql = "SELECT * FROM $TBL_EXERCICES
WHERE c_id = $courseId AND active<>'-1' $condition_session
- ORDER BY title LIMIT ".$from.",".$limit;
+ ORDER BY title
+ LIMIT ".$from.",".$limit;
} else {
// Only for students
- $total_sql = "SELECT count(id) as count FROM $TBL_EXERCICES
+ $total_sql = "SELECT count(iid) as count FROM $TBL_EXERCICES
WHERE c_id = $courseId AND active = '1' $condition_session ";
$sql = "SELECT * FROM $TBL_EXERCICES
WHERE c_id = $courseId AND
active='1' $condition_session
ORDER BY title LIMIT ".$from.",".$limit;
}
-
$result = Database::query($sql);
-$exercises_count = Database :: num_rows($result);
-
$result_total = Database::query($total_sql);
+
$total_exercises = 0;
if (Database :: num_rows($result_total)) {
@@ -410,6 +409,7 @@ if ($is_allowedToEdit) {
$res = Database::query($sql);
$hp_count = Database :: num_rows($res);
}
+
$total = $total_exercises + $hp_count;
$token = Security::get_token();
@@ -477,7 +477,7 @@ $exercise_obj = new Exercise();
$list_ordered = null;
while ($row = Database :: fetch_array($result, 'ASSOC')) {
- $exercise_list[$row['id']] = $row;
+ $exercise_list[$row['iid']] = $row;
}
if (isset($list_ordered) && !empty($list_ordered)) {
@@ -489,6 +489,7 @@ if (isset($list_ordered) && !empty($list_ordered)) {
}
$exercise_list = $new_question_list;
}
+
echo '';
echo ' ';
@@ -644,10 +645,10 @@ if (!empty($exercise_list)) {
$item = Display::tag('td', $url.' '.$session_img.$lp_blocked);
// Count number exercise - teacher
- $sql = "SELECT count(*) FROM $TBL_EXERCICE_QUESTION
+ $sql = "SELECT count(*) count FROM $TBL_EXERCICE_QUESTION
WHERE c_id = $courseId AND exercice_id = $my_exercise_id";
$sqlresult = Database::query($sql);
- $rowi = Database :: result($sqlresult, 0);
+ $rowi = Database :: result($sqlresult, 0, 0);
if ($session_id == $row['session_id']) {
// Settings
@@ -726,14 +727,14 @@ if (!empty($exercise_list)) {
$random_number_of_question = $rowi;
}
if ($row['random_by_category'] > 0) {
- $nbQuestionsTotal = Testcategory::getNumberOfQuestionRandomByCategory(
+ $nbQuestionsTotal = TestCategory::getNumberOfQuestionRandomByCategory(
$my_exercise_id,
$random_number_of_question
);
$number_of_questions = $nbQuestionsTotal." ";
$number_of_questions .= ($nbQuestionsTotal > 1) ? get_lang("QuestionsLowerCase") : get_lang("QuestionLowerCase");
$number_of_questions .= " - ";
- $number_of_questions .= min(Testcategory::getNumberMaxQuestionByCat($my_exercise_id), $random_number_of_question).' '.get_lang('QuestionByCategory');
+ $number_of_questions .= min(TestCategory::getNumberMaxQuestionByCat($my_exercise_id), $random_number_of_question).' '.get_lang('QuestionByCategory');
} else {
$random_label = ' ('.get_lang('Random').') ';
$number_of_questions = $random_number_of_question.' '.$random_label;
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 3a53fd3a02..205f866abf 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -752,26 +752,26 @@ class Exercise
*/
public function save($type_e = '')
{
- global $_course;
- $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
-
- $id = $this->id;
- $exercise = $this->exercise;
- $description = $this->description;
- $sound = $this->sound;
- $type = $this->type;
- $attempts = $this->attempts;
- $feedback_type = $this->feedback_type;
- $random = $this->random;
- $random_answers = $this->random_answers;
- $active = $this->active;
- $propagate_neg = $this->propagate_neg;
- $review_answers = (isset($this->review_answers) && $this->review_answers) ? 1 : 0;
- $randomByCat = $this->randomByCat;
- $text_when_finished = $this->text_when_finished;
- $display_category_name = intval($this->display_category_name);
- $pass_percentage = intval($this->pass_percentage);
- $session_id = api_get_session_id();
+ $_course = api_get_course_info();
+ $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+
+ $id = $this->id;
+ $exercise = $this->exercise;
+ $description = $this->description;
+ $sound = $this->sound;
+ $type = $this->type;
+ $attempts = isset($this->attempts) ? $this->attempts : 0;
+ $feedback_type = isset($this->feedback_type) ? $this->feedback_type : 0;
+ $random = $this->random;
+ $random_answers = $this->random_answers;
+ $active = $this->active;
+ $propagate_neg = $this->propagate_neg;
+ $review_answers = isset($this->review_answers) && $this->review_answers ? 1 : 0;
+ $randomByCat = $this->randomByCat;
+ $text_when_finished = $this->text_when_finished;
+ $display_category_name = intval($this->display_category_name);
+ $pass_percentage = intval($this->pass_percentage);
+ $session_id = api_get_session_id();
//If direct we do not show results
if ($feedback_type == EXERCISE_FEEDBACK_TYPE_DIRECT) {
@@ -847,42 +847,55 @@ class Exercise
$end_time = '0000-00-00 00:00:00';
}
- $sql = "INSERT INTO $TBL_EXERCICES (
- c_id, start_time, end_time, title, description, sound, type, random, random_answers, active,
- results_disabled, max_attempt, feedback_type, expired_time, session_id, review_answers, random_by_category,
- text_when_finished, display_category_name, pass_percentage
- )
- VALUES(
- ".$this->course_id.",
- '$start_time','$end_time',
- '".Database::escape_string($exercise)."',
- '".Database::escape_string($description)."',
- '".Database::escape_string($sound)."',
- ".intval($type).",
- ".intval($random).",
- ".intval($random_answers).",
- ".intval($active).",
- ".intval($results_disabled).",
- ".intval($attempts).",
- ".intval($feedback_type).",
- ".intval($expired_time).",
- ".intval($session_id).",
- ".intval($review_answers).",
- ".intval($randomByCat).",
- '".Database::escape_string($text_when_finished)."',
- ".intval($display_category_name).",
- ".intval($pass_percentage)."
- )";
- Database::query($sql);
- $this->id = Database::insert_id();
+ $params = [
+ 'c_id' => $this->course_id,
+ 'start_time' => $start_time,
+ 'end_time' => $end_time,
+ 'title' => $exercise,
+ 'description' => $description,
+ 'sound' => $sound,
+ 'type' => $type,
+ 'random' => $random,
+ 'random_answers' => $random_answers,
+ 'active' => $active,
+ 'results_disabled' => $results_disabled,
+ 'max_attempt' => $attempts,
+ 'feedback_type' => $feedback_type,
+ 'expired_time' => $expired_time,
+ 'session_id' => $session_id,
+ 'review_answers' => $review_answers,
+ 'random_by_category' => $randomByCat,
+ 'text_when_finished' => $text_when_finished,
+ 'display_category_name' => $display_category_name,
+ 'pass_percentage' => $pass_percentage
+ ];
+
+ $this->id = Database::insert($TBL_EXERCICES, $params);
+
+ if ($this->id) {
+
+ $sql = "UPDATE $TBL_EXERCICES SET id = iid WHERE iid = {$this->id} ";
+ Database::query($sql);
+
+ // insert into the item_property table
+ api_item_property_update(
+ $this->course,
+ TOOL_QUIZ,
+ $this->id,
+ 'QuizAdded',
+ api_get_user_id()
+ );
- // insert into the item_property table
- api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'QuizAdded', api_get_user_id());
- // This function save the quiz again, carefull about start_time and end_time if you remove this line (see above)
- api_set_default_visibility($this->id, TOOL_QUIZ, null, true);
+ // This function save the quiz again, carefull about start_time
+ // and end_time if you remove this line (see above)
+ api_set_default_visibility($this->id, TOOL_QUIZ, null, true);
- if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) {
- $this->search_engine_save();
+ if (api_get_setting(
+ 'search_enabled'
+ ) == 'true' && extension_loaded('xapian')
+ ) {
+ $this->search_engine_save();
+ }
}
}
@@ -893,16 +906,19 @@ class Exercise
/**
* Updates question position
*/
- function update_question_positions()
+ public function update_question_positions()
{
$quiz_question_table = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
//Fixes #3483 when updating order
$question_list = $this->selectQuestionList(true);
if (!empty($question_list)) {
foreach ($question_list as $position => $questionId) {
- $sql="UPDATE $quiz_question_table SET
- question_order ='".intval($position)."'".
- "WHERE c_id = ".$this->course_id." AND question_id = ".intval($questionId)." AND exercice_id=".intval($this->id);
+ $sql = "UPDATE $quiz_question_table SET
+ question_order ='".intval($position)."'
+ WHERE
+ c_id = ".$this->course_id." AND
+ question_id = ".intval($questionId)." AND
+ exercice_id=".intval($this->id);
Database::query($sql);
}
}
@@ -928,8 +944,10 @@ class Exercise
}
}
$this->questionList[$pos] = $questionId;
+
return true;
}
+
return false;
}
@@ -1753,8 +1771,6 @@ class Exercise
$safe_lp_item_id = intval($safe_lp_item_id);
$safe_lp_item_view_id = intval($safe_lp_item_view_id);
- $trackValues = array();
-
if (empty($safe_lp_id)) {
$safe_lp_id = 0;
}
@@ -1787,6 +1803,7 @@ class Exercise
}
$id = Database::insert($track_exercises, $params);
+
return $id;
}
@@ -2149,33 +2166,35 @@ class Exercise
$table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
// Creates a temporary Question object
- $course_id = api_get_course_int_id();
- $objQuestionTmp = Question::read($questionId, $course_id);
+ $course_id = api_get_course_int_id();
+ $objQuestionTmp = Question::read($questionId, $course_id);
if ($objQuestionTmp === false) {
return false;
}
- $questionName = $objQuestionTmp->selectTitle();
- $questionWeighting = $objQuestionTmp->selectWeighting();
- $answerType = $objQuestionTmp->selectType();
- $quesId = $objQuestionTmp->selectId();
- $extra = $objQuestionTmp->extra;
+ $questionName = $objQuestionTmp->selectTitle();
+ $questionWeighting = $objQuestionTmp->selectWeighting();
+ $answerType = $objQuestionTmp->selectType();
+ $quesId = $objQuestionTmp->selectId();
+ $extra = $objQuestionTmp->extra;
$next = 1; //not for now
// Extra information of the question
if (!empty($extra)) {
$extra = explode(':', $extra);
- if ($debug) error_log(print_r($extra, 1));
+ if ($debug) {
+ error_log(print_r($extra, 1));
+ }
// Fixes problems with negatives values using intval
- $true_score = floatval(trim($extra[0]));
- $false_score = floatval(trim($extra[1]));
- $doubt_score = floatval(trim($extra[2]));
+ $true_score = floatval(trim($extra[0]));
+ $false_score = floatval(trim($extra[1]));
+ $doubt_score = floatval(trim($extra[2]));
}
- $totalWeighting = 0;
- $totalScore = 0;
+ $totalWeighting = 0;
+ $totalScore = 0;
// Destruction of the Question object
unset($objQuestionTmp);
@@ -2200,12 +2219,12 @@ class Exercise
$exe_info = isset($exe_info[$exeId]) ? $exe_info[$exeId] : null;
$params = array();
- $params['course_id'] = api_get_course_int_id();
- $params['session_id'] = api_get_session_id();
- $params['user_id'] = isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id();
- $params['exercise_id'] = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id;
- $params['question_id'] = $questionId;
- $params['exe_id'] = isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId;
+ $params['course_id'] = api_get_course_int_id();
+ $params['session_id'] = api_get_session_id();
+ $params['user_id'] = isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id();
+ $params['exercise_id'] = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id;
+ $params['question_id'] = $questionId;
+ $params['exe_id'] = isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId;
$nano = new Nanogong($params);
@@ -2218,13 +2237,13 @@ class Exercise
$user_answer = '';
// Get answer list for matching
- $sql_answer = 'SELECT id, answer FROM '.$table_ans.'
+ $sql_answer = 'SELECT id_auto, id, answer FROM '.$table_ans.'
WHERE c_id = '.$course_id.' AND question_id = "'.$questionId.'"';
$res_answer = Database::query($sql_answer);
- $answer_matching =array();
+ $answerMatching = array();
while ($real_answer = Database::fetch_array($res_answer)) {
- $answer_matching[$real_answer['id']]= $real_answer['answer'];
+ $answerMatching[$real_answer['id_auto']] = $real_answer['answer'];
}
$real_answers = array();
@@ -2242,11 +2261,12 @@ class Exercise
$answerComment = $objAnswerTmp->selectComment($answerId);
$answerCorrect = $objAnswerTmp->isCorrect($answerId);
$answerWeighting = (float)$objAnswerTmp->selectWeighting($answerId);
- $numAnswer = $objAnswerTmp->selectAutoId($answerId);
+ $answerAutoId = $objAnswerTmp->selectAutoId($answerId);
+
$answer_correct_array[$answerId] = (bool)$answerCorrect;
if ($debug) {
- error_log("answer auto id: $numAnswer ");
+ error_log("answer auto id: $answerAutoId ");
error_log("answer correct: $answerCorrect ");
}
@@ -2266,16 +2286,16 @@ class Exercise
$result = Database::query($sql);
$choice = Database::result($result,0,"answer");
- $studentChoice = ($choice == $numAnswer)?1:0;
+ $studentChoice = $choice == $answerAutoId ? 1 : 0;
if ($studentChoice) {
- $questionScore+=$answerWeighting;
- $totalScore+=$answerWeighting;
+ $questionScore += $answerWeighting;
+ $totalScore += $answerWeighting;
}
} else {
- $studentChoice = ($choice == $numAnswer) ? 1 : 0;
+ $studentChoice = $choice == $answerAutoId ? 1 : 0;
if ($studentChoice) {
- $questionScore+=$answerWeighting;
- $totalScore+=$answerWeighting;
+ $questionScore += $answerWeighting;
+ $totalScore += $answerWeighting;
}
}
break;
@@ -2298,7 +2318,7 @@ class Exercise
}
}
- $studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
+ $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
if (!empty($studentChoice)) {
if ($studentChoice == $answerCorrect) {
@@ -2328,14 +2348,14 @@ class Exercise
$choice[$ind] = 1;
}
- $studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
+ $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
$real_answers[$answerId] = (bool)$studentChoice;
if ($studentChoice) {
$questionScore +=$answerWeighting;
}
} else {
- $studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
+ $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
$real_answers[$answerId] = (bool)$studentChoice;
if (isset($studentChoice)) {
@@ -2356,13 +2376,13 @@ class Exercise
$ind = $row['answer'];
$choice[$ind] = 1;
}
- $studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
+ $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
$real_answers[$answerId] = (bool)$studentChoice;
if ($studentChoice) {
$questionScore +=$answerWeighting;
}
} else {
- $studentChoice = isset($choice[$numAnswer]) ? $choice[$numAnswer] : null;
+ $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
if (isset($studentChoice)) {
$questionScore += $answerWeighting;
}
@@ -2383,8 +2403,7 @@ class Exercise
$option = $result[1];
$choice[$my_answer_id] = $option;
}
- $numAnswer = $objAnswerTmp->selectAutoId($answerId);
- $studentChoice = $choice[$numAnswer];
+ $studentChoice = $choice[$answerAutoId];
if ($answerCorrect == $studentChoice) {
//$answerCorrect = 1;
@@ -2394,7 +2413,7 @@ class Exercise
$real_answers[$answerId] = false;
}
} else {
- $studentChoice = $choice[$numAnswer];
+ $studentChoice = $choice[$answerAutoId];
if ($answerCorrect == $studentChoice) {
//$answerCorrect = 1;
$real_answers[$answerId] = true;
@@ -2413,8 +2432,7 @@ class Exercise
$ind = $row['answer'];
$choice[$ind] = 1;
}
- $numAnswer=$objAnswerTmp->selectAutoId($answerId);
- $studentChoice=$choice[$numAnswer];
+ $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
if ($answerCorrect == 1) {
if ($studentChoice) {
@@ -2430,7 +2448,7 @@ class Exercise
}
}
} else {
- $studentChoice = $choice[$numAnswer];
+ $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null;
if ($answerCorrect == 1) {
if ($studentChoice) {
$real_answers[$answerId] = true;
@@ -2688,11 +2706,14 @@ class Exercise
if ($from_database) {
$query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT."
WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'";
- $resq = Database::query($query);
- $choice = Database::result($resq,0,'answer');
+ $resq = Database::query($query);
+ $data = Database::fetch_array($resq);
+
+ $choice = $data['answer'];
$choice = str_replace('\r\n', '', $choice);
$choice = stripslashes($choice);
- $questionScore = Database::result($resq, 0, "marks");
+ $questionScore = $data['marks'];
+
if ($questionScore == -1) {
$totalScore+= 0;
} else {
@@ -2739,50 +2760,59 @@ class Exercise
break;
case MATCHING:
if ($from_database) {
-
- $sql_answer = 'SELECT id, answer, id_auto FROM '.$table_ans.' WHERE c_id = '.$course_id.' AND question_id="'.$questionId.'" AND correct = 0';
- $res_answer = Database::query($sql_answer);
+ $sql = 'SELECT id, answer, id_auto
+ FROM '.$table_ans.'
+ WHERE
+ c_id = '.$course_id.' AND
+ question_id = "'.$questionId.'" AND
+ correct = 0';
+ $res_answer = Database::query($sql);
// Getting the real answer
$real_list = array();
while ($real_answer = Database::fetch_array($res_answer)) {
- $real_list[$real_answer['id']] = $real_answer['answer'];
+ $real_list[$real_answer['id_auto']] = $real_answer['answer'];
}
- $sql_select_answer = 'SELECT id, answer, correct, id_auto, ponderation FROM '.$table_ans.'
- WHERE c_id = '.$course_id.' AND question_id="'.$questionId.'" AND correct <> 0
- ORDER BY id_auto';
- $res_answers = Database::query($sql_select_answer);
+ $sql = 'SELECT id, answer, correct, id_auto, ponderation
+ FROM '.$table_ans.'
+ WHERE
+ c_id = '.$course_id.' AND
+ question_id="'.$questionId.'" AND
+ correct <> 0
+ ORDER BY id_auto';
+ $res_answers = Database::query($sql);
$questionScore = 0;
while ($a_answers = Database::fetch_array($res_answers)) {
- $i_answer_id = $a_answers['id']; //3
+ $i_answer_id = $a_answers['id']; //3
$s_answer_label = $a_answers['answer']; // your daddy - your mother
$i_answer_correct_answer = $a_answers['correct']; //1 - 2
$i_answer_id_auto = $a_answers['id_auto']; // 3 - 4
- $sql_user_answer = "SELECT answer FROM $TBL_TRACK_ATTEMPT
- WHERE exe_id = '$exeId' AND question_id = '$questionId' AND position = '$i_answer_id_auto'";
- $res_user_answer = Database::query($sql_user_answer);
+ $sql = "SELECT answer FROM $TBL_TRACK_ATTEMPT
+ WHERE
+ exe_id = '$exeId' AND
+ question_id = '$questionId' AND
+ position = '$i_answer_id_auto'";
+ $res_user_answer = Database::query($sql);
- if (Database::num_rows($res_user_answer)>0 ) {
+ if (Database::num_rows($res_user_answer) > 0) {
$s_user_answer = Database::result($res_user_answer, 0, 0); // rich - good looking
-
- //$s_user_answer = Database::result($res_user_answer, 0, 1); // rich - good looking
} else {
$s_user_answer = 0;
}
- //$i_answerWeighting = $objAnswerTmp->selectWeighting($i_answer_id);
$i_answerWeighting = $a_answers['ponderation'];
$user_answer = '';
-
if (!empty($s_user_answer)) {
if ($s_user_answer == $i_answer_correct_answer) {
- $questionScore += $i_answerWeighting;
- $totalScore += $i_answerWeighting;
- $user_answer = ''.$real_list[$i_answer_id].'';
+ $questionScore += $i_answerWeighting;
+ $totalScore += $i_answerWeighting;
+ if (isset($real_list[$i_answer_id])) {
+ $user_answer = ''.$real_list[$i_answer_id].'';
+ }
} else {
$user_answer = ''.$real_list[$s_user_answer].'';
}
@@ -2792,24 +2822,27 @@ class Exercise
echo '';
echo '| '.$s_answer_label.' | ';
echo ''.$user_answer;
- echo ' '.$real_list[$i_answer_correct_answer].' ';
+ if (isset($real_list[$i_answer_correct_answer])) {
+ echo ' '.$real_list[$i_answer_correct_answer].' ';
+ }
echo ' | ';
echo ' ';
}
}
break(2); // break the switch and the "for" condition
} else {
- $numAnswer = $objAnswerTmp->selectAutoId($answerId);
if ($answerCorrect) {
- if ($answerCorrect == $choice[$numAnswer]) {
- $questionScore += $answerWeighting;
- $totalScore += $answerWeighting;
+ if ($answerCorrect == $choice[$answerAutoId]) {
+ $questionScore += $answerWeighting;
+ $totalScore += $answerWeighting;
- $user_answer = ''.$answer_matching[$choice[$numAnswer]].'';
+ $user_answer = ''.$answerMatching[$choice[$answerAutoId]].'';
} else {
- $user_answer = ''.$answer_matching[$choice[$numAnswer]].'';
+ if (isset($answerMatching[$choice[$answerAutoId]])) {
+ $user_answer = ''.$answerMatching[$choice[$answerAutoId]].'';
+ }
}
- $matching[$numAnswer] = $choice[$numAnswer];
+ $matching[$answerAutoId] = $choice[$answerAutoId];
}
break;
}
@@ -3089,11 +3122,10 @@ class Exercise
}
}
} elseif($answerType == MATCHING) {
- // if ($origin != 'learnpath') {
echo '';
- echo '| '.$answer_matching[$answerId].' | '.$user_answer.' / '.$answer_matching[$answerCorrect].' | ';
+ echo ''.$answerMatching[$answerId].' | ';
+ echo ''.$user_answer.' / '.$answerMatching[$answerCorrect].' | ';
echo ' ';
- //}
}
}
} else {
@@ -3150,7 +3182,7 @@ class Exercise
// Save into db
/* $sql = "INSERT INTO $tbl_track_e_hotspot (hotspot_user_id, hotspot_course_code, hotspot_exe_id, hotspot_question_id, hotspot_answer_id, hotspot_correct, hotspot_coordinate )
VALUES ('".Database::escape_string($_user['user_id'])."', '".Database::escape_string($_course['id'])."', '".Database::escape_string($exeId)."', '".Database::escape_string($questionId)."', '".Database::escape_string($answerId)."', '".Database::escape_string($studentChoice)."', '".Database::escape_string($user_array)."')";
- $result = api_sql_query($sql,__FILE__,__LINE__);*/
+ $result = Database::query($sql,__FILE__,__LINE__);*/
$user_answer = $user_array;
// we compare only the delineation not the other points
@@ -3292,11 +3324,11 @@ class Exercise
ExerciseShowFunctions::display_hotspot_order_answer($feedback_type, $answerId, $answer, $studentChoice, $answerComment);
break;
case MATCHING:
- // if ($origin != 'learnpath') {
echo '';
- echo '| '.$answer_matching[$answerId].' | '.$user_answer.' / '.$answer_matching[$answerCorrect].' | ';
+ echo ''.$answerMatching[$answerId].' | ';
+ echo ''.$user_answer.' / '.$answerMatching[$answerCorrect].' | ';
echo ' ';
- //}
+
break;
}
}
@@ -3731,15 +3763,16 @@ class Exercise
$answer = $item['answer'];
$answer_type = $item['answer_type'];
- if (!empty($question) && !empty($answer) && $answer_type == FREE_ANSWER ) {
- $open_question_list.='
- | '.get_lang('Question').' |
- '.$question.' |
-
-
- | '.get_lang('Answer').' |
- '.$answer.' |
- ';
+ if (!empty($question) && !empty($answer) && $answer_type == FREE_ANSWER) {
+ $open_question_list.='
+
+ | '.get_lang('Question').' |
+ '.$question.' |
+
+
+ | '.get_lang('Answer').' |
+ '.$answer.' |
+ ';
}
}
@@ -3951,11 +3984,17 @@ class Exercise
$sessionId = api_get_session_id();
$course_id = api_get_course_int_id();
// Save a new quiz
- $sql = "INSERT INTO $tbl_quiz (c_id, title, type, random, active, results_disabled, max_attempt, start_time,end_time,feedback_type,expired_time, session_id, propagate_neg) ".
- " VALUES('$course_id', '".$title."', $type, $random, $active, $results_disabled, $max_attempt,'','', $feedback, $expired_time, $sessionId, $propagateNegative)";
+ $sql = "INSERT INTO $tbl_quiz (c_id, title, type, random, active, results_disabled, max_attempt, start_time,end_time,feedback_type,expired_time, session_id, propagate_neg)
+ VALUES('$course_id', '".$title."', $type, $random, $active, $results_disabled, $max_attempt,'','', $feedback, $expired_time, $sessionId, $propagateNegative)";
Database::query($sql);
$quiz_id = Database::insert_id();
+ if ($quiz_id) {
+
+ $sql = "UPDATE $tbl_quiz SET id = iid WHERE iid = {$quiz_id} ";
+ Database::query($sql);
+ }
+
return $quiz_id;
}
@@ -4194,7 +4233,7 @@ class Exercise
// key of $tabCategoryQuestions are the categopy id (0 for not in a category)
// value is the array of question id of this category
$questionList = array();
- $tabCategoryQuestions = Testcategory::getQuestionsByCat($this->id);
+ $tabCategoryQuestions = TestCategory::getQuestionsByCat($this->id);
$isRandomByCategory = $this->selectRandomByCat();
// on tri les categories en fonction du terme entre [] en tete de la description de la categorie
/*
@@ -4209,14 +4248,14 @@ class Exercise
*/
// If test option is Grouped By Categories
if ($isRandomByCategory == 2) {
- $tabCategoryQuestions = Testcategory::sortTabByBracketLabel($tabCategoryQuestions);
+ $tabCategoryQuestions = TestCategory::sortTabByBracketLabel($tabCategoryQuestions);
}
while (list($cat_id, $tabquestion) = each($tabCategoryQuestions)) {
$number_of_random_question = $this->random;
if ($this->random == -1) {
$number_of_random_question = count($this->questionList);
}
- $questionList = array_merge($questionList, Testcategory::getNElementsFromArray($tabquestion, $number_of_random_question));
+ $questionList = array_merge($questionList, TestCategory::getNElementsFromArray($tabquestion, $number_of_random_question));
}
// shuffle the question list if test is not grouped by categories
if ($isRandomByCategory == 1) {
@@ -4448,7 +4487,7 @@ class Exercise
$nb_random_questions = $this->random;
$tab_categories_scores = array();
for ($i=1; $i <= count($tab_question_list); $i++) {
- $question_category_id = Testcategory::getCategoryForQuestion($tab_question_list[$i]);
+ $question_category_id = TestCategory::getCategoryForQuestion($tab_question_list[$i]);
if (!is_array($tab_categories_scores[$question_category_id])) {
$tab_categories_scores[$question_category_id] = array();
}
diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php
index fdfdd13ff6..be32d59425 100755
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
@@ -124,7 +124,7 @@ if ($form->validate()) {
} else {
// DISPLAY FORM
if (isset($_SESSION['gradebook'])) {
- $gradebook= $_SESSION['gradebook'];
+ $gradebook = $_SESSION['gradebook'];
}
if (!empty($gradebook) && $gradebook=='view') {
@@ -134,7 +134,7 @@ if ($form->validate()) {
$interbreadcrumb[] = array("url"=>'exercice.php', 'name'=> get_lang('Exercices'));
$interbreadcrumb[] = array("url"=>"admin.php?exerciseId=".$objExercise->id, "name" => $objExercise->name);
- Display::display_header($nameTools,get_lang('Exercise'));
+ Display::display_header($nameTools, get_lang('Exercise'));
echo '';
diff --git a/main/exercice/exercise_reminder.php b/main/exercice/exercise_reminder.php
index 9038cb5e49..22c274ca73 100755
--- a/main/exercice/exercise_reminder.php
+++ b/main/exercice/exercise_reminder.php
@@ -4,7 +4,7 @@
* Exercise reminder overview
* Then it shows the results on the screen.
* @package chamilo.exercise
-* @author Julio Montoya Armas switchable fill in blank option added
+* @author Julio Montoya switchable fill in blank option added
*/
require_once '../inc/global.inc.php';
diff --git a/main/exercice/exercise_result.php b/main/exercice/exercise_result.php
index dab853844f..b131a77271 100755
--- a/main/exercice/exercise_result.php
+++ b/main/exercice/exercise_result.php
@@ -10,7 +10,7 @@
* @package chamilo.exercise
* @author Olivier Brouckaert, main author
* @author Roan Embrechts, some refactoring
-* @author Julio Montoya Armas switchable fill in blank option added
+* @author Julio Montoya switchable fill in blank option added
*
* @todo split more code up in functions, move functions to library?
*/
diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php
index b823a0928f..5356e5b2bf 100755
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
@@ -4,7 +4,7 @@
/**
* Shows the exercise results
*
- * @author Julio Montoya Armas Added switchable fill in blank option added
+ * @author Julio Montoya - Added switchable fill in blank option added
* @version $Id: exercise_show.php 22256 2009-07-20 17:40:20Z ivantcholakov $
* @package chamilo.exercise
* @todo remove the debug code and use the general debug library
@@ -56,10 +56,10 @@ if (empty($id)) {
if (api_is_course_session_coach(
api_get_user_id(),
- api_get_course_id(),
+ api_get_course_int_id(),
api_get_session_id()
)) {
- if (!api_coach_can_edit_view_results(api_get_course_id(), api_get_session_id())) {
+ if (!api_coach_can_edit_view_results(api_get_course_int_id(), api_get_session_id())) {
api_not_allowed(true);
}
}
@@ -701,7 +701,7 @@ if (!empty($category_list) && ($show_results || $show_only_total_score)) {
'score' => $my_total_score_temp,
'total' => $totalWeighting
);
- echo Testcategory::get_stats_table_by_attempt($objExercise->id, $category_list);
+ echo TestCategory::get_stats_table_by_attempt($objExercise->id, $category_list);
}
echo $total_score_text;
diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php
index 147627c870..a0c788568a 100755
--- a/main/exercice/exercise_submit.php
+++ b/main/exercice/exercise_submit.php
@@ -913,7 +913,7 @@ if (!empty($error)) {
$.ajax({
type:"post",
async: false,
- url: "'.api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=save_exercise_by_now",
+ url: "'.api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?'.api_get_cidreq().'&a=save_exercise_by_now",
data: "'.$params.'&type=simple&question_id="+question_id+"&"+my_choice+"&"+hotspot+"&"+remind_list,
success: function(return_value) {
if (return_value == "ok") {
@@ -978,7 +978,7 @@ if (!empty($error)) {
$.ajax({
type:"post",
async: false,
- url: "'.api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=save_exercise_by_now",
+ url: "'.api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?'.api_get_cidreq().'&a=save_exercise_by_now",
data: "'.$params.'&type=all&"+my_choice+"&"+hotspot+"&"+free_answers+"&"+remind_list,
success: function(return_value) {
if (return_value == "ok") {
diff --git a/main/exercice/export/aiken/aiken_import.inc.php b/main/exercice/export/aiken/aiken_import.inc.php
index a67d348f95..3e08b59881 100755
--- a/main/exercice/export/aiken/aiken_import.inc.php
+++ b/main/exercice/export/aiken/aiken_import.inc.php
@@ -173,15 +173,20 @@ function aiken_import_exercise($file)
$question->type = $question_array['type'];
$question->setAnswer();
$question->updateTitle($question_array['title']);
- $question->updateDescription($question_array['description']);
+
+ if (isset($question_array['description'])) {
+ $question->updateDescription($question_array['description']);
+ }
$type = $question->selectType();
$question->type = constant($type);
$question->save($last_exercise_id);
$last_question_id = $question->selectId();
- //3.create answer
+ //3. Create answer
$answer = new Answer($last_question_id);
+
$answer->new_nbrAnswers = count($question_array['answer']);
$max_score = 0;
+
foreach ($question_array['answer'] as $key => $answers) {
$key++;
$answer->new_answer[$key] = $answers['value'];
@@ -189,19 +194,26 @@ function aiken_import_exercise($file)
// Correct answers ...
if (in_array($key, $question_array['correct_answers'])) {
$answer->new_correct[$key] = 1;
- $answer->new_comment[$key] = $question_array['feedback'];
+ if (isset($question_array['feedback'])) {
+ $answer->new_comment[$key] = $question_array['feedback'];
+ }
} else {
$answer->new_correct[$key] = 0;
}
- $answer->new_weighting[$key] = $question_array['weighting'][$key - 1];
- $max_score += $question_array['weighting'][$key - 1];
+
+ if (isset($question_array['weighting'][$key - 1])) {
+ $answer->new_weighting[$key] = $question_array['weighting'][$key - 1];
+ $max_score += $question_array['weighting'][$key - 1];
+ }
}
+
$answer->save();
// Now that we know the question score, set it!
$question->updateWeighting($max_score);
$question->save();
}
- // delete the temp dir where the exercise was unzipped
+
+ // Delete the temp dir where the exercise was unzipped
my_delete($baseWorkDir . $uploadPath);
$operation = $last_exercise_id;
}
diff --git a/main/exercice/fill_blanks.class.php b/main/exercice/fill_blanks.class.php
index d02d681fa1..cabe048afa 100755
--- a/main/exercice/fill_blanks.class.php
+++ b/main/exercice/fill_blanks.class.php
@@ -16,9 +16,9 @@ class FillBlanks extends Question
/**
* Constructor
*/
- public function FillBlanks()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this -> type = FILL_IN_BLANKS;
$this -> isContent = $this-> getIsContent();
}
@@ -32,7 +32,7 @@ class FillBlanks extends Question
$defaults = array();
if (!empty($this->id)) {
- $objAnswer = new answer($this->id);
+ $objAnswer = new Answer($this->id);
// the question is encoded like this
// [A] B [C] D [E] F::10,10,10@1
@@ -179,7 +179,7 @@ class FillBlanks extends Question
$answer.= '@'.$is_multiple;
$this->save();
- $objAnswer = new answer($this->id);
+ $objAnswer = new Answer($this->id);
$objAnswer->createAnswer($answer, 0, '', 0, '1');
$objAnswer->save();
}
diff --git a/main/exercice/freeanswer.class.php b/main/exercice/freeanswer.class.php
index 7d6cdb7efe..9396a176b8 100755
--- a/main/exercice/freeanswer.class.php
+++ b/main/exercice/freeanswer.class.php
@@ -16,9 +16,9 @@ class FreeAnswer extends Question
/**
* Constructor
*/
- function FreeAnswer()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this->type = FREE_ANSWER;
$this->isContent = $this->getIsContent();
}
@@ -32,7 +32,6 @@ class FreeAnswer extends Question
$form->addElement('text', 'weighting', get_lang('Weighting'), array('class' => 'span1'));
global $text, $class;
// setting the save button here and not in the question class.php
- //$form->addElement('style_submit_button', 'submitQuestion', $text, 'class="' . $class . '"');
$form->addButtonSave($text, 'submitQuestion');
if (!empty($this->id)) {
$form->setDefaults(array('weighting' => float_format($this->weighting, 1)));
diff --git a/main/exercice/global_multiple_answer.class.php b/main/exercice/global_multiple_answer.class.php
index 7ef5477fab..f4eed35d2e 100755
--- a/main/exercice/global_multiple_answer.class.php
+++ b/main/exercice/global_multiple_answer.class.php
@@ -12,9 +12,9 @@ class GlobalMultipleAnswer extends Question
/**
*
*/
- public function GlobalMultipleAnswer()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this->type = GLOBAL_MULTIPLE_ANSWER;
$this->isContent = $this->getIsContent();
}
@@ -135,23 +135,15 @@ class GlobalMultipleAnswer extends Question
// Affiche un message si le score n'est pas renseign�
$form->addRule('weighting[1]', get_lang('ThisFieldIsRequired'), 'required');
- $navigator_info = api_get_navigator();
global $text, $class;
- //ie6 fix
if ($obj_ex->edit_exercise_in_lp == true) {
- if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
- $form = new FormValidator();
- $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
- $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
- $form->addButtonSave($text, 'submitQuestion');
- } else {
- $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
- $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
- $form->addButtonSave($text, 'submitQuestion');
- // setting the save button here and not in the question class.php
- }
+ $form->addButtonDelete(get_lang('LessAnswer'), 'lessAnswers');
+ $form->addButtonCreate(get_lang('PlusAnswer'), 'moreAnswers');
+ $form->addButtonSave($text, 'submitQuestion');
+ // setting the save button here and not in the question class.php
}
+
$renderer->setElementTemplate('{element} ', 'lessAnswers');
$renderer->setElementTemplate('{element} ', 'submitQuestion');
$renderer->setElementTemplate('{element}', 'moreAnswers');
diff --git a/main/exercice/hotspot.class.php b/main/exercice/hotspot.class.php
index 2946b2cec0..24c18433bb 100755
--- a/main/exercice/hotspot.class.php
+++ b/main/exercice/hotspot.class.php
@@ -15,9 +15,9 @@ class HotSpot extends Question
static $typePicture = 'hotspot.png';
static $explanationLangVar = 'HotSpot';
- public function HotSpot()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this -> type = HOT_SPOT;
}
@@ -85,9 +85,9 @@ class HotSpotDelineation extends HotSpot
static $typePicture = 'hotspot_delineation.gif';
static $explanationLangVar = 'HotspotDelineation';
- function HotSpotDelineation()
+ function __construct()
{
- parent::question();
+ parent::__construct();
$this -> type = HOT_SPOT_DELINEATION;
}
diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php
index 54c336982e..66b7e52812 100755
--- a/main/exercice/matching.class.php
+++ b/main/exercice/matching.class.php
@@ -19,11 +19,11 @@ class Matching extends Question
/**
* Constructor
*/
- public function Matching()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this->type = MATCHING;
- $this->isContent = $this-> getIsContent();
+ $this->isContent = $this->getIsContent();
}
/**
@@ -33,25 +33,44 @@ class Matching extends Question
public function createAnswersForm($form)
{
$defaults = array();
- $navigator_info = api_get_navigator();
-
$nb_matches = $nb_options = 2;
+ $matches = array();
+
+ $answer = null;
+ $counter = 1;
+
+ if (isset($this->id)) {
+ $answer = new Answer($this->id);
+ $answer->read();
+
+ if (count($answer->nbrAnswers) > 0) {
+ for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
+ $correct = $answer->isCorrect($i);
+ if (empty($correct)) {
+ $matches[$answer->selectAutoId($i)] = chr(64 + $counter);
+ $counter++;
+ }
+ }
+ }
+ }
+
if ($form->isSubmitted()) {
$nb_matches = $form->getSubmitValue('nb_matches');
$nb_options = $form->getSubmitValue('nb_options');
- if (isset($_POST['lessMatches']))
+ if (isset($_POST['lessMatches'])) {
$nb_matches--;
- if (isset($_POST['moreMatches']))
+ }
+ if (isset($_POST['moreMatches'])) {
$nb_matches++;
- if (isset($_POST['lessOptions']))
+ }
+ if (isset($_POST['lessOptions'])) {
$nb_options--;
- if (isset($_POST['moreOptions']))
+ }
+ if (isset($_POST['moreOptions'])) {
$nb_options++;
+ }
} else if (!empty($this->id)) {
- $answer = new Answer($this->id);
- $answer->read();
if (count($answer->nbrAnswers) > 0) {
- $a_matches = $a_options = array();
$nb_matches = $nb_options = 0;
for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
if ($answer->isCorrect($i)) {
@@ -72,9 +91,17 @@ class Matching extends Question
$defaults['option[1]'] = get_lang('DefaultMatchingOptA');
$defaults['option[2]'] = get_lang('DefaultMatchingOptB');
}
- $a_matches = array();
- for ($i = 1; $i <= $nb_options; ++$i) {
- $a_matches[$i] = chr(64 + $i); // fill the array with A, B, C.....
+
+ if (empty($matches)) {
+ for ($i = 1; $i <= $nb_options; ++$i) {
+ // fill the array with A, B, C.....
+ $matches[$i] = chr(64 + $i);
+ }
+ } else {
+ for ($i = $counter; $i <= $nb_options; ++$i) {
+ // fill the array with A, B, C.....
+ $matches[$i] = chr(64 + $i);
+ }
}
$form->addElement('hidden', 'nb_matches', $nb_matches);
@@ -107,10 +134,12 @@ class Matching extends Question
' {error}{element} | ',
"answer[$i]"
);
+
$renderer->setElementTemplate(
'{error}{element} | ',
"matches[$i]"
);
+
$renderer->setElementTemplate(
'{error}{element} | ',
"weighting[$i]"
@@ -120,25 +149,21 @@ class Matching extends Question
$form->addHtml("$i | ");
$form->addText("answer[$i]", null);
- $form->addSelect("matches[$i]", null, $a_matches);
+
+ $form->addSelect("matches[$i]", null, $matches);
$form->addText("weighting[$i]", null, true, ['value' => 10]);
-
+
$form->addHtml('');
}
$form->addHtml(' ');
$group = array();
- if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
- $group[] = $form->createElement('submit', 'lessMatches', get_lang('DelElem'), 'class="btn btn-default"');
- $group[] = $form->createElement('submit', 'moreMatches', get_lang('AddElem'), 'class="btn btn-default"');
- } else {
- $renderer->setElementTemplate(' ', 'moreMatches');
+ $renderer->setElementTemplate(' ', 'moreMatches');
- $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessMatches', true);
- $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreMatches', true);
- }
+ $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessMatches', true);
+ $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreMatches', true);
$form->addGroup($group);
@@ -177,19 +202,12 @@ class Matching extends Question
$form->addHtml('');
$group = array();
- global $text, $class;
+ global $text;
- if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
- // setting the save button here and not in the question class.php
- $group[] = $form->createElement('submit', 'submitQuestion', $text, 'class="' . $class . '"');
- $group[] = $form->createElement('submit', 'lessOptions', get_lang('DelElem'), 'class="minus"');
- $group[] = $form->createElement('submit', 'moreOptions', get_lang('AddElem'), 'class="plus"');
- } else {
- // setting the save button here and not in the question class.php
- $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessOptions', true);
- $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreOptions', true);
- $group[] = $form->addButtonSave($text, 'submitQuestion', true);
- }
+ // setting the save button here and not in the question class.php
+ $group[] = $form->addButtonDelete(get_lang('DelElem'), 'lessOptions', true);
+ $group[] = $form->addButtonCreate(get_lang('AddElem'), 'moreOptions', true);
+ $group[] = $form->addButtonSave($text, 'submitQuestion', true);
$form->addGroup($group);
@@ -201,39 +219,50 @@ class Matching extends Question
}
}
- $form->setConstants(array('nb_matches' => $nb_matches, 'nb_options' => $nb_options));
+ $form->setConstants(
+ array(
+ 'nb_matches' => $nb_matches,
+ 'nb_options' => $nb_options
+ )
+ );
}
-
/**
* abstract function which creates the form to create / edit the answers of the question
* @param FormValidator $form
*/
public function processAnswersCreation($form)
{
- $nb_matches = $form -> getSubmitValue('nb_matches');
- $nb_options = $form -> getSubmitValue('nb_options');
- $this -> weighting = 0;
- $objAnswer = new Answer($this->id);
-
+ $nb_matches = $form->getSubmitValue('nb_matches');
+ $nb_options = $form->getSubmitValue('nb_options');
+ $this->weighting = 0;
$position = 0;
- // insert the options
- for($i=1 ; $i<=$nb_options; ++$i) {
+ $objAnswer = new Answer($this->id);
+
+ // Insert the options
+ for ($i = 1; $i <= $nb_options; ++$i) {
$position++;
- $option = $form -> getSubmitValue('option['.$i.']');
+ $option = $form->getSubmitValue('option['.$i.']');
$objAnswer->createAnswer($option, 0, '', 0, $position);
}
- // insert the answers
- for($i=1 ; $i<=$nb_matches ; ++$i) {
+ // Insert the answers
+ for ($i = 1; $i <= $nb_matches; ++$i) {
$position++;
- $answer = $form -> getSubmitValue('answer['.$i.']');
- $matches = $form -> getSubmitValue('matches['.$i.']');
- $weighting = $form -> getSubmitValue('weighting['.$i.']');
- $this -> weighting += $weighting;
- $objAnswer->createAnswer($answer,$matches,'',$weighting,$position);
+ $answer = $form->getSubmitValue('answer['.$i.']');
+ $matches = $form->getSubmitValue('matches['.$i.']');
+ $weighting = $form->getSubmitValue('weighting['.$i.']');
+ $this->weighting += $weighting;
+ $objAnswer->createAnswer(
+ $answer,
+ $matches,
+ '',
+ $weighting,
+ $position
+ );
}
+
$objAnswer->save();
$this->save();
}
@@ -252,6 +281,7 @@ class Matching extends Question
'.get_lang('ElementList').' |
'.get_lang('CorrespondsTo').' |
|
';
+
return $header;
}
}
diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index 764b83164c..de6eeaf6a6 100755
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -18,9 +18,9 @@ class MultipleAnswer extends Question
/**
* Constructor
*/
- function MultipleAnswer()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this -> type = MULTIPLE_ANSWER;
$this -> isContent = $this-> getIsContent();
}
diff --git a/main/exercice/multiple_answer_combination.class.php b/main/exercice/multiple_answer_combination.class.php
index 550c75554d..1000d36405 100755
--- a/main/exercice/multiple_answer_combination.class.php
+++ b/main/exercice/multiple_answer_combination.class.php
@@ -18,9 +18,9 @@ class MultipleAnswerCombination extends Question
/**
* Constructor
*/
- function MultipleAnswerCombination()
+ public function __construct()
{
- parent::question();
+ parent::__construct();
$this -> type = MULTIPLE_ANSWER_COMBINATION;
$this -> isContent = $this-> getIsContent();
}
@@ -148,38 +148,16 @@ class MultipleAnswerCombination extends Question
//only 1 answer the all deal ...
$form->addText('weighting[1]', get_lang('Score'), false, ['value' => 10]);
- $navigator_info = api_get_navigator();
-
global $text, $class;
//ie6 fix
if ($obj_ex->edit_exercise_in_lp == true) {
- $buttonGroup = [];
-
- if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
- $buttonGroup[] = $form->createElement(
- 'submit',
- 'lessAnswers',
- '