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 - format code, use Session class

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent 33a2f013ca
commit d0a9275c14
12 changed files with 520 additions and 498 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. 1
      main/inc/lib/legal.lib.php
  2. 32
      main/inc/lib/link.lib.php
  3. 22
      main/inc/lib/lp_item.lib.php
  4. 20
      main/inc/lib/message.lib.php
  5. 2
      main/inc/lib/plugin.class.php
  6. 1
      main/inc/lib/rights.lib.php
  7. 8
      main/inc/lib/security.lib.php
  8. 20
      main/inc/lib/sortable_table.class.php
  9. 23
      main/inc/lib/system_announcements.lib.php
  10. 12
      main/inc/lib/thematic.lib.php
  11. 51
      main/inc/lib/urlmanager.lib.php
  12. 26
      main/inc/lib/userportal.lib.php

1
main/inc/lib/legal.lib.php
Unescape View File

@ -126,7 +126,6 @@ class LegalManager
{
if (strpos($content, '{{sessions}}')) {
$sessionListToString = '';
$sessionList = SessionManager::get_sessions_by_user(api_get_user_id());
if ($sessionList) {
$sessionListToString = get_lang('SessionList').'<ul>';

32
main/inc/lib/link.lib.php
Unescape View File

@ -558,7 +558,7 @@ class Link extends Model
'display_order' => $max_display_order,
'on_homepage' => $values['on_homepage'],
'target' => $values['target'],
'category_id' => $values['category_id'],
'category_id' => $values['category_id']
];
Database::update($tbl_link, $params, ['c_id = ? AND id = ?' => [$course_id, $id] ]);
@ -887,7 +887,8 @@ class Link extends Model
$toolbar = '';
$link_validator = '';
if (api_is_allowed_to_edit(null, true)) {
$toolbar .= Display::toolbarButton('',
$toolbar .= Display::toolbarButton(
'',
'#',
'retweet',
'default btn-sm',
@ -903,7 +904,6 @@ class Link extends Model
'class' => 'check-link'
)
);
}
if (api_is_allowed_to_edit(null, true)) {
@ -954,8 +954,8 @@ class Link extends Model
'title' => $title
)
);
}
if ($myrow['visibility'] == '0') {
$url .= 'link.php?' . api_get_cidreq() .'&sec_token=' . $token .'&action=visible&id=' . $myrow['id'] .'&scope=link&category_id=' . $myrow['category_id'];
$title = get_lang('MakeVisible');
@ -984,8 +984,6 @@ class Link extends Model
'title' => $title
)
);
} else {
$title = get_lang('EditionNotAvailableFromSession');
$toolbar .= Display::toolbarButton(
@ -998,7 +996,6 @@ class Link extends Model
)
);
}
}
$iconLink = Display::return_icon(
'url.png',
@ -1285,16 +1282,11 @@ class Link extends Model
$result
))
) {
Database:: query(
"UPDATE $tbl_link set title='" . Database:: escape_string(
$title
) . "', description='" . Database:: escape_string(
$description
) . "'
WHERE c_id = $course_id AND id='" . Database:: escape_string(
$row['id']
) . "'"
);
$sql = "UPDATE $tbl_link SET
title = '" . Database:: escape_string($title) . "',
description = '" . Database:: escape_string($description) . "'
WHERE c_id = $course_id AND id='" . Database:: escape_string($row['id']) . "'";
Database:: query($sql);
$ipu = 'LinkUpdated';
$rv = 1; // 1 = upd
@ -1321,6 +1313,7 @@ class Link extends Model
$ipu = 'LinkAdded';
$rv = 2; // 2 = new
}
api_item_property_update(
$_course,
TOOL_LINK,
@ -1338,6 +1331,7 @@ class Link extends Model
$_user['user_id']
);
}
return $rv;
}
@ -1421,7 +1415,6 @@ class Link extends Model
// i.e. allow some BBcode tags, e.g. [b]...[/b]
}
/**
* This function checks if the url is a vimeo link
* @author Julio Montoya
@ -1430,6 +1423,7 @@ class Link extends Model
public static function isVimeoLink($url)
{
$isLink = strrpos($url, "vimeo.com");
return $isLink;
}
@ -1622,8 +1616,8 @@ class Link extends Model
/**
* @param int $linkId
* @param $action
* @param null $urlview
* @param null $token
*
* @return FormValidator
*/
public static function getLinkForm($linkId, $action, $token = null)

22
main/inc/lib/lp_item.lib.php
Unescape View File

