From d29a2cfa16d73e1ed852ca05dadf0f3e1ee85e2e Mon Sep 17 00:00:00 2001
From: yarik <yarik.nechyporuk@gmail.com>
Date: Tue, 27 Sep 2016 15:25:04 +0300
Subject: [PATCH] Seo fix

---
 frontend/views/catalog/products.php |  9 +--------
 frontend/widgets/Seo.php            | 27 +++++++++++++--------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/frontend/views/catalog/products.php b/frontend/views/catalog/products.php
index eb440b1..a87181f 100755
--- a/frontend/views/catalog/products.php
+++ b/frontend/views/catalog/products.php
@@ -39,13 +39,6 @@ $this->registerJsFile(Yii::getAlias('@web/js/ion.rangeSlider.js'),[
     'position' => View::POS_END,
     'depends' => ['yii\web\JqueryAsset']
 ]);
-
-
-function my_mb_ucfirst($str) {
-    $str = strtolower($str);
-    $fc = mb_strtoupper(mb_substr($str, 0, 1));
-    return $fc.mb_substr($str, 1);
-}
 ?>
 
 <script type="text/javascript">
@@ -191,7 +184,7 @@ function my_mb_ucfirst($str) {
     </div>
 
     <div class="content" itemscope itemtype="http://schema.org/Product">
-        <div itemprop="name"><h1><?=  my_mb_ucfirst(Seo::widget([ 'row'=>'h1']))?></h1></div>
+        <div itemprop="name"><h1><?=  Seo::widget([ 'row'=>'h1'])?></h1></div>
         <div itemprop="offers" itemscope itemtype="http://schema.org/AggregateOffer" style="display: none;">
             <span itemprop="priceCurrency">UAH</span>
             <span itemprop="lowPrice"><?= $priceLimits['min'] ?></span>
diff --git a/frontend/widgets/Seo.php b/frontend/widgets/Seo.php
index 2f775e4..b277214 100755
--- a/frontend/widgets/Seo.php
+++ b/frontend/widgets/Seo.php
@@ -2,15 +2,11 @@
 namespace frontend\widgets;
 
 use common\models\SeoDynamic;
-use Yii;
 use common\modules\product\models\Brand;
 use common\modules\rubrication\models\TaxGroup;
 use common\modules\rubrication\models\TaxOption;
 use yii\base\Widget;
 use yii\helpers\ArrayHelper;
-use yii\helpers\Html;
-use yii\helpers\Url;
-use yii\web\HttpException;
 
 class Seo extends Widget
 {
@@ -202,7 +198,7 @@ class Seo extends Widget
                     $title_string = $this->getTitleString($array);
 
                     if($title_string){
-                        return $title_string;
+                        return $this->my_mb_ucfirst(trim($title_string));
                     }
 
                 }
@@ -238,9 +234,8 @@ class Seo extends Widget
                 $paginate = \Yii::$app->request->get('page', []);
 
 
-
                 if (!empty($meta)) {
-
+    
                     $this->getView()->registerMetaTag([
                         'name' => 'robots',
                         'content' => $meta
@@ -267,15 +262,14 @@ class Seo extends Widget
                     isset($filter['brands']) && count($filter['brands']) > 1 ||  isset($filter)  && $this->checkFilter($filter)
 
                 ) {
-
                     $this->getView()->registerMetaTag([
                         'name' => 'robots',
                         'content' => 'noindex,nofollow'
                     ]);
 
                 } else if (
-                    isset($filter['brands']) && count($filter['brands']) <= 1 && isset($filter) && count($filter, COUNT_RECURSIVE) >= 4
-                    || isset($filter) && count($filter, COUNT_RECURSIVE) >1
+                    isset($filter['brands']) && count($filter['brands']) <= 1 && isset($filter) && count($filter, COUNT_RECURSIVE) >= 2
+                    || isset($filter) && count($filter, COUNT_RECURSIVE) >= 2
                     || !empty($sort) ||  !empty($paginate) || isset($filter['prices'])
                 ) {
                     $this->getView()->registerMetaTag([
@@ -369,18 +363,18 @@ class Seo extends Widget
         $result = '';
 
         $widgetData = static::findSeoByUrl($this->url);
-
+        
         if ($widgetData instanceof \common\models\Seo) {
 
             $result = $widgetData->$param;
 
         } else if (!empty($this->$param)) {
-
             $result = $this->$param;
+            
         } else {
 
             $widgetData = $this->findSeoByDynamic();
-
+            
             if ($widgetData instanceof SeoDynamic) {
 
                 $result = $widgetData->$param;
@@ -407,6 +401,11 @@ class Seo extends Widget
         return false;
 
     }
-
+    
+    public function my_mb_ucfirst($str) {
+        $str = strtolower($str);
+        $fc = mb_strtoupper(mb_substr($str, 0, 1));
+        return $fc.mb_substr($str, 1);
+    }
 
 }
\ No newline at end of file
--
libgit2 0.21.4