Minor - format code

pull/2487/head
jmontoyaa 8 years ago
parent 953b66991d
commit 176de61508
  1. 3
      main/webservices/access_url.php
  2. 3
      main/webservices/cm_webservice.php
  3. 1
      main/webservices/cm_webservice_announcements.php
  4. 11
      main/webservices/cm_webservice_courses.php
  5. 26
      main/webservices/cm_webservice_user.php
  6. 244
      main/webservices/user_import/import.lib.php
  7. 86
      main/webservices/user_import/service.php
  8. 1
      src/Chamilo/ThemeBundle/Event/MessageListEvent.php
  9. 1
      src/Chamilo/ThemeBundle/Event/NotificationListEvent.php
  10. 2
      src/Chamilo/ThemeBundle/Event/SidebarMenuKnpEvent.php
  11. 12
      src/Chamilo/ThemeBundle/Event/TaskListEvent.php
  12. 4
      src/Chamilo/ThemeBundle/Event/ThemeEvent.php
  13. 4
      src/Chamilo/ThemeBundle/Event/ThemeEvents.php
  14. 10
      src/Chamilo/ThemeBundle/EventListener/ContextListener.php
  15. 11
      src/Chamilo/ThemeBundle/EventListener/NavbarMessageListDemoListener.php
  16. 13
      src/Chamilo/ThemeBundle/EventListener/NavbarNotificationListDemoListener.php
  17. 10
      src/Chamilo/ThemeBundle/EventListener/NavbarShowUserDemoListener.php
  18. 11
      src/Chamilo/ThemeBundle/EventListener/NavbarTaskListDemoListener.php
  19. 13
      src/Chamilo/ThemeBundle/EventListener/SetupThemeListener.php
  20. 13
      src/Chamilo/ThemeBundle/EventListener/SidebarSetupMenuDemoListener.php
  21. 1
      src/Chamilo/ThemeBundle/Form/FormDemoModelType.php

@ -20,7 +20,8 @@ define('WS_ERROR_SETTING', 4);
/**
* @param integer $code
*/
function return_error($code) {
function return_error($code)
{
$fault = null;
switch ($code) {
case WS_ERROR_SECRET_KEY:

@ -1,10 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Entity\User;
/**
* @package chamilo.webservices
*/
use Chamilo\UserBundle\Entity\User;
require_once __DIR__.'/../inc/global.inc.php';

@ -15,7 +15,6 @@ require_once __DIR__.'/cm_webservice.php';
*/
class WSCMAnnouncements extends WSCM
{
public function get_announcements_id($username, $password, $course_code)
{
if ($this->verifyUserPass($username, $password) == "valid") {

@ -5,6 +5,7 @@
* @package chamilo.webservices
*/
require_once __DIR__.'/../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once __DIR__.'/cm_webservice.php';
@ -43,13 +44,3 @@ class WSCMCourses extends WSCM
}
}
}
/*
echo "aqui: ";
$aqui = new WSCMCourses();
echo "<pre>";
//print_r($aqui->unreadMessage("aluno", "e695f51fe3dd6b7cf2be3188a614f10f"));
print_r($aqui->get_course_title("aluno", "c4ca4238a0b923820dcc509a6f75849b", "P0204"));
echo "</pre>";
*/

@ -79,13 +79,13 @@ class WSCMUser extends WSCM
case 'firstname':
return $userInfo['firstname'];
break;
case 'lastname' :
case 'lastname':
return $userInfo['lastname'];
break;
case 'bothfl' :
case 'bothfl':
return $userInfo['firstname']." ".$userInfo['lastname'];
break;
case 'bothlf' :
case 'bothlf':
return $userInfo['lastname']." ".$userInfo['firstname'];
break;
default:
@ -107,9 +107,25 @@ class WSCMUser extends WSCM
$count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
if ($count_is_true) {
return Display::return_message(api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES, $charset), 'normal', false);
return Display::return_message(
api_htmlentities(
get_lang('InvitationHasBeenSent'),
ENT_QUOTES,
$charset
),
'normal',
false
);
} else {
return Display::return_message(api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES, $charset), 'error', false);
return Display::return_message(
api_htmlentities(
get_lang('YouAlreadySentAnInvitation'),
ENT_QUOTES,
$charset
),
'error',
false
);
}
}
return get_lang('InvalidId');

