pull/2487/head
jmontoyaa 7 years ago
parent 23aa16b23b
commit 9aa3e2b095
  1. 1
      .gitattributes
  2. 4
      config/packages/chamilo.yaml
  3. 2
      config/packages/dev/monolog.yaml
  4. 2
      config/packages/dev/security_checker.yaml
  5. 2
      config/packages/doctrine.yaml
  6. 4
      config/packages/fm_elfinder.yaml
  7. 2
      config/packages/fos_user.yaml
  8. 4
      config/packages/hwi_oauth.yaml
  9. 4
      config/packages/ivory_ck_editor.yaml
  10. 27
      config/packages/mopa_bootstrap.yaml
  11. 2
      config/packages/prod/monolog.yaml
  12. 2
      config/packages/security.yaml
  13. 2
      config/packages/sonata_seo.yaml
  14. 26
      src/CoreBundle/Resources/config/admin.yml
  15. 11
      src/CoreBundle/Resources/config/routing.yml
  16. 33
      src/CoreBundle/Resources/config/services.yml
  17. 17
      src/CourseBundle/Resources/config/admin.yml
  18. 25
      src/CourseBundle/Resources/config/services.yml
  19. 2
      src/FaqBundle/Resources/config/routing.yml
  20. 2
      src/ThemeBundle/Resources/config/security.yml
  21. 2
      src/UserBundle/Resources/config/admin.yml
  22. 2
      src/UserBundle/Resources/config/services.yml

1
.gitattributes vendored

@ -5,6 +5,7 @@
.scrutinizer.yml export-ignore
.styleci.yml export-ignore
.travis.yml export-ignore
.yamllint_config export-ignore
codesize.xml export-ignore
phpcs.xml export-ignore

@ -95,5 +95,5 @@ doctrine_cache:
type: file_system
imports:
- { resource: ../../src/CoreBundle/Resources/config/services.yml }
- { resource: ../../vendor/knplabs/doctrine-behaviors/config/orm-services.yml }
- {resource: ../../src/CoreBundle/Resources/config/services.yml}
- {resource: ../../vendor/knplabs/doctrine-behaviors/config/orm-services.yml}

@ -12,6 +12,6 @@ monolog:
# type: chromephp
# level: info
console:
type: console
type: console
process_psr_3_messages: false
channels: ["!event", "!doctrine", "!console"]

@ -5,4 +5,4 @@ services:
arguments:
- '@SensioLabs\Security\SecurityChecker'
tags:
- { name: console.command }
- {name: console.command}

@ -6,7 +6,7 @@ doctrine:
password: '%env(DATABASE_PASSWORD)%'
host: '%env(DATABASE_HOST)%'
driver: 'pdo_mysql'
charset: utf8mb4
charset: utf8mb4
types:
json: Sonata\Doctrine\Types\JsonType
orm:

@ -23,8 +23,8 @@ fm_elfinder:
flysystem:
type: local
options:
local:
path: '%kernel.root_dir%/../public/uploads/media/'
local:
path: '%kernel.root_dir%/../public/uploads/media/'
upload_allow: ['all']
#upload_allow: ['image/png', 'image/jpg', 'image/jpeg']
#upload_deny: ['all']

@ -12,4 +12,4 @@ fos_user:
from_email:
address: 'test@example.com'
sender_name: 'test@example.com'
sender_name: 'test@example.com'

@ -26,12 +26,10 @@ hwi_oauth:
infos_url: 'https://path.to/api/user'
scope: user_details
user_response_class: HWI\Bundle\OAuthBundle\OAuth\Response\PathUserResponse
paths: { identifier: id, nickname: username, realname: fullname }
paths: {identifier: id, nickname: username, realname: fullname}
fosub:
# try 30 times to check if a username is available (foo, foo1, foo2 etc)
username_iterations: 30
# mapping between resource owners (see below) and properties
properties:
github: githubId

