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

Browse Source
ofaj
jmontoyaa 10 years ago
parent 965c658031
commit 71f67f5b9d
3 changed files with 32 additions and 26 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. 10
      main/auth/courses.php
  2. 24
      main/auth/courses_controller.php
  3. 24
      main/auth/profile.php

10
main/auth/courses.php
Unescape View File

@ -12,7 +12,6 @@ use \Chamilo\CoreBundle\Entity\SequenceResource;
// Delete the globals['_cid'], we don't need it here.
$cidReset = true; // Flag forcing the 'current course' reset
// including files
require_once '../inc/global.inc.php';
$ctok = Security::get_existing_token();
@ -31,7 +30,7 @@ if (api_get_setting('course_catalog_published') !== 'true') {
$user_can_view_page = false;
//For students
if (api_get_setting('allow_students_to_browse_courses') == 'false') {
if (api_get_setting('allow_students_to_browse_courses') === 'false') {
$user_can_view_page = false;
} else {
$user_can_view_page = true;
@ -73,7 +72,8 @@ if (empty($nameTools)) {
'name' => get_lang('CourseManagement'),
);
}
if ($action == 'createcoursecategory') {
if ($action === 'createcoursecategory') {
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses',
'name' => get_lang('SortMyCourses'),
@ -153,19 +153,19 @@ if (isset($_REQUEST['subscribe_course'])) {
$courses_controller->subscribe_user($_GET['subscribe_course'], $_GET['search_term'], $categoryCode);
}
}
// We are unsubscribing from a course (=Unsubscribe from course).
if (isset($_GET['unsubscribe'])) {
$search_term = isset($_GET['search_term']) ? $_GET['search_term'] : null;
if ($ctok == $_GET['sec_token']) {
$courses_controller->unsubscribe_user_from_course($_GET['unsubscribe'], $search_term, $categoryCode);
//$message = remove_user_from_course($_user['user_id'], $_POST['unsubscribe']);
}
}
// We are unsubscribing from a course (=Unsubscribe from course).
if (isset($_POST['unsubscribe'])) {
if ($ctok == $_POST['sec_token']) {
$courses_controller->unsubscribe_user_from_course($_POST['unsubscribe']);
//$message = remove_user_from_course($_user['user_id'], $_POST['unsubscribe']);
}
}

24
main/auth/courses_controller.php
Unescape View File

@ -90,14 +90,20 @@ class CoursesController
* @internal param \action $string
* @internal param \Category $string code (optional)
*/
public function courses_categories($action, $category_code = null, $message = '', $error = '', $content = null, $limit = array())
{
public function courses_categories(
$action,
$category_code = null,
$message = '',
$error = '',
$content = null,
$limit = array()
) {
$data = array();
$browse_course_categories = $this->model->browse_course_categories();
$data['countCoursesInCategory'] = $this->model->count_courses_in_category($category_code);
if ($action == 'display_random_courses') {
if ($action === 'display_random_courses') {
// Random value is used instead limit filter
$data['browse_courses_in_category'] = $this->model->browse_courses_in_category(null, 10);
$data['browse_courses_in_category'] = $this->model->browse_courses_in_category(null, 12);
$data['countCoursesInCategory'] = count($data['browse_courses_in_category']);
} else {
if (!isset($category_code)) {
@ -117,7 +123,7 @@ class CoursesController
// we need only the course codes as these will be used to match against the courses of the category
if ($user_courses != '') {
foreach($user_courses as $key => $value) {
foreach ($user_courses as $key => $value) {
$user_coursecodes[] = $value['code'];
}
}
@ -143,7 +149,7 @@ class CoursesController
}
// render to the view
$this->view->set_data($data);
$this->view->set_layout('catalog_layout');
$this->view->set_template('courses_categories');
@ -750,7 +756,7 @@ class CoursesController
'coach_access_start_date' => $session->getCoachAccessStartDate(),
'coach_access_end_date' => $session->getCoachAccessEndDate(),
]);
$imageField = $extraFieldValue->get_values_by_handler_and_field_variable($session->getId(), 'image');
$sessionCourseTags = [];
@ -799,7 +805,7 @@ class CoursesController
} else {
$catName = $cat->getName();
}
$coachId = $session->getGeneralCoach()->getId();
$coachName = $session->getGeneralCoach()->getCompleteName();
$actions = null;
@ -834,7 +840,7 @@ class CoursesController
'tags' => $sessionCourseTags,
'edit_actions' => $actions
);
$sessionsBlock = array_merge($sessionsBlock, $sequences);
$sessionsBlocks[] = $sessionsBlock;
}

24
main/auth/profile.php
Unescape View File

@ -811,7 +811,7 @@ if ($form->validate()) {
unset($user_data['api_key_generate']);
foreach ($user_data as $key => $value) {
if (substr($key, 0, 6) == 'extra_') { //an extra field
if (substr($key, 0, 6) === 'extra_') { //an extra field
continue;
} elseif (strpos($key, 'remove_extra_') !== false) {
} else {
@ -859,7 +859,7 @@ if ($form->validate()) {
UserManager::updatePassword(api_get_user_id(), $password);
}
if (api_get_setting('profile', 'officialcode') == 'true' &&
if (api_get_setting('profile', 'officialcode') === 'true' &&
isset($user_data['official_code'])
) {
$sql .= ", official_code = '".Database::escape_string($user_data['official_code'])."'";
@ -897,41 +897,41 @@ if ($form->validate()) {
// the header
$actions = null;
if (api_get_setting('allow_social_tool') != 'true') {
if (api_get_setting('extended_profile') == 'true') {
if (api_get_setting('allow_social_tool') !== 'true') {
if (api_get_setting('extended_profile') === 'true') {
$actions .= '<div class="actions">';
if (api_get_setting('allow_social_tool') == 'true' &&
api_get_setting('allow_message_tool') == 'true'
if (api_get_setting('allow_social_tool') === 'true' &&
api_get_setting('allow_message_tool') === 'true'
) {
$actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';
}
if (api_get_setting('allow_message_tool') == 'true') {
if (api_get_setting('allow_message_tool') === 'true') {
$actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
Display::return_icon('inbox.png', get_lang('Messages')).'</a>';
}
$show = isset($_GET['show']) ? '&amp;show='.Security::remove_XSS($_GET['show']) : '';
if (isset($_GET['type']) && $_GET['type'] == 'extended') {
if (isset($_GET['type']) && $_GET['type'] === 'extended') {
$actions .= '<a href="profile.php?type=reduced'.$show.'">'.
Display::return_icon('edit.png', get_lang('EditNormalProfile'),'',16).'</a>';
Display::return_icon('edit.png', get_lang('EditNormalProfile'), '', 16).'</a>';
} else {
$actions .= '<a href="profile.php?type=extended'.$show.'">'.
Display::return_icon('edit.png', get_lang('EditExtendProfile'),'',16).'</a>';
Display::return_icon('edit.png', get_lang('EditExtendProfile'), '', 16).'</a>';
}
$actions .= '</div>';
}
}
$show_delete_account_button = api_get_setting('platform_unsubscribe_allowed') == 'true' ? true : false;
$show_delete_account_button = api_get_setting('platform_unsubscribe_allowed') === 'true' ? true : false;
$tpl = new Template(get_lang('ModifyProfile'));
$tpl->assign('actions', $actions);
SocialManager::setSocialUserBlock($tpl, $user_id, 'messages');
if (api_get_setting('allow_social_tool') == 'true') {
if (api_get_setting('allow_social_tool') === 'true') {
SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'home');
$menu = SocialManager::show_social_menu(
'home',

Write Preview
Loading…
Cancel
Save