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 - white spaces, format code.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent c0e4ee509b
commit 7d0a0023d2
11 changed files with 123 additions and 106 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. 11
      main/inc/lib/attendance.lib.php
  2. 1
      main/inc/lib/chat.lib.php
  3. 3
      main/inc/lib/course.lib.php
  4. 1
      main/inc/lib/sessionmanager.lib.php
  5. 72
      main/inc/lib/skill.lib.php
  6. 1
      main/inc/lib/social.lib.php
  7. 20
      main/inc/lib/sortable_table.class.php
  8. 11
      main/inc/lib/surveymanager.lib.php
  9. 1
      main/inc/lib/table_sort.class.php
  10. 2
      main/inc/lib/upload.xajax.php
  11. 104
      main/inc/lib/urlmanager.lib.php

11
main/inc/lib/attendance.lib.php
Unescape View File

@ -50,7 +50,6 @@ class Attendance
return $obj->total_number_of_items; return $obj->total_number_of_items;
} }
/** /**
* Get attendance list only the id, name and attendance_qualify_max fields * Get attendance list only the id, name and attendance_qualify_max fields
* @param string course db name (optional) * @param string course db name (optional)
@ -72,7 +71,8 @@ class Attendance
$condition_session = api_get_session_condition($session_id); $condition_session = api_get_session_condition($session_id);
// Get attendance data // Get attendance data
$sql = "SELECT id, name, attendance_qualify_max FROM $tbl_attendance $sql = "SELECT id, name, attendance_qualify_max
FROM $tbl_attendance
WHERE c_id = $course_id AND active = 1 $condition_session "; WHERE c_id = $course_id AND active = 1 $condition_session ";
$rs = Database::query($sql); $rs = Database::query($sql);
if (Database::num_rows($rs) > 0) { if (Database::num_rows($rs) > 0) {
@ -237,7 +237,8 @@ class Attendance
} }
/** /**
* add attendaces inside table * Add attendaces sheet inside table. This is the *list of* dates, not
* a specific date in itself.
* @param bool true for adding link in gradebook or false otherwise (optional) * @param bool true for adding link in gradebook or false otherwise (optional)
* @return int last attendance id * @return int last attendance id
*/ */
@ -288,7 +289,7 @@ class Attendance
* @return int last id * @return int last id
*/ */
public function attendance_edit($attendance_id, $link_to_gradebook = false) { public function attendance_edit($attendance_id, $link_to_gradebook = false) {
global $_course; $_course = api_get_course_info();
$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE); $tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
$table_link = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); $table_link = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$session_id = api_get_session_id(); $session_id = api_get_session_id();
@ -315,7 +316,7 @@ class Attendance
// add link to gradebook // add link to gradebook
if ($link_to_gradebook && !empty($this->category_id)) { if ($link_to_gradebook && !empty($this->category_id)) {
$description = ''; $description = '';
$link_id=is_resource_in_course_gradebook($course_code,7,$attendance_id,$session_id); $link_id = is_resource_in_course_gradebook($course_code, 7, $attendance_id, $session_id);
if (!$link_id) { if (!$link_id) {
add_resource_to_course_gradebook($this->category_id, $course_code, 7, $attendance_id, $title_gradebook,$weight_calification,$value_calification,$description,1,$session_id); add_resource_to_course_gradebook($this->category_id, $course_code, 7, $attendance_id, $title_gradebook,$weight_calification,$value_calification,$description,1,$session_id);
} else { } else {

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

@ -134,6 +134,7 @@ class Chat extends Model
} }
} }
} }
$sql = "UPDATE ".$this->table." SET recd = 1 WHERE to_user = '".$to_user_id."' AND recd = 0"; $sql = "UPDATE ".$this->table." SET recd = 1 WHERE to_user = '".$to_user_id."' AND recd = 0";
Database::query($sql); Database::query($sql);

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

