From fcf321d6196410883be57978d46d8eebf86f1e6a Mon Sep 17 00:00:00 2001
From: Egorka <error-202@mail.ru>
Date: Wed, 12 Sep 2018 21:47:50 +0300
Subject: [PATCH] Favicon fix

---
 backend/controllers/settings/ListController.php |   6 +++---
 backend/views/auth/login.php                    |   4 ++--
 backend/web/favicon.ico                         | Bin 318 -> 1150 bytes
 core/components/favicon/FaviconGenerator.php    |   8 ++++----
 core/widgets/FaviconWidget.php                  |   4 ++--
 frontend/web/favicon.ico                        | Bin 318 -> 1150 bytes
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/controllers/settings/ListController.php b/backend/controllers/settings/ListController.php
index a0302c1..62792e4 100644
--- a/backend/controllers/settings/ListController.php
+++ b/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']);
diff --git a/backend/views/auth/login.php b/backend/views/auth/login.php
index 4385d06..5ef8f5b 100644
--- a/backend/views/auth/login.php
+++ b/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>
diff --git a/backend/web/favicon.ico b/backend/web/favicon.ico
index 580ed732e86556ec57f3f3395a210246d679c076..af1efb131cc5fe8a1d72294456b8655b31fc5ea4 100644
GIT binary patch
literal 1150
zcmaKsUu;ul7{;HKWhfUwkO-SWiIRmNK@u-a)C<R-#EZrYZX}QxC0-EO1sB{opez3t
zHrxoX0Et9}5OFG~nGAJd3xTa&yRNJ~r#)wFPgmNmW2J7I_=og+c)x8;2qB!4-}%n>
z_I;l7p7;AsfhswdE`?lIV|O+1B7n7mgd{Q-mjRI9ZY`c;b}ko^c<G+U)o%ovqtR%W
z#xRU_VHsLkkCR-cbDl+A=5x2t9HD8NnzCV<+i;l8Xj4R|D&s5F|NM7!*Z!njPx>ry
zK6KSOdj{h1I4#T4oI<l|#8J_92<H{6E-Ak7qvC7V)h}=KspXG*Ao<RQMaiv9Boa&}
zlMEQnMtD^b$3=TuxS&|`tzzBJitGMReCxKd8-jef;sLwn0PJe|93Ru^G*_K?SdYV^
z`$9M?e51JJd&Sp#%6zj=@m-(d`=iR<W^=X<#Bf8PH|1qEn`PV0Ki8l|l^32--1+<e
z{K5K*&cqb+`8?B^d%QW8=aKj{cRK3&Clhobij=?=#tK>!7AGescdYDGO<m@{+h=BG
z>K_#EFVETo>vFl=$K&JUqp4Jiwr#W5PV-Ri?@w_TC4rjF@y*N^^WjpdR9$($>B8u%
z{v-Hr@F2SVEwvk^PgiuG^;(4ta|j`11!8!P2J=0JizCM>`eMevJ8&HI9|8vtpcLp>
zzh2fVE&GGAS3W}ky#g^bj~}cXuH^@&d!N+dD%d^2U^_U}0{Xn-u^(T{vztU45^CVX
zK7kmVXF$d|TBoL_c4dMc44nppC&c5Jcr>FR&wg99Yjus1y9jsCh}-BFvVu?eD4WZ=
z3x&czR(Au#=fKb@FwiC*M^W~BQB!$8J&NC6scDz=Ws~%0yW==rnM{TmtDDiwRUEwl
zhR=e-C&i-`jgM>fz0~5?{fNb4vumUGp_2&G?paN<3yfX@?|zBtkxuM*Qai7AiN`JN
zp}&JM<1!Qdt7!iU#;>7dUO{{0B33?4TZu&?ku|Z%)!tOteIq@9i>W>|js1o#RyUrj
n<UDQk90WW|<d0yXut2C1<_|s9%pN)}6OZKSe9tRDpJ*Qe<T9(7

literal 318
zcmZQzU<5(|0RbS%!l1#(z#zuJz@P!d0zj+)#2|4HXaJKC0wf0lAEr2iX{M9K3=BR0
y!E90pK{x=K$Oz&POT#sS8N$ZKhC)h8ip0_|-T#43{vnSYgXBQCu@O54$pHYIza?e>

diff --git a/core/components/favicon/FaviconGenerator.php b/core/components/favicon/FaviconGenerator.php
index 89e8c80..bb911d0 100644
--- a/core/components/favicon/FaviconGenerator.php
+++ b/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(
diff --git a/core/widgets/FaviconWidget.php b/core/widgets/FaviconWidget.php
index b41a6ed..1736e05 100644
--- a/core/widgets/FaviconWidget.php
+++ b/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);
diff --git a/frontend/web/favicon.ico b/frontend/web/favicon.ico
index 580ed732e86556ec57f3f3395a210246d679c076..af1efb131cc5fe8a1d72294456b8655b31fc5ea4 100644
GIT binary patch
literal 1150
zcmaKsUu;ul7{;HKWhfUwkO-SWiIRmNK@u-a)C<R-#EZrYZX}QxC0-EO1sB{opez3t
zHrxoX0Et9}5OFG~nGAJd3xTa&yRNJ~r#)wFPgmNmW2J7I_=og+c)x8;2qB!4-}%n>
z_I;l7p7;AsfhswdE`?lIV|O+1B7n7mgd{Q-mjRI9ZY`c;b}ko^c<G+U)o%ovqtR%W
z#xRU_VHsLkkCR-cbDl+A=5x2t9HD8NnzCV<+i;l8Xj4R|D&s5F|NM7!*Z!njPx>ry
zK6KSOdj{h1I4#T4oI<l|#8J_92<H{6E-Ak7qvC7V)h}=KspXG*Ao<RQMaiv9Boa&}
zlMEQnMtD^b$3=TuxS&|`tzzBJitGMReCxKd8-jef;sLwn0PJe|93Ru^G*_K?SdYV^
z`$9M?e51JJd&Sp#%6zj=@m-(d`=iR<W^=X<#Bf8PH|1qEn`PV0Ki8l|l^32--1+<e
z{K5K*&cqb+`8?B^d%QW8=aKj{cRK3&Clhobij=?=#tK>!7AGescdYDGO<m@{+h=BG
z>K_#EFVETo>vFl=$K&JUqp4Jiwr#W5PV-Ri?@w_TC4rjF@y*N^^WjpdR9$($>B8u%
z{v-Hr@F2SVEwvk^PgiuG^;(4ta|j`11!8!P2J=0JizCM>`eMevJ8&HI9|8vtpcLp>
zzh2fVE&GGAS3W}ky#g^bj~}cXuH^@&d!N+dD%d^2U^_U}0{Xn-u^(T{vztU45^CVX
zK7kmVXF$d|TBoL_c4dMc44nppC&c5Jcr>FR&wg99Yjus1y9jsCh}-BFvVu?eD4WZ=
z3x&czR(Au#=fKb@FwiC*M^W~BQB!$8J&NC6scDz=Ws~%0yW==rnM{TmtDDiwRUEwl
zhR=e-C&i-`jgM>fz0~5?{fNb4vumUGp_2&G?paN<3yfX@?|zBtkxuM*Qai7AiN`JN
zp}&JM<1!Qdt7!iU#;>7dUO{{0B33?4TZu&?ku|Z%)!tOteIq@9i>W>|js1o#RyUrj
n<UDQk90WW|<d0yXut2C1<_|s9%pN)}6OZKSe9tRDpJ*Qe<T9(7

literal 318
zcmZQzU<5(|0RbS%!l1#(z#zuJz@P!d0zj+)#2|4HXaJKC0wf0lAEr2iX{M9K3=BR0
y!E90pK{x=K$Oz&POT#sS8N$ZKhC)h8ip0_|-T#43{vnSYgXBQCu@O54$pHYIza?e>