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 - cosmetic changes

Browse Source
skala
Julio Montoya 12 years ago
parent 5dd8844dea
commit 5d854994c0
7 changed files with 52 additions and 46 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. 19
      main/inc/lib/internationalization.lib.php
  2. 3
      main/inc/lib/page.lib.php
  3. 1
      main/inc/lib/security.lib.php
  4. 7
      main/inc/lib/template.lib.php
  5. 21
      main/user/userInfoLib.php
  6. 13
      src/ChamiloLMS/Controller/IndexController.php
  7. 34
      src/ChamiloLMS/Controller/UserPortalController.php

19
main/inc/lib/internationalization.lib.php
Unescape View File

@ -159,12 +159,13 @@ function get_lang($variable, $reserved = null, $language = null)
global $langstats;
$langstats->add_use($variable, '');
}
if (!isset ($used_lang_vars)) {
if (!isset($used_lang_vars)) {
$used_lang_vars = array();
}
// Caching results from some API functions, for speed.
static $initialized, $encoding, $is_utf8_encoding, $langpath, $test_server_mode, $show_special_markup;
if (!isset($initialized)) {
$encoding = api_get_system_encoding();
$is_utf8_encoding = api_is_utf8($encoding);
@ -196,7 +197,6 @@ function get_lang($variable, $reserved = null, $language = null)
return $ret;
}
$_api_is_translated = false;
// There is no cached translation, we have to retrieve it:
@ -287,7 +287,7 @@ function get_lang($variable, $reserved = null, $language = null)
$_api_is_translated = false;
$langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;
}
//return $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
$ret = $cache[$language][$variable] = $is_utf8_encoding ? $langvar : api_utf8_decode($langvar, $encoding);
$used_lang_vars[$variable.$lang_postfix] = $ret;
return $ret;
@ -418,13 +418,18 @@ function api_get_language_isocode($language = null, $default_code = 'en')
if (empty($language)) {
$language = api_get_interface_language(false, true);
}
// Try session
/*if (empty($iso_code)) {
$iso_code = Session::read('_setting.api_get_language_isocode');
}*/
if (!isset($iso_code[$language])) {
if (!class_exists('Database')) {
return $default_code; // This might happen, in case of calling this function early during the global initialization.
}
$sql_result = Database::query(
"SELECT isocode FROM ".Database::get_main_table(TABLE_MAIN_LANGUAGE)." WHERE dokeos_folder = '$language'"
);
$sql = "SELECT isocode FROM ".Database::get_main_table(TABLE_MAIN_LANGUAGE)." WHERE dokeos_folder = '$language'";
$sql_result = Database::query($sql);
if (Database::num_rows($sql_result)) {
$result = Database::fetch_array($sql_result);
$iso_code[$language] = trim($result['isocode']);
@ -435,7 +440,9 @@ function api_get_language_isocode($language = null, $default_code = 'en')
if (empty($iso_code[$language])) {
$iso_code[$language] = $default_code;
}
//Session::write('_setting.api_get_language_isocode', $iso_code);
}
return $iso_code[$language];
}

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

