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

Minor - Code style - Use "self" instead of classname within the class and remove spaces around :: operator

Browse Source
pull/2487/head
Yannick Warnier 9 years ago
parent 02f16760bd
commit 926ebc4638
6 changed files with 141 additions and 141 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. 58
      main/inc/lib/course.lib.php
  2. 40
      main/inc/lib/glossary.lib.php
  3. 66
      main/inc/lib/statistics.lib.php
  4. 36
      main/inc/lib/sub_language.class.php
  5. 46
      main/inc/lib/system_announcements.lib.php
  6. 36
      main/lp/learnpathItem.class.php

58
main/inc/lib/course.lib.php
Unescape View File

@ -79,7 +79,7 @@ class CourseManager
if ($substring === false || empty($substring)) {
return false;
} else {
$params['wanted_code'] = CourseManager::generate_course_code($substring);
$params['wanted_code'] = self::generate_course_code($substring);
}
}
@ -571,7 +571,7 @@ class CourseManager
if (!empty($session_id)) {
SessionManager::subscribe_users_to_session_course(array($user_id), $session_id, $courseCode);
} else {
CourseManager::add_user_to_course(
self::add_user_to_course(
$user_id,
$courseCode,
$status,
@ -896,7 +896,7 @@ class CourseManager
public static function get_course_list_as_coach($user_id, $include_courses_in_sessions = false)
{
// 1. Getting courses as teacher (No session)
$courses_temp = CourseManager::get_course_list_of_user_as_course_admin($user_id);
$courses_temp = self::get_course_list_of_user_as_course_admin($user_id);
$courseList = array();
if (!empty($courses_temp)) {
@ -932,7 +932,7 @@ class CourseManager
public static function get_user_list_from_courses_as_coach($user_id, $include_sessions = true)
{
$students_in_courses = array();
$sessions = CourseManager::get_course_list_as_coach($user_id, true);
$sessions = self::get_course_list_as_coach($user_id, true);
if (!empty($sessions)) {
foreach ($sessions as $session_id => $courses) {
@ -943,7 +943,7 @@ class CourseManager
}
if (empty($session_id)) {
foreach ($courses as $course_code) {
$students_in_course = CourseManager::get_user_list_from_course_code($course_code);
$students_in_course = self::get_user_list_from_course_code($course_code);
foreach ($students_in_course as $user_item) {
//Only students
@ -1532,7 +1532,7 @@ class CourseManager
$users[$row_key]['count_users'] += $counter;
$registered_users_with_extra_field = CourseManager::getCountRegisteredUsersWithCourseExtraField(
$registered_users_with_extra_field = self::getCountRegisteredUsersWithCourseExtraField(
$name,
$tableExtraField,
$table_user_field_value
@ -3556,7 +3556,7 @@ class CourseManager
$params = [];
// Get notifications.
$course_info['id_session'] = null;
$courseUserInfo = CourseManager::getUserCourseInfo($user_id, $courseId);
$courseUserInfo = self::getUserCourseInfo($user_id, $courseId);
if (empty($courseUserInfo)) {
$course_info['status'] = STUDENT;
@ -3593,7 +3593,7 @@ class CourseManager
$params['title'] = $course_info['title'];
$params['link'] = $course_info['course_public_url'].'?id_session=0&autoreg=1';
if (api_get_setting('display_teacher_in_courselist') === 'true') {
$params['teachers'] = CourseManager::getTeachersFromCourse($courseId, false);
$params['teachers'] = self::getTeachersFromCourse($courseId, false);
}
if ($showCustomIcon === 'true') {
@ -3776,7 +3776,7 @@ class CourseManager
$courseUrl = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/index.php?id_session=0';
$teachers = [];
if (api_get_setting('display_teacher_in_courselist') === 'true') {
$teachers = CourseManager::getTeachersFromCourse($course_info['real_id'], false);
$teachers = self::getTeachersFromCourse($course_info['real_id'], false);
}
$params['status'] = $row['status'];
@ -3915,7 +3915,7 @@ class CourseManager
$teachers = [];
if (api_get_setting('display_teacher_in_courselist') === 'true') {
$teachers = CourseManager::getTeachersFromCourse($course_info['real_id'], false);
$teachers = self::getTeachersFromCourse($course_info['real_id'], false);
}
$params['status'] = $row['status'];
@ -4061,7 +4061,7 @@ class CourseManager
return '';
}
$userInCourseStatus = CourseManager::getUserInCourseStatus(
$userInCourseStatus = self::getUserInCourseStatus(
$user_id,
$course_info['real_id']
);
@ -4163,7 +4163,7 @@ class CourseManager
}
if (api_get_setting('display_teacher_in_courselist') === 'true') {
$teacher_list = CourseManager::getTeachersFromCourse(
$teacher_list = self::getTeachersFromCourse(
$course_info['real_id'],
false
);
@ -4200,7 +4200,7 @@ class CourseManager
$sessionCoachName = $coachInfo['complete_name'];
}
$session_category_id = CourseManager::get_session_category_id_by_session_id($course_info['id_session']);
$session_category_id = self::get_session_category_id_by_session_id($course_info['id_session']);
if (
$session['access_start_date'] == '0000-00-00 00:00:00' || empty($session['access_start_date']) ||
@ -4337,7 +4337,7 @@ class CourseManager
{
$course_code_ok = !self::course_code_exists($wanted_code);
if (!$course_code_ok) {
$wanted_code = CourseManager::generate_course_code($wanted_code);
$wanted_code = self::generate_course_code($wanted_code);
$table = Database::get_main_table(TABLE_MAIN_COURSE);
$wanted_code = Database::escape_string($wanted_code);
$sql = "SELECT count(id) as count
@ -4741,7 +4741,7 @@ class CourseManager
$limit = intval($limit);
// Getting my courses
$my_course_list = CourseManager::get_courses_list_by_user_id(api_get_user_id());
$my_course_list = self::get_courses_list_by_user_id(api_get_user_id());
$my_course_code_list = array();
foreach ($my_course_list as $course) {
@ -4749,7 +4749,7 @@ class CourseManager
}
if (api_is_drh()) {
$courses = CourseManager::get_courses_followed_by_drh(api_get_user_id());
$courses = self::get_courses_followed_by_drh(api_get_user_id());
foreach ($courses as $course) {
$my_course_code_list[$course['real_id']] = $course['real_id'];
}
@ -4814,8 +4814,8 @@ class CourseManager
$my_course_code_list
);
$user_registerd_in_course = CourseManager::is_user_subscribed_in_course($user_id, $courseCode);
$user_registerd_in_course_as_teacher = CourseManager::is_course_teacher($user_id, $courseCode);
$user_registerd_in_course = self::is_user_subscribed_in_course($user_id, $courseCode);
$user_registerd_in_course_as_teacher = self::is_course_teacher($user_id, $courseCode);
$user_registerd_in_course_as_student = ($user_registerd_in_course && !$user_registerd_in_course_as_teacher);
// if user registered as student
@ -4895,7 +4895,7 @@ class CourseManager
);
//}
/* get_lang('Description') */
$my_course['teachers'] = CourseManager::getTeachersFromCourse($course_info['real_id'], false);
$my_course['teachers'] = self::getTeachersFromCourse($course_info['real_id'], false);
$point_info = self::get_course_ranking($course_info['real_id'], 0);
$my_course['rating_html'] = Display::return_rating_system('star_' . $course_info['real_id'],
$ajax_url . '&course_id=' . $course_info['real_id'], $point_info);
@ -5075,7 +5075,7 @@ class CourseManager
if (empty($user_courses)) {
// get the array of courses to which the user is subscribed
$user_courses = CourseManager::get_courses_list_by_user_id($uid);
$user_courses = self::get_courses_list_by_user_id($uid);
foreach ($user_courses as $k => $v) {
$user_courses[$k] = $v['real_id'];
}
@ -5162,7 +5162,7 @@ class CourseManager
$course_code = $courseInfo['code'];
$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$alreadyAddedTeachers = CourseManager::get_teacher_list_from_course_code($course_code);
$alreadyAddedTeachers = self::get_teacher_list_from_course_code($course_code);
if ($deleteTeachersNotInList) {
// Delete only teacher relations that doesn't match the selected teachers
@ -5605,7 +5605,7 @@ class CourseManager
return substr(
preg_replace('/[^A-Z0-9]/', '', strtoupper(api_replace_dangerous_char($title))),
0,
CourseManager::MAX_COURSE_LENGTH_CODE
self::MAX_COURSE_LENGTH_CODE
);
}
@ -5927,7 +5927,7 @@ class CourseManager
if (in_array($course_info['visibility'],
array(COURSE_VISIBILITY_OPEN_PLATFORM, COURSE_VISIBILITY_OPEN_WORLD))
) {
if (CourseManager::is_user_subscribed_in_course($user_id, $course_info['code'])) {
if (self::is_user_subscribed_in_course($user_id, $course_info['code'])) {
$form_data['action'] = $course_info['course_public_url'];
$form_data['message'] = sprintf(get_lang('YouHaveBeenRegisteredToCourseX'), $course_info['title']);
@ -5990,9 +5990,9 @@ class CourseManager
{
$user_id = api_get_user_id();
// Table definitions
$TABLECOURS = Database :: get_main_table(TABLE_MAIN_COURSE);
$TABLECOURSUSER = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$TABLE_ACCESS_URL_REL_COURSE = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$TABLECOURS = Database::get_main_table(TABLE_MAIN_COURSE);
$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$TABLE_ACCESS_URL_REL_COURSE = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
// Get course list auto-register
@ -6101,7 +6101,7 @@ class CourseManager
}
$teachers = '';
if (api_get_setting('display_teacher_in_courselist') === 'true') {
$teachers = CourseManager::get_teacher_list_from_course_code_to_string($course['code'], self::USER_SEPARATOR, true);
$teachers = self::get_teacher_list_from_course_code_to_string($course['code'], self::USER_SEPARATOR, true);
}
$params['link'] = $course_title_url;
$params['icon'] = $status_icon;
@ -6272,12 +6272,12 @@ class CourseManager
);
if (isset($params['gradebook_model_id'])) {
CourseManager::createDefaultGradebook($params['gradebook_model_id'], $courseInfo['code']);
self::createDefaultGradebook($params['gradebook_model_id'], $courseInfo['code']);
}
// If parameter defined, copy the contents from a specific
// template course into this new course
if (isset($params['course_template'])) {
CourseManager::useTemplateAsBasisIfRequired($courseInfo['id'], $params['course_template']);
self::useTemplateAsBasisIfRequired($courseInfo['id'], $params['course_template']);
}
$params['course_code'] = $courseInfo['code'];
$params['item_id'] = $courseInfo['real_id'];

40
main/inc/lib/glossary.lib.php
Unescape View File

@ -105,16 +105,16 @@ class GlossaryManager
}
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
// get the maximum display order of all the glossary items
$max_glossary_item = GlossaryManager::get_max_glossary_item();
$max_glossary_item = self::get_max_glossary_item();
// session_id
$session_id = api_get_session_id();
// check if the glossary term already exists
if (GlossaryManager::glossary_exists($values['name'])) {
if (self::glossary_exists($values['name'])) {
// display the feedback message
if ($showMessage) {
Display::addFlash(
@ -166,11 +166,11 @@ class GlossaryManager
public static function update_glossary($values, $showMessage = true)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
// check if the glossary term already exists
if (GlossaryManager::glossary_exists($values['name'], $values['glossary_id'])) {
if (self::glossary_exists($values['name'], $values['glossary_id'])) {
// display the feedback message
if ($showMessage) {
Display::addFlash(
@ -218,7 +218,7 @@ class GlossaryManager
public static function get_max_glossary_item()
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
$get_max = "SELECT MAX(display_order) FROM $t_glossary
WHERE c_id = $course_id ";
@ -245,7 +245,7 @@ class GlossaryManager
public static function glossary_exists($term, $not_id = '')
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
$sql = "SELECT name FROM $t_glossary
@ -274,8 +274,8 @@ class GlossaryManager
public static function get_glossary_information($glossary_id)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_item_propery = Database :: get_course_table(TABLE_ITEM_PROPERTY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$t_item_propery = Database::get_course_table(TABLE_ITEM_PROPERTY);
if (empty($glossary_id)) {
return false;
}
@ -314,7 +314,7 @@ class GlossaryManager
public static function delete_glossary($glossary_id, $showMessage = true)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
$glossaryInfo = self::get_glossary_information($glossary_id);
@ -343,7 +343,7 @@ class GlossaryManager
);
// reorder the remaining terms
GlossaryManager::reorder_glossary();
self::reorder_glossary();
if ($showMessage) {
Display::addFlash(
@ -436,7 +436,7 @@ class GlossaryManager
}
if ($view === 'list') {
$content .= GlossaryManager::displayGlossaryList();
$content .= self::displayGlossaryList();
}
return $content;
@ -469,7 +469,7 @@ class GlossaryManager
public static function get_number_glossary_terms($session_id=0)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
$session_id = intval($session_id);
$sql_filter = api_get_session_condition($session_id, true, true);
@ -509,8 +509,8 @@ class GlossaryManager
$view = Session::read('glossary_view');
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_item_propery = Database :: get_course_table(TABLE_ITEM_PROPERTY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$t_item_propery = Database::get_course_table(TABLE_ITEM_PROPERTY);
if (api_is_allowed_to_edit(null, true)) {
$col2 = " glossary.glossary_id as col2, ";
@ -591,7 +591,7 @@ class GlossaryManager
$glossary_id = $row[2];
$return = '<a href="'.api_get_self().'?action=edit_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.
Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
$glossary_data = GlossaryManager::get_glossary_information($glossary_id);
$glossary_data = self::get_glossary_information($glossary_id);
$glossary_term = $glossary_data['name'];
if (api_is_allowed_to_edit(null, true)) {
if ($glossary_data['session_id'] == api_get_session_id()) {
@ -630,7 +630,7 @@ class GlossaryManager
public static function reorder_glossary()
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id();
$sql = "SELECT * FROM $t_glossary
WHERE c_id = $course_id
@ -655,7 +655,7 @@ class GlossaryManager
public static function move_glossary($direction, $glossary_id)
{
// Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_glossary = Database::get_course_table(TABLE_GLOSSARY);
// sort direction
if ($direction === 'up') {
@ -697,9 +697,9 @@ class GlossaryManager
*/
public static function export_to_pdf()
{
$data = GlossaryManager::get_glossary_data(
$data = self::get_glossary_data(
0,
GlossaryManager::get_number_glossary_terms(api_get_session_id()),
self::get_number_glossary_terms(api_get_session_id()),
0,
'ASC'
);

66
main/inc/lib/statistics.lib.php
Unescape View File

@ -35,8 +35,8 @@ class Statistics
*/
public static function countCourses($categoryCode = null)
{
$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
if (api_is_multiple_url_enabled()) {
$sql = "SELECT COUNT(*) AS number
@ -68,8 +68,8 @@ class Statistics
if (!isset($visibility)) {
return 0;
}
$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
if (api_is_multiple_url_enabled()) {
$sql = "SELECT COUNT(*) AS number
@ -104,7 +104,7 @@ class Statistics
$course_user_table = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
$course_table = Database:: get_main_table(TABLE_MAIN_COURSE);
$user_table = Database:: get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
$active_filter = $onlyActive?' AND active=1':'';
$status_filter = isset($status)?' AND status = '.intval($status):'';
@ -155,8 +155,8 @@ class Statistics
*/
public static function countSessions()
{
$session_table = Database :: get_main_table(TABLE_MAIN_SESSION);
$access_url_rel_session_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$session_table = Database::get_main_table(TABLE_MAIN_SESSION);
$access_url_rel_session_table= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
if (api_is_multiple_url_enabled()) {
$current_url_id = api_get_current_access_url_id();
$sql = "SELECT COUNT(id) AS number
@ -179,9 +179,9 @@ class Statistics
public static function getNumberOfActivities()
{
// Database table definitions
$track_e_default = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
$track_e_default = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if (api_is_multiple_url_enabled()) {
$sql = "SELECT count(default_id) AS total_number_of_items
@ -345,7 +345,7 @@ class Statistics
*/
public static function getCourseCategories()
{
$categoryTable = Database :: get_main_table(TABLE_MAIN_CATEGORY);
$categoryTable = Database::get_main_table(TABLE_MAIN_CATEGORY);
$sql = "SELECT code, name
FROM $categoryTable
ORDER BY tree_pos";
@ -390,7 +390,7 @@ class Statistics
public static function printStats($title, $stats, $showTotal = true, $isFileSize = false)
{
$total = 0;
$data = Statistics::rescale($stats);
$data = self::rescale($stats);
echo '<table class="data_table" cellspacing="0" cellpadding="3">
<tr><th colspan="'.($showTotal ? '4' : '3').'">'.$title.'</th></tr>';
@ -403,7 +403,7 @@ class Statistics
if (!$isFileSize) {
$number_label = number_format($number, 0, ',', '.');
} else {
$number_label = Statistics::makeSizeString($number);
$number_label = self::makeSizeString($number);
}
$percentage = ($total>0?number_format(100*$number/$total, 1, ',', '.'):'0');
@ -421,7 +421,7 @@ class Statistics
if (!$isFileSize) {
$total_label = number_format($total, 0, ',', '.');
} else {
$total_label = Statistics::makeSizeString($total);
$total_label = self::makeSizeString($total);
}
echo '<tr><th colspan="4" align="right">'.get_lang('Total').': '.$total_label.'</td></tr>';
}
@ -435,7 +435,7 @@ class Statistics
public static function printLoginStats($type)
{
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
$table_url = null;
@ -488,7 +488,7 @@ class Statistics
$stat_date = ($type === 'day') ? $periodCollection[$obj->stat_date] : $obj->stat_date;
$result_last_x[$stat_date] = $obj->number_of_logins;
}
Statistics::printStats(get_lang('LastLogins').' ('.$period.')', $result_last_x, true);
self::printStats(get_lang('LastLogins').' ('.$period.')', $result_last_x, true);
flush(); //flush web request at this point to see something already while the full data set is loading
echo '<br />';
}
@ -508,7 +508,7 @@ class Statistics
}
$result[$stat_date] = $obj->number_of_logins;
}
Statistics::printStats(get_lang('AllLogins').' ('.$period.')', $result, true);
self::printStats(get_lang('AllLogins').' ('.$period.')', $result, true);
}
/**
@ -520,7 +520,7 @@ class Statistics
{
$totalLogin = array();
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if (api_is_multiple_url_enabled()) {
$table_url = ", $access_url_rel_user_table";
@ -544,9 +544,9 @@ class Statistics
$totalLogin[$index] = $obj->number;
}
if ($distinct) {
Statistics::printStats(get_lang('DistinctUsersLogins'), $totalLogin, false);
self::printStats(get_lang('DistinctUsersLogins'), $totalLogin, false);
} else {
Statistics::printStats(get_lang('Logins'), $totalLogin, false);
self::printStats(get_lang('Logins'), $totalLogin, false);
}
}
@ -559,7 +559,7 @@ class Statistics
{
$totalLogin = [];
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if (api_is_multiple_url_enabled()) {
$table_url = ", $access_url_rel_user_table";
@ -592,7 +592,7 @@ class Statistics
public static function printToolStats()
{
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
$access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
$tools = array(
@ -637,7 +637,7 @@ class Statistics
$result[$tool_names[$obj->access_tool]] = $obj->number_of_logins;
}
Statistics::printStats(get_lang('PlatformToolAccess'), $result, true);
self::printStats(get_lang('PlatformToolAccess'), $result, true);
}
/**
@ -645,8 +645,8 @@ class Statistics
*/
public static function printCourseByLanguageStats()
{
$table = Database :: get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$table = Database::get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
if (api_is_multiple_url_enabled()) {
$sql = "SELECT course_language, count( c.code ) AS number_of_courses
@ -664,7 +664,7 @@ class Statistics
while ($obj = Database::fetch_object($res)) {
$result[$obj->course_language] = $obj->number_of_courses;
}
Statistics::printStats(get_lang('CountCourseByLanguage'), $result, true);
self::printStats(get_lang('CountCourseByLanguage'), $result, true);
}
/**
@ -672,8 +672,8 @@ class Statistics
*/
public static function printUserPicturesStats()
{
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
$url_condition = null;
$url_condition2 = null;
@ -694,7 +694,7 @@ class Statistics
$result[get_lang('No')] = $count1->n - $count2->n;
$result[get_lang('Yes')] = $count2->n; // #users with picture
Statistics::printStats(get_lang('CountUsers').' ('.get_lang('UserPicture').')', $result, true);
self::printStats(get_lang('CountUsers').' ('.get_lang('UserPicture').')', $result, true);
}
/**
@ -755,7 +755,7 @@ class Statistics
*/
public static function printCourseLastVisit()
{
$access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_rel_course_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
$columns[0] = 't.c_id';
@ -841,7 +841,7 @@ class Statistics
{
$message_table = Database::get_main_table(TABLE_MESSAGE);
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
@ -889,7 +889,7 @@ class Statistics
{
$user_friend_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if (api_is_multiple_url_enabled()) {
@ -929,7 +929,7 @@ class Statistics
{
$totalLogin = array();
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
$total = self::countUsers();
if (api_is_multiple_url_enabled()) {
@ -965,7 +965,7 @@ class Statistics
$r = $total - $obj->number;
$totalLogin[$index] = $r < 0 ? 0 : $r;
}
Statistics::printStats(
self::printStats(
get_lang('StatsUsersDidNotLoginInLastPeriods'),
$totalLogin,
false

36
main/inc/lib/sub_language.class.php
Unescape View File

@ -22,7 +22,7 @@ class SubLanguageManager
*/
public static function getAllLanguages($onlyActive = false)
{
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT * FROM ' . $table;
if ($onlyActive) {
$sql .= ' WHERE available = 1';
@ -74,7 +74,7 @@ class SubLanguageManager
*/
public static function get_all_information_of_sub_language($parent_id, $sub_language_id)
{
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT * FROM ' . $table . '
WHERE
parent_id= ' . intval($parent_id).' AND
@ -95,7 +95,7 @@ class SubLanguageManager
*/
public static function get_all_information_of_language($parent_id)
{
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT * FROM ' . $table . ' WHERE id = "' . intval($parent_id) . '"';
$rs = Database::query($sql);
$all_information = array();
@ -206,7 +206,7 @@ class SubLanguageManager
) {
return false;
}
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT dokeos_folder FROM ' . $table . '
WHERE parent_id = ' . $parent_id . ' and id = ' . $sub_language_id;
$res = Database::query($sql);
@ -214,7 +214,7 @@ class SubLanguageManager
return false;
}
$row = Database::fetch_assoc($res);
$res = SubLanguageManager::remove_language_directory($row['dokeos_folder']);
$res = self::remove_language_directory($row['dokeos_folder']);
if ($res === false) {
return false;
} //can't delete dir, so do not delete language record
@ -239,7 +239,7 @@ class SubLanguageManager
if (!is_dir($dir)) {
return true;
} //even if the dir does not exist, we reach the objective of not having the directory there
$content = SubLanguageManager::get_lang_folder_files_list($dir);
$content = self::get_lang_folder_files_list($dir);
if (count($content) > 0) {
foreach ($content as $value_content) {
@ -259,7 +259,7 @@ class SubLanguageManager
*/
public static function check_if_exist_language_by_id($language_id)
{
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT count(*) as count
FROM ' . $table . '
WHERE id="' . intval($language_id) . '"';
@ -282,7 +282,7 @@ class SubLanguageManager
*/
public static function get_name_of_language_by_id($language_id)
{
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT original_name
FROM ' . $table . '
WHERE id= ' . intval($language_id) . '';
@ -302,7 +302,7 @@ class SubLanguageManager
*/
public static function check_if_language_is_sub_language($language_id)
{
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT count(*) AS count FROM ' . $table . '
WHERE id = ' . intval($language_id) . ' AND NOT ISNULL(parent_id)';
$rs = Database::query($sql);
@ -321,7 +321,7 @@ class SubLanguageManager
public static function check_if_language_is_used($language_id)
{
$language_info = self::get_all_information_of_language($language_id);
$table = Database :: get_main_table(TABLE_MAIN_USER);
$table = Database::get_main_table(TABLE_MAIN_USER);
$sql = 'SELECT count(*) AS count FROM ' . $table . '
WHERE language ="' . Database::escape_string($language_info['english_name']).'"';
$rs = Database::query($sql);
@ -339,7 +339,7 @@ class SubLanguageManager
*/
public static function check_if_language_is_father($language_id)
{
$table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = 'SELECT count(*) AS count FROM ' . $table . '
WHERE parent_id= ' . intval($language_id) . ' AND NOT ISNULL(parent_id);';
$rs = Database::query($sql);
@ -358,7 +358,7 @@ class SubLanguageManager
*/
public static function make_unavailable_language($language_id)
{
$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$tbl_admin_languages = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = "UPDATE $tbl_admin_languages SET available='0'
WHERE id = " . intval($language_id) . "";
$result = Database::query($sql);
@ -373,7 +373,7 @@ class SubLanguageManager
*/
public static function make_available_language($language_id)
{
$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$tbl_admin_languages = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = "UPDATE $tbl_admin_languages SET available='1'
WHERE id = " . intval($language_id) . "";
$result = Database::query($sql);
@ -391,8 +391,8 @@ class SubLanguageManager
if (empty($language_id) or (intval($language_id) != $language_id)) {
return false;
}
$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
$tbl_admin_languages = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
$sql = "SELECT english_name FROM " . $tbl_admin_languages . "
WHERE id= " . intval($language_id) . "";
$result = Database::query($sql);
@ -416,7 +416,7 @@ class SubLanguageManager
public static function get_platform_language_id()
{
$name = api_get_setting('platformLanguage');
$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$tbl_admin_languages = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = "SELECT id FROM " . $tbl_admin_languages . " WHERE english_name ='$name'";
$res = Database::query($sql);
if (Database::num_rows($res) < 1) {
@ -434,7 +434,7 @@ class SubLanguageManager
*/
public static function get_parent_language_path($language_path)
{
$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$tbl_admin_languages = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$sql = "SELECT dokeos_folder
FROM " . $tbl_admin_languages . "
WHERE id = (
@ -458,7 +458,7 @@ class SubLanguageManager
public static function getLanguageFromIsocode($isocode)
{
$isocode = Database::escape_string($isocode);
$adminLanguagesTable = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$adminLanguagesTable = Database::get_main_table(TABLE_MAIN_LANGUAGE);
// select language - if case several languages match, get the last (more recent) one
$sql = "SELECT english_name
FROM " . $adminLanguagesTable . "

46
main/inc/lib/system_announcements.lib.php
Unescape View File

@ -18,8 +18,8 @@ class SystemAnnouncementManager
public static function display_announcements($visible, $id = -1)
{
$user_selected_language = api_get_interface_language();
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$tbl_announcement_group = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
$userGroup = new UserGroup();
$temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
@ -109,7 +109,7 @@ class SystemAnnouncementManager
$user_selected_language = api_get_interface_language();
$start = intval($start);
$userGroup = new UserGroup();
$tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
$tbl_announcement_group = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
$temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
$groups = array();
foreach ($temp_user_groups as $user_group) {
@ -120,7 +120,7 @@ class SystemAnnouncementManager
// Checks if tables exists to not break platform not updated
$groups_string = '('.implode($groups,',').')';
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$now = api_get_utc_datetime();
$sql = "SELECT * FROM ".$db_table."
@ -165,7 +165,7 @@ class SystemAnnouncementManager
$content .= '<table align="center">';
$content .= '<tr>';
$content .= '<td>';
$content .= SystemAnnouncementManager :: display_arrow($user_id);
$content .= self::display_arrow($user_id);
$content .= '</td>';
$content .= '</tr>';
$content .= '</table>';
@ -188,7 +188,7 @@ class SystemAnnouncementManager
$content .= '<table align="center">';
$content .= '<tr>';
$content .= '<td>';
$content .= SystemAnnouncementManager :: display_arrow($user_id);
$content .= self::display_arrow($user_id);
$content .= '</td>';
$content .= '</tr>';
$content .= '</table>';
@ -205,7 +205,7 @@ class SystemAnnouncementManager
public static function display_arrow($user_id)
{
$start = (int)$_GET['start'];
$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start, $user_id);
$nb_announcement = self::count_nb_announcement($start, $user_id);
$next = ((int)$_GET['start']+19);
$prev = ((int)$_GET['start']-19);
$content = '';
@ -232,7 +232,7 @@ class SystemAnnouncementManager
$start = intval($start);
$visibility = api_is_allowed_to_create_course() ? self::VISIBLE_TEACHER : self::VISIBLE_STUDENT;
$user_selected_language = api_get_interface_language();
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$sql = 'SELECT id FROM '.$db_table.'
WHERE (lang="'.$user_selected_language.'" OR lang IS NULL) ';
if (isset($user_id)) {
@ -271,7 +271,7 @@ class SystemAnnouncementManager
*/
public static function get_all_announcements()
{
$table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$now = api_get_utc_datetime();
$sql = "SELECT *, IF ( '$now' >= date_start AND '$now' <= date_end, '1', '0') AS visible
FROM $table";
@ -332,7 +332,7 @@ class SystemAnnouncementManager
$a_arrayEH = explode(':', $a_dateE[1]);
$date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
Display::addFlash(Display::return_message(get_lang('InvalidStartDate'), 'warning'));
@ -387,7 +387,7 @@ class SystemAnnouncementManager
if ($resultId) {
if ($sendEmailTest) {
SystemAnnouncementManager::send_system_announcement_by_email(
self::send_system_announcement_by_email(
$title,
$content,
$visible_teacher,
@ -397,7 +397,7 @@ class SystemAnnouncementManager
);
} else {
if ($send_mail == 1) {
SystemAnnouncementManager::send_system_announcement_by_email(
self::send_system_announcement_by_email(
$title,
$content,
$visible_teacher,
@ -468,8 +468,8 @@ class SystemAnnouncementManager
**/
public static function get_announcement_groups($announcement_id)
{
$tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
$tbl_group = Database :: get_main_table(TABLE_USERGROUP);
$tbl_announcement_group = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
$tbl_group = Database::get_main_table(TABLE_USERGROUP);
//first delete all group associations for this announcement
$sql = "SELECT
@ -537,7 +537,7 @@ class SystemAnnouncementManager
$date_end_to_compare[0]) &&
!checkdate($date_end_to_compare[1], $date_end_to_compare[2], $date_end_to_compare[0])
) {
Display :: display_normal_message(get_lang('InvalidEndDate'));
Display::display_normal_message(get_lang('InvalidEndDate'));
return false;
}
@ -558,7 +558,7 @@ class SystemAnnouncementManager
$content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
if ($sendEmailTest) {
SystemAnnouncementManager::send_system_announcement_by_email(
self::send_system_announcement_by_email(
$title,
$content,
null,
@ -568,7 +568,7 @@ class SystemAnnouncementManager
);
} else {
if ($send_mail==1) {
SystemAnnouncementManager::send_system_announcement_by_email(
self::send_system_announcement_by_email(
$title,
$content,
$visible_teacher,
@ -605,7 +605,7 @@ class SystemAnnouncementManager
*/
public static function delete_announcement($id)
{
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$id = intval($id);
$sql = "DELETE FROM ".$db_table." WHERE id =".$id;
$res = Database::query($sql);
@ -622,7 +622,7 @@ class SystemAnnouncementManager
*/
public static function get_announcement($id)
{
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$id = intval($id);
$sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
$announcement = Database::fetch_object(Database::query($sql));
@ -687,10 +687,10 @@ class SystemAnnouncementManager
return true;
}
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$user_table = Database::get_main_table(TABLE_MAIN_USER);
if (api_is_multiple_url_enabled()) {
$current_access_url_id = api_get_current_access_url_id();
$url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$url_condition = " INNER JOIN $url_rel_user uu ON uu.user_id = u.user_id ";
}
@ -761,7 +761,7 @@ class SystemAnnouncementManager
public static function display_announcements_slider($visible, $id = null)
{
$user_selected_language = Database::escape_string(api_get_interface_language());
$table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$cut_size = 500;
$now = api_get_utc_datetime();
@ -837,7 +837,7 @@ class SystemAnnouncementManager
public static function displayAnnouncement($announcementId, $visibility)
{
$selectedUserLanguage = Database::escape_string(api_get_interface_language());
$announcementTable = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$announcementTable = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$now = api_get_utc_datetime();

36
main/lp/learnpathItem.class.php
Unescape View File

@ -1237,7 +1237,7 @@ class learnpathItem
'local',
'url'
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$second_part,
$recursivity + 1
@ -1276,7 +1276,7 @@ class learnpathItem
'local',
'abs'
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$second_part,
$recursivity + 1
@ -1307,7 +1307,7 @@ class learnpathItem
$new_abs_path = realpath(
$dir . '/' . $second_part
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$new_abs_path,
$recursivity + 1
@ -1345,7 +1345,7 @@ class learnpathItem
$new_abs_path = realpath(
$dir . '/' . $second_part
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$new_abs_path,
$recursivity + 1
@ -1385,7 +1385,7 @@ class learnpathItem
'local',
'url'
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$source,
$recursivity + 1
@ -1421,7 +1421,7 @@ class learnpathItem
'local',
'abs'
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$source,
$recursivity + 1
@ -1452,7 +1452,7 @@ class learnpathItem
$new_abs_path = realpath(
$dir . '/' . $source
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$new_abs_path,
$recursivity + 1
@ -1490,7 +1490,7 @@ class learnpathItem
$new_abs_path = realpath(
$dir . '/' . $source
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$new_abs_path,
$recursivity + 1
@ -1520,7 +1520,7 @@ class learnpathItem
'local',
'url'
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$source,
$recursivity + 1
@ -1548,7 +1548,7 @@ class learnpathItem
'local',
'abs'
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$source,
$recursivity + 1
@ -1574,7 +1574,7 @@ class learnpathItem
$new_abs_path = realpath(
$dir . '/' . $source
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$new_abs_path,
$recursivity + 1
@ -1619,7 +1619,7 @@ class learnpathItem
$new_abs_path = realpath(
$dir . '/' . $source
);
$in_files_list[] = learnpathItem::get_resources_from_source(
$in_files_list[] = self::get_resources_from_source(
TOOL_DOCUMENT,
$new_abs_path,
$recursivity + 1
@ -2524,7 +2524,7 @@ class learnpathItem
if ($returnstatus) {
//AND origin_lp_item_id = '.$user_id.'
$sql = 'SELECT exe_result, exe_weighting
FROM ' . Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . '
FROM ' . Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . '
WHERE
exe_exo_id = ' . $items[$refs_list[$prereqs_string]]->path . ' AND
exe_user_id = ' . $user_id . ' AND
@ -2534,7 +2534,7 @@ class learnpathItem
ORDER BY exe_date DESC
LIMIT 0, 1';
$rs_quiz = Database::query($sql);
if ($quiz = Database :: fetch_array($rs_quiz)) {
if ($quiz = Database::fetch_array($rs_quiz)) {
$minScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMinScore();
$maxScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMaxScore();
@ -2567,7 +2567,7 @@ class learnpathItem
// Checking in the database.
$sql = 'SELECT exe_result, exe_weighting
FROM ' . Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . '
FROM ' . Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . '
WHERE
exe_exo_id = ' . $items[$refs_list[$prereqs_string]]->path . ' AND
exe_user_id = ' . $user_id . ' AND
@ -2576,7 +2576,7 @@ class learnpathItem
$rs_quiz = Database::query($sql);
if (Database::num_rows($rs_quiz) > 0) {
while ($quiz = Database :: fetch_array($rs_quiz)) {
while ($quiz = Database::fetch_array($rs_quiz)) {
$minScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMinScore();
$maxScore = $items[$refs_list[$this->get_id()]]->getPrerequisiteMaxScore();
@ -2649,7 +2649,7 @@ class learnpathItem
session_id = '.$sessionId.'
LIMIT 0, 1';
$rs_lp = Database::query($sql);
$lp_id = Database :: fetch_row(
$lp_id = Database::fetch_row(
$rs_lp
);
$my_lp_id = $lp_id[0];
@ -2661,7 +2661,7 @@ class learnpathItem
lp_item_id = ' . $refs_list[$prereqs_string] . '
LIMIT 0, 1';
$rs_lp = Database::query($sql);
$status_array = Database :: fetch_row(
$status_array = Database::fetch_row(
$rs_lp
);
$status = $status_array[0];

Write Preview
Loading…
Cancel
Save