@ -2,136 +2,158 @@
/**
* Validates imported data.
*/
function validate_data($users) {
global $defined_auth_sources;
$errors = array ();
$usernames = array ();
if(is_array($users)) {
foreach ($users as $index => $user) {
// 1. Check whether mandatory fields have been set.
$mandatory_fields = array ('LastName', 'FirstName');
if (api_get_setting('registration', 'email') == 'true') {
$mandatory_fields[] = 'Email';
}
foreach ($mandatory_fields as $key => $field) {
if (!isset ($user[$field]) || strlen($user[$field]) == 0) {
$user['error'] = get_lang($field.'Mandatory');
$errors[] = $user;
}
}
// 2. Check username.
if (!UserManager::is_username_empty($user['UserName'])) {
// 2.1. Check whether username was used twice in the import file.
if (isset($usernames[$user['UserName']])) {
$user['error'] = get_lang('UserNameUsedTwice');
$errors[] = $user;
}
$usernames[$user['UserName']] = 1;
// 2.2. Check whether username is allready in use in database.
if (!UserManager::is_username_available($user['UserName'])) {
$user['error'] = get_lang('UserNameNotAvailable');
$errors[] = $user;
}
// 2.3. Check whether username is too long.
if (UserManager::is_username_too_long($user['UserName'])) {
$user['error'] = get_lang('UserNameTooLong');
$errors[] = $user;
}
}
// 3. Check status.
if (isset ($user['Status']) && !api_status_exists($user['Status'])) {
$user['error'] = get_lang('WrongStatus');
$errors[] = $user;
}
// 5. Check authentication source.
if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
if (!in_array($user['AuthSource'], $defined_auth_sources)) {
$user['error'] = get_lang('AuthSourceNotAvailable');
$errors[] = $user;
}
}
}
}
return $errors;
function validate_data($users)
{
global $defined_auth_sources;
$errors = array ();
$usernames = array();
if (is_array($users)) {
foreach ($users as $index => $user) {
// 1. Check whether mandatory fields have been set.
$mandatory_fields = array ('LastName', 'FirstName');
if (api_get_setting('registration', 'email') == 'true') {
$mandatory_fields[] = 'Email';
}
foreach ($mandatory_fields as $key => $field) {
if (!isset($user[$field]) || strlen($user[$field]) == 0) {
$user['error'] = get_lang($field.'Mandatory');
$errors[] = $user;
}
}
// 2. Check username.
if (!UserManager::is_username_empty($user['UserName'])) {
// 2.1. Check whether username was used twice in the import file.
if (isset($usernames[$user['UserName']])) {
$user['error'] = get_lang('UserNameUsedTwice');
$errors[] = $user;
}
$usernames[$user['UserName']] = 1;
// 2.2. Check whether username is allready in use in database.
if (!UserManager::is_username_available($user['UserName'])) {
$user['error'] = get_lang('UserNameNotAvailable');
$errors[] = $user;
}
// 2.3. Check whether username is too long.
if (UserManager::is_username_too_long($user['UserName'])) {
$user['error'] = get_lang('UserNameTooLong');
$errors[] = $user;
}
}
// 3. Check status.
if (isset($user['Status']) && !api_status_exists($user['Status'])) {
$user['error'] = get_lang('WrongStatus');
$errors[] = $user;
}
// 5. Check authentication source.
if (isset($user['AuthSource']) && strlen($user['AuthSource']) != 0) {
if (!in_array($user['AuthSource'], $defined_auth_sources)) {
$user['error'] = get_lang('AuthSourceNotAvailable');
$errors[] = $user;
}
}
}
}
return $errors;
}
/**
* Adds missing user-information (which isn't required, like password, username, etc).
*/
function complete_missing_data($user) {
// 1. Create a username if necessary.
if (UserManager::is_username_empty($user['UserName'])) {
$user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']);
}
// 2. Generate a password if necessary.
if (!isset ($user['Password']) || strlen($user['Password']) == 0) {
$user['Password'] = api_generate_password();
}
// 3. set status if not allready set.
if (!isset ($user['Status']) || strlen($user['Status']) == 0) {
$user['Status'] = 'user';
}
// 4. Set authsource if not allready set.
if (!isset ($user['AuthSource']) || strlen($user['AuthSource']) == 0) {
$user['AuthSource'] = PLATFORM_AUTH_SOURCE;
}
return $user;
function complete_missing_data($user)
{
// 1. Create a username if necessary.
if (UserManager::is_username_empty($user['UserName'])) {
$user['UserName'] = UserManager::create_unique_username(
$user['FirstName'],
$user['LastName']
);
}
// 2. Generate a password if necessary.
if (!isset($user['Password']) || strlen($user['Password']) == 0) {
$user['Password'] = api_generate_password();
}
// 3. set status if not allready set.
if (!isset($user['Status']) || strlen($user['Status']) == 0) {
$user['Status'] = 'user';
}
// 4. Set authsource if not allready set.
if (!isset($user['AuthSource']) || strlen($user['AuthSource']) == 0) {
$user['AuthSource'] = PLATFORM_AUTH_SOURCE;
}
return $user;
}
/**
* Save the imported data
*/
function save_data($users) {
$user_table = Database::get_main_table(TABLE_MAIN_USER);
if(is_array($users)) {
foreach ($users as $index => $user) {
$user = complete_missing_data($user);
function save_data($users)
{
if (is_array($users)) {
foreach ($users as $index => $user) {
$user = complete_missing_data($user);
$user['Status'] = api_status_key($user['Status']);
$user_id = UserManager:: create_user(
$user['FirstName'],
$user['LastName'],
$user['Status'],
$user['Email'],
$user['UserName'],
$user['Password'],
$user['OfficialCode'],
api_get_setting('PlatformLanguage'),
$user['PhoneNumber'],
'',
$user['AuthSource']
);
foreach ($user['Courses'] as $index => $course) {
if (CourseManager:: course_exists($course)) {
CourseManager:: subscribe_user(
$user_id,
$course,
$user['Status']
);
}
}
$user['Status'] = api_status_key($user['Status']);
// TODO: Hard-coded French texts.
$user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']);
foreach ($user['Courses'] as $index => $course) {
if(CourseManager :: course_exists($course))
CourseManager :: subscribe_user($user_id, $course,$user['Status']);
}
// Qualite
if (!empty($user['Qualite'])) {
UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
}
// TODO: Hard-coded French texts.
// Categorie
if (!empty($user['Categorie'])) {
UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
}
// Qualite
if (!empty($user['Qualite'])) {
UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']);
}
// Etat
if (!empty($user['Etat'])) {
UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
}
// Categorie
if (!empty($user['Categorie'])) {
UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']);
}
// Etat
if (!empty($user['Etat'])) {
UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']);
}
// Niveau
if (!empty($user['Niveau'])) {
UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
}
}
}
// Niveau
if (!empty($user['Niveau'])) {
UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']);
}
}
}
}
/**
* Reads the CSV-file.
* @param string $file Path to the CSV-file
* @return array All userinformation read from the file
* @return array All user information read from the file
*/
function parse_csv_data($file) {
$users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset ($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));
}
$users[$index] = $user;
}
return $users;
function parse_csv_data($file)
{
$users = Import :: csvToArray($file);
foreach ($users as $index => $user) {
if (isset($user['Courses'])) {
$user['Courses'] = explode('|', trim($user['Courses']));
}
$users[$index] = $user;
}
return $users;
}