@ -14,11 +14,11 @@ class LpItem
public $c_id = 0;
public $id = 0;
public $lp_id = 0;
public $item_type = "";
public $ref = "";
public $title = "";
public $description = "";
public $path = "";
public $item_type = '';
public $ref = '';
public $title = '';
public $description = '';
public $path = '';
public $min_score = 0;
public $max_score = 0;
public $mastery_score = 0;
@ -26,13 +26,13 @@ class LpItem
public $previous_item_id = 0;
public $next_item_id = 0;
public $display_order = 0;
public $prerequisite = "";
public $parameters = "";
public $launch_data = "";
public $max_time_allowed = "";
public $terms = "";
public $prerequisite = '';
public $parameters = '';
public $launch_data = '';
public $max_time_allowed = '';
public $terms = '';
public $search_did = 0;
public $audio = "";
public $audio = '';
public function __construct($in_c_id = 0, $in_id = 0)
{

20
main/inc/lib/message.lib.php
Unescape View File

@ -227,8 +227,7 @@ class MessageManager
$topic_id = 0,
$sender_id = null,
$directMessage = false
)
{
) {
$table_message = Database::get_main_table(TABLE_MESSAGE);
$group_id = intval($group_id);
$receiver_user_id = intval($receiver_user_id);
@ -435,8 +434,7 @@ class MessageManager
$sender_id = null,
$sendCopyToDrhUsers = false,
$directMessage = false
)
{
) {
$result = MessageManager::send_message(
$receiver_user_id,
$subject,
@ -521,8 +519,9 @@ class MessageManager
public static function delete_message_by_user_receiver($user_receiver_id, $id)
{
$table_message = Database::get_main_table(TABLE_MESSAGE);
if ($id != strval(intval($id)))
if ($id != strval(intval($id))) {
return false;
}
$user_receiver_id = intval($user_receiver_id);
$id = intval($id);
$sql = "SELECT * FROM $table_message
@ -536,6 +535,7 @@ class MessageManager
$query = "UPDATE $table_message SET msg_status=3
WHERE user_receiver_id=" . $user_receiver_id . " AND id=" . $id;
$result = Database::query($query);
return $result;
} else {
return false;
@ -594,8 +594,7 @@ class MessageManager
$receiver_user_id = 0,
$sender_user_id = 0,
$group_id = 0
)
{
) {
$tbl_message_attach = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT);
// Try to add an extension to the file if it hasn't one
@ -745,6 +744,7 @@ class MessageManager
$query = "SELECT * FROM $table_message
WHERE user_receiver_id=" . intval($user_id) . " AND id='" . intval($message_id) . "'";
$result = Database::query($query);
return $row = Database::fetch_array($result);
}
@ -755,8 +755,9 @@ class MessageManager
*/
public static function get_messages_by_group($group_id)
{
if ($group_id != strval(intval($group_id)))
if ($group_id != strval(intval($group_id))) {
return false;
}
$table_message = Database::get_main_table(TABLE_MESSAGE);
$group_id = intval($group_id);
@ -783,8 +784,9 @@ class MessageManager
*/
public static function get_messages_by_group_by_message($group_id, $message_id)
{
if ($group_id != strval(intval($group_id)))
if ($group_id != strval(intval($group_id))) {
return false;
}
$table_message = Database::get_main_table(TABLE_MESSAGE);
$group_id = intval($group_id);
$sql = "SELECT * FROM $table_message

2
main/inc/lib/plugin.class.php
Unescape View File

@ -534,7 +534,7 @@ class Plugin
/**
* Install the course fields and tool link of this plugin in all courses
* @param boolean Whether we want to add a plugin link on the course homepage
* @param boolean $add_tool_link Whether we want to add a plugin link on the course homepage
*
* @return void
*/

1
main/inc/lib/rights.lib.php
Unescape View File

@ -1,6 +1,7 @@
<?php
/**
* @deprecated
* Class Rights
* @deprecated Don't use this class
*/

8
main/inc/lib/security.lib.php
Unescape View File

@ -44,7 +44,8 @@ class Security
* Checks if the absolute path (directory) given is really under the
* checker path (directory)
* @param string Absolute path to be checked (with trailing slash)
* @param string Checker path under which the path should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
* @param string Checker path under which the path
* should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
* @return bool True if the path is under the checker, false otherwise
*/
public static function check_abs_path($abs_path, $checker_path)
@ -77,7 +78,8 @@ class Security
* Checks if the relative path (directory) given is really under the
* checker path (directory)
* @param string Relative path to be checked (relative to the current directory) (with trailing slash)
* @param string Checker path under which the path should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
* @param string Checker path under which the path
* should be (absolute path, with trailing slash, get it from api_get_path(SYS_COURSE_PATH))
* @return bool True if the path is under the checker, false otherwise
*/
public static function check_rel_path($rel_path, $checker_path)
@ -156,7 +158,7 @@ class Security
*/
public static function check_ua()
{
if (isset($_SESSION['sec_ua']) and $_SESSION['sec_ua'] === $_SERVER['HTTP_USER_AGENT'].$_SESSION['sec_ua_seed']) {
if (isset($_SESSION['sec_ua']) && $_SESSION['sec_ua'] === $_SERVER['HTTP_USER_AGENT'].$_SESSION['sec_ua_seed']) {
return true;
}

20
main/inc/lib/sortable_table.class.php
Unescape View File

@ -1,6 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* This class allows you to display a sortable data-table. It is possible to
* split the data in several pages.
@ -131,13 +133,12 @@ class SortableTable extends HTML_Table
$this->additional_parameters = array();
$this->param_prefix = $table_name.'_';
$this->page_nr = isset($_SESSION[$this->param_prefix.'page_nr']) ? intval($_SESSION[$this->param_prefix.'page_nr']) : 1;
$this->page_nr = Session::read($this->param_prefix.'page_nr', 1);
$this->page_nr = isset($_GET[$this->param_prefix.'page_nr']) ? intval($_GET[$this->param_prefix.'page_nr']) : $this->page_nr;
$this->column = isset($_SESSION[$this->param_prefix.'column']) ? intval($_SESSION[$this->param_prefix.'column']) : $default_column;
$this->column = Session::read($this->param_prefix.'column', $default_column);
$this->column = isset($_GET[$this->param_prefix.'column']) ? intval($_GET[$this->param_prefix.'column']) : $this->column;
// Default direction.
if (in_array(strtoupper($default_order_direction), array('ASC', 'DESC'))) {
$this->direction = $default_order_direction;
}
@ -169,15 +170,16 @@ class SortableTable extends HTML_Table
}
// Allow to change paginate in multiples tabs
unset($_SESSION[$this->param_prefix.'per_page']);
Session::erase($this->param_prefix.'per_page');
$this->per_page = isset($_SESSION[$this->param_prefix.'per_page']) ? intval($_SESSION[$this->param_prefix.'per_page']) : $default_items_per_page;
$this->per_page = Session::read($this->param_prefix.'per_page', $default_items_per_page);
$this->per_page = isset($_GET[$this->param_prefix.'per_page']) ? intval($_GET[$this->param_prefix.'per_page']) : $this->per_page;
$_SESSION[$this->param_prefix.'per_page'] = $this->per_page;
$_SESSION[$this->param_prefix.'direction'] = $this->direction;
$_SESSION[$this->param_prefix.'page_nr'] = $this->page_nr;
$_SESSION[$this->param_prefix.'column'] = $this->column;
Session::write($this->param_prefix.'per_page', $this->per_page);
Session::write($this->param_prefix.'direction', $this->direction);
Session::write($this->param_prefix.'page_nr', $this->page_nr);
Session::write($this->param_prefix.'column', $this->column);
$this->pager = null;
$this->default_items_per_page = $default_items_per_page;
$this->total_number_of_items = -1;

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

@ -360,8 +360,6 @@ class SystemAnnouncementManager
//$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
$content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
$content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
$lang = is_null($lang) ? '' : $lang;
$current_access_url_id = 1;
@ -427,8 +425,8 @@ class SystemAnnouncementManager
/**
* Makes the announcement id visible only for groups in groups_array
* @param int announcement id
* @param array array of group id
* @param int $announcement_id
* @param array $group_array array of group id
**/
public static function announcement_for_groups($announcement_id, $group_array)
{
@ -437,9 +435,8 @@ class SystemAnnouncementManager
);
//first delete all group associations for this announcement
$res = Database::query(
"DELETE FROM $tbl_announcement_group WHERE announcement_id=".intval(
$announcement_id
)
"DELETE FROM $tbl_announcement_group
WHERE announcement_id=".intval($announcement_id)
);
if ($res === false) {
@ -482,6 +479,7 @@ class SystemAnnouncementManager
ag.group_id = g.id";
$res = Database::query($sql);
$groups = Database::fetch_array($res);
return $groups;
}
@ -523,6 +521,7 @@ class SystemAnnouncementManager
if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
Display:: display_normal_message(get_lang('InvalidStartDate'));
return false;
}
@ -670,8 +669,14 @@ class SystemAnnouncementManager
* @param string Language (optional, considered for all languages if left empty)
* @return bool True if the message was sent or there was no destination matching. False on database or e-mail sending error.
*/
public static function send_system_announcement_by_email($title, $content, $teacher, $student, $language = null, $sendEmailTest = false)
{
public static function send_system_announcement_by_email(
$title,
$content,
$teacher,
$student,
$language = null,
$sendEmailTest = false
) {
global $charset;
$title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);

12
main/inc/lib/thematic.lib.php
Unescape View File

@ -408,6 +408,7 @@ class Thematic
);
}
}
return $affected_rows;
}
@ -654,6 +655,7 @@ class Thematic
$return .= '</div>';
$final_return[$thematic_id] = $return;
}
return $final_return;
}
@ -668,9 +670,7 @@ class Thematic
) {
$course_info = api_get_course_info($course_code);
$tbl_thematic_advance = Database::get_course_table(TABLE_THEMATIC_ADVANCE);
$data = array();
$condition = '';
if (isset($thematic_advance_id)) {
$thematic_advance_id = intval($thematic_advance_id);
@ -1157,9 +1157,7 @@ class Thematic
);
if ($item_info['session_id'] == $sessionId) {
$a_thematic_advance_ids[] = $thematic_advance['id'];
// update done thematic for previous advances ((done_advance = 1))
$upd = "UPDATE $tbl_thematic_advance SET
done_advance = 1
@ -1321,7 +1319,10 @@ class Thematic
if (!empty($thematic_data)) {
foreach ($thematic_data as $thematic) {
$thematic_id = $thematic['id'];
$a_average_of_advances_by_thematic[$thematic_id] = $this->get_average_of_advances_by_thematic($thematic_id, $course_code);
$a_average_of_advances_by_thematic[$thematic_id] = $this->get_average_of_advances_by_thematic(
$thematic_id,
$course_code
);
}
}
@ -1331,6 +1332,7 @@ class Thematic
$score = array_sum($a_average_of_advances_by_thematic);
$total_average = round(($score * 100) / ($count_tematics * 100));
}
return $total_average;
}

