Minor - flint fixes

pull/2650/head
Julio Montoya 7 years ago
parent 04cbf04fdd
commit 447932aa3b
  1. 2
      main/admin/index.php
  2. 2
      main/course_info/infocours.php
  3. 2
      main/inc/lib/add_course.lib.inc.php
  4. 1
      main/inc/lib/api.lib.php
  5. 1
      main/inc/lib/template.lib.php
  6. 1
      main/inc/lib/userportal.lib.php
  7. 1
      main/install/install.lib.php
  8. 2
      src/CoreBundle/Controller/CourseController.php
  9. 3
      src/CoreBundle/Controller/FrontController.php
  10. 7
      src/CoreBundle/Controller/IndexController.php
  11. 6
      src/CoreBundle/Controller/ResourceController.php
  12. 2
      src/CoreBundle/Controller/User/ProfileController.php
  13. 4
      src/CoreBundle/Controller/User/UserController.php
  14. 2
      src/CoreBundle/Controller/UserPortalController.php
  15. 2
      src/CoreBundle/EventListener/LegacyLoginListener.php
  16. 3
      src/CoreBundle/EventListener/LoginSuccessHandler.php
  17. 3
      src/CoreBundle/Framework/Exporter.php
  18. 2
      src/CoreBundle/Security/Authorization/Voter/CourseVoter.php
  19. 2
      src/CoreBundle/Settings/ProfileSettingsSchema.php
  20. 2
      src/CoreBundle/Settings/SessionSettingsSchema.php
  21. 1
      src/CoreBundle/Twig/Extension/ChamiloExtension.php
  22. 2
      src/CourseBundle/Controller/Home/HomeController.php
  23. 1
      src/CourseBundle/Entity/CTool.php
  24. 8
      src/ThemeBundle/EventListener/TwigListener.php
  25. 4
      src/UserBundle/Admin/UserAdmin.php

@ -725,7 +725,7 @@ if (api_is_platform_admin()) {
get_lang('Save'),
'submit_extra_content'
);
//var_dump($extraContentForm->returnForm());
$tpl->assign('extraDataForm', $extraContentForm->returnForm());
}

@ -400,7 +400,6 @@ $group[] = $form->createElement(
);
$globalGroup[get_lang('NewHomeworkEmailAlert')] = $group;
$group = [];
$group[] = $form->createElement(
'radio',
@ -493,7 +492,6 @@ $form->addPanelOption(
$globalGroup
);
$group = [];
$group[] = $form->createElement(
'radio',

@ -1,10 +1,10 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Framework\Container;
use Chamilo\CourseBundle\Entity\CTool;
use Chamilo\CourseBundle\Entity\CToolIntro;
use Chamilo\CourseBundle\Tool\BaseTool;
use Chamilo\CoreBundle\Framework\Container;
/**
* Class AddCourse.

@ -2108,7 +2108,6 @@ function api_get_url_entity($id = 0)
return Database::getManager()->getRepository('ChamiloCoreBundle:AccessUrl')->find($id);
}
/**
* Returns the current course info array.

@ -680,6 +680,7 @@ class Template
/**
* Set theme, include mainstream CSS files.
*
* @deprecated
* @see setCssCustomFiles() for additional CSS sheets
*/

@ -1971,7 +1971,6 @@ class IndexManager
}
$htmlSessionCategory .= '</div>'; // end session cat block
$htmlCategory .= Display::panel($htmlSessionCategory, '');
}
$userCategoryHtml .= $htmlCategory;
}

