From 93e4d2dd63ba11adbee102b14fa4f22013977e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20G=C3=B6tzinger?= Date: Wed, 14 Feb 2018 12:51:55 +0100 Subject: [PATCH] =?UTF-8?q?Imports=20f=C3=BCr=20DcaHelper=20erg=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Resources/contao/dca/tl_article.php | 9 ++++---- src/Resources/contao/dca/tl_content.php | 30 +++++++++++++------------ src/Resources/contao/dca/tl_faq.php | 9 ++++---- src/Resources/contao/dca/tl_module.php | 10 +++++---- src/Resources/contao/dca/tl_news.php | 9 ++++---- src/Resources/contao/dca/tl_page.php | 10 +++++---- 6 files changed, 43 insertions(+), 34 deletions(-) diff --git a/src/Resources/contao/dca/tl_article.php b/src/Resources/contao/dca/tl_article.php index e08d5f2..920ecab 100644 --- a/src/Resources/contao/dca/tl_article.php +++ b/src/Resources/contao/dca/tl_article.php @@ -27,8 +27,9 @@ * @license GNU/LGPL * @filesource */ - - + + use cgoIT/rateit/DcaHelper; + /** * Extend tl_article */ @@ -80,14 +81,14 @@ $GLOBALS['TL_DCA']['tl_article']['fields']['rateit_template'] = array 'eval' => array('mandatory'=>true, 'tl_class'=>'w50') ); -class tl_article_rating extends rateit\DcaHelper { +class tl_article_rating extends DcaHelper { /** * Constructor */ public function __construct() { parent::__construct(); } - + /** * Return all navigation templates as array * @param DataContainer diff --git a/src/Resources/contao/dca/tl_content.php b/src/Resources/contao/dca/tl_content.php index fcbdc87..20ec446 100644 --- a/src/Resources/contao/dca/tl_content.php +++ b/src/Resources/contao/dca/tl_content.php @@ -28,6 +28,8 @@ * @filesource */ + use cgoIT/rateit/DcaHelper; + $GLOBALS['TL_DCA']['tl_content']['config']['onsubmit_callback'][] = array('tl_content_rateit','insert'); $GLOBALS['TL_DCA']['tl_content']['config']['ondelete_callback'][] = array('tl_content_rateit','delete'); @@ -62,7 +64,7 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['rateit_active'] = array /** * Class tl_content_rateit */ -class tl_content_rateit extends rateit\DcaHelper { +class tl_content_rateit extends DcaHelper { /** * Constructor @@ -70,31 +72,31 @@ class tl_content_rateit extends rateit\DcaHelper { public function __construct() { parent::__construct(); } - + public function insert(\DC_Table $dc) { if ($dc->activeRecord->type == "gallery") { $type = 'galpic'; - + // Alle vorherigen Bilder erst mal auf inaktiv setzen $this->Database->prepare("UPDATE tl_rateit_items SET active='' WHERE rkey LIKE ? AND typ=?")->execute($dc->activeRecord->id.'|%', $type); - + if (version_compare(VERSION, '3.2', '>=')) { $objFiles = \FilesModel::findMultipleByUuids(deserialize($dc->activeRecord->multiSRC)); } else { $objFiles = \FilesModel::findMultipleByIds(deserialize($dc->activeRecord->multiSRC)); } - + if ($objFiles !== null) { // Get all images while ($objFiles->next()) { // Single files if ($objFiles->type == 'file') { $objFile = new \File($objFiles->path, true); - + if (!$objFile->isGdImage) { continue; } - + $this->insertOrUpdateRatingItemGallery($dc, $type, $objFile->name, $objFiles->id, ($dc->activeRecord->rateit_active ? '1' : '')); } // Folders @@ -104,23 +106,23 @@ class tl_content_rateit extends rateit\DcaHelper { } else { $objSubfiles = \FilesModel::findByPid($objFiles->id); } - + if ($objSubfiles === null) { continue; } - + while ($objSubfiles->next()) { // Skip subfolders if ($objSubfiles->type == 'folder') { continue; } - + $objFile = new \File($objSubfiles->path, true); - + if (!$objFile->isGdImage) { continue; } - + $this->insertOrUpdateRatingItemGallery($dc, $type, $objSubfiles->name, $objSubfiles->id, ($dc->activeRecord->rateit_active ? '1' : '')); } } @@ -142,7 +144,7 @@ class tl_content_rateit extends rateit\DcaHelper { return $this->deleteRatingKey($dc, 'ce'); } } - + private function insertOrUpdateRatingItemGallery(\DC_Table &$dc, $type, $strName, $imgId, $active) { $rkey = $dc->activeRecord->id.'|'.$imgId; $headline = deserialize($dc->activeRecord->headline); @@ -173,4 +175,4 @@ class tl_content_rateit extends rateit\DcaHelper { } } } -?> \ No newline at end of file +?> diff --git a/src/Resources/contao/dca/tl_faq.php b/src/Resources/contao/dca/tl_faq.php index f71ac9f..da4c58e 100644 --- a/src/Resources/contao/dca/tl_faq.php +++ b/src/Resources/contao/dca/tl_faq.php @@ -27,8 +27,9 @@ * @license GNU/LGPL * @filesource */ - - + +use cgoIT/rateit/DcaHelper; + /** * Extend tl_article */ @@ -69,14 +70,14 @@ $GLOBALS['TL_DCA']['tl_faq']['fields']['rateit_position'] = array 'eval' => array('mandatory'=>true, 'tl_class'=>'w50') ); -class tl_faq_rating extends rateit\DcaHelper { +class tl_faq_rating extends DcaHelper { /** * Constructor */ public function __construct() { parent::__construct(); } - + public function insert(\DC_Table $dc) { return $this->insertOrUpdateRatingKey($dc, 'faq', $dc->activeRecord->question); } diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php index 367e933..608cfe2 100644 --- a/src/Resources/contao/dca/tl_module.php +++ b/src/Resources/contao/dca/tl_module.php @@ -1,4 +1,4 @@ -insertOrUpdateRatingKey($dc, 'module', $dc->activeRecord->rateit_title); } @@ -137,4 +139,4 @@ class tl_module_rateit extends rateit\DcaHelper { return $this->getTemplateGroup('mod_rateit_top', $intPid); } } -?> \ No newline at end of file +?> diff --git a/src/Resources/contao/dca/tl_news.php b/src/Resources/contao/dca/tl_news.php index 4eaab58..6caa8bf 100644 --- a/src/Resources/contao/dca/tl_news.php +++ b/src/Resources/contao/dca/tl_news.php @@ -27,8 +27,9 @@ * @license GNU/LGPL * @filesource */ - - + +use cgoIT/rateit/DcaHelper; + /** * Extend tl_article */ @@ -69,14 +70,14 @@ $GLOBALS['TL_DCA']['tl_news']['fields']['rateit_position'] = array 'eval' => array('mandatory'=>true, 'tl_class'=>'w50') ); -class tl_news_rating extends rateit\DcaHelper { +class tl_news_rating extends DcaHelper { /** * Constructor */ public function __construct() { parent::__construct(); } - + public function insert(\DC_Table $dc) { return $this->insertOrUpdateRatingKey($dc, 'news', $dc->activeRecord->headline); } diff --git a/src/Resources/contao/dca/tl_page.php b/src/Resources/contao/dca/tl_page.php index ab3324a..2e6fb83 100644 --- a/src/Resources/contao/dca/tl_page.php +++ b/src/Resources/contao/dca/tl_page.php @@ -27,8 +27,10 @@ * @license GNU/LGPL * @filesource */ - - + + +use cgoIT/rateit/DcaHelper; + /** * Extend tl_page */ @@ -81,14 +83,14 @@ $GLOBALS['TL_DCA']['tl_page']['fields']['rateit_position'] = array 'eval' => array('mandatory'=>true, 'tl_class'=>'w50') ); -class tl_page_rateit extends rateit\DcaHelper { +class tl_page_rateit extends DcaHelper { /** * Constructor */ public function __construct() { parent::__construct(); } - + public function insert(\DC_Table $dc) { return $this->insertOrUpdateRatingKey($dc, 'page', $dc->activeRecord->title); }