51
main/inc/lib/urlmanager.lib.php
Unescape View File

@ -80,22 +80,22 @@ class UrlManager
$tableGroup = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
$sql = "DELETE FROM $tableCourse WHERE access_url_id = ".$id;
$result = Database::query($sql);
Database::query($sql);
/*
$sql = "DELETE FROM $tableCourseCategory WHERE access_url_id = ".$id;
$result = Database::query($sql);
Database::query($sql);
*/
$sql = "DELETE FROM $tableSession WHERE access_url_id = ".$id;
$result = Database::query($sql);
Database::query($sql);
$sql = "DELETE FROM $tableGroup WHERE access_url_id = ".$id;
$result = Database::query($sql);
Database::query($sql);
$sql = "DELETE FROM $tableUser WHERE access_url_id = ".$id;
$result = Database::query($sql);
Database::query($sql);
$sql= "DELETE FROM $table WHERE id = ".$id;
$result = Database::query($sql);
Database::query($sql);
return $result;
return true;
}
/**
@ -281,8 +281,9 @@ class UrlManager
$table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
if (!empty($access_url_id))
if (!empty($access_url_id)) {
$where = "WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
}
$sql = "SELECT id, name, access_url_id
FROM $tbl_session u
@ -430,7 +431,8 @@ class UrlManager
{
$table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
$sql= "SELECT usergroup_id FROM $table
WHERE access_url_id = ".intval($urlId)." AND
WHERE
access_url_id = ".intval($urlId)." AND
usergroup_id = ".intval($userGroupId);
$result = Database::query($sql);
$num = Database::num_rows($result);
@ -478,7 +480,9 @@ class UrlManager
$count = UrlManager::relation_url_user_exist($user_id,$url_id);
if ($count == 0) {
$sql = "INSERT INTO $table_url_rel_user
SET user_id = ".intval($user_id).", access_url_id = ".intval($url_id);
SET
user_id = ".intval($user_id).",
access_url_id = ".intval($url_id);
$result = Database::query($sql);
if ($result) {
$result_array[$url_id][$user_id] = 1;
@ -643,14 +647,15 @@ class UrlManager
return Database::insert_id();
}
return 0;
}
/**
* Add a group of sessions into a group of URLs
* @author Julio Montoya
* @param array of session ids
* @param array of url_ids
* @param array $session_list of session ids
* @param array $url_list of url_ids
* @return array
* */
public static function add_sessions_to_urls($session_list, $url_list)
@ -873,8 +878,8 @@ class UrlManager
/**
* Updates the access_url_rel_user table with a given user list
* @author Julio Montoya
* @param array user list
* @param int access_url_id
* @param array $user_list
* @param int $access_url_id
* */
public static function update_urls_rel_user($user_list, $access_url_id)
{
@ -954,8 +959,8 @@ class UrlManager
/**
* Updates the access_url_rel_course table with a given user list
* @author Julio Montoya
* @param array user list
* @param int access_url_id
* @param array $userGroupList user list
* @param int $urlId
* */
public static function update_urls_rel_usergroup($userGroupList, $urlId)
{
@ -987,8 +992,8 @@ class UrlManager
/**
* Updates the access_url_rel_course_category table with a given list
* @author Julio Montoya
* @param array course category list
* @param int access_url_id
* @param array $list course category list
* @param int $urlId access_url_id
**/
public static function updateUrlRelCourseCategory($list, $urlId)
{
@ -1031,13 +1036,11 @@ class UrlManager
}
}
/**
* Updates the access_url_rel_session table with a given user list
* @author Julio Montoya
* @param array user list
* @param int access_url_id
* @param array $session_list
* @param int $access_url_id
* */
public static function update_urls_rel_session($session_list, $access_url_id)
{
@ -1072,6 +1075,7 @@ class UrlManager
/**
* @param int $user_id
*
* @return array
*/
public static function get_access_url_from_user($user_id)
@ -1083,6 +1087,7 @@ class UrlManager
WHERE user_id = ".intval($user_id);
$result = Database::query($sql);
$url_list = Database::store_result($result,'ASSOC');
return $url_list;
}
@ -1130,6 +1135,7 @@ class UrlManager
$sql = "SELECT id FROM $table_access_url WHERE url = '".Database::escape_string($url)."'";
$result = Database::query($sql);
$access_url_id = Database::result($result, 0, 0);
return $access_url_id;
}
@ -1167,6 +1173,7 @@ class UrlManager
}
}
$response->addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
return $response;
}
}

