chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r9987] replace $_uid with $_user['user_id']

Browse Source
skala
Patrick Cool 19 years ago
parent e3ff50a87a
commit 1ec0fb21d0
25 changed files with 83 additions and 80 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      main/learnpath/contents.php
  2. 10
      main/learnpath/learnpath_functions.inc.php
  3. 22
      main/link/linkfunctions.php
  4. 3
      main/messaging/email_editor.php
  5. 2
      main/metadata/doc/mdApiTest.php
  6. 2
      main/metadata/importdocs.php
  7. 2
      main/metadata/importlinks.php
  8. 6
      main/metadata/importmanifest.php
  9. 2
      main/metadata/index.php
  10. 2
      main/metadata/playscormmdset.inc.php
  11. 2
      main/metadata/statistics.php
  12. 2
      main/metadata/update_indexabletext.php
  13. 4
      main/mySpace/cours.php
  14. 14
      main/mySpace/index.php
  15. 2
      main/mySpace/myStudents.php
  16. 2
      main/mySpace/session.php
  17. 6
      main/mySpace/student.php
  18. 10
      main/newscorm/aicc_api.php
  19. 8
      main/newscorm/aicc_hacp.php
  20. 4
      main/newscorm/learnpath.class.php
  21. 10
      main/newscorm/learnpath_functions.inc.php
  22. 6
      main/newscorm/lp_stats.php
  23. 8
      main/newscorm/resourcelinker.inc.php
  24. 4
      main/newscorm/scorm_admin.php
  25. 10
      main/newscorm/scorm_api.php

20
main/learnpath/contents.php
Unescape View File

