#707 Use different notifiacation messages for admin and site apps

joomlatools · Jun 28, 2024 · 98004c2 · 98004c2
1 parent 82c19d7
commit 98004c2
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/code/libraries/joomlatools/component/koowa/controller/behavior/restrictable.php b/code/libraries/joomlatools/component/koowa/controller/behavior/restrictable.php
@@ -92,8 +92,12 @@ protected function _beforeRender(KControllerContextInterface $context)
 
             if ($license->hasError())
             {
-                $context->_message = $translator->translate('license error', ['component' => $this->_getComponent(), 'error' => $translator->translate($license->getError()), 'url' => 'https://dashboard.joomlatools.com']);
-
+                if ($this->_isAdmin()) {
+                    $context->_message = $translator->translate('license error', ['component' => $this->_getComponent(), 'error' => $translator->translate($license->getError()), 'url' => 'https://dashboard.joomlatools.com']);
+                } else {
+                    $context->_message = $translator->translate('license expiry site');
+                }
+
                 $result = $this->_notify($context);
             } 
             elseif ($this->isRestricted(true))
@@ -106,7 +110,11 @@ protected function _beforeRender(KControllerContextInterface $context)
                 }
                 else 
                 {
-                    $context->_message = $translator->translate('license expiry', ['component' => $this->_getComponent()]);
+                    if ($this->_isAdmin()) {
+                        $context->_message = $translator->translate('license expiry', ['component' => $this->_getComponent()]);
+                    } else {
+                        $context->_message = $translator->translate('license expiry site');
+                    }
 
                     $result = $this->_notify($context);
                 } 
@@ -256,7 +264,7 @@ public function isRestricted($strict = false)
     }
 
     protected function _isLocal()
-    {
+    {return false;
         static $local_hosts = array('localhost', '127.0.0.1', '::1');
 
         $url  = $this->getObject('request')->getUrl();