@ -10,8 +10,8 @@ ivory_ck_editor:
default:
# default toolbar plus Format button
toolbar:
- [Bold, Italic, Underline, -, Cut, Copy, Paste, PasteText, PasteFromWord, -, Undo, Redo, -, NumberedList, BulletedList, -, Outdent, Indent, -, Blockquote, -, Image, Link, Unlink, Table]
- [Format, Maximize, Source]
- [Bold, Italic, Underline, -, Cut, Copy, Paste, PasteText, PasteFromWord, -, Undo, Redo, -, NumberedList, BulletedList, -, Outdent, Indent, -, Blockquote, -, Image, Link, Unlink, Table]
- [Format, Maximize, Source]
filebrowserBrowseRoute: admin_chamilo_media_media_ckeditor_browser
filebrowserImageBrowseRoute: admin_chamilo_media_media_ckeditor_browser

@ -5,17 +5,16 @@ mopa_bootstrap:
# horizontal_input_wrapper_class: 'dd'
menu: ~ # enables twig helpers for menu
form:
show_legend: true # default is true
show_child_legend: false # default is true
error_type: block # or inline which is default
render_optional_text: true
collection:
widget_remove_btn:
icon: trash
attr:
class: btn btn-danger
widget_add_btn:
icon: plus-sign
attr:
class: btn btn-primary
show_legend: true # default is true
show_child_legend: false # default is true
error_type: block # or inline which is default
render_optional_text: true
collection:
widget_remove_btn:
icon: trash
attr:
class: btn btn-danger
widget_add_btn:
icon: plus-sign
attr:
class: btn btn-primary

@ -12,6 +12,6 @@ monolog:
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
console:
type: console
type: console
process_psr_3_messages: false
channels: ["!event", "!doctrine"]

@ -52,7 +52,7 @@ security:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false
admin:
pattern:.*
pattern: .*
context: user
form_login:
provider: fos_userbundle

@ -1,7 +1,7 @@
sonata_seo:
encoding: UTF-8
page:
default: sonata.seo.page.default
default: sonata.seo.page.default
title: Chamilo
metas:
name:

@ -8,7 +8,7 @@ services:
- Chamilo\CoreBundle\Entity\Session
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.session_category:
class: Chamilo\CoreBundle\Admin\SessionCategoryAdmin
@ -19,7 +19,7 @@ services:
- Chamilo\CoreBundle\Entity\SessionCategory
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.career:
class: Chamilo\CoreBundle\Admin\CareerAdmin
@ -30,7 +30,7 @@ services:
- Chamilo\CoreBundle\Entity\Career
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.promotion:
class: Chamilo\CoreBundle\Admin\PromotionAdmin
@ -41,7 +41,7 @@ services:
- Chamilo\CoreBundle\Entity\Promotion
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.session_rel_course:
class: Chamilo\CoreBundle\Admin\SessionRelCourseAdmin
@ -52,7 +52,7 @@ services:
- Chamilo\CoreBundle\Entity\SessionRelCourse
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.session_rel_user:
class: Chamilo\CoreBundle\Admin\SessionRelUserAdmin
@ -63,7 +63,7 @@ services:
- Chamilo\CoreBundle\Entity\SessionRelUser
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.access_url:
class: Chamilo\CoreBundle\Admin\AccessUrlAdmin
@ -74,7 +74,7 @@ services:
- Chamilo\CoreBundle\Entity\AccessUrl
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.access_url_rel_course:
class: Chamilo\CoreBundle\Admin\AccessUrlRelCourseAdmin
@ -85,7 +85,7 @@ services:
- Chamilo\CoreBundle\Entity\AccessUrlRelCourse
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.settings_current:
class: Chamilo\CoreBundle\Admin\SettingsCurrentAdmin
@ -96,7 +96,7 @@ services:
- Chamilo\CoreBundle\Entity\SettingsCurrent
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.user_group:
class: Chamilo\CoreBundle\Admin\UserGroupAdmin
@ -107,7 +107,7 @@ services:
- Chamilo\CoreBundle\Entity\UserGroup
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.user_group_rel_user:
class: Chamilo\CoreBundle\Admin\UsergroupRelUser
@ -118,7 +118,7 @@ services:
- Chamilo\CoreBundle\Entity\UsergroupRelUser
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.tool:
class: Chamilo\CoreBundle\Admin\ToolAdmin
@ -129,7 +129,7 @@ services:
- Chamilo\CoreBundle\Entity\Tool
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.tool_resource_rights:
class: Chamilo\CoreBundle\Admin\ToolResourceRightsAdmin
@ -140,4 +140,4 @@ services:
- Chamilo\CoreBundle\Entity\ToolResourceRights
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]

