Skip to content

Commit

Permalink
Merge pull request #14 from paulmassen/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@paulmassen
paulmassen authored Sep 8, 2017
2 parents e830c62 + 65991c1 commit 197bada
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 69 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# v2.0.3
## 09/08/2017
1. [](#bugfix)
* Fixed error on empty fields
* Added function for getting image width and height


# v2.0.2
## 09/08/2017
1. [](#bugfix)
Expand Down
2 changes: 1 addition & 1 deletion blueprints.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "SEO"
version: "2.0.2"
version: "2.0.3"
description: "SEO is an user friendly plugin to manage your SEO across all your pages."
icon: "facebook"
testing: true
Expand Down
135 changes: 67 additions & 68 deletions seo.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* SEO v2.0.2
* SEO v2.0.3
*
* This plugin adds an SEO Tab to every pages for managing SEO data.
*
Expand Down Expand Up @@ -74,8 +74,8 @@ private function seoGetimage($imageurl){

$im = getimagesize($imgobject->path());
$imagedata = [
'width' => $im[0],
'height' => $im[1],
'width' => "$im[0]",
'height' => "$im[1]",
'url' => $imgobject->url(),
];
return $imagedata;
Expand Down Expand Up @@ -161,7 +161,9 @@ public function onPageInitialized()
if (isset($page->header()->twittershareimg)) {
$meta['twitter:image']['name'] = 'twitter:image';
$meta['twitter:image']['property'] = 'twitter:image';
$meta['twitter:image']['content'] = $this->grav['uri']->base() . $page->header()->twittershareimg;
$twittershareimg = $page->header()->twittershareimg;
$imagedata = $this->seoGetimage($twittershareimg);
$meta['twitter:image']['content'] = $this->grav['uri']->base() . $imagedata['url'];
};
$meta['twitter:url']['name'] = 'twitter:url';
$meta['twitter:url']['property'] = 'twitter:url';
Expand Down Expand Up @@ -211,7 +213,9 @@ public function onPageInitialized()
if (isset($page->header()->facebookimg)) {
// $meta['og:image']['name'] = 'og:image';
$meta['og:image']['property'] = 'og:image';
$meta['og:image']['content'] = $this->grav['uri']->base() . $page->header()->facebookimg;
$facebookimg = $page->header()->facebookimg;
$imagedata = $this->seoGetimage($facebookimg);
$meta['og:image']['content'] = $this->grav['uri']->base() . $imagedata['url'];
}

}
Expand All @@ -224,62 +228,62 @@ public function onPageInitialized()
if (property_exists($page->header(),'musiceventenabled')){
if (($page->header()->musiceventenabled) and $this->config['plugins']['seo']['musicevent']) {
$musiceventsarray = $page->header()->musicevents;
if (count($musiceventsarray) > 1) {
if (count($musiceventsarray) > 0) {
foreach ($musiceventsarray as $event) {
if (isset($event['musicevent_performer'])){
foreach ($event['musicevent_performer'] as $artist){
$performerarray[] = [
'@type' => $artist['performer_type'],
'name' => $artist['name'],
'sameAs' => $artist['sameAs'],
'@type' => @$artist['performer_type'],
'name' => @$artist['name'],
'sameAs' => @$artist['sameAs'],
];

};
}
if (isset($event['musicevent_workPerformed'])){
foreach ($event['musicevent_workPerformed'] as $work){
$workarray[] = [
'name' => $work['name'],
'sameAs' => $work['sameAs'],
'name' => @$work['name'],
'sameAs' => @$work['sameAs'],
];

};
}
}
if (isset($event['musicevent_image'])){
$imageurl = $event['musicevent_image'];
$fixedurl = preg_replace($pattern, $replacement, $imageurl);
$myvar = $fixedurl;
$imagefolder = $page->find($fixedurl)->folder();
$imagename = preg_replace($pattern, '$3', $imageurl);
$im = @getimagesize($this->grav['uri']->rootUrl() . 'user/pages/' . $imagefolder . '/' . $imagename);
$imagedata = $this->seoGetimage($imageurl);
$musiceventimage = [

'@type' => 'ImageObject',
'width' => "$im[0]",
'height' => "$im[1]",
'url' => $this->grav['uri']->base() . $event['musicevent_image'],
'width' => $imagedata['width'],
'height' => $imagedata['height'],
'url' => $this->grav['uri']->base() . $imagedata['url'],

];

}
$microdata[] = [
'@context' => 'http://schema.org',
'@type' => 'MusicEvent',
'name' => $event['musicevent_location_name'],
'name' => @$event['musicevent_location_name'],
'location' => [
'@type' => 'MusicVenue',
'name' => $event['musicevent_location_name'],
'address' => $event['musicevent_location_address'],
'name' => @$event['musicevent_location_name'],
'address' => @$event['musicevent_location_address'],
],
'description' => $event['musicevent_description'],
'url' => $event['musicevent_url'],
'performer' => $performerarray,
'workPerformed' => $workarray,
'image' => $musiceventimage,
'description' => @$event['musicevent_description'],
'url' => @$event['musicevent_url'],
'performer' => @$performerarray,
'workPerformed' => @$workarray,
'image' => @$musiceventimage,
'offers' => [
'@type' => 'Offer',
'price' => $event['musicevent_offers_price'],
'priceCurrency' => $event['musicevent_offers_priceCurrency'],
'url' => $event['musicevent_offers_url'],
'price' => @$event['musicevent_offers_price'],
'priceCurrency' => @$event['musicevent_offers_priceCurrency'],
'url' => @$event['musicevent_offers_url'],
],
'startDate' => date("c", strtotime($event['musicevent_startdate'])),
'endDate' => date("c", strtotime($event['musicevent_enddate'])),
'startDate' => @date("c", strtotime($event['musicevent_startdate'])),
'endDate' => @date("c", strtotime($event['musicevent_enddate'])),

];

Expand All @@ -297,29 +301,29 @@ public function onPageInitialized()
$microdata[] = [
'@context' => 'http://schema.org',
'@type' => 'Event',
'name' => $event['event_name'],
'name' => @$event['event_name'],

'location' => [
'@type' => 'Place',
'name' => $event['event_location_name'],
'name' => @$event['event_location_name'],
'address' => [
'@type' => 'PostalAddress',
'addressLocality' => $event['event_location_address_addressLocality'],
'addressRegion' => $event['event_location_address_addressRegion'],
'streetAddress' => $event['event_location_streetAddress'],
'addressLocality' => @$event['event_location_address_addressLocality'],
'addressRegion' => @$event['event_location_address_addressRegion'],
'streetAddress' => @$event['event_location_streetAddress'],
],
'url' => $event['musicevent_location_url'],
'url' => @$event['musicevent_location_url'],
],
'description' => $event['musicevent_description'],
'description' => @$event['musicevent_description'],
'offers' => [
'@type' => 'Offer',
'price' => $event['event_offers_price'],
'priceCurrency' => $event['event_offers_priceCurrency'],
'url' => $event['event_offers_url'],
'price' => @$event['event_offers_price'],
'priceCurrency' => @$event['event_offers_priceCurrency'],
'url' => @$event['event_offers_url'],
],
'startDate' => date("c", strtotime($event['event_startdate'])),
'endDate' => date("c", strtotime($event['event_enddate'])),
'description' => $event['event_description'],
'startDate' => @date("c", strtotime($event['event_startdate'])),
'endDate' => @date("c", strtotime($event['event_enddate'])),
'description' => @$event['event_description'],

];

Expand All @@ -335,18 +339,18 @@ public function onPageInitialized()
$microdata[] = [
'@context' => 'http://schema.org',
'@type' => 'Restaurant',
'name' => $page->header()->restaurant['name'],
'name' => @$page->header()->restaurant['name'],

'address' => [
'@type' => 'PostalAddress',
'addressLocality' => $page->header()->restaurant['address_addressLocality'],
'addressRegion' => $page->header()->restaurant['address_addressRegion'],
'streetAddress' => $page->header()->restaurant['address_streetAddress'],
'postalCode' => $page->header()->restaurant['address_postalCode'],
'addressLocality' => @$page->header()->restaurant['address_addressLocality'],
'addressRegion' => @$page->header()->restaurant['address_addressRegion'],
'streetAddress' => @$page->header()->restaurant['address_streetAddress'],
'postalCode' => @$page->header()->restaurant['address_postalCode'],
],
'servesCuisine' => $page->header()->restaurant['servesCuisine'],
'priceRange' => $page->header()->restaurant['priceRange'],
'telephone' => $page->header()->restaurant['telephone'],
'servesCuisine' => @$page->header()->restaurant['servesCuisine'],
'priceRange' => @$page->header()->restaurant['priceRange'],
'telephone' => @$page->header()->restaurant['telephone'],

];

Expand All @@ -364,12 +368,12 @@ public function onPageInitialized()
$microdata['article'] = [
'@context' => 'http://schema.org',
'@type' => 'Article',
'headline' => $headline ,
'headline' => @$headline ,
'mainEntityOfPage' => [
"@type" => "WebPage",
'url' => $this->grav['uri']->base(),
],
'articleBody' => $this->cleanMarkdown($content),
'articleBody' => @$this->cleanMarkdown($content),
'datePublished' => @date("c", strtotime($page->header()->article['datePublished'])),
'dateModified' => @date("c", strtotime($page->header()->article['dateModified'])),
];
Expand All @@ -385,22 +389,17 @@ public function onPageInitialized()
};
if (isset($page->header()->article['publisher_name'])) {
$microdata['article']['publisher']['@type'] = 'Organization';
$microdata['article']['publisher']['name'] = $page->header()->article['publisher_name'];
$microdata['article']['publisher']['name'] = @$page->header()->article['publisher_name'];
};
if (isset($page->header()->article['publisher_logo_url'])) {
$publisherlogourl = $page->header()->article['publisher_logo_url'];
$imagedata = $this->seoGetimage($publisherlogourl);
$microdata['article']['publisher']['logo']['@type'] = 'ImageObject';
$microdata['article']['publisher']['logo']['url'] = $this->grav['uri']->base() . $page->header()->article['publisher_logo_url'];
// $url = $this->grav['uri']->folder . $page->header()->article['publisher_logo_url'];
$microdata['article']['publisher']['logo']['url'] = $this->grav['uri']->base() . $imagedata['url'];


//$im = getimagesize($url);
$imageurl = $page->header()->article['publisher_logo_url'];
$fixedurl = preg_replace($pattern, $replacement, $imageurl);
$imagename = preg_replace($pattern, '$3', $imageurl);
$imagefolder = $page->find($fixedurl)->folder();

$im = @getimagesize($this->grav['uri']->rootUrl() . 'user/pages/' . $imagefolder . '/' . $imagename);
$microdata['article']['publisher']['logo']['width'] = "$im[0]";
$microdata['article']['publisher']['logo']['height'] = "$im[1]";
$microdata['article']['publisher']['logo']['width'] = $imagedata['width'];
$microdata['article']['publisher']['logo']['height'] = $imagedata['height'];

};
if (isset($page->header()->article['image_url'])) {
Expand Down

0 comments on commit 197bada

Please sign in to comment.