Minor - flint fixes

pull/2487/merge
Julio Montoya 7 years ago
parent 7611bf5ac9
commit d2ef72bff0
  1. 1
      main/admin/user_edit.php
  2. 2
      main/auth/courses_controller.php
  3. 1
      main/auth/profile.php
  4. 4
      main/course_info/infocours.php
  5. 1
      main/inc/ajax/message.ajax.php
  6. 1
      main/inc/ajax/session.ajax.php
  7. 2
      main/inc/lib/sessionmanager.lib.php
  8. 4
      main/inc/lib/usermanager.lib.php
  9. 1
      main/install/index.php
  10. 2
      main/install/install.lib.php
  11. 4
      main/lp/lp_subscribe_users.php
  12. 2
      main/session/about.php
  13. 4
      main/session/resume_session.php
  14. 2
      src/CoreBundle/Entity/Listener/CourseListener.php
  15. 2
      src/CoreBundle/Entity/Listener/SessionListener.php
  16. 1
      src/UserBundle/Repository/UserRepository.php

@ -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(){

@ -1,10 +1,10 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\SequenceResource; use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\SessionRelCourse; use Chamilo\CoreBundle\Entity\SessionRelCourse;
use Chamilo\CoreBundle\Entity\Tag; use Chamilo\CoreBundle\Entity\Tag;
use Chamilo\CoreBundle\Repository\SequenceRepository;
/** /**
* Class CoursesController. * Class CoursesController.

@ -362,7 +362,6 @@ if (is_profile_editable()) {
$form->freeze(); $form->freeze();
} }
$extraConditions = api_get_configuration_value('show_conditions_to_user'); $extraConditions = api_get_configuration_value('show_conditions_to_user');
if ($extraConditions && isset($extraConditions['conditions'])) { if ($extraConditions && isset($extraConditions['conditions'])) {
$extraConditions = $extraConditions['conditions']; $extraConditions = $extraConditions['conditions'];

@ -505,7 +505,6 @@ $form->addHtml('
'); ');
$form->addHtml('</div>'); $form->addHtml('</div>');
$group = []; $group = [];
$group[] = $form->createElement( $group[] = $form->createElement(
'radio', 'radio',
@ -573,7 +572,6 @@ $form->addPanelOption(
$globalGroup $globalGroup
); );
$group = []; $group = [];
$group[] = $form->createElement( $group[] = $form->createElement(
'radio', 'radio',
@ -784,7 +782,6 @@ if (api_get_configuration_value('allow_exercise_auto_launch')) {
$form->addHtml('</div>'); $form->addHtml('</div>');
} }
$group = []; $group = [];
$group[] = $form->createElement( $group[] = $form->createElement(
'radio', 'radio',
@ -857,7 +854,6 @@ if (api_get_setting('allow_public_certificates') === 'true') {
); );
} }
$group = [ $group = [
$form->createElement('radio', 'enable_forum_auto_launch', null, get_lang('RedirectToForumList'), 1), $form->createElement('radio', 'enable_forum_auto_launch', null, get_lang('RedirectToForumList'), 1),
$form->createElement('radio', 'enable_forum_auto_launch', null, get_lang('Disabled'), 2), $form->createElement('radio', 'enable_forum_auto_launch', null, get_lang('Disabled'), 2),

@ -1,7 +1,6 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;
$_dont_save_user_course_access = true; $_dont_save_user_course_access = true;

@ -1,7 +1,6 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;
/** /**

@ -3,12 +3,12 @@
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField; use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\SequenceResource; use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelCourse; use Chamilo\CoreBundle\Entity\SessionRelCourse;
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser; use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
use Chamilo\CoreBundle\Entity\SessionRelUser; use Chamilo\CoreBundle\Entity\SessionRelUser;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;
use ExtraField as ExtraFieldModel; use ExtraField as ExtraFieldModel;
use Monolog\Logger; use Monolog\Logger;

@ -2,12 +2,12 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField; use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
use Chamilo\CoreBundle\Repository\AccessUrlRepository;
use Chamilo\CoreBundle\Entity\SkillRelUser; use Chamilo\CoreBundle\Entity\SkillRelUser;
use Chamilo\CoreBundle\Entity\SkillRelUserComment; use Chamilo\CoreBundle\Entity\SkillRelUserComment;
use Chamilo\CoreBundle\Framework\Container; use Chamilo\CoreBundle\Framework\Container;
use Chamilo\UserBundle\Repository\UserRepository; use Chamilo\CoreBundle\Repository\AccessUrlRepository;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;
use Chamilo\UserBundle\Repository\UserRepository;
use ChamiloSession as Session; use ChamiloSession as Session;
use Symfony\Component\Security\Core\Encoder\EncoderFactory; use Symfony\Component\Security\Core\Encoder\EncoderFactory;

@ -42,7 +42,6 @@ define('FORM_FIELD_DISPLAY_LENGTH', 40);
define('DATABASE_FORM_FIELD_DISPLAY_LENGTH', 25); define('DATABASE_FORM_FIELD_DISPLAY_LENGTH', 25);
define('MAX_FORM_FIELD_LENGTH', 80); define('MAX_FORM_FIELD_LENGTH', 80);
require_once '../inc/lib/api.lib.php'; require_once '../inc/lib/api.lib.php';
require_once '../inc/lib/text.lib.php'; require_once '../inc/lib/text.lib.php';

@ -1153,7 +1153,7 @@ function display_requirements(
} }
if (count($deprecatedToRemove) > 0) { if (count($deprecatedToRemove) > 0) {
?> ?>
<p class="text-danger"><?php echo get_lang('WarningForDeprecatedDirectoriesForUpgrade'); ?></p> <p class="text-danger"><?php echo get_lang('WarningForDeprecatedDirectoriesForUpgrade'); ?></p>
<ul> <ul>
<?php foreach ($deprecatedToRemove as $deprecatedDirectory) { <?php foreach ($deprecatedToRemove as $deprecatedDirectory) {

@ -1,10 +1,10 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CoreBundle\Repository\ItemPropertyRepository;
use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser; use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CoreBundle\Repository\ItemPropertyRepository;
use Chamilo\CourseBundle\Entity\CItemProperty; use Chamilo\CourseBundle\Entity\CItemProperty;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;

@ -3,9 +3,9 @@
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField; use Chamilo\CoreBundle\Entity\ExtraField;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Entity\SequenceResource; use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CourseBundle\Entity\CCourseDescription; use Chamilo\CourseBundle\Entity\CCourseDescription;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;

@ -2,11 +2,11 @@
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Repository\SessionRepository;
use Chamilo\CoreBundle\Entity\SequenceResource; use Chamilo\CoreBundle\Entity\SequenceResource;
use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser; use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
use Chamilo\CoreBundle\Repository\SequenceRepository;
use Chamilo\CoreBundle\Repository\SessionRepository;
/** /**
* @author Bart Mollet, Julio Montoya lot of fixes * @author Bart Mollet, Julio Montoya lot of fixes

@ -6,8 +6,8 @@ namespace Chamilo\CoreBundle\Entity\Listener;
use Chamilo\CoreBundle\Entity\AccessUrl; use Chamilo\CoreBundle\Entity\AccessUrl;
use Chamilo\CoreBundle\Entity\AccessUrlRelCourse; use Chamilo\CoreBundle\Entity\AccessUrlRelCourse;
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CoreBundle\Entity\Tool; use Chamilo\CoreBundle\Entity\Tool;
use Chamilo\CoreBundle\Repository\CourseRepository;
use Chamilo\CourseBundle\ToolChain; use Chamilo\CourseBundle\ToolChain;
use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LifecycleEventArgs;

@ -5,8 +5,8 @@ namespace Chamilo\CoreBundle\Entity\Listener;
use Chamilo\CoreBundle\Entity\AccessUrl; use Chamilo\CoreBundle\Entity\AccessUrl;
use Chamilo\CoreBundle\Entity\AccessUrlRelSession; use Chamilo\CoreBundle\Entity\AccessUrlRelSession;
use Chamilo\CoreBundle\Repository\SessionRepository;
use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Repository\SessionRepository;
use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LifecycleEventArgs;
/** /**

@ -364,7 +364,6 @@ class UserRepository extends EntityRepository
; ;
} }
/** /**
* Find potential users to send a message. * Find potential users to send a message.
* *

Loading…
Cancel
Save