@ -29,16 +29,15 @@ legacy_javascript:
# Legacy routes
main:
path: /main/{name}
defaults: {_controller: ChamiloCoreBundle:Legacy:classic}
defaults: {_controller: 'ChamiloCoreBundle:Legacy:classic'}
requirements:
name: .+
name: .+
legacy_plugin:
path: /plugin/{name}
defaults: {_controller: ChamiloCoreBundle:Legacy:plugin}
defaults: {_controller: 'ChamiloCoreBundle:Legacy:plugin'}
requirements:
name: .+
name: .+
# web url shortcuts for legacy templates
web.ajax:
path: main/inc/ajax/
@ -55,7 +54,7 @@ core_admin:
# Redirects /url/ to /url always located at the end
remove_trailing_slash:
path: /{url}
defaults: {_controller: ChamiloCoreBundle:Redirecting:removeTrailingSlash}
defaults: {_controller: 'ChamiloCoreBundle:Redirecting:removeTrailingSlash'}
requirements:
url: .*/$
_method: GET

@ -37,24 +37,24 @@ services:
# Course voter checks if a user has permissions to do actions in a course
chamilo_core.security.authorization.voter.course_voter:
class: Chamilo\CoreBundle\Security\Authorization\Voter\CourseVoter
arguments: [ '@doctrine.orm.entity_manager', '@chamilo_core.entity.manager.course_manager', '@service_container']
arguments: ['@doctrine.orm.entity_manager', '@chamilo_core.entity.manager.course_manager', '@service_container']
public: false
tags:
- {name: security.voter}
- {name: security.voter}
# Session voter checks if a user has permissions to do actions in a session
chamilo_core.security.authorization.voter.session_voter:
class: Chamilo\CoreBundle\Security\Authorization\Voter\SessionVoter
arguments: [ '@doctrine.orm.entity_manager', '@chamilo_core.entity.manager.course_manager', '@service_container']
arguments: ['@doctrine.orm.entity_manager', '@chamilo_core.entity.manager.course_manager', '@service_container']
public: false
tags:
- {name: security.voter}
- {name: security.voter}
# Resrouce voter checks if a user has permissions to do actions in a resource
chamilo_core.security.authorization.voter.resource_node_voter:
class: Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter
public: false
arguments: [ '@service_container' ]
arguments: ['@service_container']
tags:
- {name: security.voter}
@ -87,17 +87,14 @@ services:
# arguments: [%sylius.attribute.attribute_types%]
# tags:
# - {name: form.type, alias: chamilo_user_attribute_choice}
# html editor
chamilo_core.html_editor:
class: Chamilo\CoreBundle\Component\Editor\CkEditor\CkEditor
arguments: ['@translator.default', '@router']
# Listeners
# chamilo.doctrine.entity_listener_resolver:
# class: Chamilo\CoreBundle\Doctrine\EntityListenerResolver
# arguments: [ '@service_container' ]
# arguments: ['@service_container' ]
# Check if users are online
# chamilo_core.listener.online:
@ -109,7 +106,7 @@ services:
# When Course entity is loaded
chamilo_core.listener.course:
class: Chamilo\CoreBundle\Entity\Listener\CourseListener
arguments: [ '@chamilo_course.tool_chain' ]
arguments: ['@chamilo_course.tool_chain']
tags:
- {name: doctrine.orm.entity_listener}
@ -124,17 +121,17 @@ services:
class: Chamilo\CoreBundle\EventListener\LegacyListener
arguments: ['@service_container']
tags:
- {name: kernel.event_listener, event: kernel.request, method: onKernelRequest, priority: 10}
- {name: kernel.event_listener, event: kernel.response, method: onKernelResponse}
- {name: kernel.event_listener, event: kernel.controller, method: onKernelController}
- {name: kernel.event_listener, event: kernel.request, method: onKernelRequest, priority: 10}
- {name: kernel.event_listener, event: kernel.response, method: onKernelResponse}
- {name: kernel.event_listener, event: kernel.controller, method: onKernelController}
# Setting user and platform locale
chamilo_core.listener.plugin:
class: Chamilo\CoreBundle\EventListener\PluginListener
arguments: ['@service_container']
tags:
- {name: kernel.event_listener, event: kernel.request, method: onKernelRequest}
- {name: kernel.event_listener, event: kernel.controller, method: onKernelController, priority: 9}
- {name: kernel.event_listener, event: kernel.request, method: onKernelRequest}
- {name: kernel.event_listener, event: kernel.controller, method: onKernelController, priority: 9}
# Locale listener
chamilo_core.listener.locale:
@ -211,7 +208,7 @@ services:
chamilo_core.block.skill:
class: Chamilo\CoreBundle\Block\SkillBlockService
arguments: [chamilo_core.block.skill, '@templating' ]
arguments: [chamilo_core.block.skill, '@templating']
tags:
- {name: sonata.block}
@ -257,8 +254,8 @@ services:
chamilo_core.settings.course:
class: Chamilo\CoreBundle\Settings\CourseSettingsSchema
calls:
- [ setToolChain, ['@chamilo_course.tool_chain']]
- [ setCourseManager, ['@chamilo_core.entity.manager.course_manager']]
- [setToolChain, ['@chamilo_course.tool_chain']]
- [setCourseManager, ['@chamilo_core.entity.manager.course_manager']]
tags:
- {name: sylius.settings_schema, alias: chamilo_core.settings.course, namespace: course}