@ -467,7 +467,7 @@ class CourseManager
$course_code = Database::escape_string($course_code); $course_code = Database::escape_string($course_code);
if (empty ($user_id) || empty ($course_code)) { if (empty($user_id) || empty ($course_code)) {
return false; return false;
} }
@ -1615,7 +1615,6 @@ class CourseManager
return $users; return $users;
} }
/** /**
* Return user info array of all users registered in the specified real or virtual course * Return user info array of all users registered in the specified real or virtual course
* This only returns the users that are registered in this actual course, not linked courses. * This only returns the users that are registered in this actual course, not linked courses.

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

@ -3799,6 +3799,7 @@ class SessionManager
Database::query($sql_update_users); Database::query($sql_update_users);
} }
} }
return array( return array(
'error_message' => $error_message, 'error_message' => $error_message,
'session_counter' => $session_counter, 'session_counter' => $session_counter,

72
main/inc/lib/skill.lib.php
Unescape View File

@ -361,7 +361,7 @@ class Skill extends Model
function get_skill_info($id) function get_skill_info($id)
{ {
$skill_rel_skill = new SkillRelSkill(); $skill_rel_skill = new SkillRelSkill();
$skill_info = $this->get($id); $skill_info = $this->get($id);
if (!empty($skill_info)) { if (!empty($skill_info)) {
$skill_info['extra'] = $skill_rel_skill->get_skill_info($id); $skill_info['extra'] = $skill_rel_skill->get_skill_info($id);
$skill_info['gradebooks'] = self::get_gradebooks_by_skill($id); $skill_info['gradebooks'] = self::get_gradebooks_by_skill($id);
@ -385,7 +385,7 @@ class Skill extends Model
{ {
$id_condition = ''; $id_condition = '';
if (isset($id) && !empty($id)) { if (isset($id) && !empty($id)) {
$id = intval($id); $id = intval($id);
$id_condition = " WHERE s.id = $id"; $id_condition = " WHERE s.id = $id";
} }
@ -443,11 +443,11 @@ class Skill extends Model
function get_gradebooks_by_skill($skill_id) function get_gradebooks_by_skill($skill_id)
{ {
$skill_id = intval($skill_id); $skill_id = intval($skill_id);
$sql = "SELECT g.* FROM {$this->table_gradebook} g INNER JOIN {$this->table_skill_rel_gradebook} sg $sql = "SELECT g.* FROM {$this->table_gradebook} g INNER JOIN {$this->table_skill_rel_gradebook} sg
ON g.id = sg.gradebook_id ON g.id = sg.gradebook_id
WHERE sg.skill_id = $skill_id"; WHERE sg.skill_id = $skill_id";
$result = Database::query($sql); $result = Database::query($sql);
$result = Database::store_result($result, 'ASSOC'); $result = Database::store_result($result,'ASSOC');
return $result; return $result;
} }
@ -468,7 +468,7 @@ class Skill extends Model
function get_all_children($skill_id) function get_all_children($skill_id)
{ {
$skill_rel_skill = new SkillRelSkill(); $skill_rel_skill = new SkillRelSkill();
$children = $skill_rel_skill->get_children($skill_id); $children = $skill_rel_skill->get_children($skill_id);
foreach ($children as $child) { foreach ($children as $child) {
$sub_children = $this->get_all_children($child['skill_id']); $sub_children = $this->get_all_children($child['skill_id']);
} }
@ -498,10 +498,10 @@ class Skill extends Model
function get_direct_parents($skill_id) function get_direct_parents($skill_id)
{ {
$skill_rel_skill = new SkillRelSkill(); $skill_rel_skill = new SkillRelSkill();
$skills = $skill_rel_skill->get_direct_parents($skill_id, true); $skills = $skill_rel_skill->get_direct_parents($skill_id, true);
foreach ($skills as &$skill) { foreach($skills as &$skill) {
$skill['data'] = self::get($skill['skill_id']); $skill['data'] = self::get($skill['skill_id']);
$skill_info2 = $skill_rel_skill->get_skill_info($skill['skill_id']); $skill_info2 = $skill_rel_skill->get_skill_info($skill['skill_id']);
$skill['data']['parent_id'] = $skill_info2['parent_id']; $skill['data']['parent_id'] = $skill_info2['parent_id'];
} }
return $skills; return $skills;
@ -544,7 +544,7 @@ class Skill extends Model
if (!empty($params['gradebook_id'])) { if (!empty($params['gradebook_id'])) {
foreach ($params['gradebook_id'] as $gradebook_id) { foreach ($params['gradebook_id'] as $gradebook_id) {
$attributes = array(); $attributes = array();
$attributes['gradebook_id'] = $gradebook_id; $attributes['gradebook_id'] = $gradebook_id;
$attributes['skill_id'] = $skill_id; $attributes['skill_id'] = $skill_id;
$skill_rel_gradebook->save($attributes); $skill_rel_gradebook->save($attributes);
@ -643,12 +643,12 @@ class Skill extends Model
public function get_user_skills($user_id, $get_skill_data = false) public function get_user_skills($user_id, $get_skill_data = false)
{ {
$user_id = intval($user_id); $user_id = intval($user_id);
$sql = 'SELECT DISTINCT s.id, s.name FROM '.$this->table_skill_rel_user.' u INNER JOIN '.$this->table.' s $sql = 'SELECT DISTINCT s.id, s.name FROM '.$this->table_skill_rel_user.' u INNER JOIN '.$this->table.' s
ON u.skill_id = s.id ON u.skill_id = s.id
WHERE user_id = '.$user_id; WHERE user_id = '.$user_id;
$result = Database::query($sql); $result = Database::query($sql);
$skills = Database::store_result($result, 'ASSOC'); $skills = Database::store_result($result, 'ASSOC');
$clean_skill = array(); $clean_skill = array();
if (!empty($skills)) { if (!empty($skills)) {
foreach ($skills as $skill) { foreach ($skills as $skill) {
@ -680,25 +680,25 @@ class Skill extends Model
if ($add_root) { if ($add_root) {
if (!empty($skill_id)) { if (!empty($skill_id)) {
//Default root node //Default root node
$skills[1] = array('id' => '1', 'name' => get_lang('Root'), 'parent_id' => '0'); $skills[1] = array('id' => '1', 'name' => get_lang('Root'), 'parent_id' => '0');
$skill_info = $this->get_skill_info($skill_id); $skill_info = $this->get_skill_info($skill_id);
//2nd node //2nd node
$skills[$skill_id] = $skill_info; $skills[$skill_id] = $skill_info;
//Uncomment code below to hide the searched skill //Uncomment code below to hide the searched skill
$skills[$skill_id]['data']['parent_id'] = $skill_info['parent_id']; $skills[$skill_id]['data']['parent_id'] = $skill_info['parent_id'];
$skills[$skill_id]['parent_id'] = 1; $skills[$skill_id]['parent_id'] = 1;
} }
} }
} }
$refs = array(); $refs = array();
$skills_tree = null; $skills_tree = null;
// Create references for all nodes // Create references for all nodes
$flat_array = array(); $flat_array = array();
$family = array(); $family = array();
if (!empty($skills)) { if (!empty($skills)) {
foreach ($skills as &$skill) { foreach ($skills as &$skill) {
@ -740,15 +740,13 @@ class Skill extends Model
if (isset($skill['gradebooks']) && !empty($skill['gradebooks'])) { if (isset($skill['gradebooks']) && !empty($skill['gradebooks'])) {
$skill['data']['skill_has_gradebook'] = true; $skill['data']['skill_has_gradebook'] = true;
} }
$refs[$skill['id']] = & $skill; $refs[$skill['id']] = &$skill;
$flat_array[$skill['id']] = & $skill; $flat_array[$skill['id']] = &$skill;
} }
//var_dump($skills);
//var_dump($refs);
//Checking family value //Checking family value
$family_id = 1; $family_id = 1;
$new_family_array = array(); $new_family_array = array();
foreach ($family as $main_family_id => $family_items) { foreach ($family as $main_family_id => $family_items) {
if (!empty($family_items)) { if (!empty($family_items)) {
@ -761,16 +759,16 @@ class Skill extends Model
} }
if (empty($original_skill)) { if (empty($original_skill)) {
$refs['root']['children'][0] = $skills[1]; $refs['root']['children'][0] = $skills[1];
$skills[$skill_id]['data']['family_id'] = 1; $skills[$skill_id]['data']['family_id'] = 1;
$refs['root']['children'][0]['children'][0] = $skills[$skill_id]; $refs['root']['children'][0]['children'][0] = $skills[$skill_id];
$flat_array[$skill_id] = $skills[$skill_id]; $flat_array[$skill_id] = $skills[$skill_id];
} else { } else {
// Moving node to the children index of their parents // Moving node to the children index of their parents
foreach ($skills as $my_skill_id => &$skill) { foreach ($skills as $my_skill_id => &$skill) {
$skill['data']['family_id'] = $new_family_array[$skill['id']]; $skill['data']['family_id'] = $new_family_array[$skill['id']];
$refs[$skill['parent_id']]['children'][] = & $skill; $refs[$skill['parent_id']]['children'][] = &$skill;
$flat_array[$my_skill_id] = $skill; $flat_array[$my_skill_id] = $skill;
} }
} }
@ -798,7 +796,7 @@ class Skill extends Model
*/ */
public function get_skills_tree_json($user_id = null, $skill_id = null, $return_flat_array = false, $main_depth = 2) public function get_skills_tree_json($user_id = null, $skill_id = null, $return_flat_array = false, $main_depth = 2)
{ {
$tree = $this->get_skills_tree($user_id, $skill_id, $return_flat_array, true); $tree = $this->get_skills_tree($user_id, $skill_id, $return_flat_array, true);
$simple_tree = array(); $simple_tree = array();
if (!empty($tree['children'])) { if (!empty($tree['children'])) {
foreach ($tree['children'] as $element) { foreach ($tree['children'] as $element) {
@ -821,9 +819,9 @@ class Skill extends Model
if (is_array($subtree)) { if (is_array($subtree)) {
$counter = 1; $counter = 1;
foreach ($subtree as $elem) { foreach ($subtree as $elem) {
$tmp = array(); $tmp = array();
$tmp['name'] = $elem['name']; $tmp['name'] = $elem['name'];
$tmp['id'] = $elem['id']; $tmp['id'] = $elem['id'];
if (is_array($elem['children'])) { if (is_array($elem['children'])) {
$tmp['children'] = $this->get_skill_json($elem['children'], $depth + 1, $max_depth); $tmp['children'] = $this->get_skill_json($elem['children'], $depth + 1, $max_depth);
@ -834,7 +832,7 @@ class Skill extends Model
continue; continue;
} }
$tmp['depth'] = $depth; $tmp['depth'] = $depth;
$tmp['counter'] = $counter; $tmp['counter'] = $counter;
$counter++; $counter++;
@ -853,7 +851,7 @@ class Skill extends Model
function get_user_skill_ranking($user_id) function get_user_skill_ranking($user_id)
{ {
$user_id = intval($user_id); $user_id = intval($user_id);
$sql = "SELECT count(skill_id) count FROM {$this->table} s INNER JOIN {$this->table_skill_rel_user} su ON (s.id = su.skill_id) $sql = "SELECT count(skill_id) count FROM {$this->table} s INNER JOIN {$this->table_skill_rel_user} su ON (s.id = su.skill_id)
WHERE user_id = $user_id"; WHERE user_id = $user_id";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
@ -868,7 +866,7 @@ class Skill extends Model
$start = intval($start); $start = intval($start);
$limit = intval($limit); $limit = intval($limit);
/* ORDER BY $sidx $sord */ /* ORDER BY $sidx $sord */
$sql = "SELECT *, @rownum:=@rownum+1 rank FROM ( $sql = "SELECT *, @rownum:=@rownum+1 rank FROM (
SELECT u.user_id, firstname, lastname, count(username) skills_acquired SELECT u.user_id, firstname, lastname, count(username) skills_acquired
FROM {$this->table} s INNER JOIN {$this->table_skill_rel_user} su ON (s.id = su.skill_id) FROM {$this->table} s INNER JOIN {$this->table_skill_rel_user} su ON (s.id = su.skill_id)
INNER JOIN {$this->table_user} u ON u.user_id = su.user_id, (SELECT @rownum:=0) r INNER JOIN {$this->table_user} u ON u.user_id = su.user_id, (SELECT @rownum:=0) r
@ -916,7 +914,7 @@ class Skill extends Model
function get_courses_by_skill($skill_id) function get_courses_by_skill($skill_id)
{ {
$skill_id = intval($skill_id); $skill_id = intval($skill_id);
$sql = "SELECT c.title, c.code FROM {$this->table_gradebook} g INNER JOIN {$this->table_skill_rel_gradebook} sg ON g.id = sg.gradebook_id $sql = "SELECT c.title, c.code FROM {$this->table_gradebook} g INNER JOIN {$this->table_skill_rel_gradebook} sg ON g.id = sg.gradebook_id
INNER JOIN {$this->table_course} c ON c.code = g.course_code INNER JOIN {$this->table_course} c ON c.code = g.course_code
WHERE sg.skill_id = $skill_id"; WHERE sg.skill_id = $skill_id";
$result = Database::query($sql); $result = Database::query($sql);

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

@ -999,6 +999,7 @@ class SocialManager extends UserManager
$html .= '<div class="well_border">'; $html .= '<div class="well_border">';
$html .= $content; $html .= $content;
$html .= '</div></div>'; $html .= '</div></div>';
return $html; return $html;
} }

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

@ -161,7 +161,7 @@ class SortableTable extends HTML_Table
if (isset($_GET[$this->param_prefix.'direction'])) { if (isset($_GET[$this->param_prefix.'direction'])) {
$my_get_direction = $_GET[$this->param_prefix.'direction']; $my_get_direction = $_GET[$this->param_prefix.'direction'];
if (!in_array($my_get_direction, array('ASC', 'DESC'))){ if (!in_array($my_get_direction, array('ASC', 'DESC'))) {
$this->direction = 'ASC'; $this->direction = 'ASC';
} else { } else {
if ($my_get_direction == 'ASC') { if ($my_get_direction == 'ASC') {
@ -321,7 +321,7 @@ class SortableTable extends HTML_Table
} }
$html .= '</td>'; $html .= '</td>';
// Pagination
if ($this->get_total_number_of_items() > $this->default_items_per_page) { if ($this->get_total_number_of_items() > $this->default_items_per_page) {
$html .= '<td style="text-align:right;">'; $html .= '<td style="text-align:right;">';
$html .= $nav; $html .= $nav;
@ -341,9 +341,9 @@ class SortableTable extends HTML_Table
} }
/** /**
* This function shows the content of a table in a grid. * This function shows the content of a table in a grid.
* Should not be use to edit information (edit/delete rows) only. * Should not be use to edit information (edit/delete rows) only.
* */ **/
public function display_grid() public function display_grid()
{ {
@ -384,9 +384,9 @@ class SortableTable extends HTML_Table
if ($my_pager->numPages() > 1) { if ($my_pager->numPages() > 1) {
$html .= '<div class="sub-header">'; $html .= '<div class="sub-header">';
$html .= '<div class="grid_selectbox">'.$form.'</div>'; $html .= '<div class="grid_selectbox">'.$form.'</div>';
$html .= '<div class="grid_title">'.$this->get_table_title().'</div>'; $html .= '<div class="grid_title">'.$this->get_table_title().'</div>';
$html .= '<div class="grid_nav">'.$nav.'</div>'; $html .= '<div class="grid_nav">'.$nav.'</div>';
$html .= '</div>'; $html .= '</div>';
} }
@ -558,7 +558,6 @@ class SortableTable extends HTML_Table
{ {
$pager = $this->get_pager(); $pager = $this->get_pager();
$pager_links = $pager->getLinks(); $pager_links = $pager->getLinks();
$nav = $pager_links['first'].' '.$pager_links['back']; $nav = $pager_links['first'].' '.$pager_links['back'];
$nav .= ' '.$pager->getCurrentPageId().' / '.$pager->numPages().' '; $nav .= ' '.$pager->getCurrentPageId().' / '.$pager->numPages().' ';
$nav .= $pager_links['next'].' '.$pager_links['last']; $nav .= $pager_links['next'].' '.$pager_links['last'];
@ -797,7 +796,7 @@ class SortableTable extends HTML_Table
* @param string $checkbox_name The name of the generated checkboxes. The * @param string $checkbox_name The name of the generated checkboxes. The
* value of the checkbox will be the value of the first column. * value of the checkbox will be the value of the first column.
*/ */
public function set_form_actions ($actions, $checkbox_name = 'id') public function set_form_actions($actions, $checkbox_name = 'id')
{ {
$this->form_actions = $actions; $this->form_actions = $actions;
$this->checkbox_name = $checkbox_name; $this->checkbox_name = $checkbox_name;
@ -919,7 +918,6 @@ class SortableTableFromArray extends SortableTable
*/ */
public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = true) public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = true)
{ {
if ($sort) { if ($sort) {
$content = TableSort::sort_table($this->table_data, $this->column, $this->direction == 'ASC' ? SORT_ASC : SORT_DESC); $content = TableSort::sort_table($this->table_data, $this->column, $this->direction == 'ASC' ? SORT_ASC : SORT_DESC);
} else { } else {

11
main/inc/lib/surveymanager.lib.php
Unescape View File

@ -33,11 +33,11 @@ class SurveyTree
if ($search_restriction) { if ($search_restriction) {
$search_restriction = ' AND '.$search_restriction; $search_restriction = ' AND '.$search_restriction;
} }
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
$sql = "SELECT
survey.survey_id , survey.parent_id, survey_version, survey.code as name $sql = "SELECT survey.survey_id , survey.parent_id, survey_version, survey.code as name
FROM $table_survey survey FROM $table_survey survey LEFT JOIN $table_survey_question survey_question
LEFT JOIN $table_survey_question survey_question
ON survey.survey_id = survey_question.survey_id , $table_user user ON survey.survey_id = survey_question.survey_id , $table_user user
WHERE WHERE
survey.c_id = $course_id AND survey.c_id = $course_id AND
@ -52,7 +52,8 @@ survey.survey_id , survey.parent_id, survey_version, survey.code as name
$last = array(); $last = array();
$plain_array=array(); $plain_array=array();
while ($survey = Database::fetch_array($res,'ASSOC')) { while ($survey = Database::fetch_array($res,'ASSOC'))
{
$plain_array[$survey['survey_id']]=$survey; $plain_array[$survey['survey_id']]=$survey;
$surveys_parents[]=$survey['survey_version']; $surveys_parents[]=$survey['survey_version'];
$thisref = &$refs[ $survey['survey_id'] ]; $thisref = &$refs[ $survey['survey_id'] ];

1
main/inc/lib/table_sort.class.php
Unescape View File

@ -216,6 +216,7 @@ class TableSort
// Replace the multi-arrays // Replace the multi-arrays
$data = $new_order_data; $data = $new_order_data;
} }
return $data; return $data;
} }

2
main/inc/lib/upload.xajax.php
Unescape View File

@ -32,5 +32,3 @@ function updateProgress($div_id, $upload_id, $waitAfterupload = false) {
return $objResponse; return $objResponse;
} }
?>

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

@ -130,6 +130,7 @@ class UrlManager
while ($url = Database::fetch_array($res)) { while ($url = Database::fetch_array($res)) {
$urls[] = $url; $urls[] = $url;
} }
return $urls; return $urls;
} }
@ -157,24 +158,26 @@ class UrlManager
**/ **/
public static function get_url_rel_user_data($access_url_id = null, $order_by = null) public static function get_url_rel_user_data($access_url_id = null, $order_by = null)
{ {
$where = ''; $where = '';
$table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER); $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
if (!empty($access_url_id)) { if (!empty($access_url_id)) {
$where ="WHERE $table_url_rel_user.access_url_id = ".Database::escape_string($access_url_id); $where = "WHERE $table_url_rel_user.access_url_id = ".Database::escape_string($access_url_id);
} }
if (empty($order_by)) { if (empty($order_by)) {
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; $order_clause = api_sort_by_first_name(
) ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
} else { } else {
$order_clause = $order_by; $order_clause = $order_by;
} }
$sql="SELECT u.user_id, lastname, firstname, username, official_code, access_url_id $sql = "SELECT u.user_id, lastname, firstname, username, official_code, access_url_id
FROM $tbl_user u FROM $tbl_user u
INNER JOIN $table_url_rel_user INNER JOIN $table_url_rel_user
ON $table_url_rel_user.user_id = u.user_id ON $table_url_rel_user.user_id = u.user_id
$where $order_clause"; $where $order_clause";
$result = Database::query($sql); $result = Database::query($sql);
$users = Database::store_result($result); $users = Database::store_result($result);
return $users; return $users;
} }
@ -279,6 +282,7 @@ class UrlManager
$result = Database::query($sql); $result = Database::query($sql);
$courses = Database::store_result($result); $courses = Database::store_result($result);
return $courses; return $courses;
} }
@ -322,17 +326,17 @@ class UrlManager
public static function set_url_status($status, $url_id) public static function set_url_status($status, $url_id)
{ {
$url_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL); $url_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
if ($status=='lock') { if ($status == 'lock') {
$status_db='0'; $status_db = '0';
} }
if ($status=='unlock') { if ($status == 'unlock') {
$status_db='1'; $status_db = '1';
} }
if (($status_db == '1' OR $status_db == '0') AND is_numeric($url_id)) {
if (($status_db=='1' OR $status_db=='0') AND is_numeric($url_id)) { $sql = "UPDATE $url_table SET active='".Database::escape_string(
$sql = "UPDATE $url_table SET active='".Database::escape_string($status_db)."' $status_db
WHERE id='".Database::escape_string($url_id)."'"; )."' WHERE id='".Database::escape_string($url_id)."'";
Database::query($sql); $result = Database::query($sql);
} }
} }
@ -350,6 +354,7 @@ class UrlManager
WHERE access_url_id = ".Database::escape_string($url_id)." AND user_id = ".Database::escape_string($user_id)." "; WHERE access_url_id = ".Database::escape_string($url_id)." AND user_id = ".Database::escape_string($user_id)." ";
$result = Database::query($sql); $result = Database::query($sql);
$num = Database::num_rows($result); $num = Database::num_rows($result);
return $num; return $num;
} }
@ -429,14 +434,15 @@ class UrlManager
SET user_id = ".Database::escape_string($user_id).", access_url_id = ".Database::escape_string($url_id); SET user_id = ".Database::escape_string($user_id).", access_url_id = ".Database::escape_string($url_id);
$result = Database::query($sql); $result = Database::query($sql);
if ($result) { if ($result) {
$result_array[$url_id][$user_id]=1; $result_array[$url_id][$user_id] = 1;
} else { } else {
$result_array[$url_id][$user_id]=0; $result_array[$url_id][$user_id] = 0;
} }
} }
} }
} }
} }
return $result_array; return $result_array;
} }
@ -594,29 +600,33 @@ class UrlManager
* @param array of url_ids * @param array of url_ids
* @return array * @return array
* */ * */
public static function add_sessions_to_urls($session_list,$url_list) public static function add_sessions_to_urls($session_list, $url_list)
{ {
$table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$result_array = array(); $result_array = array();
if (is_array($session_list) && is_array($url_list)){ if (is_array($session_list) && is_array($url_list)) {
foreach ($url_list as $url_id) { foreach ($url_list as $url_id) {
foreach ($session_list as $session_id) { foreach ($session_list as $session_id) {
$count = UrlManager::relation_url_session_exist($session_id,$url_id); $count = UrlManager::relation_url_session_exist($session_id, $url_id);
if ($count==0) { if ($count == 0) {
$sql = "INSERT INTO $table_url_rel_session $sql = "INSERT INTO $table_url_rel_session
SET session_id = ".Database::escape_string($session_id).", access_url_id = ".Database::escape_string($url_id); SET session_id = ".Database::escape_string(
$session_id
).", access_url_id = ".Database::escape_string($url_id);
$result = Database::query($sql); $result = Database::query($sql);
if($result) if ($result) {
$result_array[$url_id][$session_id]=1; $result_array[$url_id][$session_id] = 1;
else } else {
$result_array[$url_id][$session_id]=0; $result_array[$url_id][$session_id] = 0;
}
} }
} }
} }
} }
return $result_array;
return $result_array;
} }
/** /**
@ -629,13 +639,16 @@ class UrlManager
public static function add_user_to_url($user_id, $url_id = 1) public static function add_user_to_url($user_id, $url_id = 1)
{ {
$table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
if (empty($url_id)) $url_id = 1; if (empty($url_id)) {
$count = UrlManager::relation_url_user_exist($user_id,$url_id); $url_id = 1;
}
$count = UrlManager::relation_url_user_exist($user_id, $url_id);
$result = true; $result = true;
if (empty($count)) { if (empty($count)) {
$sql = "INSERT INTO $table_url_rel_user (user_id, access_url_id) VALUES ('".Database::escape_string($user_id)."', '".Database::escape_string($url_id)."') "; $sql = "INSERT INTO $table_url_rel_user (user_id, access_url_id) VALUES ('".Database::escape_string($user_id)."', '".Database::escape_string($url_id)."') ";
$result = Database::query($sql); $result = Database::query($sql);
} }
return $result; return $result;
} }
@ -656,6 +669,7 @@ class UrlManager
SET course_code = '".Database::escape_string($course_code)."', access_url_id = ".Database::escape_string($url_id); SET course_code = '".Database::escape_string($course_code)."', access_url_id = ".Database::escape_string($url_id);
$result = Database::query($sql); $result = Database::query($sql);
} }
return $result; return $result;
} }
@ -667,9 +681,9 @@ class UrlManager
*/ */
public static function add_session_to_url($session_id, $url_id = 1) public static function add_session_to_url($session_id, $url_id = 1)
{ {
$table_url_rel_session= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
if (empty($url_id)) { if (empty($url_id)) {
$url_id=1; $url_id = 1;
} }
$result = false; $result = false;
$count = UrlManager::relation_url_session_exist($session_id, $url_id); $count = UrlManager::relation_url_session_exist($session_id, $url_id);
@ -680,6 +694,7 @@ class UrlManager
SET session_id = ".Database::escape_string($session_id).", access_url_id = ".Database::escape_string($url_id); SET session_id = ".Database::escape_string($session_id).", access_url_id = ".Database::escape_string($url_id);
$result = Database::query($sql); $result = Database::query($sql);
} }
return $result; return $result;
} }
@ -699,6 +714,7 @@ class UrlManager
WHERE user_id = ".Database::escape_string($user_id)." AND access_url_id = ".Database::escape_string($url_id); WHERE user_id = ".Database::escape_string($user_id)." AND access_url_id = ".Database::escape_string($url_id);
$result = Database::query($sql); $result = Database::query($sql);
} }
return $result; return $result;
} }
@ -764,7 +780,7 @@ class UrlManager
{ {
$table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$sql= "DELETE FROM $table_url_rel_session $sql= "DELETE FROM $table_url_rel_session
WHERE session_id = ".Database::escape_string($session_id)." AND access_url_id=".Database::escape_string($url_id)." "; WHERE session_id = ".Database::escape_string($session_id)." AND access_url_id=".Database::escape_string($url_id)." ";
$result = Database::query($sql,'ASSOC'); $result = Database::query($sql,'ASSOC');
return $result; return $result;
} }
@ -783,13 +799,13 @@ class UrlManager
$existing_users = array(); $existing_users = array();
//Getting all users //Getting all users
while($row = Database::fetch_array($result)){ while ($row = Database::fetch_array($result)) {
$existing_users[] = $row['user_id']; $existing_users[] = $row['user_id'];
} }
// Adding users // Adding users
$users_added = array(); $users_added = array();
foreach($user_list as $user_id_to_add) { foreach ($user_list as $user_id_to_add) {
if (!in_array($user_id_to_add, $existing_users)) { if (!in_array($user_id_to_add, $existing_users)) {
$result = UrlManager::add_user_to_url($user_id_to_add, $access_url_id); $result = UrlManager::add_user_to_url($user_id_to_add, $access_url_id);
if ($result) { if ($result) {
@ -800,7 +816,7 @@ class UrlManager
$users_deleted = array(); $users_deleted = array();
// Deleting old users // Deleting old users
foreach($existing_users as $user_id_to_delete) { foreach ($existing_users as $user_id_to_delete) {
if (!in_array($user_id_to_delete, $user_list)) { if (!in_array($user_id_to_delete, $user_list)) {
$result = UrlManager::delete_url_rel_user($user_id_to_delete, $access_url_id); $result = UrlManager::delete_url_rel_user($user_id_to_delete, $access_url_id);
if ($result) { if ($result) {
@ -812,6 +828,7 @@ class UrlManager
if (empty($users_added) && empty($users_deleted)) { if (empty($users_added) && empty($users_deleted)) {
return false; return false;
} }
return array('users_added' => $users_added, 'users_deleted' => $users_deleted); return array('users_added' => $users_added, 'users_deleted' => $users_deleted);
} }
@ -954,7 +971,7 @@ class UrlManager
// Adding users // Adding users
foreach ($session_list as $session) { foreach ($session_list as $session) {
if(!in_array($session, $existing_sessions)) { if (!in_array($session, $existing_sessions)) {
if (!empty($session) && !empty($access_url_id)) { if (!empty($session) && !empty($access_url_id)) {
UrlManager::add_session_to_url($session, $access_url_id); UrlManager::add_session_to_url($session, $access_url_id);
} }
@ -962,10 +979,10 @@ class UrlManager
} }
// Deleting old users // Deleting old users
foreach($existing_sessions as $existing_session) { foreach ($existing_sessions as $existing_session) {
if (!in_array($existing_session, $session_list)) { if (!in_array($existing_session, $session_list)) {
if (!empty($existing_session) && !empty($access_url_id)) { if (!empty($existing_session) && !empty($access_url_id)) {
UrlManager::delete_url_rel_session($existing_session,$access_url_id); UrlManager::delete_url_rel_session($existing_session, $access_url_id);
} }
} }
} }
@ -1000,6 +1017,7 @@ class UrlManager
WHERE session_id = ".Database::escape_string($session_id); WHERE session_id = ".Database::escape_string($session_id);
$result = Database::query($sql); $result = Database::query($sql);
$url_list = Database::store_result($result); $url_list = Database::store_result($result);
return $url_list; return $url_list;
} }

Write Preview
Loading…
Cancel
Save