diff --git a/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php b/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php index b8555a3b245b3c777cceaf3d3985bcdfa1d75c95..791cc23b7b96455167f040f7f5f8474c639ff62d 100644 --- a/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php +++ b/module/VuFind/src/VuFind/Role/PermissionProvider/IpRange.php @@ -31,7 +31,8 @@ namespace VuFind\Role\PermissionProvider; use VuFind\Net\IpAddressUtils; -use Zend\Http\PhpEnvironment\Request; +use Zend\Console\Console; +use Zend\Stdlib\RequestInterface; /** * IpRange permission provider for VuFind. @@ -63,10 +64,10 @@ class IpRange implements PermissionProviderInterface /** * Constructor * - * @param Request $request Request object - * @param IpAddressUtils $ipUtils IpAddressUtils object + * @param RequestInterface $request Request object + * @param IpAddressUtils $ipUtils IpAddressUtils object */ - public function __construct(Request $request, IpAddressUtils $ipUtils) + public function __construct(RequestInterface $request, IpAddressUtils $ipUtils) { $this->request = $request; $this->ipAddressUtils = $ipUtils; @@ -82,6 +83,9 @@ class IpRange implements PermissionProviderInterface */ public function getPermissions($options) { + if (Console::isConsole()) { + return []; + } // Check if any regex matches.... $ip = $this->request->getServer()->get('REMOTE_ADDR'); if ($this->ipAddressUtils->isInRange($ip, (array)$options)) { diff --git a/module/VuFindTheme/src/VuFindTheme/Initializer.php b/module/VuFindTheme/src/VuFindTheme/Initializer.php index 5ee1a14dd23bd21a34e32be3cd8cb2ff40286793..6ab4d9ad6a4b3ad9e99e38b2de0bce93c1e0f04b 100644 --- a/module/VuFindTheme/src/VuFindTheme/Initializer.php +++ b/module/VuFindTheme/src/VuFindTheme/Initializer.php @@ -217,6 +217,9 @@ class Initializer { // Load standard configuration options: $standardTheme = $this->config->theme; + if (Console::isConsole()) { + return $standardTheme; + } $mobileTheme = $this->mobile->enabled() ? $this->config->mobile_theme : false;