@ -10,47 +10,46 @@ services:
# calls:
# - [ setTranslationDomain, [ChamiloCoreBundle]]
# - [ setToolChain, [@chamilo_course.tool_chain]]
sonata.admin.course_rel_user:
class: Chamilo\CourseBundle\Admin\CourseRelUserAdmin
tags:
- { name: sonata.admin, manager_type: orm, group: "LMS", label: "CourseRelUser" }
- {name: sonata.admin, manager_type: orm, group: "LMS", label: "CourseRelUser"}
arguments:
- ~
- Chamilo\CoreBundle\Entity\CourseRelUser
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.course_category:
class: Chamilo\CourseBundle\Admin\CourseCategoryAdmin
tags:
- { name: sonata.admin, manager_type: orm, group: "LMS", label: "CourseCategoryAdmin" }
- {name: sonata.admin, manager_type: orm, group: "LMS", label: "CourseCategoryAdmin"}
arguments:
- ~
- Chamilo\CoreBundle\Entity\CourseCategory
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.course_request:
class: Chamilo\CourseBundle\Admin\CourseRequestAdmin
tags:
- { name: sonata.admin, manager_type: orm, group: "LMS", label: "CourseRequestAdmin" }
- {name: sonata.admin, manager_type: orm, group: "LMS", label: "CourseRequestAdmin"}
arguments:
- ~
- Chamilo\CoreBundle\Entity\CourseRequest
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]
sonata.admin.c_group_info:
class: Chamilo\CourseBundle\Admin\CGroupInfoAdmin
tags:
- { name: sonata.admin, manager_type: orm, audit: true, group: "LMS", label: "CGroupInfo" }
- {name: sonata.admin, manager_type: orm, audit: true, group: "LMS", label: "CGroupInfo"}
arguments:
- ~
- Chamilo\CourseBundle\Entity\CGroupInfo
- ~
calls:
- [ setTranslationDomain, [ChamiloCoreBundle]]
- [setTranslationDomain, [ChamiloCoreBundle]]

