From 00fdaaafde99051c950a04f50d93cc5d2d044fe4 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 10 Sep 2018 16:13:17 +0200 Subject: [PATCH] Minor - flint fixes --- index.php | 1 - main/inc/lib/system_announcements.lib.php | 3 +-- src/CoreBundle/Controller/IndexController.php | 3 +-- src/CoreBundle/Controller/NewsController.php | 2 +- src/CoreBundle/Controller/UserController.php | 4 ---- src/CoreBundle/Controller/UserPortalController.php | 1 - src/CoreBundle/Framework/PageController.php | 1 - src/CourseBundle/EventListener/CourseListener.php | 1 - whoisonline.php | 2 -- 9 files changed, 3 insertions(+), 15 deletions(-) diff --git a/index.php b/index.php index 4f40df6317..8c06fdeed2 100755 --- a/index.php +++ b/index.php @@ -147,7 +147,6 @@ if (!isset($_REQUEST['include'])) { } $announcements_block = $controller->return_announcements(); - } if (api_get_configuration_value('show_hot_sessions') === true) { $hotSessions = SessionManager::getHotSessions(); diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php index a4080002bb..11848b7171 100755 --- a/main/inc/lib/system_announcements.lib.php +++ b/main/inc/lib/system_announcements.lib.php @@ -822,7 +822,7 @@ class SystemAnnouncementManager * * @return array */ - public static function getAnnouncements($visible, $id = null) : array + public static function getAnnouncements($visible, $id = null): array { $user_selected_language = Database::escape_string(api_get_interface_language()); $table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS); @@ -918,7 +918,6 @@ class SystemAnnouncementManager return $announcement; } - /** * @return string */ diff --git a/src/CoreBundle/Controller/IndexController.php b/src/CoreBundle/Controller/IndexController.php index 53b213b3fb..653e733c2a 100644 --- a/src/CoreBundle/Controller/IndexController.php +++ b/src/CoreBundle/Controller/IndexController.php @@ -3,7 +3,6 @@ namespace Chamilo\CoreBundle\Controller; -use Chamilo\CoreBundle\Framework\PageController; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -29,7 +28,7 @@ class IndexController extends BaseController return $this->render( '@ChamiloCore/Index/index.html.twig', [ - 'content' => '' + 'content' => '', ] ); } diff --git a/src/CoreBundle/Controller/NewsController.php b/src/CoreBundle/Controller/NewsController.php index fd58eb4006..d5d8413e44 100644 --- a/src/CoreBundle/Controller/NewsController.php +++ b/src/CoreBundle/Controller/NewsController.php @@ -9,6 +9,7 @@ use Symfony\Component\Routing\Annotation\Route; /** * Class IndexController * author Julio Montoya . + * * @Route("/news") * * @package Chamilo\CoreBundle\Controller @@ -40,7 +41,6 @@ class NewsController extends BaseController } /** - * * @Route("/{id}", name="news", methods={"GET", "POST"}, options={"expose"=true}) * * @param int $id diff --git a/src/CoreBundle/Controller/UserController.php b/src/CoreBundle/Controller/UserController.php index db1a7d8332..3105ee727a 100644 --- a/src/CoreBundle/Controller/UserController.php +++ b/src/CoreBundle/Controller/UserController.php @@ -3,11 +3,7 @@ namespace Chamilo\CoreBundle\Controller; -use Chamilo\CoreBundle\Controller\BaseController; -use Chamilo\CoreBundle\Entity\CourseRelUser; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; diff --git a/src/CoreBundle/Controller/UserPortalController.php b/src/CoreBundle/Controller/UserPortalController.php index a4b2cddb34..4bfb16d012 100644 --- a/src/CoreBundle/Controller/UserPortalController.php +++ b/src/CoreBundle/Controller/UserPortalController.php @@ -17,7 +17,6 @@ use Symfony\Component\HttpFoundation\Response; * @Route("/userportal") * * @package Chamilo\CoreBundle\Controller - * */ class UserPortalController extends BaseController { diff --git a/src/CoreBundle/Framework/PageController.php b/src/CoreBundle/Framework/PageController.php index ba4db1b9dd..f905b65fab 100644 --- a/src/CoreBundle/Framework/PageController.php +++ b/src/CoreBundle/Framework/PageController.php @@ -9,7 +9,6 @@ use Display; use Pagerfanta\Adapter\FixedAdapter; use Pagerfanta\Pagerfanta; use Pagerfanta\View\TwitterBootstrapView; -use SystemAnnouncementManager; use UserManager; /** diff --git a/src/CourseBundle/EventListener/CourseListener.php b/src/CourseBundle/EventListener/CourseListener.php index bcb5f35c72..84971733b5 100644 --- a/src/CourseBundle/EventListener/CourseListener.php +++ b/src/CourseBundle/EventListener/CourseListener.php @@ -88,7 +88,6 @@ class CourseListener $course = null; if (!empty($courseCode)) { /** @var Course $course */ - $course = $em->getRepository('ChamiloCoreBundle:Course')->findOneBy(['directory' => $courseCode]); if ($course === null) { throw new NotFoundHttpException($translator->trans('Course does not exist')); diff --git a/whoisonline.php b/whoisonline.php index ee16a07eac..69fb53ebda 100755 --- a/whoisonline.php +++ b/whoisonline.php @@ -55,8 +55,6 @@ if (isset($_GET['id'])) { if (api_get_setting('allow_social_tool') == 'true' && api_user_is_login()) { header("Location: ".api_get_path(WEB_CODE_PATH)."social/profile.php?u=".intval($_GET['id'])); exit; - } else { - $social_right_content .= SocialManager::display_individual_user($_GET['id']); } }