'
- . $GLOBALS['TL_LANG']['tl_module']['rsts_getPro']
- . '
';
- },
+// maximum number of visible slides
+$GLOBALS['TL_DCA']['tl_module']['fields']['rsts_slideMaxCount'] = array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_module']['rsts_slideMaxCount'],
+ 'exclude' => true,
+ 'inputType' => 'select',
+ 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20),
+ 'eval' => array('tl_class' => 'w50', 'includeBlankOption' => true),
+ 'sql' => "int(10) unsigned NOT NULL default '0'",
+);
+// number of slides to navigate by clicking prev or next
+$GLOBALS['TL_DCA']['tl_module']['fields']['rsts_prevNextSteps'] = array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_module']['rsts_prevNextSteps'],
+ 'exclude' => true,
+ 'inputType' => 'select',
+ 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20),
+ 'eval' => array('tl_class' => 'w50', 'includeBlankOption' => true),
+ 'sql' => "int(10) unsigned NOT NULL default '0'",
+);
+// the size of the area for the visible slide (0 = 0%, 1 = 100%)
+$GLOBALS['TL_DCA']['tl_module']['fields']['rsts_visibleArea'] = array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_module']['rsts_visibleArea'],
+ 'exclude' => true,
+ 'inputType' => 'text',
+ 'eval' => array('tl_class' => 'w50 clr'),
+ 'sql' => "double unsigned NOT NULL default '0'",
+);
+// maximum size of the area for the visible slide in px
+$GLOBALS['TL_DCA']['tl_module']['fields']['rsts_visibleAreaMax'] = array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_module']['rsts_visibleAreaMax'],
+ 'exclude' => true,
+ 'inputType' => 'text',
+ 'eval' => array('tl_class' => 'w50'),
+ 'sql' => "double unsigned NOT NULL default '0'",
+);
+// minimal size of one slide in px
+$GLOBALS['TL_DCA']['tl_module']['fields']['rsts_slideMinSize'] = array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_module']['rsts_slideMinSize'],
+ 'exclude' => true,
+ 'inputType' => 'text',
+ 'eval' => array('tl_class' => 'w50'),
+ 'sql' => "int(10) unsigned NOT NULL default '0'",
+);
+// combine navigation items if multiple slides are visible (default true)
+$GLOBALS['TL_DCA']['tl_module']['fields']['rsts_combineNavItems'] = array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_module']['rsts_combineNavItems'],
+ 'exclude' => true,
+ 'inputType' => 'checkbox',
+ 'eval' => array('tl_class' => 'w50 m12'),
+ 'sql' => "char(1) NOT NULL default '1'",
);
// custom slider skin (rsts_skin gets ignored if this is set)
$GLOBALS['TL_DCA']['tl_module']['fields']['rsts_customSkin'] = array(
diff --git a/dca/tl_rocksolid_slide.php b/dca/tl_rocksolid_slide.php
index aada86c..7cd9180 100644
--- a/dca/tl_rocksolid_slide.php
+++ b/dca/tl_rocksolid_slide.php
@@ -19,6 +19,9 @@
'ctable' => array('tl_content'),
'switchToEdit' => true,
'enableVersioning' => true,
+ 'onload_callback' => array(
+ array('MadeYourDay\\Contao\\Slider', 'slideOnloadCallback'),
+ ),
'sql' => array(
'keys' => array(
'id' => 'primary',
@@ -90,7 +93,7 @@
),
'palettes' => array(
- 'default' => '{title_legend},title,videoURL,singleSRC,scaleMode,imagePosition,centerContent,invertControls;{background_legend},getPro;{expert_legend},slideClass,sliderClass;{publish_legend},published,start,stop',
+ 'default' => '{title_legend},title,videoURL,singleSRC,scaleMode,imagePosition,centerContent,invertControls;{background_legend},backgroundImage,backgroundVideos,backgroundImageSize,backgroundScaleMode,backgroundPosition;{expert_legend},slideClass,sliderClass;{publish_legend},published,start,stop',
),
'fields' => array(
@@ -183,12 +186,72 @@
'eval' => array('tl_class' => 'w50 m12'),
'sql' => "char(1) NOT NULL default ''",
),
- 'getPro' => array(
- 'input_field_callback' => function() {
- return ''
- . $GLOBALS['TL_LANG']['tl_rocksolid_slide']['getPro']
- . '
';
- },
+ 'backgroundImage' => array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['backgroundImage'],
+ 'exclude' => true,
+ 'inputType' => 'fileTree',
+ 'eval' => array(
+ 'fieldType' => 'radio',
+ 'files' => true,
+ 'filesOnly' => true,
+ ),
+ 'sql' => version_compare(VERSION, '3.2', '<') ? "varchar(255) NOT NULL default ''" : "binary(16) NULL",
+ ),
+ 'backgroundVideos' => array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['backgroundVideos'],
+ 'exclude' => true,
+ 'inputType' => 'fileTree',
+ 'eval' => array(
+ 'multiple' => true,
+ 'fieldType' => 'checkbox',
+ 'orderField' => 'backgroundVideosOrder',
+ 'files' => true,
+ 'filesOnly' => true,
+ ),
+ 'sql' => "blob NULL",
+ ),
+ 'backgroundVideosOrder' => array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['backgroundVideosOrder'],
+ 'sql' => "blob NULL",
+ ),
+ 'backgroundImageSize' => array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['backgroundImageSize'],
+ 'exclude' => true,
+ 'inputType' => 'imageSize',
+ 'options' => version_compare(VERSION, '3.4', '<') ? $GLOBALS['TL_CROP'] : System::getImageSizes(),
+ 'reference' => &$GLOBALS['TL_LANG']['MSC'],
+ 'eval' => array(
+ 'rgxp' => 'digit',
+ 'nospace' => true,
+ 'helpwizard' => true,
+ 'tl_class' => 'w50',
+ 'includeBlankOption' => true,
+ ),
+ 'sql' => "varchar(64) NOT NULL default ''",
+ ),
+ 'backgroundScaleMode' => array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['backgroundScaleMode'],
+ 'exclude' => true,
+ 'inputType' => 'select',
+ 'options' => array('fit', 'crop', 'scale', 'none'),
+ 'reference' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['scaleModes'],
+ 'eval' => array(
+ 'includeBlankOption' => true,
+ 'tl_class' => 'w50 clr',
+ ),
+ 'sql' => "varchar(64) NOT NULL default ''",
+ ),
+ 'backgroundPosition' => array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['backgroundPosition'],
+ 'exclude' => true,
+ 'inputType' => 'select',
+ 'options' => array('center', 'top', 'right', 'bottom', 'left', 'top-left', 'top-right', 'bottom-left', 'bottom-right'),
+ 'reference' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['imagePositions'],
+ 'eval' => array(
+ 'includeBlankOption' => true,
+ 'tl_class' => 'w50',
+ ),
+ 'sql' => "varchar(64) NOT NULL default ''",
),
'slideClass' => array(
'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slide']['slideClass'],
diff --git a/dca/tl_rocksolid_slider.php b/dca/tl_rocksolid_slider.php
index 1ffc54f..15ba5f7 100644
--- a/dca/tl_rocksolid_slider.php
+++ b/dca/tl_rocksolid_slider.php
@@ -37,6 +37,12 @@
'format' => '%s',
),
'global_operations' => array(
+ 'license' => array(
+ 'label' => &$GLOBALS['TL_LANG']['tl_rocksolid_slider']['editLicense'],
+ 'href' => 'table=tl_rocksolid_slider_license',
+ 'class' => 'header_icon',
+ 'icon' => 'system/themes/default/images/settings.gif',
+ ),
'all' => array(
'label' => &$GLOBALS['TL_LANG']['MSC']['all'],
'href' => 'act=select',
diff --git a/dca/tl_rocksolid_slider_license.php b/dca/tl_rocksolid_slider_license.php
new file mode 100644
index 0000000..ba61fdf
--- /dev/null
+++ b/dca/tl_rocksolid_slider_license.php
@@ -0,0 +1,38 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * RockSolid Slider license DCA
+ *
+ * @author Martin Auswöger ' . $GLOBALS['TL_DCA'][$table]['fields'][$field]['label'][1], + ); + } + + foreach ($GLOBALS['TL_DCA'][$table]['palettes'] as $key => $palette) { + foreach ($legends as $legend) { + $GLOBALS['TL_DCA'][$table]['palettes'][$key] = preg_replace('(\\{' . $legend . '\\}[^;]*(;|$))', '{' . $legend . '},rsts_getPro$1', $palette); + } + $GLOBALS['TL_DCA'][$table]['fields']['rsts_getPro'] = array( + 'input_field_callback' => function() { + return ''; + }, + ); + } + } + + /** + * On load callback for tl_rocksolid_slide + * + * @param \DataContainer $dc + * @return void + */ + public function slideOnloadCallback($dc) + { + if (!static::checkLicense()) { + $this->removeProFields($dc->table, array('centerContent'), array('background_legend')); + } + } + + /** + * On load callback for tl_content + * + * @param \DataContainer $dc + * @return void + */ + public function contentOnloadCallback($dc) + { + if (!static::checkLicense()) { + $this->removeProFields($dc->table, array('rsts_content_type', 'rsts_direction', 'rsts_centerContent'), array('rsts_carousel_legend')); + } + + if (!$dc->id) { + return; + } + + $contentElement = \ContentModel::findByPk($dc->id); + + if (!$contentElement || !isset($contentElement->type)) { + return; + } + + if ($contentElement->type === 'rocksolid_slider') { + $GLOBALS['TL_DCA'][$dc->table]['fields']['multiSRC']['eval']['isGallery'] = true; + $GLOBALS['TL_DCA'][$dc->table]['fields']['multiSRC']['eval']['filesOnly'] = true; + $GLOBALS['TL_DCA'][$dc->table]['fields']['multiSRC']['eval']['extensions'] = $GLOBALS['TL_CONFIG']['validImageTypes']; + } + } + + /** + * On load callback for tl_module + * + * @param \DataContainer $dc + * @return void + */ + public function moduleOnloadCallback($dc) + { + if (!static::checkLicense()) { + $this->removeProFields($dc->table, array('rsts_content_type', 'rsts_direction', 'rsts_centerContent'), array('rsts_carousel_legend')); + } + + if (!$dc->id) { + return; + } + + $module = \ModuleModel::findByPk($dc->id); + + if (!$module || !isset($module->type)) { + return; + } + + if ($module->type === 'rocksolid_slider') { + $GLOBALS['TL_DCA'][$dc->table]['fields']['multiSRC']['eval']['isGallery'] = true; + $GLOBALS['TL_DCA'][$dc->table]['fields']['multiSRC']['eval']['filesOnly'] = true; + $GLOBALS['TL_DCA'][$dc->table]['fields']['multiSRC']['eval']['extensions'] = $GLOBALS['TL_CONFIG']['validImageTypes']; + } + } + + /** + * parseFrontendTemplate hook for SliderEvents::getEventItems() + * + * @param string $contents HTML output + * @param string $template Temmplate name + * @return string Modified HTML output + */ + public function parseEventsTemplateHook($contents, $template) + { + // Only modify output of event templates + if (substr($template, 0, 6) === 'event_') { + $contents = SliderEvents::TEMPLATE_SEPARATOR . $contents; + } + + return $contents; + } + + /** + * Check if the license key is valid + * + * @param string $value + * @param \DataContainer $dc + * @return string value + */ + public function licenseSaveCallback($value, $dc) + { + if ($value !== '' && !static::checkLicense($value)) { + throw new \Exception($GLOBALS['TL_LANG']['tl_rocksolid_slider_license']['invalidLicense']); + } + + return $value; + } + + /** + * Checksums of valid license keys + */ + static private $validLicenseChecksums = array( + '85380d820cc50b8542cec3e51d4eac9f', '4732b9a9dd3aae401c98f63294d170a1', '22d538b507a6a0bc095e1a811f4e6f7d', '60f659e658b30dd06902953309f0fb34', '0176edfaa880a282190fd3e165317d10', 'f3d8f0ebfab6534a5a27a62ef95a6529', 'ad82206facc36748c8bc8d91c0586ca3', '8384d476c3a9d6382543d304cfd6c21d', 'f8e8f2da06997ef4c9377563789cc35c', '8ef64e085fa33b4d854b2946def8c869', '5174f9cbb4bac399c12d40660a5e3113', '41b73c9596d5eac961f2d2e96645e004', '1e51b48b566c82563da966f2ee6a7dbc', '822d2eb467c9729ed9c0541fdeae590e', '454e2484c52f396499670928667f43b2', 'e71564d3ebff2ec8636085c379b7e29d', '25bbedcf242e3a0380f59880b6d46d81', '2c1eb7b8a750988d2ec66668ec26d253', '4f2b3524fc8ec25a883cc6329081dccf', 'b9e92376c5e0fae6d335bc2ac699c5e9', 'fe7f4692ee9a6a17b902d2afef1fc384', 'cc067cd4ccd6d4b5af5a665ab59bfd43', '4797c57225b8a98ef2b8c8c97ba6e76f', 'd5ed13cf6bcca1577a7f67207b02cd97', '0b045681ff3eca3a592a7d77961c2fe8', 'dfe6840b260c9b9316febfa7c406da65', '0bf69b1dc131a8bbba1bf5807fb9cfa2', '63d833a0af1ef63d8888125a7639433e', '466331268d08c68e14f3616f8566d099', '6775eb75f3d4b3e6b2450ed15f13aa32', '5657190a80d001785e89a0ca0a40a27c', 'e77567456d818ee70771a7df84612aee', 'ce935bcbf538c212179f53bac0ab507b', '0cd0860142ebc0053337baea065bfb22', '5276e0da003cd2dfed0466088c6538fc', 'c0d482aa84f849dd4d28e0520033319b', 'ba6da4b992141b83865c34fbf6214c68', '482f1d5372ee8567029fea14a09496f7', 'af56c615f0ebc15bd32053a34783f1c9', 'cc1c33a8d5bfbd86f889e0ca3c26de6b', 'e2d95da64963873b96465bcf89f620b2', 'd2319086afa76cc40e79dd4f78bf7178', 'ce5c1dbf30c9e04de201cd5ac8ffd5f3', '2d9d84c1fd29688b898569107bf96472', '2122d3eafd546a065208d9aaa22dc4e0', '239081bf138b3266f20adf9e7b290dec', 'c8e627a9d37345cf069b7a7932c5e806', '66602424a1de4f52949fab44a995d56a', '8c2efdf01db429ebaa9556151099ba33', '4c3e8df2beee8b9a141f582a3cea4dd1', '9fda8bb2036bfbac9b218dec79eeb541', '195cab27a2e0aaeade6fdb25213e06a8', 'c7a25f2a4db2090aba98820f959ab935', '5dbeead3204e47d03a7566ab778dfbf3', '84ec8527df930916bd33c8e11a277e5f', 'da4b029288c2ca045534be801201f69f', '2c77196a51f422fe5a08fbf7b8ec8785', '603a63463eb4b6ef49481dd649d68141', '02cf5192d6b1c89a7433fee4c3d7562d', '0fe2abdb479f42e79f66b3b2eb681cdf', 'a939ca53f988ed92aca3c9406b1e6bdf', '877ff77b1fbd3f88dd4c4544d28382cd', '60362edf52603ad5913c2f83d2dda53d', '846d3be076206ae4f7a9cb96c8473fbf', '95f63730fc688b71551cfe9971bdc60d', + ); + + /** + * Check if the license key is valid + * + * @param string $license license key or null to get the it from the config + * @return bool true if the license key is valid + */ + public static function checkLicense($license = null) + { + if ($license === null) { + $license = \Config::get('rocksolid_slider_license'); + } + + if (!$license) { + return false; + } + + if (in_array(md5($license), static::$validLicenseChecksums, true)) { + return true; + } + + return false; + } } diff --git a/src/MadeYourDay/Contao/SliderRunonce.php b/src/MadeYourDay/Contao/SliderRunonce.php index cbfa918..3190681 100644 --- a/src/MadeYourDay/Contao/SliderRunonce.php +++ b/src/MadeYourDay/Contao/SliderRunonce.php @@ -24,6 +24,19 @@ public static function run() { $database = \Database::getInstance(); + // Copy license key from extension repository + if ( + !\Config::get('rocksolid_slider_license') + && $database->tableExists('tl_repository_installs') + && $database->fieldExists('lickey', 'tl_repository_installs') + && $database->fieldExists('extension', 'tl_repository_installs') + ) { + $result = $database->prepare('SELECT lickey FROM tl_repository_installs WHERE extension = \'rocksolid-slider-pro\'')->execute(); + if ($result && Slider::checkLicense((string)$result->lickey)) { + \Config::persist('rocksolid_slider_license', (string)$result->lickey); + } + } + // Fix the singleSRC data type for Contao 3.1 and below if (version_compare(VERSION, '3.2', '<') && $database->tableExists('tl_rocksolid_slide')) { $fields = $database->listFields('tl_rocksolid_slide'); diff --git a/templates/rsts_default.html5 b/templates/rsts_default.html5 index 8c7f414..20cd54e 100644 --- a/templates/rsts_default.html5 +++ b/templates/rsts_default.html5 @@ -6,7 +6,7 @@ images as $image): ?> -
+
diff --git a/templates/rsts_default.xhtml b/templates/rsts_default.xhtml
index 04d3d9c..7a07bf0 100644
--- a/templates/rsts_default.xhtml
+++ b/templates/rsts_default.xhtml
@@ -6,7 +6,7 @@
images as $image): ?>
- rsts_invertControls)): ?> data-rsts-class="options['cssPrefix']) ? 'rsts-' : $this->options['cssPrefix'] ?>invert-controls">
imgSize ?> alt="alt ?>">
@@ -38,7 +38,10 @@
if (!empty($slide['slideClass'])) {
$attributes[] = 'class="' . $slide['slideClass'] . '"';
}
- if (!empty($slide['invertControls'])) {
+ if (
+ (!empty($slide['invertControls']) && empty($this->rsts_invertControls))
+ || (empty($slide['invertControls']) && !empty($this->rsts_invertControls))
+ ) {
$slide['sliderClass'] = (empty($slide['sliderClass']) ? '' : $slide['sliderClass'] . ' ')
. (empty($this->options['cssPrefix']) ? 'rsts-' : $this->options['cssPrefix'])
. 'invert-controls';
@@ -56,6 +59,15 @@
$imageAttributes[] = 'data-rsts-position="' . $slide['imagePosition'] . '"';
}
$imageAttributes = implode(' ', $imageAttributes);
+
+ $backgroundAttributes = array('data-rsts-background');
+ if (!empty($slide['backgroundScaleMode'])) {
+ $backgroundAttributes[] = 'data-rsts-scale-mode="' . $slide['backgroundScaleMode'] . '"';
+ }
+ if (!empty($slide['backgroundPosition'])) {
+ $backgroundAttributes[] = 'data-rsts-position="' . $slide['backgroundPosition'] . '"';
+ }
+ $backgroundAttributes = implode(' ', $backgroundAttributes);
?>
@@ -97,6 +109,24 @@
+
+ poster="src ?>" >
+
+
+
+
+
+
+ 
imgSize ?> alt="alt ?>" >
+
+ insert('picture_default', $slide['backgroundImage']->picture);
+ echo preg_replace('(
+
+
+
@@ -104,5 +134,9 @@
+
rsts_invertControls)): ?> data-rsts-class="options['cssPrefix']) ? 'rsts-' : $this->options['cssPrefix'] ?>invert-controls">
imgSize ?> alt="alt ?>" />
@@ -38,7 +38,10 @@
if (!empty($slide['slideClass'])) {
$attributes[] = 'class="' . $slide['slideClass'] . '"';
}
- if (!empty($slide['invertControls'])) {
+ if (
+ (!empty($slide['invertControls']) && empty($this->rsts_invertControls))
+ || (empty($slide['invertControls']) && !empty($this->rsts_invertControls))
+ ) {
$slide['sliderClass'] = (empty($slide['sliderClass']) ? '' : $slide['sliderClass'] . ' ')
. (empty($this->options['cssPrefix']) ? 'rsts-' : $this->options['cssPrefix'])
. 'invert-controls';
@@ -56,6 +59,15 @@
$imageAttributes[] = 'data-rsts-position="' . $slide['imagePosition'] . '"';
}
$imageAttributes = implode(' ', $imageAttributes);
+
+ $backgroundAttributes = array('data-rsts-background');
+ if (!empty($slide['backgroundScaleMode'])) {
+ $backgroundAttributes[] = 'data-rsts-scale-mode="' . $slide['backgroundScaleMode'] . '"';
+ }
+ if (!empty($slide['backgroundPosition'])) {
+ $backgroundAttributes[] = 'data-rsts-position="' . $slide['backgroundPosition'] . '"';
+ }
+ $backgroundAttributes = implode(' ', $backgroundAttributes);
?>
@@ -97,6 +109,24 @@
+
+ poster="src ?>" >
+
+
+
+
+
@@ -105,6 +135,10 @@