Favicon fix

backend/controllers/settings/ListController.php

@@ -155,11 +155,11 @@ class ListController extends Controller
         if ($form->load(Yii::$app->request->post())) {
             $form->image = UploadedFile::getInstance($form, 'image');
             if ($form->image && $form->validate()) {
-                if (!file_exists(Yii::getAlias('@staticRoot') . '/images/origin/favicon')) {
-                    mkdir(Yii::getAlias('@staticRoot') . '/images/origin/favicon', 0777, true);
+                if (!file_exists(Yii::getAlias('@staticRoot') . '/origin/favicon')) {
+                    mkdir(Yii::getAlias('@staticRoot') . '/origin/favicon', 0777, true);
                 }
 
-                $form->image->saveAs(Yii::getAlias('@staticRoot') . '/images/origin/favicon/favicon.png');
+                $form->image->saveAs(Yii::getAlias('@staticRoot') . '/origin/favicon/favicon.png');
                 $this->_service->newFavicon();
                 Yii::$app->session->setFlash('success', Yii::t('main', 'Favicon generation complete'));
                 return $this->redirect(['settings/list/index']);

backend/views/auth/login.php

@@ -22,8 +22,8 @@ $fieldOptions2 = [
 
 <div class="login-box">
     <div class="login-logo">
-        <?php if (file_exists(Yii::getAlias('@static/images/cache/favicon/favicon-96x96.png'))) : ?>
-            <img style="filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.2));" src="<?= Yii::getAlias('@static/images/cache/favicon/favicon-96x96.png') ?>" alt="Zertex CMS">
+        <?php if (file_exists(Yii::getAlias('@staticRoot/cache/favicon/favicon-96x96.png'))) : ?>
+            <img style="filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.2));" src="<?= Yii::getAlias('@static/cache/favicon/favicon-96x96.png') ?>" alt="Zertex CMS">
             <br>
         <?php endif; ?>
         <a style="filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.2));" href="#"><b>Zertex</b>CMS</a>

core/components/favicon/FaviconGenerator.php

@@ -17,8 +17,8 @@ class FaviconGenerator
 
     public function __construct()
     {
-        $this->originPath = Yii::getAlias('@staticRoot') . '/images/origin/favicon';
-        $this->cachePath = Yii::getAlias('@staticRoot') . '/images/cache/favicon';
+        $this->originPath = Yii::getAlias('@staticRoot') . '/origin/favicon';
+        $this->cachePath = Yii::getAlias('@staticRoot') . '/cache/favicon';
     }
 
     public function generateIcons()
@@ -90,7 +90,7 @@ class FaviconGenerator
 
     protected function generateManifestJson()
     {
-        $cacheUrl = Yii::getAlias('@static') . '/images/cache';
+        $cacheUrl = Yii::getAlias('@static') . '/cache';
 
         // frontend
         file_put_contents(
@@ -113,7 +113,7 @@ class FaviconGenerator
 
     protected function generateBrowserConfigXml()
     {
-        $cacheUrl = Yii::getAlias('@static') . '/images/cache';
+        $cacheUrl = Yii::getAlias('@static') . '/cache';
 
         // frontend
         file_put_contents(

core/widgets/FaviconWidget.php

@@ -20,8 +20,8 @@ class FaviconWidget extends Widget
         /** @var \yii\web\View $View */
         $View = \Yii::$app->get('view');
 
-        $this->iconsPath = Yii::getAlias('@staticRoot') . '/images/cache/favicon';
-        $this->iconsUrl = Yii::getAlias('@static') . '/images/cache/favicon';
+        $this->iconsPath = Yii::getAlias('@staticRoot') . '/cache/favicon';
+        $this->iconsUrl = Yii::getAlias('@static') . '/cache/favicon';
 
         foreach ([16, 32, 96, 194] as $s) {
             $filename = sprintf('favicon-%sx%s.png', $s, $s);