@ -1,5 +1,5 @@
<?php
/*
/**
* See license terms in /license.txt
* @author Eric Marguin <eric.marguin@dokeos.com>
*/
@ -12,52 +12,50 @@ require_once __DIR__.'/../../inc/global.inc.php';
* @param string Security key (as found in configuration file)
* @return string Error message
*/
function import_users_from_file($filepath, $security_key) {
global $_configuration;
$errors_returned = array(
0 => 'success',
1 => 'file import does not exist',
2 => 'no users to import',
3 => 'wrong datas in file',
4 => 'security error'
);
// Check whether this script is launch by server and security key is ok.
if (empty($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] || $security_key != $_configuration['security_key']) {
return $errors_returned[4];
}
// Libraries
require_once 'import.lib.php';
// Check is users file exists.
if (!is_file($filepath)) {
return $errors_returned[1];
}
// Get list of users
$users = parse_csv_data($filepath);
if (count($users) == 0) {
return $errors_returned[2];
}
// Check the datas for each user
$errors = validate_data($users);
if (count($errors) > 0) {
return $errors_returned[3];
}
// Apply modifications in database
save_data($users);
return $errors_returned[0]; // Import successfull
function import_users_from_file($filepath, $security_key)
{
global $_configuration;
$errors_returned = array(
0 => 'success',
1 => 'file import does not exist',
2 => 'no users to import',
3 => 'wrong datas in file',
4 => 'security error'
);
// Check whether this script is launch by server and security key is ok.
if (empty($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] || $security_key != $_configuration['security_key']) {
return $errors_returned[4];
}
// Libraries
require_once 'import.lib.php';
// Check is users file exists.
if (!is_file($filepath)) {
return $errors_returned[1];
}
// Get list of users
$users = parse_csv_data($filepath);
if (count($users) == 0) {
return $errors_returned[2];
}
// Check the datas for each user
$errors = validate_data($users);
if (count($errors) > 0) {
return $errors_returned[3];
}
// Apply modifications in database
save_data($users);
return $errors_returned[0]; // Import successfull
}
$server = new soap_server();
$server->register('import_users_from_file');
$http_request = (isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '');
$server->service($http_request);

@ -17,7 +17,6 @@ use Chamilo\ThemeBundle\Model\MessageInterface;
*/
class MessageListEvent extends ThemeEvent
{
/**
* Stores the list of messages
* @var array

@ -17,7 +17,6 @@ use Chamilo\ThemeBundle\Model\NotificationInterface;
*/
class NotificationListEvent extends ThemeEvent
{
/**
* @var array
*/

@ -90,8 +90,6 @@ class SidebarMenuKnpEvent extends ThemeEvent
return $child;
}
}
return null;
}
}

