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

Fix UserManager calls.

Browse Source
1.10.x
Julio Montoya 11 years ago
parent e02d049041
commit 8cf694bccf
3 changed files with 18 additions and 18 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/cron/import_csv.php
  2. 23
      main/inc/lib/api.lib.php
  3. 2
      plugin/advanced_subscription/src/terms_and_conditions.php

11
main/cron/import_csv.php
Unescape View File

@ -1261,7 +1261,7 @@ class ImportCsv
continue; continue;
} }
$userId = Usermanager::get_user_id_from_username($chamiloUserName); $userId = UserManager::get_user_id_from_username($chamiloUserName);
if (empty($userId)) { if (empty($userId)) {
$this->logger->addError('User does not exists: '.$chamiloUserName); $this->logger->addError('User does not exists: '.$chamiloUserName);
@ -1321,7 +1321,7 @@ class ImportCsv
continue; continue;
} }
$userId = Usermanager::get_user_id_from_username($chamiloUserName); $userId = UserManager::get_user_id_from_username($chamiloUserName);
if (empty($userId)) { if (empty($userId)) {
$this->logger->addError('User does not exists: '.$chamiloUserName); $this->logger->addError('User does not exists: '.$chamiloUserName);
@ -1416,11 +1416,10 @@ class ImportCsv
} }
} }
use Monolog\Logger;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\NativeMailerHandler;
use Monolog\Handler\RotatingFileHandler;
use Monolog\Handler\BufferHandler; use Monolog\Handler\BufferHandler;
use Monolog\Handler\RotatingFileHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
$logger = new Logger('cron'); $logger = new Logger('cron');
$emails = isset($_configuration['cron_notification_mails']) ? $_configuration['cron_notification_mails'] : null; $emails = isset($_configuration['cron_notification_mails']) ? $_configuration['cron_notification_mails'] : null;

23
main/inc/lib/api.lib.php
Unescape View File

@ -1348,12 +1348,12 @@ function _api_format_user($user, $add_password = false)
$result['complete_name_with_username'] = $result['complete_name'].' ('.$user['username'].')'; $result['complete_name_with_username'] = $result['complete_name'].' ('.$user['username'].')';
} }
$result['firstname'] = $firstname; $result['firstname'] = $firstname;
$result['lastname'] = $lastname; $result['lastname'] = $lastname;
// Kept for historical reasons // Kept for historical reasons
$result['firstName'] = $firstname; $result['firstName'] = $firstname;
$result['lastName'] = $lastname; $result['lastName'] = $lastname;
$attributes = array( $attributes = array(
'phone', 'phone',
@ -1407,12 +1407,11 @@ function _api_format_user($user, $add_password = false)
$result['lastLogin'] = $last_login; $result['lastLogin'] = $last_login;
// Getting user avatar. // Getting user avatar.
$picture_filename = trim($result['picture_uri']); $picture_filename = trim($result['picture_uri']);
$result['avatar'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg'; $result['avatar'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg';
$result['avatar_small'] = api_get_path(WEB_CODE_PATH).'img/unknown_22.jpg'; $result['avatar_small'] = api_get_path(WEB_CODE_PATH).'img/unknown_22.jpg';
$result['avatar_sys_path'] = api_get_path(SYS_CODE_PATH).'img/unknown.jpg'; $result['avatar_sys_path'] = api_get_path(SYS_CODE_PATH).'img/unknown.jpg';
$dir = 'upload/users/'.$user_id.'/'; $dir = 'upload/users/'.$user_id.'/';
//if (!empty($picture_filename) && api_is_anonymous() ) { //Why you have to be anonymous? //if (!empty($picture_filename) && api_is_anonymous() ) { //Why you have to be anonymous?
if (!empty($picture_filename)) { if (!empty($picture_filename)) {
@ -1454,6 +1453,8 @@ function _api_format_user($user, $add_password = false)
$result['password'] = $user['password']; $result['password'] = $user['password'];
} }
$result['profile_url'] = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_id;
return $result; return $result;
} }
@ -7201,7 +7202,7 @@ function api_block_account_captcha($username)
global $_configuration; global $_configuration;
$minutesToBlock = isset($_configuration['captcha_time_to_block']) ? $_configuration['captcha_time_to_block'] : 10; $minutesToBlock = isset($_configuration['captcha_time_to_block']) ? $_configuration['captcha_time_to_block'] : 10;
$time = time() + $minutesToBlock*60; $time = time() + $minutesToBlock*60;
Usermanager::update_extra_field_value($userInfo['user_id'], 'captcha_blocked_until_date', api_get_utc_datetime($time)); UserManager::update_extra_field_value($userInfo['user_id'], 'captcha_blocked_until_date', api_get_utc_datetime($time));
} }
/** /**
@ -7214,7 +7215,7 @@ function api_clean_account_captcha($username)
return false; return false;
} }
Session::erase('loginFailedCount'); Session::erase('loginFailedCount');
Usermanager::update_extra_field_value($userInfo['user_id'], 'captcha_blocked_until_date', null); UserManager::update_extra_field_value($userInfo['user_id'], 'captcha_blocked_until_date', null);
} }
/** /**

2
plugin/advanced_subscription/src/terms_and_conditions.php
Unescape View File

@ -57,7 +57,7 @@ if (
} }
$data['session'] = api_get_session_info($data['sessionId']); $data['session'] = api_get_session_info($data['sessionId']);
$data['student'] = Usermanager::get_user_info_by_id($data['studentUserId']); $data['student'] = UserManager::get_user_info_by_id($data['studentUserId']);
$data['course'] = api_get_course_info_by_id($data['courseId']); $data['course'] = api_get_course_info_by_id($data['courseId']);
$data['acceptTermsUrl'] = $plugin->getQueueUrl($data); $data['acceptTermsUrl'] = $plugin->getQueueUrl($data);
$data['rejectTermsUrl'] = $plugin->getTermsUrl($data, ADVANCED_SUBSCRIPTION_TERMS_MODE_REJECT); $data['rejectTermsUrl'] = $plugin->getTermsUrl($data, ADVANCED_SUBSCRIPTION_TERMS_MODE_REJECT);

Write Preview
Loading…
Cancel
Save