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

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent 1b0c1c898b
commit b0595052a6
3 changed files with 76 additions and 54 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. 30
      main/inc/lib/course_request.lib.php
  2. 32
      main/inc/lib/display.lib.php
  3. 68
      main/inc/lib/userportal.lib.php

30
main/inc/lib/course_request.lib.php
Unescape View File

@ -48,7 +48,7 @@ class CourseRequestManager
* @param string $description
* @param string $category_code
* @param string $course_language
* @param string $objetives
* @param string $objectives
* @param string $target_audience
* @param int $user_id
* @return mixed The database id of the newly created course request or FALSE on failure.
@ -59,7 +59,7 @@ class CourseRequestManager
$description,
$category_code,
$course_language,
$objetives,
$objectives,
$target_audience,
$user_id,
$exemplary_content
@ -122,7 +122,7 @@ class CourseRequestManager
Database::escape_string($tutor_name),
Database::escape_string($visual_code),
Database::escape_string($request_date),
Database::escape_string($objetives),
Database::escape_string($objectives),
Database::escape_string($target_audience),
Database::escape_string($status),
Database::escape_string($info),
@ -151,7 +151,7 @@ class CourseRequestManager
$email_body .= get_lang('Professor', null, $email_language).': '.api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language)."\n";
$email_body .= get_lang('Email', null, $email_language).': '.$user_info['mail']."\n";
$email_body .= get_lang('Description', null, $email_language).': '.$description."\n";
$email_body .= get_lang('Objectives', null, $email_language).': '.$objetives."\n";
$email_body .= get_lang('Objectives', null, $email_language).': '.$objectives."\n";
$email_body .= get_lang('TargetAudience', null, $email_language).': '.$target_audience."\n";
$email_body .= get_lang('Ln', null, $email_language).': '.$course_language."\n";
$email_body .= get_lang('FillWithExemplaryContent', null, $email_language).': '.($exemplary_content ? get_lang('Yes', null, $email_language) : get_lang('No', null, $email_language))."\n";
@ -225,7 +225,6 @@ class CourseRequestManager
);
return $last_insert_id;
}
/**
@ -236,7 +235,7 @@ class CourseRequestManager
* @param string $description
* @param string $category_code
* @param string $course_language
* @param string $objetives
* @param string $objectives
* @param string $target_audience
* @param int $user_id
* @return bool Returns TRUE on success or FALSE on failure.
@ -248,7 +247,7 @@ class CourseRequestManager
$description,
$category_code,
$course_language,
$objetives,
$objectives,
$target_audience,
$user_id,
$exemplary_content
@ -341,7 +340,7 @@ class CourseRequestManager
Database::escape_string($tutor_name),
Database::escape_string($visual_code),
Database::escape_string($request_date),
Database::escape_string($objetives),
Database::escape_string($objectives),
Database::escape_string($target_audience),
Database::escape_string($status),
Database::escape_string($info),
@ -350,13 +349,12 @@ class CourseRequestManager
$result_sql = Database::query($sql);
return $result_sql !== false;
}
/**
* Deletes a given course request.
* @param int $id The id (an integer number) of the corresponding database record.
* @return bool Returns TRUE on success or FALSE on failure.
* @param int $id The id (an integer number) of the corresponding database record.
* @return bool Returns TRUE on success or FALSE on failure.
*/
public static function delete_course_request($id)
{
@ -499,7 +497,6 @@ class CourseRequestManager
$sender_email = api_get_setting('emailAdministrator');
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;
$additionalParameters = array(
'smsType' => SmsPlugin::COURSE_OPENING_REQUEST_CODE_APPROVED,
@ -522,13 +519,14 @@ class CourseRequestManager
return $course_info['code'];
}
return false;
}
/**
* Rejects a given course request.
* @param int $id The id (an integer number) of the corresponding database record.
* @return bool Returns TRUE on success or FALSE on failure.
* @param int $id The id (an integer number) of the corresponding database record.
* @return bool Returns TRUE on success or FALSE on failure.
*/
public static function reject_course_request($id)
{
@ -605,8 +603,8 @@ class CourseRequestManager
/**
* Asks the author (through e-mail) for additional information about the given course request.
* @param int $id The database primary id of the given request.
* @return bool Returns TRUE on success or FALSE on failure.
* @param int $id The database primary id of the given request.
* @return bool Returns TRUE on success or FALSE on failure.
*/
public static function ask_for_additional_info($id)
{

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

@ -1050,7 +1050,16 @@ class Display
if ($i == 1) {
$active = ' active';
}
$item = self::tag('a', $item, array('href'=>'#'.$id.'-'.$i, 'role'=> 'tab', 'data-toggle' => 'tab', 'id' => $id . $i));
$item = self::tag(
'a',
$item,
array(
'href' => '#'.$id.'-'.$i,
'role' => 'tab',
'data-toggle' => 'tab',
'id' => $id.$i,
)
);
$ul_attributes['role'] = 'presentation';
$ul_attributes['class'] = $active;
$lis .= self::tag('li', $item, $ul_attributes);
@ -1077,7 +1086,11 @@ class Display
$attributes['role'] = 'tabpanel';
$attributes['class'] = 'tab-wrapper';
$main_div = self::tag('div', $ul.self::tag('div', $divs, ['class' => 'tab-content']), $attributes);
$main_div = self::tag(
'div',
$ul.self::tag('div', $divs, ['class' => 'tab-content']),
$attributes
);
return $main_div ;
}
@ -2086,6 +2099,7 @@ class Display
* @param string $link
* @param bool $isMedia
* @param bool $addHeaders
* @param array $linkAttributes
* @return string
*/
public static function progressPaginationBar(
@ -2093,11 +2107,11 @@ class Display
$list,
$current,
$fixedValue = null,
$conditions = array(),
$conditions = [],
$link = null,
$isMedia = false,
$addHeaders = true,
$linkAttributes = array()
$linkAttributes = []
) {
if ($addHeaders) {
$pagination_size = 'pagination-mini';
@ -2135,6 +2149,7 @@ class Display
if ($addHeaders) {
$html .= '</ul></div>';
}
return $html;
}
/**
@ -2147,6 +2162,8 @@ class Display
* @param bool $isMedia
* @param int $localCounter
* @param int $fixedValue
* @param array $linkAttributes
*
* @return string
*/
public static function parsePaginationItem(
@ -2158,8 +2175,8 @@ class Display
$isMedia = false,
$localCounter = null,
$fixedValue = null,
$linkAttributes = array())
{
$linkAttributes = []
) {
$defaultClass = "before";
$class = $defaultClass;
foreach ($conditions as $condition) {
@ -2205,6 +2222,7 @@ class Display
$link_to_show = $link.$fixedValue.'#questionanchor'.$itemId;
}
$link = Display::url($label.' ', $link_to_show, $linkAttributes);
return '<li class = "'.$class.'">'.$link.'</li>';
}
@ -2279,14 +2297,12 @@ class Display
public static function getProfileEditionLink($userId, $asAdmin = false)
{
$editProfileUrl = api_get_path(WEB_CODE_PATH).'auth/profile.php';
if ($asAdmin) {
$editProfileUrl = api_get_path(WEB_CODE_PATH)."admin/user_edit.php?user_id=".intval($userId);
}
if (api_get_setting('sso_authentication') === 'true') {
$subSSOClass = api_get_setting('sso_authentication_subclass');
$objSSO = null;
if (!empty($subSSOClass)) {

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

@ -62,7 +62,7 @@ class IndexManager
{
$exercise_list = array();
if (!empty($personal_course_list)) {
foreach ($personal_course_list as $course_item) {
foreach ($personal_course_list as $course_item) {
$course_code = $course_item['c'];
$session_id = $course_item['id_session'];
@ -271,7 +271,6 @@ class IndexManager
}
$home_top_temp = '';
// Try language specific home
if (file_exists($this->home.'home_top_'.$user_selected_language.'.html')) {
$home_top_temp = file_get_contents($this->home.'home_top_'.$user_selected_language.'.html');
@ -288,17 +287,17 @@ class IndexManager
}
}
if (trim($home_top_temp) == '' && api_is_platform_admin()) {
$home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
} else {
$home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
}
$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
}
if (trim($home_top_temp) == '' && api_is_platform_admin()) {
$home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
} else {
$home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
}
$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
}
return $html;
}
return $html;
}
/**
* @return string
@ -395,7 +394,8 @@ class IndexManager
if (api_get_setting('allow_public_certificates') == 'true') {
$searchItem = Display::tag(
'li',
Display::url(Display::return_icon('search_graduation.png',get_lang('Search'),null,ICON_SIZE_SMALL).
Display::url(
Display::return_icon('search_graduation.png', get_lang('Search'),null,ICON_SIZE_SMALL).
get_lang('Search'),
api_get_path(WEB_CODE_PATH) . "gradebook/search.php"
)
@ -419,10 +419,14 @@ class IndexManager
);
$allowSkillsManagement = api_get_setting('allow_hr_skills_management') == 'true';
if (($allowSkillsManagement && api_is_drh()) || api_is_platform_admin()) {
$content .= Display::tag('li',
Display::url(Display::return_icon('edit-skill.png', get_lang('MySkills'), null,
$content .= Display::tag(
'li',
Display::url(
Display::return_icon('edit-skill.png', get_lang('MySkills'), null,
ICON_SIZE_SMALL) . get_lang('ManageSkills'),
api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php'));
api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php'
)
);
}
}
@ -612,7 +616,9 @@ class IndexManager
}
foreach ($course_list as $course) {
// $setting_show_also_closed_courses
if ($course['visibility'] == COURSE_VISIBILITY_HIDDEN) { continue; }
if ($course['visibility'] == COURSE_VISIBILITY_HIDDEN) {
continue;
}
if (!$setting_show_also_closed_courses) {
// If we do not show the closed courses
// we only show the courses that are open to the world (to everybody)
@ -650,9 +656,10 @@ class IndexManager
|| ($user_identified && array_key_exists($course['code'], $courses_of_user)
&& $course['visibility'] != COURSE_VISIBILITY_CLOSED)
|| $courses_of_user[$course['code']]['status'] == '1'
|| api_is_platform_admin()) {
$courses_list_string .= '<a href="'.$web_course_path.$course['directory'].'/">';
}
|| api_is_platform_admin()
) {
$courses_list_string .= '<a href="'.$web_course_path.$course['directory'].'/">';
}
$courses_list_string .= $course['title'];
if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD
|| ($user_identified && $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM)
@ -704,6 +711,7 @@ class IndexManager
Display :: return_icon('back.png', get_lang('BackToHomePage')).
get_lang('BackToHomePage') . '</a></p>';
}
return $result;
}
@ -721,16 +729,16 @@ class IndexManager
// and sort these according to the sort of the category
$user_id = intval($user_id);
$sql = "SELECT
course.code k,
course.visual_code vc,
course.subscribe subscr,
course.unsubscribe unsubscr,
course.title i,
course.tutor_name t,
course.directory dir,
course_rel_user.status status,
course_rel_user.sort sort,
course_rel_user.user_course_cat user_course_cat
course.code k,
course.visual_code vc,
course.subscribe subscr,
course.unsubscribe unsubscr,
course.title i,
course.tutor_name t,
course.directory dir,
course_rel_user.status status,
course_rel_user.sort sort,
course_rel_user.user_course_cat user_course_cat
FROM
$table_course course,
$table_course_user course_rel_user

Write Preview
Loading…
Cancel
Save