@ -10,10 +10,9 @@ namespace Chamilo\ThemeBundle\Event;
use Chamilo\ThemeBundle\Model\TaskInterface;
class TaskListEvent extends ThemeEvent {
class TaskListEvent extends ThemeEvent
{
protected $tasks = array();
protected $total = 0;
/**
@ -24,13 +23,13 @@ class TaskListEvent extends ThemeEvent {
return $this->tasks;
}
/**
* @param TaskInterface $taskInterface
*
* @return $this
*/
public function addTask(TaskInterface $taskInterface) {
public function addTask(TaskInterface $taskInterface)
{
$this->tasks[] = $taskInterface;
return $this;
}
@ -53,7 +52,4 @@ class TaskListEvent extends ThemeEvent {
{
return $this->total == 0 ? sizeof($this->tasks) : $this->total;
}
}

@ -13,6 +13,6 @@ use Symfony\Component\EventDispatcher\Event;
* Base event class to make theme related events easier to detect
*
*/
class ThemeEvent extends Event {
class ThemeEvent extends Event
{
}

@ -7,15 +7,12 @@
namespace Chamilo\ThemeBundle\Event;
/**
* Holds all events used by the theme
*
*/
class ThemeEvents
{
/**
* Used to receive notification data
*/
@ -57,5 +54,4 @@ class ThemeEvents
*
*/
const THEME_SIDEBAR_ACTIVATE_MENU = 'theme.sidebar_activate_menu';
}

@ -13,17 +13,17 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\Security\Core\User\User;
use Symfony\Component\Security\Core\User\UserInterface;
class ContextListener {
class ContextListener
{
protected $indicator = '^/admin';
protected $container = null;
function __construct($container)
public function __construct($container)
{
$this->container = $container;
}
public function onRequest(GetResponseEvent $event)
{
$request = $event->getRequest();
@ -35,13 +35,12 @@ class ContextListener {
if (false == ($user = $this->getUser())) {
return;
}
}
public function getUser()
{
if (!$this->container->has('security.context')) {
return false;
return false;
}
if (null === $token = $this->container->get('security.context')->getToken()) {
@ -57,6 +56,5 @@ class ContextListener {
public function onController(FilterControllerEvent $event)
{
}
}

@ -12,16 +12,17 @@ use Chamilo\ThemeBundle\Event\MessageListEvent;
use Chamilo\ThemeBundle\Model\MessageModel;
use Chamilo\ThemeBundle\Model\UserModel;
class NavbarMessageListDemoListener {
public function onListMessages(MessageListEvent $event) {
class NavbarMessageListDemoListener
{
public function onListMessages(MessageListEvent $event)
{
foreach ($this->getMessages() as $msg) {
$event->addMessage($msg);
}
}
protected function getMessages() {
protected function getMessages()
{
return array(
new MessageModel(new UserModel('Karl kettenkit'), 'Dude! do something!', new \DateTime('-3 days')),
new MessageModel(new UserModel('Jack Trockendoc'), 'This is some subject', new \DateTime('-10 month')),

@ -11,18 +11,17 @@ namespace Chamilo\ThemeBundle\EventListener;
use Chamilo\ThemeBundle\Event\NotificationListEvent;
use Chamilo\ThemeBundle\Model\NotificationModel;
class NavbarNotificationListDemoListener {
public function onListNotifications(NotificationListEvent $event) {
class NavbarNotificationListDemoListener
{
public function onListNotifications(NotificationListEvent $event)
{
foreach ($this->getNotifications() as $notify) {
$event->addNotification($notify);
}
}
protected function getNotifications() {
protected function getNotifications()
{
return array(
new NotificationModel('some notification'),
new NotificationModel('some more notices', 'success'),

@ -11,14 +11,12 @@ namespace Chamilo\ThemeBundle\EventListener;
use Chamilo\ThemeBundle\Event\ShowUserEvent;
use Chamilo\ThemeBundle\Model\UserModel;
class NavbarShowUserDemoListener {
public function onShowUser(ShowUserEvent $event) {
class NavbarShowUserDemoListener
{
public function onShowUser(ShowUserEvent $event)
{
$user = new UserModel();
$user->setAvatar('')->setIsOnline(true)->setMemberSince(new \DateTime())->setUsername('Demo User');
$event->setUser($user);
}
}

@ -13,24 +13,19 @@ use Chamilo\ThemeBundle\Model\TaskModel;
class NavbarTaskListDemoListener
{
public function onListTasks(TaskListEvent $event)
{
foreach ($this->getTasks() as $task) {
$event->addTask($task);
}
}
protected function getTasks()
{
return array(
new TaskModel('make stuff', 30, TaskModel::COLOR_GREEN),
new TaskModel('make more stuff', 60),
new TaskModel('some more tasks to do', 10, TaskModel::COLOR_RED)
new TaskModel('make stuff', 30, TaskModel::COLOR_GREEN),
new TaskModel('make more stuff', 60),
new TaskModel('some more tasks to do', 10, TaskModel::COLOR_RED),
);
}
}

@ -11,8 +11,8 @@ namespace Chamilo\ThemeBundle\EventListener;
use Chamilo\ThemeBundle\Theme\ThemeManager;
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
class SetupThemeListener {
class SetupThemeListener
{
/**
* @var ThemeManager
*/
@ -22,19 +22,17 @@ class SetupThemeListener {
protected $lteAdmin;
function __construct($manager, $cssBase = null, $lteAdmin = null)
public function __construct($manager, $cssBase = null, $lteAdmin = null)
{
$this->cssBase = $cssBase ?: 'bundles/avanzuadmintheme/';
$this->lteAdmin = $lteAdmin ?: 'vendor/AdminLTE/css/';
$this->manager = $manager;
}
public function onKernelController(FilterControllerEvent $event) {
public function onKernelController(FilterControllerEvent $event)
{
$css = rtrim($this->cssBase, '/').'/'.trim($this->lteAdmin, '/');
$mng = $this->manager;
$mng->registerStyle('jquery-ui', $css.'/jQueryUI/jquery-ui-1.10.3.custom.css');
$mng->registerStyle('bootstrap', $css.'/bootstrap.css', array('jquery-ui'));
$mng->registerStyle('bootstrap-slider', $css.'/bootstrap-slider/slider.css', array('bootstrap'));
@ -46,6 +44,5 @@ class SetupThemeListener {
$mng->registerStyle('daterangepicker', $css.'/daterangepicker/daterangepicker-bs3.css', array('admin-lte'));
$mng->registerStyle('timepicker', $css.'/timepicker/bootstrap-timepicker.css', array('admin-lte'));
$mng->registerStyle('wysiwyg', $css.'/bootstrap-wysihtml5/bootstrap3-wysihtml5.css', array('admin-lte'));
}
}

@ -14,7 +14,6 @@ use Symfony\Component\HttpFoundation\Request;
class SidebarSetupMenuDemoListener
{
public function onSetupMenu(SidebarMenuEvent $event)
{
$request = $event->getRequest();
@ -22,13 +21,11 @@ class SidebarSetupMenuDemoListener
foreach ($this->getMenu($request) as $item) {
$event->addItem($item);
}
}
protected function getMenu(Request $request)
{
$earg = array();
$earg = array();
$rootItems = array(
$dash = new MenuItemModel('dashboard', 'Dashboard', 'avanzu_admin_dash_demo', $earg, 'fa fa-dashboard'),
$form = new MenuItemModel('forms', 'Forms', 'avanzu_admin_form_demo', $earg, 'fa fa-edit'),
@ -40,16 +37,14 @@ class SidebarSetupMenuDemoListener
->addChild($icons = new MenuItemModel('ui-elements-icons', 'Icons', 'avanzu_admin_ui_icon_demo', $earg));
return $this->activateByRoute($request->get('_route'), $rootItems);
}
protected function activateByRoute($route, $items) {
protected function activateByRoute($route, $items)
{
foreach ($items as $item) { /** @var $item MenuItemModel */
if ($item->hasChildren()) {
$this->activateByRoute($route, $item->getChildren());
}
else {
} else {
if ($item->getRoute() == $route) {
$item->setIsActive(true);
}

@ -13,7 +13,6 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class FormDemoModelType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options)
{
$options = array(

Loading…
Cancel
Save