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

Format code, PHP warnings.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent d78fa9c194
commit ad6ff13c45
2 changed files with 53 additions and 32 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. 24
      main/admin/dashboard_add_sessions_to_user.php
  2. 61
      main/inc/lib/course.lib.php

24
main/admin/dashboard_add_sessions_to_user.php
Unescape View File

@ -150,16 +150,21 @@ function remove_item(origin) {
</script>';
$formSent=0;
$errorMsg = $firstLetterSession = '';
$firstLetterSession = isset($_POST['firstLetterSession']) ? $_POST['firstLetterSession'] : null;
$errorMsg = '';
$UserList = array();
$msg = '';
if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
$sessions_list = $_POST['SessionsList'];
$userInfo = api_get_user_info($user_id);
$affected_rows = SessionManager::suscribe_sessions_to_hr_manager($userInfo, $sessions_list);
$affected_rows = SessionManager::suscribe_sessions_to_hr_manager(
$userInfo,
$sessions_list
);
if ($affected_rows) {
$msg = get_lang('AssignedSessionsHaveBeenUpdatedSuccessfully');
Display::addFlash(
Display::return_message(get_lang('AssignedSessionsHaveBeenUpdatedSuccessfully'))
);
}
}
@ -186,8 +191,8 @@ if (count($assigned_sessions_id) > 0) {
}
$needle = '%';
if (isset($_POST['firstLetterSession'])) {
$needle = Database::escape_string($_POST['firstLetterSession']);
if (!empty($firstLetterSession)) {
$needle = Database::escape_string($firstLetterSession);
$needle = "$needle%";
}
@ -208,11 +213,6 @@ $result = Database::query($sql);
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){ echo ' onsubmit="valide();"';}?>>
<input type="hidden" name="formSent" value="1" />
<?php
if(!empty($msg)) {
Display::display_normal_message($msg); //main API
}
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
<tr>
<td align="left"></td>
@ -241,7 +241,7 @@ $result = Database::query($sql);
<select name="firstLetterSession" onchange = "xajax_search_sessions(this.value, 'multiple')">
<option value="%">--</option>
<?php
echo Display :: get_alphabet_options($_POST['firstLetterSession']);
echo Display :: get_alphabet_options($firstLetterSession);
?>
</select>
</td>

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

@ -4368,17 +4368,18 @@ class CourseManager
/**
* Remove course ranking + user votes
*
* @param int course id
* @param int session id
* @param int url id
* @param int $course_id
* @param int $session_id
* @param int $url_id
*
*/
public function remove_course_ranking($course_id, $session_id, $url_id = null) {
$table_course_ranking = Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);
$table_user_course_vote = Database::get_main_table(TABLE_MAIN_USER_REL_COURSE_VOTE);
if (!empty($course_id) && isset($session_id)) {
public function remove_course_ranking($course_id, $session_id, $url_id = null)
{
$table_course_ranking = Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);
$table_user_course_vote = Database::get_main_table(TABLE_MAIN_USER_REL_COURSE_VOTE);
$url_id = empty($url_id) ? api_get_current_access_url_id() : intval($url_id);
if (!empty($course_id) && isset($session_id)) {
$url_id = empty($url_id) ? api_get_current_access_url_id() : intval($url_id);
$params = array(
'c_id' => $course_id,
'session_id' => $session_id,
@ -4391,14 +4392,15 @@ class CourseManager
/**
* Returns an array with the hottest courses
* @param int number of days
* @param int number of hottest courses
* @param int $days number of days
* @param int $limit number of hottest courses
*/
public static function return_hot_courses($days = 30, $limit = 5) {
public static function return_hot_courses($days = 30, $limit = 5)
{
global $_configuration;
$limit = intval($limit);
//Getting my courses
// Getting my courses
$my_course_list = CourseManager::get_courses_list_by_user_id(api_get_user_id());
$my_course_code_list = array();
@ -4448,7 +4450,13 @@ class CourseManager
return $courses;
}
public static function process_hot_course_item($courses, $my_course_code_list = array()) {
/**
* @param array $courses
* @param array $my_course_code_list
* @return mixed
*/
public static function process_hot_course_item($courses, $my_course_code_list = array())
{
$ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
$stok = Security::get_existing_token();
@ -4488,11 +4496,22 @@ class CourseManager
return $courses;
}
public static function return_most_accessed_courses($limit = 5) {
$table_course_ranking = Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);
$params['url_id'] = api_get_current_access_url_id();
/**
* @param int $limit
* @return array
*/
public static function return_most_accessed_courses($limit = 5)
{
$table_course_ranking = Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);
$params['url_id'] = api_get_current_access_url_id();
$result = Database::select('c_id, accesses, total_score, users', $table_course_ranking, array('where' => array('url_id = ?' => $params), 'order' => 'accesses DESC', 'limit' => $limit), 'all', true);
$result = Database::select(
'c_id, accesses, total_score, users',
$table_course_ranking,
array('where' => array('url_id = ?' => $params), 'order' => 'accesses DESC', 'limit' => $limit),
'all',
true
);
return $result;
}
@ -4529,7 +4548,8 @@ class CourseManager
* @param int Access URL ID (optional)
* @return int Number of courses
*/
public static function count_courses($access_url_id = null) {
public static function count_courses($access_url_id = null)
{
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$table_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql = "SELECT count(id) FROM $table_course c";
@ -4542,7 +4562,7 @@ class CourseManager
}
/**
* Get availab le courses count
* Get available le courses count
* @param int Access URL ID (optional)
* @return int Number of courses
*/
@ -4565,7 +4585,8 @@ class CourseManager
}
}
if (!empty($accessUrlId) && $accessUrlId == intval($accessUrlId)) {
$sql = "SELECT count(id) FROM $tableCourse c, $tableCourseRelAccessUrl u WHERE c.code = u.course_code AND u.access_url_id = $accessUrlId AND c.visibility != 0 AND c.visibility != 4 $withoutSpecialCourses $visibilityCondition";
$sql = "SELECT count(id) FROM $tableCourse c, $tableCourseRelAccessUrl u
WHERE c.code = u.course_code AND u.access_url_id = $accessUrlId AND c.visibility != 0 AND c.visibility != 4 $withoutSpecialCourses $visibilityCondition";
}
$res = Database::query($sql);
$row = Database::fetch_row($res);

Write Preview
Loading…
Cancel
Save