Merge branch 'develop' into dev/tmp-merge

# Conflicts: # Classes/Controller/Ajax/AbstractPageSeoController.php
tgaertner · Jun 10, 2017 · ca8ae1f · ca8ae1f
2 parents b08796e + 0f4e108
commit ca8ae1f
Show file tree

Hide file tree

Showing 34 changed files with 376 additions and 60 deletions.
diff --git a/Classes/Backend/Module/AbstractModule.php b/Classes/Backend/Module/AbstractModule.php
@@ -73,7 +73,6 @@ protected function initializeAction()
      */
     protected function translateList(array $list)
     {
-        unset($token);
         foreach ($list as &$token) {
             if (!empty($token)) {
                 if (is_array($token)) {

diff --git a/Classes/Controller/Ajax/AbstractPageSeoController.php b/Classes/Controller/Ajax/AbstractPageSeoController.php
@@ -31,6 +31,7 @@
 use Metaseo\Metaseo\Controller\Ajax\PageSeo as PageSeo;
 use Metaseo\Metaseo\DependencyInjection\Utility\HttpUtility;
 use Metaseo\Metaseo\Exception\Ajax\AjaxException;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -353,10 +354,23 @@ protected function getPageSeoDao()
             ->objectManager
             ->get('Metaseo\\Metaseo\\Dao\\PageSeoDao')
             ->setPageTreeView($this->getPageTreeView())
-            ->setDataHandler($this->getDataHandler());
+            ->setDataHandler($this->getDataHandler())
+            ->setExtensibilityOptions($this->getExtensibilityOptions());
     }
 
     /**
+     * return array
+     */
+    protected function getExtensibilityOptions()
+    {
+        $config = $this
+            ->objectManager
+            ->get('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManager')
+            ->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
+        return $config['plugin.']['metaseo.']['extensibility.'];
+    }
+
+        /**
      * @return \TYPO3\CMS\Core\DataHandling\DataHandler
      */
     protected function getDataHandler()

diff --git a/Classes/Controller/Ajax/PageSeo/MetaDataController.php b/Classes/Controller/Ajax/PageSeo/MetaDataController.php
@@ -51,7 +51,6 @@ protected function getIndex(array $page, $depth, $sysLanguage)
     {
         $list = $this->getPageSeoDao()->index($page, $depth, $sysLanguage, $this->fieldList);
 
-        unset($row);
         foreach ($list as &$row) {
             if (!empty($row['lastUpdated'])) {
                 $row['lastUpdated'] = date('Y-m-d', $row['lastUpdated']);

diff --git a/Classes/Controller/BackendControlCenterController.php b/Classes/Controller/BackendControlCenterController.php
@@ -114,7 +114,6 @@ public function mainAction()
         // Build root page list
         // #################
 
-        unset($page);
         foreach ($rootPageList as $pageId => &$page) {
             // Domain list
             $page['domainList'] = '';

diff --git a/Classes/Controller/BackendRootSettingsController.php b/Classes/Controller/BackendRootSettingsController.php
@@ -112,7 +112,6 @@ public function mainAction()
         // Build root page list
         // #################
 
-        unset($page);
         foreach ($rootPageList as $pageId => &$page) {
             // Domain list
             $page['domainList'] = '';

diff --git a/Classes/Controller/BackendSitemapController.php b/Classes/Controller/BackendSitemapController.php
@@ -104,7 +104,6 @@ public function mainAction()
         // #################
 
 
-        unset($page);
         foreach ($rootPageList as $pageId => &$page) {
             $stats = array(
                 'sum_pages'     => 0,

diff --git a/Classes/Dao/PageSeoDao.php b/Classes/Dao/PageSeoDao.php
@@ -39,6 +39,12 @@ class PageSeoDao extends Dao
      */
     protected $pageTreeView;
 
+    /**
+     * Extended options set via plugin.metaseo.extensibility
+     * @var array
+     */
+    protected $extensibilityOptions;
+
     /**
      * Return default tree
      *
@@ -68,8 +74,10 @@ public function index(array $page, $depth, $sysLanguage, $fieldList = array())
         foreach ($fieldList as $field) {
             $tree->addField($field, true);
         }
+
         $tree->init(
-            'AND doktype IN (1,4) AND ' . $this->getBackendUserAuthentication()->getPagePermsClause(1)
+            'AND doktype IN (' . $this->getDocTypeList() . ') AND '
+            . $this->getBackendUserAuthentication()->getPagePermsClause(1)
         );
 
         $tree->tree[] = array(
@@ -102,7 +110,6 @@ public function index(array $page, $depth, $sysLanguage, $fieldList = array())
             $defaultOverlayStatus = 2;
         }
 
-        unset($row);
         foreach ($list as &$row) {
             // Set field as main fields
             foreach ($fieldList as $fieldName) {
@@ -143,7 +150,6 @@ public function index(array $page, $depth, $sysLanguage, $fieldList = array())
             );
 
             // update all overlay status field to "from base"
-            unset($row);
             foreach ($list as &$row) {
                 foreach ($overlayFieldList as $fieldName) {
                     $row['_overlay'][$fieldName] = 0;
@@ -178,6 +184,23 @@ public function index(array $page, $depth, $sysLanguage, $fieldList = array())
         return $list;
     }
 
+    protected function getDocTypeList()
+    {
+        if (!isset($this->extensibilityOptions['allowedDoktypes'])
+            || empty($this->extensibilityOptions['allowedDoktypes'])
+        ) {
+            return '1,4'; //default
+        }
+
+        // validate input
+        $allowedDoktypes = explode(',', $this->extensibilityOptions['allowedDoktypes']);
+        foreach ($allowedDoktypes as &$allowedDoktype) {
+            $allowedDoktype = (int)trim($allowedDoktype);
+        }
+
+        return implode(',', $allowedDoktypes);
+    }
+
     /**
      * Calculate the depth of a page
      *
@@ -325,4 +348,16 @@ public function setPageTreeView($pageTreeView)
 
         return $this;
     }
+
+    /**
+     * @param array $extensibilityOptions
+     *
+     * @return $this
+     */
+    public function setExtensibilityOptions(array $extensibilityOptions)
+    {
+        $this->extensibilityOptions = $extensibilityOptions;
+
+        return $this;
+    }
 }
diff --git a/Classes/Page/Part/MetatagPart.php b/Classes/Page/Part/MetatagPart.php
@@ -636,7 +636,6 @@ protected function processMetaTags(array &$tags)
         foreach ($keyList as $key) {
             if (!empty($tags[$key]['attributes'])) {
                 foreach ($markerList as $marker => $value) {
-                    unset($metaTagAttribute);
                     foreach ($tags[$key]['attributes'] as &$metaTagAttribute) {
                         // only replace markers if they are present
                         if (strpos($metaTagAttribute, $marker) !== false) {
@@ -1419,8 +1418,19 @@ protected function getProtocolLength($url)
      */
     protected function generateOpenGraphMetaTags()
     {
+        $prefixes = array('og');
         $tsSetupSeoOg = $this->tsSetupSeo['opengraph.'];
+        $this->convertOpenGraphTypoScriptToMetaTags($prefixes, $tsSetupSeoOg);
+    }
 
+    /**
+     * Convert nested TypoScript to OpenGraph MetaTags
+     *
+     * @param array $prefixes
+     * @param array $tsSetupSeoOg
+     */
+    protected function convertOpenGraphTypoScriptToMetaTags(array $prefixes, array $tsSetupSeoOg)
+    {
         // Get list of tags (filtered array)
         $ogTagNameList = array_keys($tsSetupSeoOg);
         $ogTagNameList = array_unique(
@@ -1446,13 +1456,20 @@ function ($item) {
                     $tsSetupSeoOg[$ogTagName],
                     $tsSetupSeoOg[$ogTagName . '.']
                 );
+            } elseif (!array_key_exists($ogTagName, $tsSetupSeoOg) && array_key_exists($ogTagName . '.', $tsSetupSeoOg)) {
+                // Nested object (e.g. image)
+                array_push($prefixes, $ogTagName);
+                $this->convertOpenGraphTypoScriptToMetaTags($prefixes, $tsSetupSeoOg[$ogTagName . '.']);
+                array_pop($prefixes);
             }
 
             if ($ogTagValue !== null && strlen($ogTagValue) >= 1) {
-                $this->metaTagList['og.' . $ogTagName] = array(
+                $path = $prefixes;
+                $path[] = $ogTagName;
+                $this->metaTagList[implode('.', $path)] = array(
                     'tag'        => 'meta',
                     'attributes' => array(
-                        'property' => 'og:' . $ogTagName,
+                        'property' => implode(':', $path),
                         'content'  => $ogTagValue,
                     ),
                 );

diff --git a/Classes/Utility/SitemapUtility.php b/Classes/Utility/SitemapUtility.php
@@ -102,7 +102,6 @@ public static function index(array $pageData)
         }
 
         // Escape/Quote data
-        unset($pageDataValue);
         foreach ($pageData as &$pageDataValue) {
             if ($pageDataValue === null) {
                 $pageDataValue = 'NULL';

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -66,6 +66,14 @@
             'maxitems' => 1
         )
     ),
+    'tx_metaseo_opengraph_image' => array(
+        'exclude' => 1,
+        'label'   => 'LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.tx_metaseo_opengraph_image',
+        'config'  => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig('tx_metaseo_opengraph_image', array(
+                'maxitems' => 1
+            )
+        )
+    ),
     'tx_metaseo_is_exclude'       => array(
         'label'   => 'LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.tx_metaseo_is_exclude',
         'exclude' => 1,
@@ -212,6 +220,11 @@
     'canNotCollapse' => 1
 );
 
+$GLOBALS['TCA']['pages']['palettes']['tx_metaseo_opengraph'] = array(
+    'showitem'       => 'tx_metaseo_opengraph_image',
+    'canNotCollapse' => 1
+);
+
 $GLOBALS['TCA']['pages']['palettes']['tx_metaseo_crawler'] = array(
     'showitem'       => 'tx_metaseo_is_exclude,--linebreak--,tx_metaseo_canonicalurl',
     'canNotCollapse' => 1
@@ -241,6 +254,7 @@
     'pages',
     '--div--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.tab.seo;,--palette--;'
     . 'LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.palette.pagetitle;tx_metaseo_pagetitle,'
+    . '--palette--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.palette.opengraph;tx_metaseo_opengraph,'
     . '--palette--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.palette.geo;tx_metaseo_geo,'
     . '--palette--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.palette.crawler;'
     . 'tx_metaseo_crawler,--palette--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:'

diff --git a/Configuration/TCA/Overrides/pages_language_overlay.php b/Configuration/TCA/Overrides/pages_language_overlay.php
@@ -26,6 +26,15 @@
             'eval'     => 'trim',
         )
     ),
+    'tx_metaseo_opengraph_image' => array(
+        'exclude' => 1,
+        'label'   => 'LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:'
+            . 'pages.tx_metaseo_opengraph_image',
+        'config'  => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig('tx_metaseo_opengraph_image', array(
+                'maxitems' => 1
+            )
+        )
+    ),
     'tx_metaseo_pagetitle_prefix' => array(
         'label'   => 'LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:'
             . 'pages.tx_metaseo_pagetitle_prefix',
@@ -80,6 +89,11 @@
     'canNotCollapse' => 1
 );
 
+$GLOBALS['TCA']['pages_language_overlay']['palettes']['tx_metaseo_opengraph'] = array(
+    'showitem'       => 'tx_metaseo_opengraph_image',
+    'canNotCollapse' => 1
+);
+
 $GLOBALS['TCA']['pages_language_overlay']['palettes']['tx_metaseo_crawler'] = array(
     'showitem'       => 'tx_metaseo_canonicalurl',
     'canNotCollapse' => 1
@@ -97,6 +111,7 @@
     'pages_language_overlay',
     '--div--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.tab.seo;,--palette--;'
     . 'LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.palette.pagetitle;tx_metaseo_pagetitle,'
+    . '--palette--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.palette.opengraph;tx_metaseo_opengraph,'
     . '--palette--;LLL:EXT:metaseo/Resources/Private/Language/TCA/locallang.xlf:pages.palette.crawler;'
     . 'tx_metaseo_crawler',
     '',

diff --git a/Configuration/TypoScript/constants.txt b/Configuration/TypoScript/constants.txt
@@ -2,6 +2,7 @@
 # This are the default TS-constants for metaseo
 ##
 plugin.metaseo {
+
     # cat=plugin.metaseo.metaTags/page/01; type=string; label= Meta Description: Short description of your webpage.
     metaTags.description =
 
@@ -62,6 +63,12 @@ plugin.metaseo {
     # cat=plugin.metaseo.metaTags/enable/26; type=boolean; label= OpenGraph Tags: Enable generation of OpenGraph Tags
     metaTags.opengraph = 1
 
+    # cat=plugin.metaseo.metaTags/page/20; type=string; label= Open Graph image width
+    metaTags.opengraphImageWidth = 1200c
+
+    # cat=plugin.metaseo.metaTags/page/21; type=string; label= Open Graph image height
+    metaTags.opengraphImageHeight = 630c
+
     # cat=plugin.metaseo.metaTags/enable/27; type=boolean; label= Publish Page Expire Time: Anounce Expire Tag (TYPO3's enddate in content elements).
     metaTags.useExpire = 1
 
@@ -181,4 +188,7 @@ plugin.metaseo {
 
     # cat=plugin.metaseo.sitemap/index/01; type=boolean; label= Lastmod tag in sitemap: Include lastmod tag in sitemap
     sitemap.enableLastMod = 1
+
+    # cat=plugin.metaseo.extensibility/page/01; type=string; label= Doktypes list for backend page tree
+    extensibility.allowedDoktypes = 1,4
 }
diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
@@ -25,6 +25,13 @@ page {
 # TypoScript added by extension "metaseo"
 plugin.metaseo =
 plugin.metaseo {
+
+    # extensibility options
+    extensibility =
+    extensibility {
+        allowedDoktypes = {$plugin.metaseo.extensibility.allowedDoktypes}
+    }
+
     # Page title generator
     pageTitle =
     pageTitle {
@@ -145,6 +152,52 @@ plugin.metaseo {
                 field = title
             }
 
+            image {
+                url = FILES
+                url {
+                    references {
+                        table = pages
+                        uid.data = page:uid
+                        fieldName = tx_metaseo_opengraph_image
+                    }
+                    renderObj = TEXT
+                    renderObj {
+                        typolink {
+                            parameter {
+                                stdWrap.cObject = IMG_RESOURCE
+                                stdWrap.cObject {
+                                    file {
+                                        import.data = file:current:uid
+                                        treatIdAsReference = 1
+                                        width = {$plugin.metaseo.metaTags.opengraphImageWidth}
+                                        height = {$plugin.metaseo.metaTags.opengraphImageHeight}
+                                    }
+                                }
+                            }
+                            returnLast = url
+                            forceAbsoluteUrl = 1
+                        }
+                    }
+                }
+
+                width = TEXT
+                width {
+                    data = TSFE:lastImgResourceInfo|0
+                }
+
+                height = TEXT
+                height {
+                    data = TSFE:lastImgResourceInfo|1
+                }
+
+                type = TEXT
+                type {
+                    wrap = image/|
+                    data = TSFE:lastImgResourceInfo|2
+                    required = 1
+                }
+            }
+
             type = article
             admins = 
             email = {$plugin.metaseo.metaTags.email}

diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
@@ -17,9 +17,15 @@ Changelog
 +=============+====================================================================================================+
 | **2.1.0**   | **New feature and Bugfix release**                                                                 |
 |             |                                                                                                    |
+|             | - Added support for OpenGraph images                                                               |
+|             | - Display custom page doktypes in SEO/Metatags section                                             |
 |             |                                                                                                    |
+|             | **Migration to 2.1.0:**                                                                            |
 |             |                                                                                                    |
-|             | `Milestone 2.1.0 <https://github.com/mblaschke/TYPO3-metaseo/milestone/17?closed=1>`_              |
+|             | - Compare and update the database schema in the install tool.                                      |
+|             | - Page title prefix/suffix inheritance has changed. Please check your titles.                      |
+|             |                                                                                                    |
+|             | `Milestone 2.1.0 <https://github.com/mblaschke/TYPO3-metaseo/milestone/5?closed=1>`_               |
 |             | `Changes in 2.1.0 <https://github.com/mblaschke/TYPO3-metaseo/compare/2.0.4...2.1.0>`_             |
 +-------------+----------------------------------------------------------------------------------------------------+
 | **2.0.4**   | **New feature and Bugfix release**                                                                 |