From 40c58d97452c65cf446b8d7a058c2e9bfe48eff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20S=C3=A1nchez?= Date: Wed, 22 Mar 2023 13:24:35 +0100 Subject: [PATCH 1/6] Plugin: ExtraMenuFromWebservice: Menu is open by default. Fix z-index - refs BT#20442 --- .../resources/js/extramenufromwebservice.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin/extramenufromwebservice/resources/js/extramenufromwebservice.js b/plugin/extramenufromwebservice/resources/js/extramenufromwebservice.js index 691f4bc9ae..6ee64333a5 100644 --- a/plugin/extramenufromwebservice/resources/js/extramenufromwebservice.js +++ b/plugin/extramenufromwebservice/resources/js/extramenufromwebservice.js @@ -1,5 +1,7 @@ $(document).ready(function () { $('#menu-toggle').click(function() { $("#nav-from-webservice").toggle("slow"); + $("#nav-from-webservice").css("z-index", 15); }); + $('#menu-toggle').click(); }); From b711d610ab060fed1c440174de3c635fac3d908b Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 22 Mar 2023 08:54:35 -0500 Subject: [PATCH 2/6] Minor: Format code --- plugin/oauth2/redirect_info.php | 2 +- plugin/oauth2/src/OAuth2.php | 66 +++++++++---------- .../Component/Editor/Driver/CourseDriver.php | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/plugin/oauth2/redirect_info.php b/plugin/oauth2/redirect_info.php index 4518c6fa57..33e8efdb09 100644 --- a/plugin/oauth2/redirect_info.php +++ b/plugin/oauth2/redirect_info.php @@ -34,4 +34,4 @@ $content = '
$template = new Template(); $template->assign('content', $content); -$template->display_one_col_template(); \ No newline at end of file +$template->display_one_col_template(); diff --git a/plugin/oauth2/src/OAuth2.php b/plugin/oauth2/src/OAuth2.php index cbbf891b81..20e300f984 100644 --- a/plugin/oauth2/src/OAuth2.php +++ b/plugin/oauth2/src/OAuth2.php @@ -337,6 +337,39 @@ class OAuth2 extends Plugin ); } + public static function isFirstLoginAfterAuthSource(int $userId): bool + { + $em = Database::getManager(); + + $lastLogin = $em + ->getRepository(TrackELogin::class) + ->findOneBy( + ['loginUserId' => $userId], + ['loginDate' => 'DESC'] + ) + ; + + if (!$lastLogin) { + return false; + } + + $objExtraField = new ExtraField('user'); + $field = $objExtraField->getHandlerEntityByFieldVariable(self::EXTRA_FIELD_OAUTH2_ID); + + $fieldValue = $em + ->getRepository(ExtraFieldValues::class) + ->findOneBy( + ['itemId' => $userId, 'field' => $field] + ) + ; + + if (!$fieldValue) { + return false; + } + + return $fieldValue->getCreatedAt() >= $lastLogin->getLoginDate(); + } + /** * Extends ArrayAccessorTrait::getValueByKey to return a list of values * $key can contain wild card character * @@ -472,37 +505,4 @@ class OAuth2 extends Plugin error_log("OAuth2 plugin: $key: $content"); } } - - public static function isFirstLoginAfterAuthSource(int $userId): bool - { - $em = Database::getManager(); - - $lastLogin = $em - ->getRepository(TrackELogin::class) - ->findOneBy( - ['loginUserId' => $userId], - ['loginDate' => 'DESC'] - ) - ; - - if (!$lastLogin) { - return false; - } - - $objExtraField = new ExtraField('user'); - $field = $objExtraField->getHandlerEntityByFieldVariable(self::EXTRA_FIELD_OAUTH2_ID); - - $fieldValue = $em - ->getRepository(ExtraFieldValues::class) - ->findOneBy( - ['itemId' => $userId, 'field' => $field] - ) - ; - - if (!$fieldValue) { - return false; - } - - return $fieldValue->getCreatedAt() >= $lastLogin->getLoginDate(); - } } diff --git a/src/Chamilo/CoreBundle/Component/Editor/Driver/CourseDriver.php b/src/Chamilo/CoreBundle/Component/Editor/Driver/CourseDriver.php index f8026b8ddc..b71763d339 100644 --- a/src/Chamilo/CoreBundle/Component/Editor/Driver/CourseDriver.php +++ b/src/Chamilo/CoreBundle/Component/Editor/Driver/CourseDriver.php @@ -397,7 +397,7 @@ class CourseDriver extends Driver implements DriverInterface return false; } - $name= api_replace_dangerous_char($name); + $name = api_replace_dangerous_char($name); $result = parent::mkdir($path, $name); if ($result && isset($result['hash'])) { From 60d11d25e8d18901fab8112f0f834594d1f3a411 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 22 Mar 2023 08:56:18 -0500 Subject: [PATCH 3/6] Composer: Generate ORM proxies post composer install --- composer.json | 6 ++-- .../CoreBundle/Composer/ScriptHandler.php | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4c5b64fde3..bada8a1ba7 100755 --- a/composer.json +++ b/composer.json @@ -142,10 +142,12 @@ "Chamilo\\CoreBundle\\Composer\\ScriptHandler::deleteOldFilesFrom19x" ], "post-install-cmd": [ - "Chamilo\\CoreBundle\\Composer\\ScriptHandler::dumpCssFiles" + "Chamilo\\CoreBundle\\Composer\\ScriptHandler::dumpCssFiles", + "Chamilo\\CoreBundle\\Composer\\ScriptHandler::generateDoctineProxies" ], "post-update-cmd": [ - "Chamilo\\CoreBundle\\Composer\\ScriptHandler::dumpCssFiles" + "Chamilo\\CoreBundle\\Composer\\ScriptHandler::dumpCssFiles", + "Chamilo\\CoreBundle\\Composer\\ScriptHandler::generateDoctineProxies" ], "update-css": "Chamilo\\CoreBundle\\Composer\\ScriptHandler::updateCss" }, diff --git a/src/Chamilo/CoreBundle/Composer/ScriptHandler.php b/src/Chamilo/CoreBundle/Composer/ScriptHandler.php index ff14354968..c3d6ca88b8 100644 --- a/src/Chamilo/CoreBundle/Composer/ScriptHandler.php +++ b/src/Chamilo/CoreBundle/Composer/ScriptHandler.php @@ -3,6 +3,10 @@ namespace Chamilo\CoreBundle\Composer; +use Doctrine\DBAL\Migrations\Tools\Console\Command\GenerateCommand; +use Doctrine\ORM\Tools\Console\ConsoleRunner; +use Symfony\Component\Console\Input\ArrayInput; +use Symfony\Component\Console\Output\BufferedOutput; use Symfony\Component\Filesystem\Filesystem; /** @@ -261,6 +265,32 @@ class ScriptHandler } } + /** + * @throws \Exception + */ + public static function generateDoctineProxies() + { + $helperSet = require __DIR__.'/../../../../cli-config.php'; + + $application = ConsoleRunner::createApplication( + $helperSet, + [ + new GenerateCommand(), + ] + ); + + $application->setAutoExit(false); + + $input = new ArrayInput([ + 'command' => 'orm:generate:proxies', + ]); + $output = new BufferedOutput(); + + $application->run($input, $output); + + echo $output->fetch(); + } + /** * Copied from chamilo rmdirr function. * From 73044c52359583b478f2cacb2ee2c9f672a3d50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20S=C3=A1nchez?= Date: Wed, 22 Mar 2023 15:14:11 +0100 Subject: [PATCH 4/6] Plugin: ExtraMenuFromWebservice: Fix z-index - refs BT#20442 --- .../resources/css/extramenufromwebservice.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css b/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css index 473906ef4c..b15d95bb44 100644 --- a/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css +++ b/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css @@ -97,3 +97,6 @@ top: 0; transform: rotate(90deg); } +#date_all_text { + z-index: 0; !important; +} \ No newline at end of file From 839f14ace54941de949ae2d7ba3b1506f5c53996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20S=C3=A1nchez?= Date: Wed, 22 Mar 2023 15:21:28 +0100 Subject: [PATCH 5/6] Plugin: ExtraMenuFromWebservice: Fix z-index - refs BT#20442 --- .../resources/css/extramenufromwebservice.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css b/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css index b15d95bb44..bf6118dd4b 100644 --- a/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css +++ b/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css @@ -97,6 +97,6 @@ top: 0; transform: rotate(90deg); } -#date_all_text { +#date_alt_text { z-index: 0; !important; } \ No newline at end of file From cf295a1bc52f5603f18bf45cba15c9b27b80b905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borja=20S=C3=A1nchez?= Date: Wed, 22 Mar 2023 15:28:28 +0100 Subject: [PATCH 6/6] Plugin: ExtraMenuFromWebservice: Fix z-index - refs BT#20442 --- .../resources/css/extramenufromwebservice.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css b/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css index bf6118dd4b..d3a0f1fa54 100644 --- a/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css +++ b/plugin/extramenufromwebservice/resources/css/extramenufromwebservice.css @@ -99,4 +99,7 @@ } #date_alt_text { z-index: 0; !important; +} +.input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { + z-index: 0; !important; } \ No newline at end of file