diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index 625bdd220f..c3ab5cfad8 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -9008,7 +9008,6 @@ function api_protect_course_group($tool, $showHeader = true) { $groupId = api_get_group_id(); if (!empty($groupId)) { - if (api_is_platform_admin()) { return true; } diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 212e82a851..ed9b68fd81 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -2476,7 +2476,6 @@ class Display return $pagination; } - /** * Adds a message in the queue. * diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 30d24beb3f..c7f33a49c2 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -6900,7 +6900,7 @@ SQL; $sessionRelUserTable = Database::get_main_table(TABLE_MAIN_SESSION_USER); $sessionId = (int) $sessionId; - $userId = (int) $userId; + $userId = (int) $userId; // COUNT(1) actually returns the number of rows from the table (as if // counting the results from the first column) diff --git a/plugin/buycourses/src/buy_course_plugin.class.php b/plugin/buycourses/src/buy_course_plugin.class.php index 892fa847c9..e0d7aa5234 100644 --- a/plugin/buycourses/src/buy_course_plugin.class.php +++ b/plugin/buycourses/src/buy_course_plugin.class.php @@ -2676,7 +2676,6 @@ class BuyCoursesPlugin extends Plugin /** * Filter the registered courses for show in plugin catalog. - * */ private function getCourses($first, $maxResults) { diff --git a/plugin/buycourses/src/buycourses.ajax.php b/plugin/buycourses/src/buycourses.ajax.php index c8c2677633..7045151b7d 100644 --- a/plugin/buycourses/src/buycourses.ajax.php +++ b/plugin/buycourses/src/buycourses.ajax.php @@ -512,7 +512,6 @@ switch ($action) { } $html .= "
  • {$plugin->get_lang('Total')}: {$serviceSale['price']} {$serviceSale['currency']}
  • "; - //$html .= "
  • {$plugin->get_lang('SalePrice')}: {$serviceSale['price_without_tax']} {$serviceSale['currency']}
  • "; $orderDate = api_format_date($serviceSale['buy_date'], DATE_FORMAT_LONG); $html .= "
  • {$plugin->get_lang('OrderDate')}: $orderDate
  • "; diff --git a/plugin/buycourses/src/configure_course.php b/plugin/buycourses/src/configure_course.php index e0c1540a09..ea40a84708 100644 --- a/plugin/buycourses/src/configure_course.php +++ b/plugin/buycourses/src/configure_course.php @@ -31,7 +31,7 @@ if ($commissionsEnable == 'true') { $includeSession = $plugin->get('include_sessions') === 'true'; $editingCourse = $type === BuyCoursesPlugin::PRODUCT_TYPE_COURSE; -$editingSession = $type === BuyCoursesPlugin::PRODUCT_TYPE_SESSION; +$editingSession = $type === BuyCoursesPlugin::PRODUCT_TYPE_SESSION; $entityManager = Database::getManager(); $userRepo = UserManager::getRepository(); diff --git a/plugin/buycourses/src/list.php b/plugin/buycourses/src/list.php index 28cda9ef17..e404b8a836 100644 --- a/plugin/buycourses/src/list.php +++ b/plugin/buycourses/src/list.php @@ -5,7 +5,6 @@ * * @package chamilo.plugin.buycourses */ - use Doctrine\ORM\Tools\Pagination\Paginator; $cidReset = true; diff --git a/plugin/buycourses/src/list_service.php b/plugin/buycourses/src/list_service.php index 003be7e6bc..488d87b563 100644 --- a/plugin/buycourses/src/list_service.php +++ b/plugin/buycourses/src/list_service.php @@ -5,9 +5,6 @@ * * @package chamilo.plugin.buycourses */ - -use Doctrine\ORM\Tools\Pagination\Paginator; - $cidReset = true; require_once __DIR__.'/../../../main/inc/global.inc.php'; diff --git a/plugin/buycourses/src/list_session.php b/plugin/buycourses/src/list_session.php index 4899b2fd48..6a280027ea 100644 --- a/plugin/buycourses/src/list_session.php +++ b/plugin/buycourses/src/list_session.php @@ -5,7 +5,6 @@ * * @package chamilo.plugin.buycourses */ - use Doctrine\ORM\Tools\Pagination\Paginator; $cidReset = true; diff --git a/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php b/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php index e7d17b7246..5721a6559f 100644 --- a/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php +++ b/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php @@ -84,52 +84,61 @@ class ChamiloApi $accessUrlId = api_get_current_access_url_id(); $themeDir = \Template::getThemeDir($theme); $customLogoPath = $themeDir."images/header-logo-custom$accessUrlId.png"; - + $svgIcons = api_get_setting('icons_mode_svg'); if ($svgIcons == 'true') { $customLogoPathSVG = substr($customLogoPath, 0, -3).'svg'; if (file_exists(api_get_path(SYS_PUBLIC_PATH)."css/$customLogoPathSVG")) { if ($getSysPath) { $logoPath = api_get_path(SYS_PUBLIC_PATH)."css/$customLogoPathSVG"; + return $logoPath; } $logoPath = api_get_path(WEB_CSS_PATH).$customLogoPathSVG; + return $logoPath; } } if (file_exists(api_get_path(SYS_PUBLIC_PATH)."css/$customLogoPath")) { if ($getSysPath) { $logoPath = api_get_path(SYS_PUBLIC_PATH)."css/$customLogoPath"; + return $logoPath; } - + $logoPath = api_get_path(WEB_CSS_PATH).$customLogoPath; + return $logoPath; } - + $originalLogoPath = $themeDir."images/header-logo.png"; if ($svgIcons == 'true') { $originalLogoPathSVG = $themeDir."images/header-logo.svg"; if (file_exists(api_get_path(SYS_CSS_PATH).$originalLogoPathSVG)) { if ($getSysPath) { $logoPath = api_get_path(SYS_CSS_PATH).$originalLogoPathSVG; + return $logoPath; } $logoPath = api_get_path(WEB_CSS_PATH).$originalLogoPathSVG; + return $logoPath; } } if (file_exists(api_get_path(SYS_CSS_PATH).$originalLogoPath)) { if ($getSysPath) { $logoPath = api_get_path(SYS_CSS_PATH).$originalLogoPath; + return $logoPath; } - + $logoPath = api_get_path(WEB_CSS_PATH).$originalLogoPath; + return $logoPath; } $logoPath = ''; } + return $logoPath; }