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 conventions - refs BT#9070

Browse Source
1.10.x
Angel Fernando Quiroz Campos 10 years ago
parent 54f87f99ad
commit 0fa60f4edd
11 changed files with 25 additions and 25 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. 2
      main/course_home/course_home.php
  2. 2
      main/forum/newthread.php
  3. 2
      main/forum/viewforum.php
  4. 2
      main/inc/lib/course.lib.php
  5. 4
      main/inc/lib/main_api.lib.php
  6. 12
      main/newscorm/learnpath.class.php
  7. 10
      main/newscorm/learnpathItem.class.php
  8. 6
      main/newscorm/lp_list.php
  9. 4
      main/newscorm/lp_view.php
  10. 2
      main/work/upload.php
  11. 4
      main/work/work_list.php

2
main/course_home/course_home.php
Unescape View File

@ -145,7 +145,7 @@ $course_code = api_get_course_id();
$sessionId = api_get_session_id();
$show_message = '';
if (api_is_invited_user()) {
if (apiIsInvitedUser()) {
$isInASession = $sessionId > 0;
$isSubscribed = CourseManager::is_user_subscribed_in_course($user_id, $course_code, $isInASession, $sessionId);

2
main/forum/newthread.php
Unescape View File

@ -119,7 +119,7 @@ if ($current_forum['forum_of_group'] != 0) {
}
// 6. Invited users can't create new threads
if (api_is_invited_user()) {
if (apiIsInvitedUser()) {
api_not_allowed(true);
}

2
main/forum/viewforum.php
Unescape View File

@ -295,7 +295,7 @@ if (api_is_allowed_to_edit(false, true) OR
($current_forum['allow_new_threads'] == 1 AND !isset($_user['user_id']) AND $current_forum['allow_anonymous'] == 1)
) {
if ($current_forum['locked'] <> 1 AND $current_forum['locked'] <> 1) {
if (!api_is_anonymous() && !api_is_invited_user()) {
if (!api_is_anonymous() && !apiIsInvitedUser()) {
if ($my_forum == strval(intval($my_forum))) {
echo '<a href="'.$forumUrl.'newthread.php?'.api_get_cidreq().'&amp;forum='.Security::remove_XSS($my_forum).$origin_string.'">'.
Display::return_icon('new_thread.png',get_lang('NewTopic'),'',ICON_SIZE_MEDIUM).'</a>';

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

@ -4565,7 +4565,7 @@ class CourseManager
{
global $_configuration;
if (api_is_invited_user()) {
if (apiIsInvitedUser()) {
return array();
}

4
main/inc/lib/main_api.lib.php
Unescape View File

@ -2565,7 +2565,7 @@ function api_is_teacher() {
* Checks whether the current user is a invited user
* @return boolean
*/
function api_is_invited_user() {
function apiIsInvitedUser() {
global $_user;
return isset($_user['status']) && $_user['status'] == ROLE_INVITED;
@ -7526,7 +7526,7 @@ function apiIsExcludedUserType($checkDB = false, $userId = 0)
}
}
$isInvited = api_is_invited_user();
$isInvited = apiIsInvitedUser();
$isAnonymous = api_is_anonymous();
if ($isInvited || $isAnonymous) {

12
main/newscorm/learnpath.class.php
Unescape View File

@ -204,7 +204,7 @@ class learnpath
$this->last_item_seen = $row['last_item'];
$this->progress_db = $row['progress'];
$this->lp_view_session_id = $row['session_id'];
} else if (!api_is_invited_user()) {
} else if (!apiIsInvitedUser()) {
if ($this->debug > 2) {
error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - NOT Found previous view', 0);
}
@ -350,7 +350,7 @@ class learnpath
}
}
} else {
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
if (is_object($this->items[$item_id])) {
$this->items[$item_id]->set_status($this->default_status);
}
@ -3621,7 +3621,7 @@ class learnpath
if (Database :: num_rows($res) > 0) {
$row = Database :: fetch_array($res);
$this->lp_view_id = $row['id'];
} else if (!api_is_invited_user()) {
} else if (!apiIsInvitedUser()) {
// There is no database record, create one.
$sql = "INSERT INTO $lp_view_table (c_id, lp_id,user_id, view_count, session_id) VALUES
($course_id, " . $this->get_id() . "," . $this->get_user_id() . ", 1, $sessionId)";
@ -4188,7 +4188,7 @@ class learnpath
// TODO
// Call autosave method to save the current progress.
//$this->index = 0;
if (api_is_invited_user()) {
if (apiIsInvitedUser()) {
return false;
}
$session_id = api_get_session_id();
@ -4308,7 +4308,7 @@ class learnpath
$session_condition = api_get_session_condition(api_get_session_id(), true, false);
$table = Database :: get_course_table(TABLE_LP_VIEW);
if (isset($this->current) && !api_is_invited_user()) {
if (isset($this->current) && !apiIsInvitedUser()) {
if ($this->debug > 2) {
error_log('New LP - Saving current item (' . $this->current . ') for later review', 0);
}
@ -4325,7 +4325,7 @@ class learnpath
Database::query($sql);
}
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
// Save progress.
list($progress, $text) = $this->get_progress_bar_text('%');
if ($progress >= 0 && $progress <= 100) {

10
main/newscorm/learnpathItem.class.php
Unescape View File

@ -3815,7 +3815,7 @@ class learnpathItem
if ($this->type == 'quiz' && $this->get_prevent_reinit() == 0 &&
$this->get_status() == 'completed'
) {
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
// We force the item to be restarted.
$this->restart();
@ -3872,7 +3872,7 @@ class learnpathItem
// Depending on what we want (really), we'll update or insert a new row
// now save into DB.
if (!$inserted && Database::num_rows($check_res) < 1) {
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
$sql = "INSERT INTO $item_view_table " .
"(c_id, total_time, " .
"start_time, " .
@ -3909,7 +3909,7 @@ class learnpathItem
} else {
$sql = '';
if ($this->type == 'hotpotatoes') {
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
$sql = "UPDATE $item_view_table SET
total_time = " . $this->get_total_time() . ",
start_time = " . $this->get_current_start_time() . ",
@ -4047,7 +4047,7 @@ class learnpathItem
}
if ($this->type == 'sco') {
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
//IF scorm scorm_update_time has already updated total_time in db
//" . //start_time = ".$this->get_current_start_time().", " . //scorm_init_time does it
////" max_time_allowed = '".$this->get_max_time_allowed()."'," .
@ -4065,7 +4065,7 @@ class learnpathItem
}
} else {
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
//" max_time_allowed = '".$this->get_max_time_allowed()."'," .
$sql = "UPDATE $item_view_table SET
$total_time

6
main/newscorm/lp_list.php
Unescape View File

@ -118,7 +118,7 @@ if (!empty($flat_list)) {
echo '<th width="300px">'.get_lang('AuthoringOptions')."</th>";
} else {
echo '<th width="50%">'.get_lang('Title').'</th>';
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
echo '<th>'.get_lang('Progress')."</th>";
}
echo '<th>'.get_lang('Actions')."</th>";
@ -230,7 +230,7 @@ if (!empty($flat_list)) {
$progress = 0;
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
$progress = learnpath::getProgress(
$id,
$userId,
@ -244,7 +244,7 @@ if (!empty($flat_list)) {
} else {
$dsp_progress = "";
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
$dsp_progress = '<td>'.learnpath::get_progress_bar($progress, '%').'</td>';
}
}

4
main/newscorm/lp_view.php
Unescape View File

@ -255,7 +255,7 @@ if (!empty($_REQUEST['exeId']) &&
LIMIT 1";
$res_last_attempt = Database::query($sql);
if (Database::num_rows($res_last_attempt) && !api_is_invited_user()) {
if (Database::num_rows($res_last_attempt) && !apiIsInvitedUser()) {
$row_last_attempt = Database::fetch_row($res_last_attempt);
$lp_item_view_id = $row_last_attempt[0];
$sql = "UPDATE $TBL_LP_ITEM_VIEW SET
@ -326,7 +326,7 @@ if (!empty ($lp_theme_css) && !empty ($mycourselptheme) && $mycourselptheme != -
}
$progress_bar = "";
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
$progress_bar = $_SESSION['oLP']->getProgressBar();
}
$navigation_bar = $_SESSION['oLP']->get_navigation_bar();

2
main/work/upload.php
Unescape View File

@ -48,7 +48,7 @@ allowOnlySubscribedUser($user_id, $work_id, $course_id);
$is_course_member = CourseManager::is_user_subscribed_in_real_or_linked_course($user_id, $course_code, $session_id);
$is_course_member = $is_course_member || api_is_platform_admin();
if ($is_course_member == false || api_is_invited_user()) {
if ($is_course_member == false || apiIsInvitedUser()) {
api_not_allowed(true);
}

4
main/work/work_list.php
Unescape View File

@ -73,7 +73,7 @@ Display :: display_header(null);
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'&origin='.$origin.'">'.Display::return_icon('back.png', get_lang('BackToWorksList'),'',ICON_SIZE_MEDIUM).'</a>';
if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !api_is_invited_user() ) {
if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !apiIsInvitedUser() ) {
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/upload.php?'.api_get_cidreq().'&id='.$workId.'&origin='.$origin.'">';
echo Display::return_icon('upload_file.png', get_lang('UploadADocument'), '', ICON_SIZE_MEDIUM).'</a>';
}
@ -112,7 +112,7 @@ $result = getWorkDateValidationStatus($work_data);
echo $result['message'];
$check_qualification = intval($my_folder_data['qualification']);
if (!api_is_invited_user()) {
if (!apiIsInvitedUser()) {
if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) {
$type = 'simple';

Write Preview
Loading…
Cancel
Save