@ -18,9 +18,9 @@ services:
class: Chamilo\CourseBundle\EventListener\CourseListener
arguments: ['@service_container']
tags:
- {name: kernel.event_listener, event: kernel.request, method: onKernelRequest}
- {name: kernel.event_listener, event: kernel.response, method: onKernelResponse}
- {name: kernel.event_listener, event: kernel.controller, method: onKernelController, priority: 10}
- {name: kernel.event_listener, event: kernel.request, method: onKernelRequest}
- {name: kernel.event_listener, event: kernel.response, method: onKernelResponse}
- {name: kernel.event_listener, event: kernel.controller, method: onKernelController, priority: 10}
# Sets the user access in a course listener
chamilo_course.listener.course_access:
@ -36,14 +36,12 @@ services:
chamilo_course.listener.session_access:
class: Chamilo\CourseBundle\EventListener\SessionAccessListener
arguments:
- '@doctrine.orm.entity_manager'
- '@doctrine.orm.entity_manager'
calls:
- [setRequest, ['@request_stack']]
- [setRequest, ['@request_stack']]
tags:
- {name: kernel.event_listener, event: chamilo_course.course.session, method: onSessionAccessEvent}
# Voters
# Group voter, checks if a user has permissions to do actions
chamilo_course.security.authorization.voter.group_voter:
class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter
@ -52,16 +50,16 @@ services:
'@chamilo_core.entity.manager.course_manager',
'@chamilo_course.manager.group',
'@service_container'
]
]
public: false
tags:
- {name: security.voter}
- {name: security.voter}
# Course settings
chamilo_course.controller.settings:
class: "%chamilo_course.controller.settings.class%"
calls:
- [setContainer, ['@service_container']]
- [setContainer, ['@service_container']]
chamilo_course.settings.form_factory:
class: Sylius\Bundle\SettingsBundle\Form\Factory\SettingsFormFactory
@ -72,7 +70,7 @@ services:
chamilo_course.repository.parameter:
class: Chamilo\CourseBundle\Entity\Repository\CCourseSettingRepository
factory: ["@doctrine", getRepository]
arguments: [ Chamilo\CourseBundle\Entity\CCourseSetting ]
arguments: [Chamilo\CourseBundle\Entity\CCourseSetting]
# chamilo_settings.repository.parameter:
# class: Chamilo\CoreBundle\Entity\Repository\SettingsCurrentRepository
@ -82,8 +80,8 @@ services:
chamilo_course.registry.settings_schema:
class: Sylius\Component\Registry\ServiceRegistry
arguments:
- Sylius\Bundle\SettingsBundle\Schema\SchemaInterface
- 'Course settings'
- Sylius\Bundle\SettingsBundle\Schema\SchemaInterface
- 'Course settings'
chamilo_course.settings.manager:
class: '%chamilo_course.settings.manager.class%'
@ -480,7 +478,6 @@ services:
tags:
- {name: chamilo_course.tool}
# Course settings
chamilo_course.settings.user:
class: Chamilo\CourseBundle\Settings\UserCourseSettingsSchema

@ -9,4 +9,4 @@ faq:
# Shows the entire FAQ at once, without collapsing any categories or questions. Useful if your FAQ is not that big.
faq_without_collapse:
path: /faq-without-collapse/{categorySlug}
defaults: {_controller: 'ChamiloFaqBundle:Faq:indexWithoutCollapse', categorySlug: null}
defaults: {_controller: 'ChamiloFaqBundle:Faq:indexWithoutCollapse', categorySlug: null}

@ -1,5 +1,5 @@
login:
path: /login
defaults: {_controller: ChamiloThemeBundle:Security:login}
defaults: {_controller: 'ChamiloThemeBundle:Security:login'}
login_check:
path: /login_check

@ -7,7 +7,7 @@ services:
sonata.user.admin.user:
class: Chamilo\UserBundle\Admin\UserAdmin
tags:
- {name: sonata.admin, manager_type: orm, audit:true, group: 'LMS', label: users, label_catalogue: '%sonata.user.admin.label_catalogue%', label_translator_strategy: sonata.admin.label.strategy.underscore, icon: '%sonata.user.admin.groupicon%'}
- {name: sonata.admin, manager_type: orm, audit: true, group: 'LMS', label: users, label_catalogue: '%sonata.user.admin.label_catalogue%', label_translator_strategy: sonata.admin.label.strategy.underscore, icon: '%sonata.user.admin.groupicon%'}
arguments: ['', Chamilo\UserBundle\Entity\User, '%sonata.user.admin.user.controller%']
calls:
- [setUserManager, ['@fos_user.user_manager']]

@ -3,4 +3,4 @@ services:
class: Chamilo\UserBundle\Security\FOSUBUserProvider
arguments:
- '@sonata.user.orm.user_manager'
- { facebook: facebookId, google: googleId, github: githubId }
- {facebook: facebookId, google: googleId, github: githubId}

Loading…
Cancel
Save