Fixed bug #14989: Use TYPO3_REQUESTTYPE consistently for CLI calls detection

[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_beuserauth.php

diff --git a/t3lib/class.t3lib_beuserauth.php b/t3lib/class.t3lib_beuserauth.php
index d8d6fd2..874f8c0 100644 (file)
--- a/t3lib/class.t3lib_beuserauth.php
+++ b/t3lib/class.t3lib_beuserauth.php
@@ -231,7 +231,7 @@ class t3lib_beUserAuth extends t3lib_userAuthGroup {
         */
        function checkCLIuser() {
                        // First, check if cliMode is enabled:
-               if (defined('TYPO3_cliMode') && TYPO3_cliMode)  {
+               if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) {
                        if (!$this->user['uid'])        {
                                if (substr($GLOBALS['MCONF']['name'],0,5)=='_CLI_')     {
                                        $userName = strtolower($GLOBALS['MCONF']['name']);
@@ -387,7 +387,7 @@ class t3lib_beUserAuth extends t3lib_userAuthGroup {
                if (!$adminOnlyMode || $this->isAdmin()) {
                        $isUserAllowedToLogin = TRUE;
                        // Backend user is allowed if adminOnly is set to 2 (CLI) and a CLI process is running:
-               } elseif ($adminOnlyMode == 2 && defined('TYPO3_cliMode') && TYPO3_cliMode) {
+               } elseif ($adminOnlyMode == 2 && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
                        $isUserAllowedToLogin = TRUE;
                }