Minor - format code

pull/2635/head
Julio Montoya 7 years ago
parent a864c4310b
commit 910353b77c
  1. 2
      config/packages/dev/web_profiler.yaml
  2. 1
      main/admin/user_edit.php
  3. 4
      src/CoreBundle/EventListener/LegacyListener.php
  4. 8
      src/CoreBundle/Framework/PageController.php
  5. 2
      src/CourseBundle/EventListener/CourseListener.php
  6. 3
      src/UserBundle/Entity/User.php

@ -1,6 +1,6 @@
web_profiler: web_profiler:
toolbar: true toolbar: true
intercept_redirects: true intercept_redirects: false
framework: framework:
profiler: profiler:
only_exceptions: false only_exceptions: false

@ -329,7 +329,6 @@ $returnParams = $extraField->addElements(
); );
$jqueryReadyContent = $returnParams['jquery_ready_content']; $jqueryReadyContent = $returnParams['jquery_ready_content'];
// the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
$(document).ready(function(){ $(document).ready(function(){

@ -120,14 +120,14 @@ class LegacyListener
$session->set('is_platformAdmin', $isAdmin); $session->set('is_platformAdmin', $isAdmin);
$session->set('is_allowedCreateCourse', $allowedCreateCourse); $session->set('is_allowedCreateCourse', $allowedCreateCourse);
$_admin = [ $adminInfo = [
'email' => api_get_setting('emailAdministrator'), 'email' => api_get_setting('emailAdministrator'),
'surname' => api_get_setting('administratorSurname'), 'surname' => api_get_setting('administratorSurname'),
'name' => api_get_setting('administratorName'), 'name' => api_get_setting('administratorName'),
'telephone' => api_get_setting('administratorTelephone'), 'telephone' => api_get_setting('administratorTelephone'),
]; ];
$twig->addGlobal('_admin', $_admin); $twig->addGlobal('_admin', $adminInfo);
$theme = api_get_visual_theme(); $theme = api_get_visual_theme();
$twig->addGlobal('favico', \Template::getPortalIcon($theme)); $twig->addGlobal('favico', \Template::getPortalIcon($theme));

@ -1042,7 +1042,7 @@ class PageController
} }
} }
$load_directories_preview = api_get_setting('document.show_documents_preview') == 'true' ? true : false; $load_directories_preview = api_get_setting('document.show_documents_preview') === 'true' ? true : false;
$sessions_with_no_category = $html; $sessions_with_no_category = $html;
if (isset($session_categories) && !empty($session_categories)) { if (isset($session_categories) && !empty($session_categories)) {
@ -1125,16 +1125,14 @@ class PageController
$params['title'] = $session_link; $params['title'] = $session_link;
$moved_status = \SessionManager::getSessionChangeUserReason( $moved_status = \SessionManager::getSessionChangeUserReason(
isset($session['moved_status']) ? $session['moved_status'] : '' $session['moved_status'] ?? ''
); );
$moved_status = isset($moved_status) && !empty($moved_status) ? ' ('.$moved_status.')' : null; $moved_status = isset($moved_status) && !empty($moved_status) ? ' ('.$moved_status.')' : null;
$params['subtitle'] = isset($session['coach_info']) ? $session['coach_info']['complete_name'] : null.$moved_status; $params['subtitle'] = isset($session['coach_info']) ? $session['coach_info']['complete_name'] : null.$moved_status;
//$params['dates'] = $session['date_message']; //$params['dates'] = $session['date_message'];
$params['dates'] = \SessionManager::parseSessionDates( $params['dates'] = \SessionManager::parseSessionDates($session);
$session
);
$params['right_actions'] = ''; $params['right_actions'] = '';
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
$params['right_actions'] .= $params['right_actions'] .=

@ -5,8 +5,6 @@ namespace Chamilo\CourseBundle\EventListener;
use Chamilo\CoreBundle\Controller\LegacyController; use Chamilo\CoreBundle\Controller\LegacyController;
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Framework\Container; use Chamilo\CoreBundle\Framework\Container;
use Chamilo\CoreBundle\Security\Authorization\Voter\CourseVoter; use Chamilo\CoreBundle\Security\Authorization\Voter\CourseVoter;
use Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter; use Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter;

@ -1868,11 +1868,10 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement
return true; return true;
} }
/** /**
* @return string * @return string
*/ */
public function getPictureLegacy() public function getPictureLegacy() : string
{ {
$id = $this->id; $id = $this->id;

Loading…
Cancel
Save