diff --git a/main/newscorm/aicc.class.php b/main/newscorm/aicc.class.php index 737aacaca9..06be741330 100755 --- a/main/newscorm/aicc.class.php +++ b/main/newscorm/aicc.class.php @@ -9,11 +9,12 @@ * Defines the "aicc" child of class "learnpath" * @package dokeos.learnpath.aicc */ -require_once('aiccItem.class.php'); -//require_once('aiccMetadata.class.php'); -//require_once('aiccOrganization.class.php'); -require_once('aiccResource.class.php'); -require_once('aiccBlock.class.php'); +require_once 'aiccItem.class.php'; +//require_once 'aiccMetadata.class.php'; +//require_once 'aiccOrganization.class.php'; +require_once 'aiccResource.class.php'; +require_once 'aiccBlock.class.php'; + class aicc extends learnpath { var $config = array(); @@ -663,11 +664,11 @@ class aicc extends learnpath { //error_log('New LP - in export_zip()',0); //zip everything that is in the corresponding scorm dir //write the zip file somewhere (might be too big to return) - require_once (api_get_path(LIBRARY_PATH)."fileUpload.lib.php"); - require_once (api_get_path(LIBRARY_PATH)."fileManage.lib.php"); - require_once (api_get_path(LIBRARY_PATH)."document.lib.php"); - require_once (api_get_path(LIBRARY_PATH)."pclzip/pclzip.lib.php"); - require_once ("learnpath_functions.inc.php"); + require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; + require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; + require_once api_get_path(LIBRARY_PATH).'document.lib.php'; + require_once api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php'; + require_once 'learnpath_functions.inc.php'; $tbl_lp = Database::get_course_table(TABLE_LP_MAIN); $_course = Database::get_course_info(api_get_course_id()); diff --git a/main/newscorm/aiccBlock.class.php b/main/newscorm/aiccBlock.class.php old mode 100644 new mode 100755 index 0d0919e9cb..e41b628b4a --- a/main/newscorm/aiccBlock.class.php +++ b/main/newscorm/aiccBlock.class.php @@ -9,7 +9,7 @@ * Class defining the Block elements in an AICC Course Structure file * */ -require_once('learnpathItem.class.php'); +require_once 'learnpathItem.class.php'; class aiccBlock extends learnpathItem{ var $identifier = ''; var $members = array(); diff --git a/main/newscorm/aiccItem.class.php b/main/newscorm/aiccItem.class.php old mode 100644 new mode 100755 index d43dfd707b..fd34e30d7a --- a/main/newscorm/aiccItem.class.php +++ b/main/newscorm/aiccItem.class.php @@ -8,7 +8,7 @@ /** * This class handles the elements from an AICC Descriptor file. */ -require_once('learnpathItem.class.php'); +require_once 'learnpathItem.class.php'; class aiccItem extends learnpathItem{ var $identifier = '';//AICC AU's system_id var $identifierref = ''; diff --git a/main/newscorm/aiccObjective.class.php b/main/newscorm/aiccObjective.class.php old mode 100644 new mode 100755 index 503b8b97bc..d19292de03 --- a/main/newscorm/aiccObjective.class.php +++ b/main/newscorm/aiccObjective.class.php @@ -9,7 +9,7 @@ * Class defining the Block elements in an AICC Course Structure file * */ -require_once('learnpathItem.class.php'); +require_once 'learnpathItem.class.php'; class aiccObjective extends learnpathItem{ var $identifier = ''; var $members = array(); diff --git a/main/newscorm/aicc_api.php b/main/newscorm/aicc_api.php index f660fa6af4..7163a8f775 100755 --- a/main/newscorm/aicc_api.php +++ b/main/newscorm/aicc_api.php @@ -31,12 +31,12 @@ $use_anonymous = true; //Load common libraries using a compatibility script to bridge between 1.6 and 1.8 -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; //Load learning path libraries so we can use the objects to define the initial values //of the API -require_once('learnpath.class.php'); -require_once('learnpathItem.class.php'); -require_once('aicc.class.php'); +require_once 'learnpath.class.php'; +require_once 'learnpathItem.class.php'; +require_once 'aicc.class.php'; // Is this needed? This is probabaly done in the header file // $_user = $_SESSION['_user']; diff --git a/main/newscorm/aicc_hacp.php b/main/newscorm/aicc_hacp.php old mode 100644 new mode 100755 index eea308eaba..16f46d8038 --- a/main/newscorm/aicc_hacp.php +++ b/main/newscorm/aicc_hacp.php @@ -47,13 +47,13 @@ if(!empty($_REQUEST['aicc_sid'])) if($debug>1){error_log('New LP - '.__FILE__.','.__LINE__.' - reusing session ID '.$_REQUEST['aicc_sid'],0);} } //Load common libraries using a compatibility script to bridge between 1.6 and 1.8 -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; if($debug>2){error_log('New LP - '.__FILE__.','.__LINE__.' - Current session ID: '.session_id(),0);} //Load learning path libraries so we can use the objects to define the initial values //of the API -require_once('learnpath.class.php'); -require_once('learnpathItem.class.php'); -require_once('aicc.class.php'); +require_once 'learnpath.class.php'; +require_once 'learnpathItem.class.php'; +require_once 'aicc.class.php'; // Is this needed? This is probabaly done in the header file //$_user = $_SESSION['_user']; diff --git a/main/newscorm/audiorecorder.inc.php b/main/newscorm/audiorecorder.inc.php old mode 100644 new mode 100755 index e8f283c3b6..347bc2c33f --- a/main/newscorm/audiorecorder.inc.php +++ b/main/newscorm/audiorecorder.inc.php @@ -12,7 +12,7 @@ $web_path = api_get_path(WEB_CODE_PATH); $getid3_path = api_get_path(LIBRARY_PATH); -require_once($getid3_path."getid3/getid3.php"); +require_once $getid3_path.'getid3/getid3.php'; function getFLVDuration($flv_path) { $getid3 = new getID3; diff --git a/main/newscorm/back_compat.inc.php b/main/newscorm/back_compat.inc.php old mode 100644 new mode 100755 index 297b408276..ab95541268 --- a/main/newscorm/back_compat.inc.php +++ b/main/newscorm/back_compat.inc.php @@ -6,11 +6,11 @@ * something like lp_includes.inc.php * @package dokeos.learnpath */ -require_once('../inc/global.inc.php'); -require_once(api_get_path(LIBRARY_PATH) . 'database.lib.php'); -require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php'); -require_once(api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php'); -require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'); //replace_dangerous_char() -require_once(api_get_path(LIBRARY_PATH) . 'fileManage.lib.php'); //check_name_exists() -require_once(api_get_path(LIBRARY_PATH) . 'pclzip/pclzip.lib.php'); +require_once '../inc/global.inc.php'; +require_once api_get_path(LIBRARY_PATH).'database.lib.php'; +require_once api_get_path(LIBRARY_PATH).'document.lib.php'; +require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php'; +require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; //replace_dangerous_char() +require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; //check_name_exists() +require_once api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php'; ?> \ No newline at end of file diff --git a/main/newscorm/display_audiorecorder.php b/main/newscorm/display_audiorecorder.php old mode 100644 new mode 100755 index 1fbab7c526..de5ffef67f --- a/main/newscorm/display_audiorecorder.php +++ b/main/newscorm/display_audiorecorder.php @@ -8,10 +8,10 @@ */ //flag to allow for anonymous user - needs to be set before global.inc.php $use_anonymous = true; -require_once('back_compat.inc.php'); -require_once('learnpath.class.php'); -require_once('scorm.class.php'); -require_once('aicc.class.php'); +require_once 'back_compat.inc.php'; +require_once 'learnpath.class.php'; +require_once 'scorm.class.php'; +require_once 'aicc.class.php'; if(isset($_SESSION['lpobject'])) { @@ -26,7 +26,7 @@ $charset = $_SESSION['oLP']->encoding; $lp_theme_css=$_SESSION['oLP']->get_theme(); $scorm_css_header=true; -include_once('../inc/reduced_header.inc.php'); +include_once '../inc/reduced_header.inc.php'; echo ' '; @@ -34,7 +34,7 @@ echo ' $audio_recorder_studentview = 'true'; $audio_recorder_item_id = $_SESSION['oLP']->current; if(api_get_setting('service_visio','active')=='true'){ - include('audiorecorder.inc.php'); + include 'audiorecorder.inc.php'; } echo ''; // end of audiorecorder include diff --git a/main/newscorm/index.php b/main/newscorm/index.php old mode 100644 new mode 100755 index e90c2e0d3a..5f066a6b2f --- a/main/newscorm/index.php +++ b/main/newscorm/index.php @@ -11,6 +11,6 @@ //flag to allow for anonymous user - needs to be set before global.inc.php $use_anonymous = true; -require('back_compat.inc.php'); +require 'back_compat.inc.php'; header('location: lp_controller.php?'.api_get_cidReq().'&action=list'); ?> diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index bb7b4adf83..a66266f2f7 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -226,8 +226,8 @@ class learnpath { break; case 2 : - require_once ('scorm.class.php'); - require_once ('scormItem.class.php'); + require_once 'scorm.class.php'; + require_once 'scormItem.class.php'; $oItem = new scormItem('db', $row['id']); if (is_object($oItem)) { $my_item_id = $oItem->get_id(); @@ -245,7 +245,7 @@ class learnpath { case 1 : default : - require_once ('learnpathItem.class.php'); + require_once 'learnpathItem.class.php'; $oItem = new learnpathItem($row['id'], $user_id); if (is_object($oItem)) { $my_item_id = $oItem->get_id(); @@ -552,7 +552,7 @@ class learnpath { } // upload the file in the documents tool - include_once (api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'); + include_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; $file_path = handle_uploaded_document($_course, $_FILES['mp3'], api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document', '/audio', api_get_user_id(), '', '', '', '', '', false); // getting the filename only @@ -882,7 +882,7 @@ class learnpath { //TODO: also delete items and item-views if (api_get_setting('search_enabled') == 'true') { - require_once (api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'); + require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; $r = delete_all_values_for_item($this->cc, TOOL_LEARNPATH, $this->lp_id); } } @@ -967,7 +967,7 @@ class learnpath { $res = Database::query($sql); if (Database :: num_rows($res) > 0) { $row2 = Database :: fetch_array($res); - require_once (api_get_path(LIBRARY_PATH) . 'search/DokeosIndexer.class.php'); + require_once api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php'; $di = new DokeosIndexer(); $di->remove_document((int) $row2['search_did']); } @@ -1362,7 +1362,7 @@ class learnpath { * @return array Array of terms */ function get_common_index_terms_by_prefix($prefix) { - require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'; + require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; $terms = get_specific_field_values_list_by_prefix($prefix, $this->cc, TOOL_LEARNPATH, $this->lp_id); $prefix_terms = array (); foreach ($terms as $term) { @@ -2605,7 +2605,7 @@ class learnpath { } $html .= '
' . "\n"; - require_once ('resourcelinker.inc.php'); + require_once 'resourcelinker.inc.php'; //temp variables $mycurrentitemid = $this->get_current_item_id(); @@ -2819,7 +2819,7 @@ class learnpath { if ($lp_item_type == 'dokeos_chapter') { $file = 'lp_content.php?type=dir'; } else { - require_once ('resourcelinker.inc.php'); + require_once 'resourcelinker.inc.php'; $file = rl_get_resource_link_for_learnpath(api_get_course_id(), $this->get_id(), $item_id); // check how much attempts of a exercise exits in lp @@ -2897,7 +2897,7 @@ class learnpath { $decoded = html_entity_decode($lp_item_path); list ($decoded) = explode('?', $decoded); if (!is_file(realpath($sys_course_path . '/scorm/' . $lp_path . '/' . $decoded))) { - require_once ('resourcelinker.inc.php'); + require_once 'resourcelinker.inc.php'; $file = rl_get_resource_link_for_learnpath(api_get_course_id(), $this->get_id(), $item_id); if (empty($file)) { $file = 'blank.php?error=document_not_found'; @@ -3781,10 +3781,10 @@ class learnpath { if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) return FALSE; - require_once ('xapian.php'); //TODO try catch every xapian use or make wrappers on api - require_once (api_get_path(LIBRARY_PATH) . 'search/DokeosIndexer.class.php'); - require_once (api_get_path(LIBRARY_PATH) . 'search/xapian/XapianQuery.php'); - require_once (api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php'); + require_once 'xapian.php'; //TODO try catch every xapian use or make wrappers on api + require_once api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php'; + require_once api_get_path(LIBRARY_PATH).'search/xapian/XapianQuery.php'; + require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php'; $items_table = Database :: get_course_table(TABLE_LP_ITEM); //TODO: make query secure agains XSS : use member attr instead of post var @@ -5852,7 +5852,7 @@ class learnpath { $return .= '
'; - require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.php'); + require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; $form = new FormValidator('form', 'POST', api_get_self() . "?" . $_SERVER["QUERY_STRING"]); //$defaults["title"] = api_convert_encoding($item_title, $charset, $this->encoding); $defaults["title"] = api_html_entity_decode(api_convert_encoding($item_title, $charset, $this->encoding), ENT_QUOTES, $charset); @@ -6081,7 +6081,7 @@ class learnpath { if (isset ($_GET['edit']) && $_GET['edit'] == 'true') { $return .= Display :: return_warning_message('' . get_lang("Warning") . ' !
' . get_lang("WarningEditingDocument"), false); } - require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.php'); + require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; $form = new FormValidator('form', 'POST', api_get_self() . "?" . $_SERVER["QUERY_STRING"], '', 'enctype="multipart/form-data"'); $defaults["title"] = Security :: remove_XSS(api_convert_encoding($item_title, api_get_system_encoding() ,$this->encoding)); if (empty ($item_title)) { @@ -6974,7 +6974,7 @@ class learnpath { $return .= $this->display_manipulate($item_id, $row['item_type']); $return .= $this->display_student_publication_form('move', $item_id, $row); break; - case TOOL_FORUM : + case TOOL_FORUM : $return .= $this->display_manipulate($item_id, $row['item_type']); $return .= $this->display_forum_form('move', $item_id, $row); break; @@ -7253,7 +7253,7 @@ class learnpath { */ function write_resources_tree($resources_sorted, $num = 0) { - require_once (api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php'); + require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php'; if (count($resources_sorted) > 0) { foreach ($resources_sorted as $key => $resource) { if (is_int($resource['id'])) { @@ -7398,8 +7398,8 @@ class learnpath { * @return string */ function get_forums() { - include ('../forum/forumfunction.inc.php'); - include ('../forum/forumconfig.inc.php'); + include '../forum/forumfunction.inc.php'; + include '../forum/forumconfig.inc.php'; global $table_forums, $table_threads, $table_posts, $table_item_property, $table_users; $table_forums = Database :: get_course_table(TABLE_FORUM); $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD); @@ -7926,7 +7926,7 @@ class learnpath { } elseif($item->type == TOOL_QUIZ) { - require_once(api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php'); + require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php'; $exe_id = $item->path; //should be using ref when everything will be cleaned up in this regard $exe = new Exercise(); $exe->read($exe_id); @@ -7969,7 +7969,7 @@ class learnpath { } //include export scripts - require_once(api_get_path(SYS_CODE_PATH).'exercice/export/scorm/scorm_export.php'); + require_once api_get_path(SYS_CODE_PATH).'exercice/export/scorm/scorm_export.php'; //get the path of the file(s) from the course directory root //$my_file_path = $item->get_file_path('scorm/'.$this->path.'/'); @@ -8110,7 +8110,7 @@ class learnpath { //file path is courses/DOKEOS/document/.... $info_file_path=explode('/',$file_path); if ($info_file_path[0]=='courses') {//add character "/" in file path - $file_path_dest='document/'.$file_path; + $file_path_dest='document/'.$file_path; } //error_log('Reduced path: '.$file_path,0); @@ -8124,7 +8124,7 @@ class learnpath { $zip_files[] = $my_sub_dir.'/'.$doc_info[0]; $my_dep_file->setAttribute('href',$doc_info[0]); $my_dep->setAttribute('xml:base',$my_xml_sub_dir); - } + } break; default: @@ -8316,7 +8316,7 @@ EOD; } //Send file to client //$name = 'scorm_export_'.$this->lp_id.'.zip'; - require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php'); + require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; $name = preg_replace('([^a-zA-Z0-9_\.])','-',html_entity_decode($this->get_name(),ENT_QUOTES)).'.zip'; DocumentManager::file_send_for_download($temp_zip_file,true,$name); } @@ -8391,7 +8391,7 @@ EOD; //$result= @move_uploaded_file($image_array['tmp_name'], $new_path); // resize the image - include_once (api_get_path(LIBRARY_PATH) . 'image.lib.php'); + include_once api_get_path(LIBRARY_PATH).'image.lib.php'; $temp = new image($image_array['tmp_name']); $picture_infos=@getimagesize($image_array['tmp_name']); // $picture_infos[0]-> width if ($picture_infos[0] > 104) { diff --git a/main/newscorm/learnpathItem.class.php b/main/newscorm/learnpathItem.class.php index 03d3fd4082..84a62fce91 100755 --- a/main/newscorm/learnpathItem.class.php +++ b/main/newscorm/learnpathItem.class.php @@ -223,7 +223,7 @@ class learnpathItem { if (api_get_setting('search_enabled') == 'true') { if (!is_null($this->search_did)) { - require_once(api_get_path(LIBRARY_PATH) .'search/DokeosIndexer.class.php'); + require_once api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php'; $di = new DokeosIndexer(); $di->remove_document($this->search_did); } @@ -2022,7 +2022,7 @@ class learnpathItem { function set_terms($terms) { global $charset; $lp_item = Database::get_course_table(TABLE_LP_ITEM); - require_once(api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php'); + require_once api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php'; $a_terms = split(',',$terms); $i_terms = split(',',$this->get_terms()); foreach ( $i_terms as $term ) { diff --git a/main/newscorm/learnpath_functions.inc.php b/main/newscorm/learnpath_functions.inc.php index 8b24c44041..84d145e26f 100755 --- a/main/newscorm/learnpath_functions.inc.php +++ b/main/newscorm/learnpath_functions.inc.php @@ -543,7 +543,7 @@ function display_learnpath_chapters($parent_item_id = 0, $tree = array (), $leve { $row_items = $row; echo "\n "; - //require('resourcelinker.inc.php'); + //require 'resourcelinker.inc.php'; display_addedresource_link_in_learnpath($row_items["item_type"], $row_items["ref"], '', $row_items["id"], 'builder', 'icon', $level); if ($row_items["description"]) @@ -1405,10 +1405,10 @@ function export_exercise($item_id) $exerciseId = $item_id; - require_once ('../exercice/exercise.class.php'); - require_once ('../exercice/question.class.php'); - require_once ('../exercice/answer.class.php'); - require_once ('../exercice/exercise.lib.php'); + require_once '../exercice/exercise.class.php'; + require_once '../exercice/question.class.php'; + require_once '../exercice/answer.class.php'; + require_once '../exercice/exercise.lib.php'; // answer types define('UNIQUE_ANSWER', 1); @@ -1417,7 +1417,7 @@ function export_exercise($item_id) define('MATCHING', 4); define('FREE_ANSWER', 5); - include_once (api_get_path(LIBRARY_PATH).'/text.lib.php'); + include_once api_get_path(LIBRARY_PATH).'text.lib.php'; $TBL_EXERCISES = Database :: get_course_table(TABLE_QUIZ_TEST); @@ -1609,27 +1609,27 @@ function exportitem($id, $item_id, $item_type, $add_scorm_communications = false global $timeNoSecFormat, $dateFormatLong, $language_interface, $langPubl, $langDone, $langThisCourseDescriptionIsEmpty, $lang_course_description, $lang_introduction_text, $_cid, $langHotPotatoesFinished, $lang_author, $lang_date, $lang_groups, $lang_users, $lang_ass, $lang_dropbox, $test, $langQuestion; // $_course=$_SESSION['course']; - require_once (api_get_path(LIBRARY_PATH)."database.lib.php"); + require_once api_get_path(LIBRARY_PATH).'database.lib.php'; //$tbl_learnpath_item = Database::get_course_learnpath_item_table(); - include_once ('exercise.class.php'); - include_once ('question.class.php'); - include_once ('answer.class.php'); - include_once ('exercise.lib.php'); - - include_once ('../lang/english/announcements.inc.php'); //this line is here only for $langPubl in announcements - include_once ("../lang/".$language_interface."/announcements.inc.php"); //this line is here only for $langPubl in announcements - include_once ('../lang/english/course_description.inc.php'); //this line is here only for $langThisCourseDescriptionIsEmpty - include_once ("../lang/".$language_interface."/course_description.inc.php"); // -||- - include_once ('../lang/english/resourcelinker.inc.php'); - include_once ("../lang/".$language_interface."/resourcelinker.inc.php"); - include_once ('../lang/english/learnpath.inc.php'); - include_once ("../lang/".$language_interface."/learnpath.inc.php"); - include_once ('../lang/english/exercice.inc.php'); - include_once ("../lang/".$language_interface."/exercice.inc.php"); - - include_once (api_get_path(LIBRARY_PATH).'text.lib.php'); - include_once ("../resourcelinker/resourcelinker.inc.php"); + include_once 'exercise.class.php'; + include_once 'question.class.php'; + include_once 'answer.class.php'; + include_once 'exercise.lib.php'; + + include_once '../lang/english/announcements.inc.php'; //this line is here only for $langPubl in announcements + include_once '../lang/'.$language_interface.'/announcements.inc.php'; //this line is here only for $langPubl in announcements + include_once '../lang/english/course_description.inc.php'; //this line is here only for $langThisCourseDescriptionIsEmpty + include_once '../lang/'.$language_interface.'/course_description.inc.php'; // -||- + include_once '../lang/english/resourcelinker.inc.php'; + include_once '../lang/'.$language_interface.'/resourcelinker.inc.php'; + include_once '../lang/english/learnpath.inc.php'; + include_once '../lang/'.$language_interface.'/learnpath.inc.php'; + include_once '../lang/english/exercice.inc.php'; + include_once '../lang/'.$language_interface.'/exercice.inc.php'; + + include_once api_get_path(LIBRARY_PATH).'text.lib.php'; + include_once '../resourcelinker/resourcelinker.inc.php'; $LPname = display_addedresource_link_in_learnpath($item_type, $item_id, '', $id, 'builder', 'nolink'); @@ -2200,7 +2200,7 @@ function exportpath($learnpath_id) $add_scorm_button = true; //2 Get the name of the LP - include_once (api_get_path(LIBRARY_PATH)."fileUpload.lib.php"); + include_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; $sql = "SELECT * FROM $tbl_learnpath_main WHERE (lp_id=$learnpath_id)"; $result = Database::query($sql); $row = Database::fetch_array($result); @@ -2286,7 +2286,7 @@ function exportpath($learnpath_id) createimsmanifest($circle1_files, $learnpath_id); //8 put the files in the exportdir into a zip and force download - include_once (api_get_path(LIBRARY_PATH)."pclzip/pclzip.lib.php"); + include_once api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php'; //create zipfile of given directory $zip_folder = new PclZip(api_get_path(SYS_COURSE_PATH).$_course['path']."/temp/".$LPnamesafe.".zip"); @@ -2304,7 +2304,7 @@ function exportpath($learnpath_id) DocumentManager :: file_send_for_download($zipfilename, false, basename($LPnamesafe.".zip")); //9 Delete the temporary zip file and directory - include_once (api_get_path(LIBRARY_PATH)."fileManage.lib.php"); + include_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; // in fileManage.lib.php my_delete($zipfilename); my_delete($zipfoldername); @@ -2335,7 +2335,7 @@ function exportSCORM($scormname, $course) $zipfilename = $zipfoldername.".zip"; //create zipfile of given directory - include_once (api_get_path(LIBRARY_PATH)."pclzip/pclzip.lib.php"); + include_once api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php'; $zip_folder = new PclZip($zipfilename); $list = 1; //$list = $zip_folder->create($zipfoldername."/",PCLZIP_OPT_REMOVE_PATH,$tmpname.$scormname."/"); // whitout folder @@ -2349,7 +2349,7 @@ function exportSCORM($scormname, $course) DocumentManager :: file_send_for_download($zipfilename, false, basename($scormname.".zip")); //clear - include_once (api_get_path(LIBRARY_PATH)."fileManage.lib.php"); + include_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; my_delete($zipfilename); } @@ -2418,7 +2418,7 @@ function createimsmanifest($circle1_files, $learnpath_id) $tbl_learnpath_item = Database :: get_course_table(TABLE_LEARNPATH_ITEM); $tbl_learnpath_chapter = Database :: get_course_table(TABLE_LEARNPATH_CHAPTER); - include_once ('../metadata/md_funcs.php'); // RH: export metadata + include_once '../metadata/md_funcs.php'; // RH: export metadata //1.1 header /* diff --git a/main/newscorm/lp_add.php b/main/newscorm/lp_add.php index 094ecb5948..8cbd45e163 100755 --- a/main/newscorm/lp_add.php +++ b/main/newscorm/lp_add.php @@ -49,9 +49,9 @@ api_protect_course_script(); //the main_api.lib.php, database.lib.php and display.lib.php //libraries are included by default -include('learnpath_functions.inc.php'); -//include('../resourcelinker/resourcelinker.inc.php'); -include('resourcelinker.inc.php'); +include 'learnpath_functions.inc.php'; +//include '../resourcelinker/resourcelinker.inc.php'; +include 'resourcelinker.inc.php'; //rewrite the language file, sadly overwritten by resourcelinker.inc.php // name of the language file that needs to be included $language_file = 'learnpath'; diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php index 2f35a606ec..9b9dbc1e41 100755 --- a/main/newscorm/lp_add_item.php +++ b/main/newscorm/lp_add_item.php @@ -26,9 +26,9 @@ api_protect_course_script(); //the main_api.lib.php, database.lib.php and display.lib.php //libraries are included by default -include('learnpath_functions.inc.php'); -//include('../resourcelinker/resourcelinker.inc.php'); -include('resourcelinker.inc.php'); +include 'learnpath_functions.inc.php'; +//include '../resourcelinker/resourcelinker.inc.php'; +include 'resourcelinker.inc.php'; //rewrite the language file, sadly overwritten by resourcelinker.inc.php // name of the language file that needs to be included $language_file = 'learnpath'; diff --git a/main/newscorm/lp_admin_view.php b/main/newscorm/lp_admin_view.php index 4574b7a70f..ebb6625601 100755 --- a/main/newscorm/lp_admin_view.php +++ b/main/newscorm/lp_admin_view.php @@ -50,9 +50,9 @@ api_protect_course_script(); //the main_api.lib.php, database.lib.php and display.lib.php //libraries are included by default -include('learnpath_functions.inc.php'); -//include('../resourcelinker/resourcelinker.inc.php'); -include('resourcelinker.inc.php'); +include 'learnpath_functions.inc.php'; +//include '../resourcelinker/resourcelinker.inc.php'; +include 'resourcelinker.inc.php'; //rewrite the language file, sadly overwritten by resourcelinker.inc.php $language_file = "learnpath"; @@ -261,7 +261,7 @@ if (isset($_POST['save_audio'])) } // upload the file in the documents tool - include_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'); + include_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; $file_path = handle_uploaded_document($_course, $_FILES[$key],api_get_path(SYS_COURSE_PATH).$_course['path'].'/document','/audio',api_get_user_id(),'','','','','',false); // getting the filename only diff --git a/main/newscorm/lp_ajax_initialize.php b/main/newscorm/lp_ajax_initialize.php old mode 100644 new mode 100755 index 1e658f34b7..d36986934f --- a/main/newscorm/lp_ajax_initialize.php +++ b/main/newscorm/lp_ajax_initialize.php @@ -14,7 +14,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Get one item's details * @param integer LP ID @@ -36,12 +36,12 @@ function initialize_item($lp_id,$user_id,$view_id,$next_item) * -'last' * - a real item ID */ - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if (isset($_SESSION['lpobject'])) { if ($debug>1) {error_log('////$_SESSION[lpobject] is set',0);} diff --git a/main/newscorm/lp_ajax_last_update_status.php b/main/newscorm/lp_ajax_last_update_status.php index e7112f1958..73015f0adb 100755 --- a/main/newscorm/lp_ajax_last_update_status.php +++ b/main/newscorm/lp_ajax_last_update_status.php @@ -22,7 +22,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Writes an item's new values into the database and returns the operation result * @param integer Learnpath ID @@ -38,10 +38,10 @@ function last_update_status($lp_id,$user_id,$view_id,$item_id) $debug=0; $return = ''; if($debug>0){error_log('In last_update_status('.$lp_id.','.$user_id.','.$view_id.','.$item_id.')',0);} - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { diff --git a/main/newscorm/lp_ajax_log.php b/main/newscorm/lp_ajax_log.php index 481a845039..a20b35f626 100755 --- a/main/newscorm/lp_ajax_log.php +++ b/main/newscorm/lp_ajax_log.php @@ -14,7 +14,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Write a log with the current message * @param string Message @@ -25,7 +25,7 @@ function lp_ajax_log($msg, $level) { $return = ''; if ($debug>0) {error_log('In log('.$msg.')',0);} if ($level == 0) { - //error_log('Logging level too low, not writing files in '.__FILE__); + //error_log('Logging level too low, not writing files in '.__FILE__); return $return; } $msg = str_replace('
',"\r\n", $msg); diff --git a/main/newscorm/lp_ajax_save_item.php b/main/newscorm/lp_ajax_save_item.php index 20e05de64b..667b5a0ae9 100755 --- a/main/newscorm/lp_ajax_save_item.php +++ b/main/newscorm/lp_ajax_save_item.php @@ -13,7 +13,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Writes an item's new values into the database and returns the operation result * @param integer Learnpath ID @@ -37,12 +37,12 @@ function save_item($lp_id,$user_id,$view_id,$item_id,$score=-1,$max=-1,$min=-1,$ $return = ''; if($debug>0){error_log('In save_item('.$lp_id.','.$user_id.','.$view_id.','.$item_id.','.$score.','.$max.','.$min.',"'.$status.'",'.$time.',"'.$suspend.'","'.$location.'","'.(count($interactions)>0?$interactions[0]:'').'","'.$core_exit.'")',0);} //$objResponse = new xajaxResponse(); - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { diff --git a/main/newscorm/lp_ajax_save_objectives.php b/main/newscorm/lp_ajax_save_objectives.php index 6d66194a11..bfca174e63 100755 --- a/main/newscorm/lp_ajax_save_objectives.php +++ b/main/newscorm/lp_ajax_save_objectives.php @@ -13,7 +13,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Writes an item's new values into the database and returns the operation result * @param integer Learnpath ID @@ -29,12 +29,12 @@ function save_objectives($lp_id,$user_id,$view_id,$item_id,$objectives=array()) $return = ''; if($debug>0){error_log('In xajax_save_objectives('.$lp_id.','.$user_id.','.$view_id.','.$item_id.',"'.(count($objectives)>0?count($objectives):'').'")',0);} //$objResponse = new xajaxResponse(); - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { diff --git a/main/newscorm/lp_ajax_switch_item.php b/main/newscorm/lp_ajax_switch_item.php index 1b3fe2eb05..f898e3db15 100755 --- a/main/newscorm/lp_ajax_switch_item.php +++ b/main/newscorm/lp_ajax_switch_item.php @@ -13,7 +13,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Get one item's details * @param integer LP ID @@ -35,12 +35,12 @@ function switch_item_details($lp_id,$user_id,$view_id,$current_item,$next_item) * -'last' * - a real item ID */ - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { @@ -148,7 +148,7 @@ function switch_item_details($lp_id,$user_id,$view_id,$current_item,$next_item) * remain). However, due to numerous technical issues with SCORM, we prefer * leaving it as a double-lock security. If removing, please test carefully * with both SCORM and dokeos learning path tracking. - */ + */ $return .= "olms.score=".$myscore.";" . "olms.max=".$mymax.";" . diff --git a/main/newscorm/lp_ajax_switch_item_toc.php b/main/newscorm/lp_ajax_switch_item_toc.php old mode 100644 new mode 100755 index 2f22ee076c..f6386a024d --- a/main/newscorm/lp_ajax_switch_item_toc.php +++ b/main/newscorm/lp_ajax_switch_item_toc.php @@ -2,7 +2,7 @@ /** * This script contains the server part of the xajax interaction process. The client part is located * in lp_api.php or other api's. - * This script updated the TOC of the SCORM without updating the SCO's attributes + * This script updated the TOC of the SCORM without updating the SCO's attributes * @package dokeos.learnpath * @author Yannick Warnier */ @@ -13,7 +13,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Get one item's details * @param integer LP ID @@ -27,12 +27,12 @@ function switch_item_toc($lp_id,$user_id,$view_id,$current_item,$next_item) $debug=0; $return = ''; if($debug>0){error_log('In xajax_switch_item_toc('.$lp_id.','.$user_id.','.$view_id.','.$current_item.','.$next_item.')',0);} - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { diff --git a/main/newscorm/lp_api.php b/main/newscorm/lp_api.php old mode 100644 new mode 100755 index d34897b782..d956a564de --- a/main/newscorm/lp_api.php +++ b/main/newscorm/lp_api.php @@ -11,11 +11,11 @@ //flag to allow for anonymous user - needs to be set before global.inc.php $use_anonymous = true; -require_once('back_compat.inc.php'); -//require_once('lp_comm.common.php'); //xajax functions +require_once 'back_compat.inc.php'; +//require_once 'lp_comm.common.php'; //xajax functions //$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/')."\n"; //$htmlHeadXtra[] = ''; -include_once('../inc/reduced_header.inc.php'); +include_once '../inc/reduced_header.inc.php'; ?> diff --git a/main/newscorm/lp_author_image.php b/main/newscorm/lp_author_image.php old mode 100644 new mode 100755 index 7d9e5bc0f0..62b54cff95 --- a/main/newscorm/lp_author_image.php +++ b/main/newscorm/lp_author_image.php @@ -6,10 +6,10 @@ */ $use_anonymous = true; -require_once('back_compat.inc.php'); -require_once('learnpath.class.php'); -require_once('scorm.class.php'); -require_once('aicc.class.php'); +require_once 'back_compat.inc.php'; +require_once 'learnpath.class.php'; +require_once 'scorm.class.php'; +require_once 'aicc.class.php'; //Getting the LP if(isset($_SESSION['lpobject'])) { @@ -25,7 +25,7 @@ $lp_theme_css=$_SESSION['oLP']->get_theme(); */ $scorm_css_header=true; // scorm.css loaded -include_once('../inc/reduced_header.inc.php'); +include_once '../inc/reduced_header.inc.php'; echo ' '; diff --git a/main/newscorm/lp_build.php b/main/newscorm/lp_build.php index 0eb8ca577f..2888a2e93f 100755 --- a/main/newscorm/lp_build.php +++ b/main/newscorm/lp_build.php @@ -52,9 +52,9 @@ api_protect_course_script(); //the main_api.lib.php, database.lib.php and display.lib.php //libraries are included by default -include('learnpath_functions.inc.php'); -//include('../resourcelinker/resourcelinker.inc.php'); -include('resourcelinker.inc.php'); +include 'learnpath_functions.inc.php'; +//include '../resourcelinker/resourcelinker.inc.php'; +include 'resourcelinker.inc.php'; //rewrite the language file, sadly overwritten by resourcelinker.inc.php // name of the language file that needs to be included $language_file = "learnpath"; diff --git a/main/newscorm/lp_comm.common.php b/main/newscorm/lp_comm.common.php old mode 100644 new mode 100755 index c8862abac5..732a79544f --- a/main/newscorm/lp_comm.common.php +++ b/main/newscorm/lp_comm.common.php @@ -12,10 +12,10 @@ //flag to allow for anonymous user - needs to be set before global.inc.php $use_anonymous = true; -require_once('back_compat.inc.php'); -require_once('learnpath.class.php'); +require_once 'back_compat.inc.php'; +require_once 'learnpath.class.php'; -require('../inc/lib/xajax/xajax.inc.php'); +require '../inc/lib/xajax/xajax.inc.php'; $xajax = new xajax(api_get_path(WEB_CODE_PATH).'newscorm/lp_comm.server.php'); $xajax->registerFunction("save_item"); $xajax->registerFunction("save_objectives"); diff --git a/main/newscorm/lp_comm.server.php b/main/newscorm/lp_comm.server.php old mode 100644 new mode 100755 index ebb924cf06..65aa722e4e --- a/main/newscorm/lp_comm.server.php +++ b/main/newscorm/lp_comm.server.php @@ -13,7 +13,7 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = 'learnpath'; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; /** * Backup an item's values into the javascript API as "old" values (so we still have them at hand) * @param integer Learnpath ID @@ -64,12 +64,12 @@ function save_item($lp_id,$user_id,$view_id,$item_id,$score=-1,$max=-1,$min=-1,$ $debug=0; if($debug>0){error_log('In xajax_save_item('.$lp_id.','.$user_id.','.$view_id.','.$item_id.','.$score.','.$max.','.$min.',"'.$status.'",'.$time.',"'.$suspend.'","'.$location.'","'.(count($interactions)>0?$interactions[0]:'').'","'.$core_exit.'")',0);} $objResponse = new xajaxResponse(); - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { @@ -205,12 +205,12 @@ function save_objectives($lp_id,$user_id,$view_id,$item_id,$objectives=array()) $debug=0; if($debug>0){error_log('In xajax_save_objectives('.$lp_id.','.$user_id.','.$view_id.','.$item_id.',"'.(count($objectives)>0?count($objectives):'').'")',0);} $objResponse = new xajaxResponse(); - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { @@ -260,12 +260,12 @@ function switch_item_details($lp_id,$user_id,$view_id,$current_item,$next_item) * -'last' * - a real item ID */ - require_once('learnpath.class.php'); - require_once('scorm.class.php'); - require_once('aicc.class.php'); - require_once('learnpathItem.class.php'); - require_once('scormItem.class.php'); - require_once('aiccItem.class.php'); + require_once 'learnpath.class.php'; + require_once 'scorm.class.php'; + require_once 'aicc.class.php'; + require_once 'learnpathItem.class.php'; + require_once 'scormItem.class.php'; + require_once 'aiccItem.class.php'; $mylp = ''; if(isset($_SESSION['lpobject'])) { @@ -450,6 +450,6 @@ function start_timer() return $objResponse; } -require('lp_comm.common.php'); +require 'lp_comm.common.php'; $xajax->processRequests(); ?> diff --git a/main/newscorm/lp_controller.php b/main/newscorm/lp_controller.php index f42b8da139..39089b80ec 100755 --- a/main/newscorm/lp_controller.php +++ b/main/newscorm/lp_controller.php @@ -55,20 +55,20 @@ $use_anonymous = true; //include class definitions before session_start() to ensure availability when touching //session vars containing learning paths -require_once('learnpath.class.php'); +require_once 'learnpath.class.php'; if($debug>0) error_log('New LP - Included learnpath',0); -require_once('learnpathItem.class.php'); +require_once 'learnpathItem.class.php'; if($debug>0) error_log('New LP - Included learnpathItem',0); -require_once('scorm.class.php'); +require_once 'scorm.class.php'; if($debug>0) error_log('New LP - Included scorm',0); -require_once('scormItem.class.php'); +require_once 'scormItem.class.php'; if($debug>0) error_log('New LP - Included scormItem',0); -require_once('aicc.class.php'); +require_once 'aicc.class.php'; if($debug>0) error_log('New LP - Included aicc',0); -require_once('aiccItem.class.php'); +require_once 'aiccItem.class.php'; if($debug>0) error_log('New LP - Included aiccItem',0); -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; if($debug>0) error_log('New LP - Included back_compat',0); if (!$is_allowed_in_course) { @@ -215,7 +215,7 @@ switch($action) if(!$lp_found){ //check if the learnpath ID was defined, otherwise send back to list error_log('New LP - No learnpath given for add item', 0); - require('lp_list.php'); + require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; @@ -224,7 +224,7 @@ switch($action) if(isset($_SESSION['post_time']) && $_SESSION['post_time'] == $_POST['post_time']) { //check post_time to ensure ??? (counter-hacking measure?) - require('lp_add_item.php'); + require 'lp_add_item.php'; } else { $_SESSION['post_time'] = $_POST['post_time']; @@ -243,10 +243,10 @@ switch($action) } //display - require('lp_add_item.php'); + require 'lp_add_item.php'; } } else { - require('lp_add_item.php'); + require 'lp_add_item.php'; } } @@ -268,7 +268,7 @@ switch($action) if(isset($_SESSION['post_time']) && $_SESSION['post_time'] == $_REQUEST['post_time']) { - require('lp_add.php'); + require 'lp_add.php'; } else { @@ -286,12 +286,12 @@ switch($action) //$_SESSION['oLP']->add_item(0,-1,'dokeos_chapter',$_REQUEST['path'],'Default'); - require('lp_build.php'); + require 'lp_build.php'; } } } else - require('lp_add.php'); + require 'lp_add.php'; break; @@ -303,12 +303,12 @@ switch($action) if($debug>0) error_log('New LP - admin_view action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for admin_view', 0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; - require('lp_admin_view.php'); + require 'lp_admin_view.php'; } break; @@ -321,12 +321,12 @@ switch($action) if($debug > 0) error_log('New LP - build action triggered', 0); - if(!$lp_found){ error_log('New LP - No learnpath given for build', 0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; - require('lp_build.php'); + require 'lp_build.php'; } break; @@ -339,7 +339,7 @@ switch($action) if($debug > 0) error_log('New LP - delete item action triggered', 0); - if(!$lp_found){ error_log('New LP - No learnpath given for delete item', 0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; @@ -353,11 +353,11 @@ switch($action) if(isset($_GET['view']) && $_GET['view'] == 'build') { - require('lp_build.php'); + require 'lp_build.php'; } else { - require('lp_admin_view.php'); + require 'lp_admin_view.php'; } } @@ -371,7 +371,7 @@ switch($action) if($debug > 0) error_log('New LP - edit item action triggered', 0); - if(!$lp_found){ error_log('New LP - No learnpath given for edit item', 0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; @@ -391,11 +391,11 @@ switch($action) if(isset($_GET['view']) && $_GET['view'] == 'build') { - require('lp_edit_item.php'); + require 'lp_edit_item.php'; } else { - require('lp_admin_view.php'); + require 'lp_admin_view.php'; } } @@ -409,7 +409,7 @@ switch($action) if($debug > 0) error_log('New LP - edit item prereq action triggered', 0); - if(!$lp_found){ error_log('New LP - No learnpath given for edit item prereq', 0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else { if(isset($_POST['submit_button'])) @@ -419,7 +419,7 @@ switch($action) $_SESSION['oLP']->edit_item_prereq($_GET['id'], $_POST['prerequisites'], $_POST['min_' . $_POST['prerequisites']], $_POST['max_' . $_POST['prerequisites']]); } - require('lp_edit_item_prereq.php'); + require 'lp_edit_item_prereq.php'; } break; @@ -432,7 +432,7 @@ switch($action) if ($debug > 0) error_log('New LP - move item action triggered', 0); - if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require('lp_list.php'); } + if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; @@ -442,7 +442,7 @@ switch($action) } if (isset($_GET['view']) && $_GET['view'] == 'build') { - require('lp_move_item.php'); + require 'lp_move_item.php'; } else { //avoids weird behaviours see CT#967 $check = Security::check_token('get'); @@ -450,7 +450,7 @@ switch($action) $_SESSION['oLP']->move_item($_GET['id'], $_GET['direction']); } Security::clear_token(); - require('lp_admin_view.php'); + require 'lp_admin_view.php'; } } @@ -462,10 +462,10 @@ switch($action) } if($debug>0) error_log('New LP - view_item action triggered', 0); if(!$lp_found){ - error_log('New LP - No learnpath given for view item', 0); require('lp_list.php'); + error_log('New LP - No learnpath given for view item', 0); require 'lp_list.php'; } else { $_SESSION['refresh'] = 1; - require('lp_view_item.php'); + require 'lp_view_item.php'; } break; @@ -476,21 +476,21 @@ switch($action) } if($debug>0) error_log('New LP - upload action triggered',0); $cwdir = getcwd(); - require('lp_upload.php'); + require 'lp_upload.php'; //reinit current working directory as many functions in upload change it chdir($cwdir); - require('lp_list.php'); + require 'lp_list.php'; break; case 'export': if(!$is_allowed_to_edit){ api_not_allowed(true); } if($debug>0) error_log('New LP - export action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for export',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for export',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->scorm_export(); exit(); - //require('lp_list.php'); + //require 'lp_list.php'; } break; case 'delete': @@ -498,14 +498,14 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - delete action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for delete',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for delete',0); require 'lp_list.php'; } else{ $_SESSION['refresh'] = 1; //remove lp from homepage if it is there //$_SESSION['oLP']->toggle_visibility((int)$_GET['lp_id'],'i'); $_SESSION['oLP']->delete(null,(int)$_GET['lp_id'],'remove'); api_session_unregister('oLP'); - require('lp_list.php'); + require 'lp_list.php'; } break; case 'toggle_visible': //change lp visibility (inside lp tool) @@ -513,10 +513,10 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - visibility action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for visibility',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for visibility',0); require 'lp_list.php'; } else{ learnpath::toggle_visibility($_REQUEST['lp_id'],$_REQUEST['new_status']); - require('lp_list.php'); + require 'lp_list.php'; } break; case 'toggle_publish': //change lp published status (visibility on homepage) @@ -524,10 +524,10 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - publish action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for publish',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for publish',0); require 'lp_list.php'; } else{ learnpath::toggle_publish($_REQUEST['lp_id'],$_REQUEST['new_status']); - require('lp_list.php'); + require 'lp_list.php'; } break; case 'move_lp_up': //change lp published status (visibility on homepage) @@ -538,12 +538,12 @@ switch($action) if(!$lp_found) { error_log('New LP - No learnpath given for publish',0); - require('lp_list.php'); + require 'lp_list.php'; } else { learnpath::move_up($_REQUEST['lp_id']); - require('lp_list.php'); + require 'lp_list.php'; } break; case 'move_lp_down': //change lp published status (visibility on homepage) @@ -553,12 +553,12 @@ switch($action) if($debug>0) error_log('New LP - publish action triggered',0); if(!$lp_found){ error_log('New LP - No learnpath given for publish',0); - require('lp_list.php'); + require 'lp_list.php'; } else { learnpath::move_down($_REQUEST['lp_id']); - require('lp_list.php'); + require 'lp_list.php'; } break; case 'edit': @@ -567,10 +567,10 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - edit action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for edit',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for edit',0); require 'lp_list.php'; } else{ $_SESSION['refresh'] = 1; - require('lp_edit.php'); + require 'lp_edit.php'; } break; case 'update_lp': @@ -578,7 +578,7 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - update_lp action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for edit',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for edit',0); require 'lp_list.php'; } else{ $_SESSION['refresh'] = 1; $lp_name=Security::remove_XSS($_REQUEST['lp_name']); @@ -615,7 +615,7 @@ switch($action) if (api_get_setting('search_enabled') === 'true') { - require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'); + require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; $specific_fields = get_specific_field_list(); foreach ($specific_fields as $specific_field) { $_SESSION['oLP']->set_terms_by_prefix($_REQUEST[$specific_field['code']], $specific_field['code']); @@ -634,7 +634,7 @@ switch($action) } } - require('lp_list.php'); + require 'lp_list.php'; } break; case 'add_sub_item': //add an item inside a chapter @@ -642,16 +642,16 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - add sub item action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for add sub item',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for add sub item',0); require 'lp_list.php'; } else{ $_SESSION['refresh'] = 1; if(!empty($_REQUEST['parent_item_id'])){ $_SESSION['from_learnpath']='yes'; $_SESSION['origintoolurl'] = 'lp_controller.php?action=admin_view&lp_id='.Security::remove_XSS($_REQUEST['lp_id']); - require('resourcelinker.php'); + require 'resourcelinker.php'; //$_SESSION['oLP']->add_sub_item($_REQUEST['parent_item_id'],$_REQUEST['previous'],$_REQUEST['type'],$_REQUEST['path'],$_REQUEST['title']); }else{ - require('lp_admin_view.php'); + require 'lp_admin_view.php'; } } break; @@ -661,13 +661,13 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - delete item action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for delete item',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for delete item',0); require 'lp_list.php'; } else{ $_SESSION['refresh'] = 1; if(!empty($_REQUEST['id'])){ $_SESSION['oLP']->delete_item($_REQUEST['id']); } - require('lp_admin_view.php'); + require 'lp_admin_view.php'; } break; case 'edititemprereq': @@ -676,64 +676,64 @@ switch($action) api_not_allowed(true); } if($debug>0) error_log('New LP - edit item prereq action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for edit item prereq',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for edit item prereq',0); require 'lp_list.php'; } else{ if(!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])){ $_SESSION['refresh'] = 1; $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'],$_REQUEST['prereq']); } - require('lp_admin_view.php'); + require 'lp_admin_view.php'; } break; case 'restart': if($debug>0) error_log('New LP - restart action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for restart',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for restart',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->restart(); - require('lp_view.php'); + require 'lp_view.php'; } break; case 'last': if($debug>0) error_log('New LP - last action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for last',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for last',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->last(); - require('lp_view.php'); + require 'lp_view.php'; } break; case 'first': if($debug>0) error_log('New LP - first action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for first',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for first',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->first(); - require('lp_view.php'); + require 'lp_view.php'; } break; case 'next': if($debug>0) error_log('New LP - next action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for next',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for next',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->next(); - require('lp_view.php'); + require 'lp_view.php'; } break; case 'previous': if($debug>0) error_log('New LP - previous action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for previous',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for previous',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->previous(); - require('lp_view.php'); + require 'lp_view.php'; } break; case 'content': if($debug>0) error_log('New LP - content action triggered',0); if($debug>0) error_log('New LP - Item id is '.$_GET['item_id'],0); - if(!$lp_found){ error_log('New LP - No learnpath given for content',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for content',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->save_last(); $_SESSION['oLP']->set_current_item($_GET['item_id']); $_SESSION['oLP']->start_current_item(); - require('lp_content.php'); + require 'lp_content.php'; } break; case 'view': @@ -742,7 +742,7 @@ switch($action) if(!$lp_found) { error_log('New LP - No learnpath given for view', 0); - require('lp_list.php'); + require 'lp_list.php'; } else { @@ -751,20 +751,20 @@ switch($action) { $_SESSION['oLP']->set_current_item($_REQUEST['item_id']); } - require('lp_view.php'); + require 'lp_view.php'; } break; case 'save': if($debug>0) error_log('New LP - save action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for save',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for save',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->save_item(); - require('lp_save.php'); + require 'lp_save.php'; } break; case 'stats': if($debug>0) error_log('New LP - stats action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for stats',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for stats',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->save_current(); $_SESSION['oLP']->save_last(); @@ -773,7 +773,7 @@ switch($action) $list = $_SESSION['oLP']->get_flat_ordered_items_list($lp_id); $user_id = api_get_user_id(); $stats_charset = $_SESSION['oLP']->encoding; - require('lp_stats.php'); + require 'lp_stats.php'; } break; case 'list': @@ -782,7 +782,7 @@ switch($action) $_SESSION['refresh'] = 1; $_SESSION['oLP']->save_last(); } - require('lp_list.php'); + require 'lp_list.php'; break; case 'mode': //switch between fullscreen and embedded mode @@ -793,35 +793,35 @@ switch($action) }else{ $_SESSION['oLP']->mode = 'embedded'; } - require('lp_view.php'); + require 'lp_view.php'; break; case 'switch_view_mode': if($debug>0) error_log('New LP - switch_view_mode action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; } $_SESSION['refresh'] = 1; $_SESSION['oLP']->update_default_view_mode(); - require('lp_list.php'); + require 'lp_list.php'; break; case 'switch_force_commit': if($debug>0) error_log('New LP - switch_force_commit action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; } $_SESSION['refresh'] = 1; $_SESSION['oLP']->update_default_scorm_commit(); - require('lp_list.php'); + require 'lp_list.php'; break; case 'switch_reinit': if($debug>0) error_log('New LP - switch_reinit action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; } $_SESSION['refresh'] = 1; $_SESSION['oLP']->update_reinit(); - require('lp_list.php'); + require 'lp_list.php'; break; case 'switch_scorm_debug': if($debug>0) error_log('New LP - switch_scorm_debug action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; } $_SESSION['refresh'] = 1; $_SESSION['oLP']->update_scorm_debug(); - require('lp_list.php'); + require 'lp_list.php'; break; case 'intro_cmdAdd': if($debug>0) error_log('New LP - intro_cmdAdd action triggered',0); @@ -829,14 +829,14 @@ switch($action) break; case 'js_api_refresh': if($debug>0) error_log('New LP - js_api_refresh action triggered',0); - if(!$lp_found){ error_log('New LP - No learnpath given for js_api_refresh',0); require('lp_message.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for js_api_refresh',0); require 'lp_message.php'; } if(isset($_REQUEST['item_id'])){ $htmlHeadXtra[] = $_SESSION['oLP']->get_js_info($_REQUEST['item_id']); } - require('lp_message.php'); + require 'lp_message.php'; break; case 'return_to_course_homepage': - if(!$lp_found){ error_log('New LP - No learnpath given for stats',0); require('lp_list.php'); } + if(!$lp_found){ error_log('New LP - No learnpath given for stats',0); require 'lp_list.php'; } else{ $_SESSION['oLP']->save_current(); $_SESSION['oLP']->save_last(); @@ -858,7 +858,7 @@ switch($action) default: if($debug>0) error_log('New LP - default action triggered',0); //$_SESSION['refresh'] = 1; - require('lp_list.php'); + require 'lp_list.php'; break; } if(!empty($_SESSION['oLP'])){ diff --git a/main/newscorm/lp_edit.php b/main/newscorm/lp_edit.php index 228280f016..e8b373e232 100755 --- a/main/newscorm/lp_edit.php +++ b/main/newscorm/lp_edit.php @@ -5,8 +5,8 @@ * @author Yannick Warnier */ -require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'); -require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'); +require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; +require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; global $charset; @@ -75,7 +75,7 @@ foreach($encodings as $encoding){ $origin_select = &$form->addElement('select', 'lp_maker', get_lang('Origin')); $lp_orig = $_SESSION['oLP']->get_maker(); -include('content_makers.inc.php'); +include 'content_makers.inc.php'; foreach($content_origins as $origin){ if($lp_orig == $origin){ $s_selected_origin = $origin; diff --git a/main/newscorm/lp_edit_item.php b/main/newscorm/lp_edit_item.php index 07c0b9b474..0ac6783f79 100755 --- a/main/newscorm/lp_edit_item.php +++ b/main/newscorm/lp_edit_item.php @@ -54,9 +54,9 @@ api_protect_course_script(); //the main_api.lib.php, database.lib.php and display.lib.php //libraries are included by default -include('learnpath_functions.inc.php'); -//include('../resourcelinker/resourcelinker.inc.php'); -include('resourcelinker.inc.php'); +include 'learnpath_functions.inc.php'; +//include '../resourcelinker/resourcelinker.inc.php'; +include 'resourcelinker.inc.php'; //rewrite the language file, sadly overwritten by resourcelinker.inc.php // name of the language file that needs to be included $language_file = "learnpath"; diff --git a/main/newscorm/lp_edit_item_prereq.php b/main/newscorm/lp_edit_item_prereq.php index c7fc2a1d6c..a0c197b59e 100755 --- a/main/newscorm/lp_edit_item_prereq.php +++ b/main/newscorm/lp_edit_item_prereq.php @@ -52,9 +52,9 @@ api_protect_course_script(); //the main_api.lib.php, database.lib.php and display.lib.php //libraries are included by default -include('learnpath_functions.inc.php'); -//include('../resourcelinker/resourcelinker.inc.php'); -include('resourcelinker.inc.php'); +include 'learnpath_functions.inc.php'; +//include '../resourcelinker/resourcelinker.inc.php'; +include 'resourcelinker.inc.php'; //rewrite the language file, sadly overwritten by resourcelinker.inc.php // name of the language file that needs to be included $language_file = "learnpath"; diff --git a/main/newscorm/lp_footer.php b/main/newscorm/lp_footer.php old mode 100644 new mode 100755 index b36ab2b132..465effe841 --- a/main/newscorm/lp_footer.php +++ b/main/newscorm/lp_footer.php @@ -9,7 +9,7 @@ */ //flag to allow for anonymous user - needs to be set before global.inc.php $use_anonymous = true; -require_once('back_compat.inc.php'); -include_once('../inc/reduced_header.inc.php'); +require_once 'back_compat.inc.php'; +include_once '../inc/reduced_header.inc.php'; Display::display_footer(); ?> \ No newline at end of file diff --git a/main/newscorm/lp_header.php b/main/newscorm/lp_header.php index 99e281cc65..ce3dd353f9 100755 --- a/main/newscorm/lp_header.php +++ b/main/newscorm/lp_header.php @@ -11,10 +11,10 @@ $use_anonymous = true; // name of the language file that needs to be included $language_file[] = "scormdocument"; -require_once('back_compat.inc.php'); -require_once('learnpath.class.php'); -require_once('scorm.class.php'); -require_once('aicc.class.php'); +require_once 'back_compat.inc.php'; +require_once 'learnpath.class.php'; +require_once 'scorm.class.php'; +require_once 'aicc.class.php'; if(isset($_SESSION['lpobject'])){ $temp = $_SESSION['lpobject']; $_SESSION['oLP'] = unserialize($temp); @@ -68,7 +68,7 @@ if($show_link) $interbreadcrumb[] = array("url"=>"./lp_controller.php?action=view&lp_id=".$path_id,'name'=>$path_name); $noPHP_SELF = true; $lp_theme_css=$_SESSION['oLP']->get_theme(); -include('../inc/reduced_header.inc.php'); +include '../inc/reduced_header.inc.php'; echo '
'; echo ''."\n"; @@ -247,7 +247,7 @@ if (is_array($flat_list)) { $dsp_desc = ''."\n"; } */ - + $dsp_desc = ''."\n"; /* export */ @@ -276,15 +276,15 @@ if (is_array($flat_list)) { $dsp_edit = ''; - + // EDIT LP if ($current_session == $details['lp_session']) { $dsp_edit_lp = '   '; } else { $dsp_edit_lp = ' '; } - - // BUILD + + // BUILD if ($current_session == $details['lp_session']) { if($details['lp_type']==1 || $details['lp_type']==2){ $dsp_build = ' '; diff --git a/main/newscorm/lp_log.php b/main/newscorm/lp_log.php index afbf0cb20f..65347bc51d 100755 --- a/main/newscorm/lp_log.php +++ b/main/newscorm/lp_log.php @@ -18,7 +18,7 @@ */ //flag to allow for anonymous user - needs to be set before global.inc.php $use_anonymous = true; -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; $htmlHeadXtra[] = ''; $lp_theme_css=$_SESSION['oLP']->get_theme(); $scorm_css_header=true; -include_once('../inc/reduced_header.inc.php'); +include_once '../inc/reduced_header.inc.php'; //close the session immediately to avoid concurrent access problems session_write_close(); ?> diff --git a/main/newscorm/lp_move_item.php b/main/newscorm/lp_move_item.php index a3ecc353f7..89472bc325 100755 --- a/main/newscorm/lp_move_item.php +++ b/main/newscorm/lp_move_item.php @@ -23,9 +23,9 @@ api_protect_course_script(); //the main_api.lib.php, database.lib.php and display.lib.php //libraries are included by default -include('learnpath_functions.inc.php'); -//include('../resourcelinker/resourcelinker.inc.php'); -include('resourcelinker.inc.php'); +include 'learnpath_functions.inc.php'; +//include '../resourcelinker/resourcelinker.inc.php'; +include 'resourcelinker.inc.php'; //rewrite the language file, sadly overwritten by resourcelinker.inc.php // name of the language file that needs to be included $language_file = "learnpath"; diff --git a/main/newscorm/lp_nav.php b/main/newscorm/lp_nav.php old mode 100644 new mode 100755 index 1aabb9b559..a08b44f277 --- a/main/newscorm/lp_nav.php +++ b/main/newscorm/lp_nav.php @@ -14,10 +14,10 @@ $use_anonymous = true; $language_file[] = "scormdocument"; $language_file[] = "scorm"; $language_file[] = "learnpath"; -require_once('back_compat.inc.php'); -require_once('learnpath.class.php'); -require_once('scorm.class.php'); -require_once('aicc.class.php'); +require_once 'back_compat.inc.php'; +require_once 'learnpath.class.php'; +require_once 'scorm.class.php'; +require_once 'aicc.class.php'; //error_log('New LP - Loaded lp_nav: '.$_SERVER['REQUEST_URI'],0); $htmlHeadXtra[] = '
'; echo ''; diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php index 4ae0c6d8bb..3c1aaa1820 100755 --- a/main/newscorm/lp_list.php +++ b/main/newscorm/lp_list.php @@ -17,14 +17,14 @@ if(empty($lp_controller_touched) || $lp_controller_touched!=1){ header('location: lp_controller.php?action=list'); } -require_once('back_compat.inc.php'); +require_once 'back_compat.inc.php'; $courseDir = api_get_course_path().'/scorm'; $baseWordDir = $courseDir; $display_progress_bar = true; -require_once('learnpathList.class.php'); -require_once('learnpath.class.php'); -require_once('learnpathItem.class.php'); +require_once 'learnpathList.class.php'; +require_once 'learnpath.class.php'; +require_once 'learnpathItem.class.php'; /** * Display initialisation and security checks @@ -98,7 +98,7 @@ if ($is_allowed_to_edit) { Display::display_normal_message(api_failure::get_last_failure()); } - //include('content_makers.inc.php'); + //include 'content_makers.inc.php'; echo '
'; echo ''. ''.get_lang('_add_learnpath'). @@ -184,12 +184,12 @@ if (is_array($flat_list)) { // This is a student and this path is invisible, skip continue; } - + // check if the learnpath is visible for student if (!$is_allowed_to_edit && !learnpath::is_lp_visible_for_student($id,api_get_user_id())) { continue; } - + $counter++; if (($counter % 2)==0) { $oddclass='; } if($is_allowed_to_edit) { - + /* if ($current_session == $details['lp_session']) { $dsp_desc = '
'.$details['lp_maker'].'    '.$details['lp_proximity'].'    '.$details['lp_encoding'].'  '.$details['lp_maker'].'    '.$details['lp_proximity'].'    '.$details['lp_encoding'].''.$details['lp_maker'].'    '.$details['lp_proximity'].'    '.$details['lp_encoding'].''; $dsp_edit_close = '