@ -953,7 +953,7 @@ class PageController
/**
* The most important function here, prints the session and course list (user_portal.php)
*
* @param int User ID
* @param int User id
* @param string filter
* @param int page
* @return string HTML list of sessions and courses
@ -971,7 +971,6 @@ class PageController
$start = ($page - 1) * $this->maxPerPage;
$nbResults = CourseManager::displayCourses($user_id, $filter, $loadDirs, true);
$html = CourseManager::displayCourses($user_id, $filter, $loadDirs, false, $start, $this->maxPerPage);
if (!empty($html)) {

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

@ -256,6 +256,7 @@ class Security
*/
public static function remove_XSS($var, $user_status = ANONYMOUS, $filter_terms = false)
{
// return $var;
if ($filter_terms) {
$var = self::filter_terms($var);
}

7
main/inc/lib/template.lib.php
Unescape View File

@ -702,8 +702,11 @@ class Template
//$this->assign('content', $content);
}
/* Sets the plugin content in a template variable */
private function set_plugin_region($plugin_region)
/**
* Sets the plugin content in a template variable
* @param string
*/
private function set_plugin_region($plugin_region)
{
if (!empty($plugin_region)) {
$region_content = $this->plugin->load_region($this->app['plugins'], $plugin_region, $this, $this->force_plugin_load);

21
main/user/userInfoLib.php
Unescape View File

@ -250,28 +250,13 @@ function update_user_course_properties($user_id, $course_code, $properties)
$result = Database::query($sql);
if (Database::affected_rows() > 0)
{
if (Database::affected_rows($result) > 0) {
return true;
}
else
{
} else {
return false;
}
}
/*----------------------------------------
CATEGORIES CONTENT TREATMENT
--------------------------------------*/
/**
* fill a bloc for information category
*
@ -598,4 +583,4 @@ function htmlize($phrase)
{
global $charset;
return nl2br(htmlspecialchars($phrase,ENT_QUOTES,$charset));
}
}

13
src/ChamiloLMS/Controller/IndexController.php
Unescape View File

@ -40,6 +40,17 @@ class IndexController extends CommonController
$this->cidReset();
/** @var \Template $template */
$template = $app['template'];
// Testing new Database with doctrine embeded
/* $sql = "SELECT * FROM user WHERE user_id = 1 ORDER BY RAND()";
$result = \Database::query($sql);
$result = \Database::fetch_object($result);
var_dump($result);*/
//var_dump(\Database::get_client_info());
/*$sql = "INSERT INTO user (username, lastname, firstname) VALUES ('111s11', '123', '123'); ";
$a = \Database::query($sql);
var_dump($app['dbs']['mysql_read']->lastInsertId());*/
/*$params['data'] = array(
'subject' => 'subject julito',
@ -215,7 +226,7 @@ class IndexController extends CommonController
if (!empty($_POST['submitAuth'])) {
// The user has been already authenticated, we are now to find the last login of the user.
if (!empty($this->user_id)) {
$track_login_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$track_login_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$sql_last_login = "SELECT login_date
FROM $track_login_table
WHERE login_user_id = '".$this->user_id."'

34
src/ChamiloLMS/Controller/UserPortalController.php
Unescape View File

@ -44,30 +44,30 @@ class UserPortalController extends CommonController
$items = null;
$type = str_replace('/', '', $type);
/** var $pageController \PageController */
/** @var \PageController $pageController */
$pageController = $app['page_controller'];
switch ($type) {
case 'sessions':
$items = $app['page_controller']->returnSessions(api_get_user_id(), $filter, $page);
$items = $pageController->returnSessions(api_get_user_id(), $filter, $page);
break;
case 'sessioncategories':
$items = $app['page_controller']->returnSessionsCategories(api_get_user_id(), $filter, $page);
$items = $pageController->returnSessionsCategories(api_get_user_id(), $filter, $page);
break;
case 'courses':
$items = $app['page_controller']->returnCourses(api_get_user_id(), $filter, $page);
$items = $pageController->returnCourses(api_get_user_id(), $filter, $page);
break;
case 'mycoursecategories':
$items = $app['page_controller']->returnMyCourseCategories(api_get_user_id(), $filter, $page);
$items = $pageController->returnMyCourseCategories(api_get_user_id(), $filter, $page);
break;
case 'specialcourses':
$items = $app['page_controller']->returnSpecialCourses(api_get_user_id(), $filter, $page);
$items = $pageController->returnSpecialCourses(api_get_user_id(), $filter, $page);
break;
}
//Show the chamilo mascot
if (empty($items) && empty($filter)) {
$app['page_controller']->return_welcome_to_course_block($app['template']);
$pageController->return_welcome_to_course_block($app['template']);
}
/*
@ -78,16 +78,16 @@ class UserPortalController extends CommonController
};
$app['knp_menu.menus'] = array('main' => 'my_main_menu');*/
$app['template']->assign('content', $items);
$app['page_controller']->getSectionCourseBlock();
$app['page_controller']->return_profile_block();
$app['page_controller']->return_user_image_block();
$app['page_controller']->return_course_block($filter);
$app['page_controller']->return_reservation_block();
$app['page_controller']->returnNavigationLinks($app['template']->getNavigationLinks());
$app['template']->assign('search_block', $app['page_controller']->return_search_block());
$app['template']->assign('classes_block', $app['page_controller']->return_classes_block());
$app['page_controller']->return_skills_links();
$pageController->getSectionCourseBlock();
$pageController->return_profile_block();
$pageController->return_user_image_block();
$pageController->return_course_block($filter);
$pageController->return_reservation_block();
$pageController->returnNavigationLinks($app['template']->getNavigationLinks());
$app['template']->assign('search_block', $pageController->return_search_block());
$app['template']->assign('classes_block', $pageController->return_classes_block());
$pageController->return_skills_links();
// Deleting the session_id.
Session::erase('session_id');

Write Preview
Loading…
Cancel
Save