@ -3059,7 +3059,6 @@ function installGroups($container, $manager)
/**
* @param SymfonyContainer $container
*
*/
function installPages($container)
{

@ -15,7 +15,9 @@ use Symfony\Component\HttpFoundation\Response;
/**
* Class CourseController.
*
* @Route("/course")
*
* @package Chamilo\CoreBundle\Controller
*/
class CourseController extends Controller

@ -14,8 +14,11 @@ use Symfony\Component\HttpFoundation\Request;
/**
* Class FrontController.
*
* @Route("/front")
*
* @deprecated not used for now
*
* @package Chamilo\CoreBundle\Controller
*/
class FrontController extends Controller

@ -4,17 +4,12 @@
namespace Chamilo\CoreBundle\Controller;
//use Chamilo\CoreBundle\Admin\CourseAdmin;
use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Entity\ExtraFieldValues;
use Chamilo\CoreBundle\Framework\PageController;
use Chamilo\PageBundle\Entity\Block;
use Chamilo\UserBundle\Entity\User;
use Symfony\Component\Routing\Annotation\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Sylius\Component\Attribute\AttributeType\TextAttributeType;
use Sylius\Component\Attribute\Model\AttributeValueInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
/**
* Class IndexController

@ -3,14 +3,15 @@
namespace Chamilo\CoreBundle\Controller;
use League\Flysystem\Filesystem;
use League\Flysystem\Adapter\Local;
use League\Flysystem\Filesystem;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
/**
* Class ResourceController
* Class ResourceController.
*
* @author Julio Montoya <gugli100@gmail.com>.
*
* @Route("/resource")
@ -52,7 +53,6 @@ class ResourceController extends BaseController
/** @var Filesystem $fs */
$fs = $this->container->get('oneup_flysystem.courses_filesystem');
$path = $course.'/document/'.$file;
// Has folder

@ -18,7 +18,6 @@ class ProfileController extends BaseController
* My files.
*
* @Route("/{username}/files", methods={"GET"})
*
*/
public function fileAction($username)
{
@ -52,7 +51,6 @@ class ProfileController extends BaseController
* Gets that rm.wav sound.
*
* @Route("/{username}/sounds/{file}", methods={"GET"})
*
*/
public function getSoundAction()
{

@ -16,13 +16,13 @@ use Symfony\Component\Routing\Annotation\Route;
*
* @package Chamilo\CoreBundle\Controller
* @Route("/user")
*
* @author Julio Montoya <gugli100@gmail.com>
*/
class UserController extends BaseController
{
/**
* @Route("/me", methods={"GET"})
*
*/
public function indexAction(Request $request)
{
@ -63,7 +63,6 @@ class UserController extends BaseController
/**
* @Route("/me/my_courses", methods={"GET"}, options={"expose"=true})
*
*/
public function myCoursesAction()
{
@ -87,7 +86,6 @@ class UserController extends BaseController
/**
* @Route("/online", methods={"GET"})
*
*/
public function onlineAction($app)
{

@ -13,7 +13,9 @@ use Symfony\Component\HttpFoundation\Response;
/**
* Class UserPortalController
* author Julio Montoya <gugli100@gmail.com>.
*
* @Route("/userportal")
*
* @package Chamilo\CoreBundle\Controller
*/
class UserPortalController extends BaseController

@ -10,9 +10,9 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
/**
* Class LegacyLoginListener.

@ -24,7 +24,8 @@ class LoginSuccessHandler implements AuthenticationSuccessHandlerInterface
* @param UrlGeneratorInterface $urlGenerator
* @param AuthorizationCheckerInterface $checker
*/
public function __construct(UrlGeneratorInterface $urlGenerator, AuthorizationCheckerInterface $checker) {
public function __construct(UrlGeneratorInterface $urlGenerator, AuthorizationCheckerInterface $checker)
{
$this->router = $urlGenerator;
$this->checker = $checker;
}

@ -11,7 +11,8 @@ use Exporter\Writer\XmlWriter;
use Symfony\Component\HttpFoundation\StreamedResponse;
/**
* Class Exporter
* Class Exporter.
*
* @package Chamilo\CoreBundle\Framework\Exporter
*/
class Exporter

@ -6,8 +6,8 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Manager\CourseManager;
use Chamilo\UserBundle\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;

@ -36,7 +36,7 @@ class ProfileSettingsSchema extends AbstractSettingsSchema
'enable_profile_user_address_geolocalization' => '',
'allow_show_skype_account' => '',
'allow_show_linkedin_url' => '',
'is_editable' => 'true'
'is_editable' => 'true',
]
)
->setTransformer(

@ -45,7 +45,7 @@ class SessionSettingsSchema extends AbstractSettingsSchema
'session_days_after_coach_access' => '',
'session_days_before_coach_access' => '',
'show_session_description' => 'false',
'remove_session_url' => 'false'
'remove_session_url' => 'false',
]
)
;

@ -27,7 +27,6 @@ class ChamiloExtension extends \Twig_Extension
new \Twig_SimpleFilter('format_date', 'Template::format_date'),
new \Twig_SimpleFilter('date_to_time_ago', 'Display::dateToStringAgoAndLongDate'),
new \Twig_SimpleFilter('api_get_configuration_value', 'api_get_configuration_value'),
];
}

@ -347,7 +347,6 @@ class HomeController extends ToolBaseController
/**
* @Route("/{itemId}/edit", methods={"GET"})
*
*/
public function editIconAction($itemId)
{
@ -389,7 +388,6 @@ class HomeController extends ToolBaseController
/**
* @Route("/{itemId}/delete", methods={"GET"})
*
*/
public function deleteIconAction($itemId)
{

@ -9,6 +9,7 @@ use Doctrine\ORM\Mapping as ORM;
/**
* CTool.
*
* @ORM\HasLifecycleCallbacks
* @ORM\Table(
* name="c_tool",

@ -7,21 +7,18 @@ use Chamilo\CoreBundle\Framework\Container;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\Routing\Route;
class TwigListener implements EventSubscriberInterface
{
use ContainerAwareTrait;
public function __construct(ContainerInterface $container)
{
$this->container = $container;
}
use ContainerAwareTrait;
/**
* @param GetResponseEvent $event
*/
@ -51,5 +48,4 @@ class TwigListener implements EventSubscriberInterface
KernelEvents::REQUEST => [['onKernelRequest', 15]],
];
}
}

@ -66,8 +66,8 @@ class UserAdmin extends BaseUserAdmin
)*/
->add('firstname', null, ['required' => false])
->add('lastname', null, ['required' => false])
->add('website', 'url', array('required' => false))
->add('biography', 'text', array('required' => false))
->add('website', 'url', ['required' => false])
->add('biography', 'text', ['required' => false])
/*->add(
'gender',
'sonata_user_gender',

Loading…
Cancel
Save