@ -69,7 +69,6 @@ $type = $_REQUEST['type'];
$origin = $_REQUEST['origin'];
$docurl = $_REQUEST['docurl'];
$thelink = $_REQUEST['thelink'];
$_uid = $_SESSION['_uid'];
$menu = $_REQUEST['menu'];
$item_id = $_REQUEST['item_id'];
@ -129,10 +128,13 @@ if ($action=='closelesson')
} else {
if ($how=='complete')
{
if (!$_uid) {
if (!$_user['user_id'])
{
$user_id=0;
} else {
$user_id=$_uid;
}
else
{
$user_id=$_user['user_id'];
}
//setting completed status
@ -187,7 +189,7 @@ if ($action=='closelesson')
$result = api_sql_query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id",__FILE__,__LINE__);
$myrow= mysql_fetch_array($result);
$path=$myrow["path"];
$fullpath=$rootWeb."main/exercice/showinframes.php?file=$path&origin=$origin&cid=".$_course['official_code']."&uid=$_uid&learnpath_id=$learnpath_id&learnpath_item_id=$id_in_path";
$fullpath=$rootWeb."main/exercice/showinframes.php?file=$path&origin=$origin&cid=".$_course['official_code']."&uid=".$_user['user_id']."&learnpath_id=$learnpath_id&learnpath_item_id=$id_in_path";
echo "<script type='text/javascript'>\n/* <![CDATA[ */\n",
"zwindow=open('$fullpath','content',$properties);",
@ -329,7 +331,7 @@ if ($action=='closelesson')
if ($menu=='restart') { //Restart clicked
$_SESSION['cur_open']='restarted';
echo "<script type='text/javascript'>\n/* <![CDATA[ */\n xwindow=open('blank.php?display_msg=1','content');\n/* ]]> */\n</script>";
$sql = "UPDATE $tbl_learnpath_user SET score='0', status='incomplete', time='00:00' WHERE (user_id='$_uid' and learnpath_id='$learnpath_id')";
$sql = "UPDATE $tbl_learnpath_user SET score='0', status='incomplete', time='00:00' WHERE (user_id='".$_user['user_id']."' and learnpath_id='$learnpath_id')";
$result = api_sql_query($sql,__FILE__,__LINE__);
message("<table><tr><td><img src=\"../img/restart.jpg\"></td><td>".get_lang('LearnpathRestarted')."</td></tr></table>",'refresh');
@ -436,12 +438,12 @@ while ($row2=mysql_fetch_array($result2)) {
$result3=api_sql_query($sql3,__FILE__,__LINE__);
while ($row3=mysql_fetch_array($result3)) {
$numrows=0;
$sql0 = "SELECT * FROM $tbl_learnpath_user WHERE (user_id='".$_uid."' and learnpath_item_id='".$row3['id']."')";
$sql0 = "SELECT * FROM $tbl_learnpath_user WHERE (user_id='".$_user['user_id']."' and learnpath_item_id='".$row3['id']."')";
$result0=api_sql_query($sql0,__FILE__,__LINE__);
$row0=mysql_fetch_array($result0);
$numrows = mysql_num_rows($result0);
if ($numrows==0) {
$sql4 = "INSERT INTO $tbl_learnpath_user VALUES ('$_uid','$learnpath_id','".$row3['id']."','".get_lang('LearnpathIncomplete')."','0','00:00')";
$sql4 = "INSERT INTO $tbl_learnpath_user VALUES ('".$_user['user_id']."','$learnpath_id','".$row3['id']."','".get_lang('LearnpathIncomplete')."','0','00:00')";
$result4 = api_sql_query($sql4,__FILE__,__LINE__);
} //otherwise, the given item is already in the database
}
@ -477,7 +479,7 @@ while ($row2=mysql_fetch_array($result2)) {
}
while ($row3=mysql_fetch_array($result3)) {
$sql0 = "SELECT * FROM $tbl_learnpath_user WHERE (user_id='".$_uid."' and learnpath_item_id='".$row3['id']."' and learnpath_id='".$learnpath_id."')";
$sql0 = "SELECT * FROM $tbl_learnpath_user WHERE (user_id='".$_user['user_id']."' and learnpath_item_id='".$row3['id']."' and learnpath_id='".$learnpath_id."')";
$result0=api_sql_query($sql0,__FILE__,__LINE__);
$row0=mysql_fetch_array($result0);

10
main/learnpath/learnpath_functions.inc.php
Unescape View File

@ -904,7 +904,7 @@ function is_prereq($learnpath_id)
function prereqcheck($id_in_path)
{
//1 Initialise and import working vars
global $learnpath_id, $_uid;
global $learnpath_id, $_user;
global $langPrereqToEnter, $langPrereqTestLimit1, $langPrereqTestLimit2, $langPrereqTestLimitNow, $langPrereqFirstNeedTo, $langPrereqModuleMinimum1, $langPrereqModuleMinimum2;
$tbl_learnpath_user = Database :: get_course_table(LEARNPATH_USER_TABLE);
$tbl_learnpath_item = Database :: get_course_table(LEARNPATH_ITEM_TABLE);
@ -926,13 +926,13 @@ function prereqcheck($id_in_path)
$prereq_limit = $row['prereq_completion_limit'];
//4.a.2 Get data from the user-item relation
if ($_uid == '')
if ($_user['user_id'] == '')
{
$user_id = '0';
}
else
{
$user_id = $_uid;
$user_id = $_user['user_id'];
}
$sql_items3 = "SELECT * FROM $tbl_learnpath_user WHERE (learnpath_item_id='$id_in_path3' and user_id=$user_id)";
$result_items3 = api_sql_query($sql_items3);
@ -997,13 +997,13 @@ function prereqcheck($id_in_path)
//4.b.3 Cycle through items in the prerequisite chapter
//4.b.3.1 Get data ready to use
$id_in_path4 = $row3['id'];
if ($_uid == '')
if ($_user['user_id'] == '')
{
$user_id = '0';
}
else
{
$user_id = $_uid;
$user_id = $_user['user_id'];
}
//4.b.3.2 Get user-item relation
$sql_items4 = "SELECT * FROM $tbl_learnpath_user WHERE (learnpath_item_id='$id_in_path4' and user_id=$user_id)";

22
main/link/linkfunctions.php
Unescape View File

@ -140,11 +140,11 @@ function addlinkcategory($type)
// "WHAT'S NEW" notification : update last tool Edit
if ($type == "link")
{
global $_uid;
global $_user;
global $_course;
global $nameTools;
api_item_property_update($_course, TOOL_LINK, mysql_insert_id(), "LinkAdded", $_uid);
api_item_property_update($_course, TOOL_LINK, mysql_insert_id(), "LinkAdded", $_user['user_id']);
}
return $ok;
@ -159,7 +159,7 @@ function deletelinkcategory($type)
{
global $catlinkstatus;
global $_course;
global $_uid;
global $_user;
$tbl_link = Database :: get_course_table(LINK_TABLE);
$tbl_categories = Database :: get_course_table(LINK_CATEGORY_TABLE);
$TABLE_ITEM_PROPERTY = Database :: get_course_table(LAST_TOOL_EDIT_TABLE);
@ -170,7 +170,7 @@ function deletelinkcategory($type)
// -> items are no longer fysically deleted, but the visibility is set to 2 (in item_property). This will
// make a restore function possible for the platform administrator
//$sql="DELETE FROM $tbl_link WHERE id='".$_GET['id']."'";
api_item_property_update($_course, TOOL_LINK, $id, "delete", $_uid);
api_item_property_update($_course, TOOL_LINK, $id, "delete", $_user['user_id']);
$catlinkstatus = get_lang("LinkDeleted");
unset ($id);
}
@ -254,11 +254,11 @@ function editlinkcategory($type)
$catlinkstatus = get_lang('LinkModded');
// "WHAT'S NEW" notification: update table last_toolEdit
global $_uid;
global $_user;
global $_course;
global $nameTools;
api_item_property_update($_course, TOOL_LINK, $_POST['id'], "LinkUpdated", $_uid);
api_item_property_update($_course, TOOL_LINK, $_POST['id'], "LinkUpdated", $_user['user_id']);
}
}
if ($type == "category")
@ -313,7 +313,7 @@ function makedefaultviewcode($locatie)
function change_visibility($id, $scope)
{
global $_course;
global $_uid;
global $_user;
$TABLE_ITEM_PROPERTY = Database :: get_course_table(LAST_TOOL_EDIT_TABLE);
if ($scope == "link")
@ -321,7 +321,7 @@ function change_visibility($id, $scope)
$sqlselect = "SELECT * FROM $TABLE_ITEM_PROPERTY WHERE tool='".TOOL_LINK."' and ref='".$id."'";
$result = api_sql_query($sqlselect);
$row = mysql_fetch_array($result);
api_item_property_update($_course, TOOL_LINK, $id, $_GET['action'], $_uid);
api_item_property_update($_course, TOOL_LINK, $id, $_GET['action'], $_user['user_id']);
}
}
@ -548,11 +548,11 @@ function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
$rv = 2; // 2= new
}
global $_course, $nameTools, $_uid;
api_item_property_update($_course, TOOL_LINK, $id, $ipu, $_uid);
global $_course, $nameTools, $_user;
api_item_property_update($_course, TOOL_LINK, $id, $ipu, $_user['user_id']);
if ($hidden && $ipu == "LinkAdded")
api_item_property_update($_course, TOOL_LINK, $id, "invisible", $_uid);
api_item_property_update($_course, TOOL_LINK, $id, "invisible", $_user['user_id']);
return $rv;
}

3
main/messaging/email_editor.php
Unescape View File

@ -30,7 +30,8 @@ $langFile = "index";
include_once("../inc/global.inc.php");
if(empty($_uid)){
if(empty($_user['user_id']))
{
api_not_allowed();
}

2
main/metadata/doc/mdApiTest.php
Unescape View File

@ -26,7 +26,7 @@ $langFile = 'Whatever'; require("../../inc/global.inc.php");
isset($_course) or give_up("Select a course first...");
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
if (!$is_allowed_to_edit) give_up("You're not allowed to edit...");
$mdStore = new mdstore($is_allowed_to_edit); // create table if needed

2
main/metadata/importdocs.php
Unescape View File

@ -32,7 +32,7 @@ $nameTools = get_lang('Tool');
$_course = api_get_course_info(); isset($_course) or give_up(get_lang('Sorry'));
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
if (!$is_allowed_to_edit) give_up(get_lang('Denied'));
$mdObj = new mdobject($_course, 0);

2
main/metadata/importlinks.php
Unescape View File

@ -32,7 +32,7 @@ $nameTools = get_lang('Tool');
$_course = api_get_course_info(); isset($_course) or give_up(get_lang('Sorry'));
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
if (!$is_allowed_to_edit) give_up(get_lang('Denied'));
$mdStore = new mdstore($is_allowed_to_edit); // create table if needed

6
main/metadata/importmanifest.php
Unescape View File

@ -40,7 +40,7 @@ define('HTF', 'mdp_scorm.htt');
$_course = api_get_course_info(); isset($_course) or give_up(get_lang('Sorry'));
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
if (!$is_allowed_to_edit) give_up(get_lang('Denied'));
$mdStore = new mdstore($is_allowed_to_edit); // create table if needed
@ -223,7 +223,7 @@ elseif ($smo == get_lang('Import'))
function store_md_and_traverse_subitems($mfdocId, $level, $counter,
$contextElem, $treeElem, $parentElem)
{
global $_uid, $xht_doc, $mdStore, $mdObj, $sdisub;
global $_user, $xht_doc, $mdStore, $mdObj, $sdisub;
// $contextElem -> @identifier, metadata/lom
// $treeElem -> title, items
@ -251,7 +251,7 @@ elseif ($smo == get_lang('Import'))
if ($level == 0)
{
$mddoc->xmd_set_attribute(0, 'created', date('Y/m/d H:i:s'), FALSE);
$mddoc->xmd_set_attribute(0, 'by', $_uid, FALSE);
$mddoc->xmd_set_attribute(0, 'by', $_user['user_id'], FALSE);
}

2
main/metadata/index.php
Unescape View File

@ -74,7 +74,7 @@ while ($row = mysql_fetch_array($result))
// XML and DB STUFF ----------------------------------------------------------->
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
$mdStore = new mdstore($is_allowed_to_edit);

2
main/metadata/playscormmdset.inc.php
Unescape View File

@ -87,7 +87,7 @@ for ($i = 0; $i < 10; $i++)
// XML and DB STUFF ----------------------------------------------------------->
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
$mdStore = new mdstore($is_allowed_to_edit);

2
main/metadata/statistics.php
Unescape View File

@ -32,7 +32,7 @@ $nameTools = get_lang('Tool');
$_course = api_get_course_info(); isset($_course) or give_up(get_lang('Sorry'));
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
if (!$is_allowed_to_edit) give_up(get_lang('Denied'));
$mdStore = new mdstore(FALSE); // no create from statistics

2
main/metadata/update_indexabletext.php
Unescape View File

@ -34,7 +34,7 @@ $nameTools = get_lang('Tool');
$_course = api_get_course_info(); isset($_course) or give_up(get_lang('Sorry'));
$is_allowed_to_edit = isset($_uid) && $is_courseMember && is_allowed_to_edit();
$is_allowed_to_edit = isset($_user['user_id']) && $is_courseMember && is_allowed_to_edit();
if (!$is_allowed_to_edit) give_up(get_lang('Denied'));
$mdStore = new mdstore($is_allowed_to_edit); // create table if needed

4
main/mySpace/cours.php
Unescape View File

@ -187,7 +187,7 @@
$sqlCourse = " SELECT title,code
FROM $tbl_course as course, $tbl_user_course as course_rel_user
WHERE course_rel_user.course_code=course.code AND course_rel_user.user_id='$_uid' AND course_rel_user.status='1'
WHERE course_rel_user.course_code=course.code AND course_rel_user.user_id='".$_user['user_id']."' AND course_rel_user.status='1'
ORDER BY title ASC
";
@ -201,7 +201,7 @@
$sqlCourse = " SELECT DISTINCT code, title
FROM $tbl_course as course, $tbl_session_course as session_rel_course
WHERE session_rel_course.course_code=course.code AND id_coach='$_uid'
WHERE session_rel_course.course_code=course.code AND id_coach='".$_user['user_id']."'
";
$resultCoursesCoach = api_sql_query($sqlCourse);

14
main/mySpace/index.php
Unescape View File

@ -79,7 +79,7 @@ function is_coach(){
$sqlNbCours = " SELECT course_code
FROM $tbl_course_user
WHERE user_id='$_uid' AND status='1'
WHERE user_id='".$_user['user_id']."' AND status='1'
";
$resultNbCours = api_sql_query($sqlNbCours);
@ -127,7 +127,7 @@ function is_coach(){
if($is_allowedCreateCourse){
$sqlNbStagiaire="SELECT DISTINCT srcru.id_user FROM $tbl_course_user as course_rel_user, $tbl_session_course_user as srcru " .
"WHERE course_rel_user.user_id='$_uid' AND course_rel_user.status='1' AND course_rel_user.course_code=srcru.course_code";
"WHERE course_rel_user.user_id='".$_user['user_id']."' AND course_rel_user.status='1' AND course_rel_user.course_code=srcru.course_code";
$resultNbStagiaire = api_sql_query($sqlNbStagiaire);
@ -141,7 +141,7 @@ function is_coach(){
$a_stagiaire_coach=array();
$sql="SELECT id_session, course_code FROM $tbl_session_course WHERE id_coach='$_uid'";
$sql="SELECT id_session, course_code FROM $tbl_session_course WHERE id_coach='".$_user['user_id']."'";
$result=api_sql_query($sql);
@ -200,7 +200,7 @@ function is_coach(){
$sqlNbCours = " SELECT DISTINCT course_code
FROM $tbl_course_user
WHERE user_id='$_uid' AND status='1'
WHERE user_id='".$_user['user_id']."' AND status='1'
";
$resultCours = api_sql_query($sqlNbCours);
@ -215,7 +215,7 @@ function is_coach(){
$sqlNbCours = " SELECT DISTINCT course_code
FROM $tbl_session_course
WHERE id_coach='$_uid'
WHERE id_coach='".$_user['user_id']."'
";
$resultCours = api_sql_query($sqlNbCours);
@ -252,7 +252,7 @@ function is_coach(){
$sqlNbSessions = " SELECT DISTINCT id_session
FROM $tbl_session_course as session_course, $tbl_course_user as course_rel_user
WHERE session_course.course_code=course_rel_user.course_code AND course_rel_user.status='1' AND course_rel_user.user_id='$_uid'
WHERE session_course.course_code=course_rel_user.course_code AND course_rel_user.status='1' AND course_rel_user.user_id='".$_user['user_id']."'
";
$resultNbSessions = api_sql_query($sqlNbSessions);
@ -266,7 +266,7 @@ function is_coach(){
if(is_coach()){
$sqlNbSessions = " SELECT DISTINCT id_session
FROM $tbl_session_course
WHERE id_coach='$_uid'
WHERE id_coach='".$_user['user_id']."'
";
$resultNbSessions = api_sql_query($sqlNbSessions);

2
main/mySpace/myStudents.php
Unescape View File

@ -149,7 +149,7 @@ if(isset($_GET["user_id"]) && $_GET["user_id"]!=""){
$i_user_id=$_GET["user_id"];
}
else{
$i_user_id=$_uid;
$i_user_id = $_user['user_id'];
}
?>

2
main/mySpace/session.php
Unescape View File

@ -97,7 +97,7 @@ ob_start();
$sqlSessions = " SELECT DISTINCT id_session, name
FROM $tbl_session_course as session_course, $tbl_course_user as course_rel_user, $tbl_sessions as session
WHERE session.id=session_course.id_session AND session_course.course_code=course_rel_user.course_code AND course_rel_user.status='1' AND (course_rel_user.user_id='$_uid' OR session_course.id_coach='$_uid')
WHERE session.id=session_course.id_session AND session_course.course_code=course_rel_user.course_code AND course_rel_user.status='1' AND (course_rel_user.user_id='".$_user['user_id']."' OR session_course.id_coach='".$_user['user_id']."')
";
$resultSessions = api_sql_query($sqlSessions);

6
main/mySpace/student.php
Unescape View File

@ -279,11 +279,11 @@ ob_start();
else{
$a_students=getStudentsFromCoursesNoSession($_uid, $a_students);
$a_students=getStudentsFromCoursesNoSession($_user['user_id'], $a_students);
$a_students=getStudentsFromCoursesFromSessions($_uid, $a_students);
$a_students=getStudentsFromCoursesFromSessions($_user['user_id'], $a_students);
$a_students=getStudentsFromCoursesFromSessionsCoach($_uid, $a_students);
$a_students=getStudentsFromCoursesFromSessionsCoach($_user['user_id'], $a_students);
}

10
main/newscorm/aicc_api.php
Unescape View File

@ -35,8 +35,8 @@ require_once('learnpath.class.php');
require_once('learnpathItem.class.php');
require_once('aicc.class.php');
$_uid = $_SESSION['_uid'];
$_user = $_SESSION['_user'];
// Is this needed? This is probabaly done in the header file
// $_user = $_SESSION['_user'];
$file = $_SESSION['file'];
$oLP = unserialize($_SESSION['lpobject']);
$oItem = $oLP->items[$oLP->current];
@ -110,7 +110,7 @@ var lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode;?>';
if(lms_progress_bar_mode == ''){lms_progress_bar_mode='%';}
var lms_view_id = '<?php echo $oLP->get_view();?>';
if(lms_view_id == ''){ lms_view_id = 1;}
var lms_user_id = '<?php echo $_uid;?>';
var lms_user_id = '<?php echo $_user['user_id'];?>';
var lms_next_item = '<?php echo $oLP->get_next_item_id();?>';
var lms_previous_item = '<?php echo $oLP->get_previous_item_id();?>';
var lms_lp_type = '<?php echo $oLP->get_type();?>';
@ -147,7 +147,7 @@ function LMSGetValue(param) {
result='not attempted';
}
}else if(param == 'cmi.core.student_id'){
result='<?php echo $_uid; ?>';
result='<?php echo $_user['user_id']; ?>';
}else if(param == 'cmi.core.student_name'){
<?php
$who=$_user['lastName'].", ".$_user['firstName'];
@ -202,7 +202,7 @@ function LMSGetValue(param) {
}
break;
case 'cmi.core.student_id' :
result='<?php echo $_uid; ?>';
result='<?php echo $_user['user_id']; ?>';
break;
case 'cmi.core.student_name' :
<?php

8
main/newscorm/aicc_hacp.php
Unescape View File

@ -51,8 +51,8 @@ require_once('learnpath.class.php');
require_once('learnpathItem.class.php');
require_once('aicc.class.php');
$_uid = $_SESSION['_uid'];
$_user = $_SESSION['_user'];
// Is this needed? This is probabaly done in the header file
//$_user = $_SESSION['_user'];
$file = $_SESSION['file'];
$oLP = unserialize($_SESSION['lpobject']);
$oItem =& $oLP->items[$oLP->current];
@ -101,8 +101,8 @@ if(!empty($_REQUEST['command']))
$error_text = $errors[$error_code];
$result = $s_ec.$error_code.$crlf.$s_et.$error_text.$crlf.$s_ad.$crlf;
$result .= '[Core]'.$crlf;
$result .= $tab.'Student_ID='.$_uid.$crlf;
$result .= $tab.'Student_Name='.$_user['lastName'].', '.$_user['firstName'].$_uid.$crlf;
$result .= $tab.'Student_ID='.$_user['user_id'].$crlf;
$result .= $tab.'Student_Name='.$_user['lastName'].', '.$_user['firstName'].$_user['user_id'].$crlf;
$result .= $tab.'Lesson_Location='.$oItem->get_lesson_location().$crlf;
$result .= $tab.'Credit='.$oItem->get_credit().$crlf;
$result .= $tab.'Lesson_Status='.$oItem->get_status().$crlf;

4
main/newscorm/learnpath.class.php
Unescape View File

@ -4346,10 +4346,10 @@ class learnpath {
if($document_id)
{
api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentAdded', $_uid, $to_group_id);
api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentAdded', $_user['user_id'], $to_group_id);
//update parent folders
//item_property_update_on_folder($_course, $_GET['dir'], $_uid);
//item_property_update_on_folder($_course, $_GET['dir'], $_user['user_id']);
$new_comment = (isset($_POST['comment'])) ? trim($_POST['comment']) : '';
$new_title = (isset($_POST['title'])) ? trim($_POST['title']) : '';

10
main/newscorm/learnpath_functions.inc.php
Unescape View File

@ -901,7 +901,7 @@ function is_prereq($learnpath_id)
function prereqcheck($id_in_path)
{
//1 Initialise and import working vars
global $learnpath_id, $_uid;
global $learnpath_id, $_user;
global $langPrereqToEnter, $langPrereqTestLimit1, $langPrereqTestLimit2, $langPrereqTestLimitNow, $langPrereqFirstNeedTo, $langPrereqModuleMinimum1, $langPrereqModuleMinimum2;
$tbl_learnpath_user = Database :: get_course_table(LEARNPATH_USER_TABLE);
$tbl_learnpath_item = Database :: get_course_table(LEARNPATH_ITEM_TABLE);
@ -923,13 +923,13 @@ function prereqcheck($id_in_path)
$prereq_limit = $row['prereq_completion_limit'];
//4.a.2 Get data from the user-item relation
if ($_uid == '')
if ($_user['user_id'] == '')
{
$user_id = '0';
}
else
{
$user_id = $_uid;
$user_id = $_user['user_id'];
}
$sql_items3 = "SELECT * FROM $tbl_learnpath_user WHERE (learnpath_item_id='$id_in_path3' and user_id=$user_id)";
$result_items3 = api_sql_query($sql_items3);
@ -994,13 +994,13 @@ function prereqcheck($id_in_path)
//4.b.3 Cycle through items in the prerequisite chapter
//4.b.3.1 Get data ready to use
$id_in_path4 = $row3['id'];
if ($_uid == '')
if ($_user['user_id'] == '')
{
$user_id = '0';
}
else
{
$user_id = $_uid;
$user_id = $_user['user_id'];
}
//4.b.3.2 Get user-item relation
$sql_items4 = "SELECT * FROM $tbl_learnpath_user WHERE (learnpath_item_id='$id_in_path4' and user_id=$user_id)";

6
main/newscorm/lp_stats.php
Unescape View File

@ -121,7 +121,7 @@ $TBL_LP_ITEM_VIEW = Database::get_course_table('lp_item_view');
$TBL_LP_VIEW = Database::get_course_table('lp_view');
$lp_id = $_SESSION['oLP']->get_id();
$list = $_SESSION['oLP']->get_flat_ordered_items_list($lp_id);
$sql = "SELECT max(view_count) FROM $TBL_LP_VIEW WHERE lp_id = $lp_id AND user_id = $_uid";
$sql = "SELECT max(view_count) FROM $TBL_LP_VIEW WHERE lp_id = $lp_id AND user_id = '".$_user['user_id']."'";
$res = api_sql_query($sql,__FILE__,__LINE__);
$view = '';
if(Database::num_rows($res)>0){
@ -149,7 +149,7 @@ foreach($list as $my_item_id){
" AND i.id = $my_item_id " .
" AND iv.lp_view_id = v.id " .
" AND i.lp_id = $lp_id " .
" AND v.user_id = $_uid " .
" AND v.user_id = ".$_user['user_id']."".
" AND v.view_count = $view ".
" ORDER BY iv.view_count $qry_order ";
}else{
@ -159,7 +159,7 @@ foreach($list as $my_item_id){
" AND i.id = $my_item_id " .
" AND iv.lp_view_id = v.id " .
" AND i.lp_id = $lp_id " .
" AND v.user_id = $_uid ".
" AND v.user_id = ".$_user['user_id']." ".
" ORDER BY iv.view_count $qry_order ";
}
$result = api_sql_query($sql,__FILE__,__LINE__);

8
main/newscorm/resourcelinker.inc.php
Unescape View File

@ -366,7 +366,7 @@ function display_addedresource_link($type, $id, $style='')
function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0)
{
global $_course, $learnpath_id, $tbl_learnpath_item, $items;
global $_course, $curDirPath, $rootWeb, $enableDocumentParsing, $_course, $_uid, $_cid, $rootSys;
global $_course, $curDirPath, $rootWeb, $enableDocumentParsing, $_course, $_user, $_cid, $rootSys;
$tbl_lp_item = Database::get_course_table('lp_item');
$hyperlink_target_parameter = ''; //or e.g. 'target="_blank"'
@ -661,7 +661,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
}
else
{
echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=$_uid\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
}
break;
@ -1164,7 +1164,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_
function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
{
global $_course, $learnpath_id, $tbl_learnpath_item, $items;
global $curDirPath, $rootWeb, $enableDocumentParsing, $_uid, $_cid, $rootSys;
global $curDirPath, $rootWeb, $enableDocumentParsing, $_user, $_cid, $rootSys;
$tbl_lp_item = Database::get_course_table('lp_item');
$hyperlink_target_parameter = ""; //or e.g. target='_blank'
@ -1273,7 +1273,7 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
}
else
{
$link .= "../exercice/showinframes.php?file=$path&cid=$cid&uid=$_uid";
$link .= "../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id'];
}
break;

4
main/newscorm/scorm_admin.php
Unescape View File

@ -284,8 +284,8 @@ if($is_allowedToEdit) // TEACHER ONLY
$dialogBox = get_lang('DownloadEnd');
}
// "WHAT'S NEW" notification: update table last_tooledit
//update_last_tooledit($_course, $nameTools, $id, get_lang('_new_document'), $_uid);
item_property_update($_course, TOOL_LEARNPATH, $id, "LearnpathAdded", $_uid);
//update_last_tooledit($_course, $nameTools, $id, get_lang('_new_document'), $_user['user_id']);
item_property_update($_course, TOOL_LEARNPATH, $id, "LearnpathAdded", $_user['user_id']);
}
else
{

10
main/newscorm/scorm_api.php
Unescape View File

@ -54,8 +54,8 @@ require_once('learnpath.class.php');
require_once('learnpathItem.class.php');
require_once('scorm.class.php');
$_uid = $_SESSION['_uid'];
$_user = $_SESSION['_user'];
// Is this needed? This is probabaly done in the header file
//$_user = $_SESSION['_user'];
$file = $_SESSION['file'];
$oLP = unserialize($_SESSION['lpobject']);
$oItem = $oLP->items[$oLP->current];
@ -145,7 +145,7 @@ var lms_progress_bar_mode = '<?php echo $oLP->progress_bar_mode;?>';
if(lms_progress_bar_mode == ''){lms_progress_bar_mode='%';}
var lms_view_id = '<?php echo $oLP->get_view();?>';
if(lms_view_id == ''){ lms_view_id = 1;}
var lms_user_id = '<?php echo $_uid;?>';
var lms_user_id = '<?php echo $_user['user_id'];?>';
var lms_next_item = '<?php echo $oLP->get_next_item_id();?>';
var lms_previous_item = '<?php echo $oLP->get_previous_item_id();?>';
var lms_lp_type = '<?php echo $oLP->get_type();?>';
@ -218,7 +218,7 @@ function LMSGetValue(param) {
result='not attempted';
}
}else if(param == 'cmi.core.student_id'){
result='<?php echo $_uid; ?>';
result='<?php echo $_user['user_id']; ?>';
}else if(param == 'cmi.core.student_name'){
<?php
$who=$_user['lastName'].", ".$_user['firstName'];
@ -282,7 +282,7 @@ function LMSGetValue(param) {
}
break;
case 'cmi.core.student_id' :
result='<?php echo $_uid; ?>';
result='<?php echo $_user['user_id']; ?>';
break;
case 'cmi.core.student_name' :
<?php

Write Preview
Loading…
Cancel
Save