26
main/inc/lib/userportal.lib.php
Unescape View File

@ -49,7 +49,7 @@ class IndexManager
/**
* @param bool $setLoginForm
*/
function set_login_form($setLoginForm = true)
public function set_login_form($setLoginForm = true)
{
global $loginFailed;
$this->tpl->setLoginForm($setLoginForm);
@ -58,7 +58,7 @@ class IndexManager
/**
* @param array $personal_course_list
*/
function return_exercise_block($personal_course_list)
public function return_exercise_block($personal_course_list)
{
$exercise_list = array();
if (!empty($personal_course_list)) {
@ -286,7 +286,7 @@ class IndexManager
return $html;
}
function return_notice()
public function return_notice()
{
$user_selected_language = api_get_interface_language();
@ -312,7 +312,7 @@ class IndexManager
return $html;
}
function return_help()
public function return_help()
{
$user_selected_language = api_get_interface_language();
$platformLanguage = api_get_setting('platformLanguage');
@ -342,7 +342,10 @@ class IndexManager
return $html;
}
function return_skills_links()
/**
* @return null|string
*/
public function return_skills_links()
{
$content = '';
$content .= '<ul class="nav nav-pills nav-stacked">';
@ -411,7 +414,7 @@ class IndexManager
*
* @version 1.0.1
*/
function handle_login_failed()
public function handle_login_failed()
{
return $this->tpl->handleLoginFailed();
}
@ -424,7 +427,7 @@ class IndexManager
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - refactoring and code cleaning
* @author Julio Montoya <gugli100@gmail.com>, Beeznest template modifs
*/
function return_courses_in_categories()
public function return_courses_in_categories()
{
$result = '';
$stok = Security::get_token();
@ -489,7 +492,8 @@ class IndexManager
LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
LEFT JOIN $main_course_table t3 ON (t3.category_code = t1.code $platform_visible_courses)
WHERE t1.parent_id ". (empty ($category) ? "IS NULL" : "='$category'")."
GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count
ORDER BY t1.tree_pos, t1.name";
// Showing only the category of courses of the current access_url_id
if (api_is_multiple_url_enabled()) {
@ -805,7 +809,7 @@ class IndexManager
public function return_classes_block()
{
$html = '';
if (api_get_setting('show_groups_to_users') == 'true') {
if (api_get_setting('show_groups_to_users') === 'true') {
$usergroup = new UserGroup();
$usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
$classes = '';
@ -955,6 +959,9 @@ class IndexManager
return $html;
}
/**
* @return null|string
*/
public function return_navigation_links()
{
$html = '';
@ -1068,6 +1075,7 @@ class IndexManager
'courseCollapse'
);
}
return $html;
}

Write Preview
Loading…
Cancel
Save