From 11f7e27a1ca65c66c9f7eaadf94716ca0fa49956 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Fri, 26 Feb 2016 17:14:45 +0300 Subject: [PATCH] =?UTF-8?q?HTTPS=20-=20=D0=BF=D0=B5=D1=80=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/Helper.php | 4 ++-- controllers/ArticleController.php | 8 ++++---- controllers/IndexController.php | 16 ++++++++-------- controllers/PointController.php | 4 ++-- controllers/UserController.php | 4 ++-- public/js/map.js | 4 ++-- public/js/mapPoint.js | 2 +- public/js/tile/Google.js | 2 +- public/js/tile/Yandex.js | 2 +- views/indexTemplate.php | 2 +- views/modals/articleInfo.php | 6 +++--- views/page/instaPoint.php | 2 +- views/page/vkPoint.php | 4 ++-- views/rightNavigation.php | 2 +- views/route.php | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/classes/Helper.php b/classes/Helper.php index 1c6b795..8bc92fb 100644 --- a/classes/Helper.php +++ b/classes/Helper.php @@ -124,7 +124,7 @@ class Helper $og['description'] = mb_substr($point->description, 0, 99, 'UTF-8') . '…'; $og['site_name'] = App::$defaultTitle; $og['type'] = 'website'; - $og['url'] = 'http://wikipoints.ru/?point=' . $point->id; + $og['url'] = 'https://wikipoints.ru/?point=' . $point->id; $og['image'] = $point->getImg('middle'); return $og; @@ -138,7 +138,7 @@ class Helper $og['description'] = mb_substr($article->text, 0, 99, 'UTF-8') . '…'; $og['site_name'] = App::$defaultTitle; $og['type'] = 'website'; - $og['url'] = 'http://wikipoints.ru/article/' . $article->id; + $og['url'] = 'https://wikipoints.ru/article/' . $article->id; $og['image'] = $article->getImg('middle'); return $og; diff --git a/controllers/ArticleController.php b/controllers/ArticleController.php index 288c18a..f420bd6 100644 --- a/controllers/ArticleController.php +++ b/controllers/ArticleController.php @@ -13,13 +13,13 @@ class ArticleController extends Controller self::addScript('/js/bootstrap.min.js'); self::addScript('/js/app.js?ver=' . App::getConfig('version')); - self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); + self::addScript('/js/fotorama.js'); self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap-theme.min.css'); - self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); + self::addStyle('/css/fotorama.css'); $article = Article::model()->getByPK($articleId); @@ -79,12 +79,12 @@ class ArticleController extends Controller self::addScript('/js/app.js?ver=' . App::getConfig('version')); self::addScript('/js/jquery.cookie.js'); self::addScript('/js/articleEdit.js?ver=' . App::getConfig('version')); - self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); + self::addScript('/js/fotorama.js'); self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap-theme.min.css'); - self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); + self::addStyle('/css/fotorama.css'); self::addStyle('/css/articleEdit.css?ver=' . App::getConfig('version')); $article = Article::model()->getByPK($articleId); diff --git a/controllers/IndexController.php b/controllers/IndexController.php index 1d44023..fe2b716 100644 --- a/controllers/IndexController.php +++ b/controllers/IndexController.php @@ -13,7 +13,7 @@ class IndexController extends Controller self::addScript('/js/bootstrap.min.js'); self::addScript('/js/leaflet.js'); - self::addScript('http://maps.google.com/maps/api/js?v=3'); + self::addScript('https://maps.google.com/maps/api/js?v=3'); self::addScript('/js/tile/Google.js'); self::addScript('/js/api-maps-yandex-2.0.js'); @@ -82,7 +82,7 @@ class IndexController extends Controller $point = Point::model()->getByPK($id); $point->name = htmlspecialchars($point->name); $point->descriptionHtml = htmlspecialchars($point->description); - $point->descriptionHtml .= ' Посмотреть на карте: http://wikipoints.ru/?point=' . $id; + $point->descriptionHtml .= ' Посмотреть на карте: https://wikipoints.ru/?point=' . $id; $point->descriptionHtml .= ' #wikipoints'; $og = Helper::buildOG($point); @@ -94,8 +94,8 @@ class IndexController extends Controller $og['description'] = 'Случайная точка на карте — это лучший способ узнать что-то новое! – wikipoints.ru'; $og['site_name'] = App::$defaultTitle; $og['type'] = 'article'; - $og['url'] = 'http://wikipoints.ru/?point=random'; - $og['image'] = 'http://wikipoints.ru/img/logo.png'; + $og['url'] = 'https://wikipoints.ru/?point=random'; + $og['image'] = 'https://wikipoints.ru/img/logo.png'; } self::render('indexTemplate.php', array( @@ -116,7 +116,7 @@ class IndexController extends Controller static function actionLogin() { - $source = file_get_contents('http://ulogin.ru/token.php?token=' . $_POST['token'] . '&host=' . $_SERVER['HTTP_HOST']); + $source = file_get_contents('https://ulogin.ru/token.php?token=' . $_POST['token'] . '&host=' . $_SERVER['HTTP_HOST']); $uLoginUser = json_decode($source, true); $uLoginUser['identity'] = md5($uLoginUser['uid'] . $uLoginUser['network'] . '=P'); @@ -149,7 +149,7 @@ class IndexController extends Controller $xml = new SimpleXMLElement(''); $url = $xml->addChild('url'); - $url->addChild('loc', 'http://wikipoints.ru/'); + $url->addChild('loc', 'https://wikipoints.ru/'); $url->addChild('lastmod', date("Y-m-d")); $url->addChild('changefreq', "daily"); $url->addChild('priority', "0.9"); @@ -157,7 +157,7 @@ class IndexController extends Controller $articles = Article::model()->getAll(array('where'=>'`author` != 0 AND (`status` = "published" OR `status` = "system") ', 'order' => 'ID DESC', 'asArray' => true)); foreach ($articles as $article) { $url = $xml->addChild('url'); - $url->addChild('loc', 'http://wikipoints.ru/article/' . $article['id']); + $url->addChild('loc', 'https://wikipoints.ru/article/' . $article['id']); $url->addChild('lastmod', date("Y-m-d", strtotime('- 5 days'))); $url->addChild('changefreq', "weekly"); $url->addChild('priority', "0.8"); @@ -166,7 +166,7 @@ class IndexController extends Controller $points = Point::model()->getAll(array('order' => 'ID DESC', 'asArray' => true)); foreach ($points as $point) { $url = $xml->addChild('url'); - $url->addChild('loc', 'http://wikipoints.ru/point/' . $point['id']); + $url->addChild('loc', 'https://wikipoints.ru/point/' . $point['id']); $url->addChild('lastmod', date("Y-m-d", $point['dateEdit'])); $url->addChild('changefreq', "weekly"); $url->addChild('priority', "0.8"); diff --git a/controllers/PointController.php b/controllers/PointController.php index 7d9d7a2..ee7ea25 100644 --- a/controllers/PointController.php +++ b/controllers/PointController.php @@ -26,13 +26,13 @@ class PointController extends Controller self::addScript('/js/app.js?ver=' . App::getConfig('version')); self::addScript('/js/mapPoint.js?ver=' . App::getConfig('version')); - self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); + self::addScript('/js/fotorama.js'); self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap-theme.min.css'); - self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); + self::addStyle('/css/fotorama.css'); self::addStyle('/css/leaflet.css'); self::addStyle('/css/MarkerCluster.css'); self::addStyle('/css/MarkerCluster.Default.css'); diff --git a/controllers/UserController.php b/controllers/UserController.php index 1c943f2..b484737 100644 --- a/controllers/UserController.php +++ b/controllers/UserController.php @@ -8,14 +8,14 @@ class UserController extends Controller self::addScript('/js/jquery-2.1.0.min.js'); self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/bootstrap.min.js'); - self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); + self::addScript('/js/fotorama.js'); self::addScript('/js/app.js?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap-theme.min.css'); - self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); + self::addStyle('/css/fotorama.css'); } function actionIndex() diff --git a/public/js/map.js b/public/js/map.js index 79294cc..eca799f 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -60,8 +60,8 @@ function init(lat, lng) { // layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox | Points data © WIKIPOINTS.RU', maxZoom: 18}); // layers['quest'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); - layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); - layers['topo'] = L.tileLayer('http://topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Маршруты.ру | Points data © WIKIPOINTS.RU', maxZoom: 15}); + layers['osm'] = L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); + layers['topo'] = L.tileLayer('//topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Маршруты.ру | Points data © WIKIPOINTS.RU', maxZoom: 15}); layers['google'] = new L.Google('HYBRID'); layers['yandexMap'] = new L.Yandex(); layers['yandex'] = new L.Yandex('hybrid'); diff --git a/public/js/mapPoint.js b/public/js/mapPoint.js index fb0fd82..9b4c17c 100644 --- a/public/js/mapPoint.js +++ b/public/js/mapPoint.js @@ -46,7 +46,7 @@ function init(lat, lng) { markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 45}); // layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox | Points data © WIKIPOINTS.RU', maxZoom: 18}); - layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); + layers['osm'] = L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); setLayer('osm'); diff --git a/public/js/tile/Google.js b/public/js/tile/Google.js index a955769..7a78a1a 100644 --- a/public/js/tile/Google.js +++ b/public/js/tile/Google.js @@ -13,7 +13,7 @@ L.Google = L.Class.extend({ tileSize: 256, subdomains: 'abc', errorTileUrl: '', - attribution: 'Points data © WIKIPOINTS.RU', + attribution: 'Points data © WIKIPOINTS.RU', opacity: 1, continuousWorld: false, noWrap: false, diff --git a/public/js/tile/Yandex.js b/public/js/tile/Yandex.js index cb042a6..aae1fd2 100644 --- a/public/js/tile/Yandex.js +++ b/public/js/tile/Yandex.js @@ -11,7 +11,7 @@ L.Yandex = L.Class.extend({ options: { minZoom: 0, maxZoom: 18, - attribution: 'Points data © WIKIPOINTS.RU', + attribution: 'Points data © WIKIPOINTS.RU', opacity: 1, traffic: false }, diff --git a/views/indexTemplate.php b/views/indexTemplate.php index 2278028..193995b 100644 --- a/views/indexTemplate.php +++ b/views/indexTemplate.php @@ -52,7 +52,7 @@ if (App::$user) { Случайная точка


- Группа ВКонтакте + Группа ВКонтакте

Instagram


diff --git a/views/modals/articleInfo.php b/views/modals/articleInfo.php index ab67bd5..efa980c 100644 --- a/views/modals/articleInfo.php +++ b/views/modals/articleInfo.php @@ -54,11 +54,11 @@ [img|#19] -
(это картинка №19) +
(это картинка №19) - http://wikipoints.ru - http://wikipoints.ru + https://wikipoints.ru + https://wikipoints.ru diff --git a/views/page/instaPoint.php b/views/page/instaPoint.php index a749319..2c5d11e 100644 --- a/views/page/instaPoint.php +++ b/views/page/instaPoint.php @@ -6,7 +6,7 @@
📍 description ?>

-Продолжить чтение и посмотреть на карте: http://wikipoints.ru/point/id ?>
+Продолжить чтение и посмотреть на карте: https://wikipoints.ru/point/id ?>

#wikipoints #точки_wikipoints
diff --git a/views/page/vkPoint.php b/views/page/vkPoint.php index 0d537b6..9955a7f 100644 --- a/views/page/vkPoint.php +++ b/views/page/vkPoint.php @@ -1,12 +1,12 @@ name . '
'; + print 'https://wikipoints.ru/photos/big/' . $photo->name . '
'; } ?> name ?> (, )

description ?>

-Продолжить чтение и посмотреть на карте: http://wikipoints.ru/point/id ?>?utm_source=vkDaly
+Продолжить чтение и посмотреть на карте: https://wikipoints.ru/point/id ?>?utm_source=vkDaly

#wikipoints # # # # # diff --git a/views/rightNavigation.php b/views/rightNavigation.php index b795414..0b94b1b 100644 --- a/views/rightNavigation.php +++ b/views/rightNavigation.php @@ -31,7 +31,7 @@ if (App::$user && App::$user->id) {
  • Случайная точка
    • -
  • Группа в VK
    • +
  • Группа в VK
  • Мы в Instargam
    • diff --git a/views/route.php b/views/route.php index 4162d7a..1159643 100644 --- a/views/route.php +++ b/views/route.php @@ -8,7 +8,7 @@ foreach ($points as $point) { description ?>
    - http://wikipoints.ru/?point=id ?> + https://wikipoints.ru/?point=id ?>   /   lat > 0 ? 'N' : 'S' ?>lat), 5, '.', '') ?>°