From 8cf694bccf4f5ebdde6b4a1e0b92d7e79fd11a84 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 15 Apr 2015 11:46:28 +0200
Subject: [PATCH] Fix UserManager calls.

---
 main/cron/import_csv.php                      | 11 ++++-----
 main/inc/lib/api.lib.php                      | 23 ++++++++++---------
 .../src/terms_and_conditions.php              |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 41a88dd509..c621849f41 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -1261,7 +1261,7 @@ class ImportCsv
                     continue;
                 }
 
-                $userId = Usermanager::get_user_id_from_username($chamiloUserName);
+                $userId = UserManager::get_user_id_from_username($chamiloUserName);
 
                 if (empty($userId)) {
                     $this->logger->addError('User does not exists: '.$chamiloUserName);
@@ -1321,7 +1321,7 @@ class ImportCsv
                     continue;
                 }
 
-                $userId = Usermanager::get_user_id_from_username($chamiloUserName);
+                $userId = UserManager::get_user_id_from_username($chamiloUserName);
 
                 if (empty($userId)) {
                     $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\RotatingFileHandler;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
 
 $logger = new Logger('cron');
 $emails = isset($_configuration['cron_notification_mails']) ? $_configuration['cron_notification_mails'] : null;
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 8db6b5fcc7..dc0114eb75 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1348,12 +1348,12 @@ function _api_format_user($user, $add_password = false)
         $result['complete_name_with_username'] = $result['complete_name'].' ('.$user['username'].')';
     }
 
-    $result['firstname']    = $firstname;
-    $result['lastname']     = $lastname;
+    $result['firstname'] = $firstname;
+    $result['lastname'] = $lastname;
 
     // Kept for historical reasons
-    $result['firstName']    = $firstname;
-    $result['lastName']     = $lastname;
+    $result['firstName'] = $firstname;
+    $result['lastName'] = $lastname;
 
     $attributes = array(
         'phone',
@@ -1407,12 +1407,11 @@ function _api_format_user($user, $add_password = false)
     $result['lastLogin'] = $last_login;
 
     // Getting user avatar.
-
     $picture_filename   = trim($result['picture_uri']);
-    $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_sys_path']    = api_get_path(SYS_CODE_PATH).'img/unknown.jpg';
-    $dir                = 'upload/users/'.$user_id.'/';
+    $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_sys_path'] = api_get_path(SYS_CODE_PATH).'img/unknown.jpg';
+    $dir = 'upload/users/'.$user_id.'/';
 
     //if (!empty($picture_filename) && api_is_anonymous() ) {  //Why you have to be anonymous?
     if (!empty($picture_filename)) {
@@ -1454,6 +1453,8 @@ function _api_format_user($user, $add_password = false)
         $result['password'] = $user['password'];
     }
 
+    $result['profile_url'] = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_id;
+
     return $result;
 }
 
@@ -7201,7 +7202,7 @@ function api_block_account_captcha($username)
     global $_configuration;
     $minutesToBlock = isset($_configuration['captcha_time_to_block']) ? $_configuration['captcha_time_to_block'] : 10;
     $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;
     }
     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);
 }
 
 /**
diff --git a/plugin/advanced_subscription/src/terms_and_conditions.php b/plugin/advanced_subscription/src/terms_and_conditions.php
index ccaa3bb3ab..8eff785878 100644
--- a/plugin/advanced_subscription/src/terms_and_conditions.php
+++ b/plugin/advanced_subscription/src/terms_and_conditions.php
@@ -57,7 +57,7 @@ if (
     }
 
     $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['acceptTermsUrl'] = $plugin->getQueueUrl($data);
     $data['rejectTermsUrl'] = $plugin->getTermsUrl($data, ADVANCED_SUBSCRIPTION_TERMS_MODE_REJECT);