Alex Savenko / semena

Commit 17bf3fa266610e78cecd88de428157b66c55f370

Authored by Dima
2 parents 64ad6dc7 b782c5cb

Merge branch 'remote_work' into 'master' 

Remote work

merge request
From Alex:remote_work into Alex:master

See merge request !16
Showing 2 changed files with 8 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/app/frontend/views/index.php
  Show/Hide comments   View file @17bf3fa
... ... @@ -8,6 +8,9 @@
8 8 if (preg_match("/page/i", $_SERVER['REQUEST_URI'])) {
9 9 echo "<link rel='canonical' href='http://".$_SERVER['HTTP_HOST'].$this->seoUrl->setUrl($this->url->get($page_url_for_sort['3']))."?all=1'>";
10 10 }
  11 + if (preg_match("/sort-/i", $_SERVER['REQUEST_URI'])) {
  12 + echo "<meta name=\"robots\" content=\"noindex, follow\"/>";
  13 + }
11 14 ?>
12 15 <title><?= !empty( $meta_title ) ? $meta_title : \config::get( 'global#title' ) ?></title>
13 16 <?= !empty( $meta_link_next ) ? $meta_link_next : '' ?>
... ... @@ -18,10 +21,10 @@
18 21 <?php
19 22 if (!empty($lang)):
20 23 if ($lang[count($lang)-1] == 'ru'): ?>
21   - <link rel="alternate" hreflang="uk" href="<?= isset($change_lang_url['1']) && !empty($change_lang_url['1']) ? $change_lang_url['1'] : '/' ?>"/>
  24 + <link rel="alternate" hreflang="uk" href="http://<?=$_SERVER['HTTP_HOST']?><?= isset($change_lang_url['1']) && !empty($change_lang_url['1']) ? $change_lang_url['1'] : '/' ?>"/>
22 25 <?php else: ?>
23   - <link rel="alternate" hreflang="ru" href="<?= isset($change_lang_url['2']) && !empty($change_lang_url['2']) ? $change_lang_url['2'] : '/ru' ?>"/>
24   - <?php endif ?>
  26 + <link rel="alternate" hreflang="ru" href="http://<?=$_SERVER['HTTP_HOST']?><?= isset($change_lang_url['2']) && !empty($change_lang_url['2']) ? $change_lang_url['2'] : '/ru' ?>"/>
  27 + <?php endif; ?>
25 28 <?php endif; ?>
26 29  
27 30 <?= ( isset( $no_robots ) && !empty( $no_robots ) ? isset($utm) && $utm == 0 ? '<meta name="robots" content="noindex, follow"/>' : '' : '' ) ?>
... ...
src/lib/common.php
  Show/Hide comments   View file @17bf3fa
... ... @@ -189,8 +189,8 @@ namespace
189 189 $output .=
190 190 ( $data['page']==$data['pages_count'] ? '' : '<li class="float"><a href="'.$this->getDi()->get('seoUrl')->setUrl($url_obj->get( array_merge( $data['url_for'], [ 'page' => ( ($data['page'] + 1 == $data['pages_count']) ? $data['pages_count'] : $data['page'] + 1 ) ] ) )).'" title="Next ('.( ($data['page'] + 1 == $data['pages_count']) ? $data['pages_count'] : $data['page'] + 1 ).')" class="next"><img src="/images/page_arrow_right.png" alt="previous" width="10" height="18" /></a></li>' ).
191 191 '</ul>';
192   - ($data['page'] != '1') ? $meta_link_prev = '<link rel="prev" href="'.$this->getDi()->get('seoUrl')->setUrl($url_obj->get( (((int)$data['page'] - 1) != 1) ? array_merge( $data['url_for'], [ 'page' => (int)$data['page'] - 1 ] ) :$firstPage)).'" />' : $meta_link_prev = '';
193   - ($data['page'] != $data['pages_count']) ? $meta_link_next = '<link rel="next" href="'.$this->getDi()->get('seoUrl')->setUrl($url_obj->get( array_merge( $data['url_for'], [ 'page' => (int)$data['page'] + 1 ] ) )).'" />' : $meta_link_next = '';
  192 + ($data['page'] != '1') ? $meta_link_prev = '<link rel="prev" href="http://'.$_SERVER['HTTP_HOST'].$this->getDi()->get('seoUrl')->setUrl($url_obj->get( (((int)$data['page'] - 1) != 1) ? array_merge( $data['url_for'], [ 'page' => (int)$data['page'] - 1 ] ) :$firstPage)).'" />' : $meta_link_prev = '';
  193 + ($data['page'] != $data['pages_count']) ? $meta_link_next = '<link rel="next" href="http://'.$_SERVER['HTTP_HOST'].$this->getDi()->get('seoUrl')->setUrl($url_obj->get( array_merge( $data['url_for'], [ 'page' => (int)$data['page'] + 1 ] ) )).'" />' : $meta_link_next = '';
194 194 if( $return_output )
195 195 {
196 196  
... ...