Snck3rs/contao-leaflet-geocode-widget
1
0
Fork 1
mirror of https://github.com/netzmacht/contao-leaflet-geocode-widget.git synced 2025-11-28 11:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move GeocodeWidget to Widget namespace.

Browse Source
This commit is contained in:
David Molineus
2018-02-06 13:19:05 +01:00
parent e505651cd9
commit c0ce2f4c5c
3 changed files with 154 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/GeocodeWidget.php
View File

@@ -5,130 +5,38 @@
*
* @package netzmacht
* @author David Molineus <david.molineus@netzmacht.de>
* @copyright 2016-2017 netzmacht David Molineus. All rights reserved.
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
* @filesource
*/
namespace Netzmacht\Contao\Leaflet\GeocodeWidget;
use Netzmacht\Contao\Leaflet\GeocodeWidget\Widget\GeocodeWidget as BaseWidget;
/**
* Class GeocodeWidget
*
* @property int size
* @property bool multiple
* @package Netzmacht\Contao\Leaflet\GeocodeWidget
* @deprecated
*/
class GeocodeWidget extends \Widget
class GeocodeWidget extends BaseWidget
{
/**
* Submit user input.
*
* @var boolean
* {@inheritdoc}
*/
protected $blnSubmitInput = true;
/**
* Add a for attribute.
*
* @var boolean
*/
protected $blnForAttribute = true;
/**
* Template.
*
* @var string
*/
protected $strTemplate = 'be_widget';
/**
* Template name.
*
* @var string
*/
protected $widgetTemplate = 'be_widget_leaflet_geocode';
/**
* Validate the input.
*
* @param mixed $value Given value.
*
* @return mixed
*
* @SuppressWarnings(PHPMD.Superglobals)
*/
protected function validator($value)
public function __construct(array $arrAttributes = null)
{
$value = parent::validator($value);
parent::__construct($arrAttributes);
if (!$value) {
return $value;
}
if (is_array($value)) {
foreach ($value as $key => $val) {
$value[$key] = $this->validator($val);
}
return $value;
}
// See: http://stackoverflow.com/a/18690202
if (!preg_match(
'#^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)(,[-+]?\d+)?$#',
$value
)) {
$this->addError(
@trigger_error(
sprintf(
$GLOBALS['TL_LANG']['ERR']['leafletInvalidCoordinate'],
$value
)
'"%s" is deprecated and will be removed in version 2.0.0. Use "%s" instead.',
GeocodeWidget::class,
BaseWidget::class
),
E_USER_DEPRECATED
);
}
return $value;
}
/**
* Generate the widget.
*
* @return string
*/
public function generate()
{
$wrapperClass = 'wizard';
if (!$this->multiple || !$this->size) {
$this->size = 1;
} else {
$wrapperClass .= ' wizard_' . $this->size;
}
if (!is_array($this->value)) {
$this->value = [$this->value];
}
$buffer = '';
for ($index = 0; $index < $this->size; $index++) {
$template = new \BackendTemplate($this->widgetTemplate);
$template->setData(
[
'wrapperClass' => $wrapperClass,
'widget' => $this,
'value' => \StringUtil::specialchars($this->value[$index]),
'class' => $this->strClass ? ' ' . $this->strClass : '',
'id' => $this->strId . (($this->size > 1) ? '_' . $index : ''),
'name' => $this->strName . (($this->size > 1) ? '[]' : ''),
'attributes' => $this->getAttributes(),
'wizard' => $this->wizard,
'label' => $this->strLabel,
]
);
$buffer .= $template->parse();
}
return $buffer;
}
}

4
src/Resources/contao/config/config.php
View File

@@ -5,9 +5,9 @@
*
* @package netzmacht
* @author David Molineus <david.molineus@netzmacht.de>
* @copyright 2016-2017 netzmacht David Molineus. All rights reserved.
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
* @filesource
*/
$GLOBALS['BE_FFL']['leaflet_geocode'] = 'Netzmacht\Contao\Leaflet\GeocodeWidget\GeocodeWidget';
$GLOBALS['BE_FFL']['leaflet_geocode'] = 'Netzmacht\Contao\Leaflet\GeocodeWidget\Widget\GeocodeWidget';

134
src/Widget/GeocodeWidget.php Normal file
View File

@@ -0,0 +1,134 @@
<?php
/**
* Geocode backend widget based on Leaflet.
*
* @package netzmacht
* @author David Molineus <david.molineus@netzmacht.de>
* @copyright 2016-2018 netzmacht David Molineus. All rights reserved.
* @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-geocode-widget/blob/master/LICENSE
* @filesource
*/
namespace Netzmacht\Contao\Leaflet\GeocodeWidget\Widget;
/**
* Class GeocodeWidget
*
* @property int size
* @property bool multiple
*/
class GeocodeWidget extends \Widget
{
/**
* Submit user input.
*
* @var boolean
*/
protected $blnSubmitInput = true;
/**
* Add a for attribute.
*
* @var boolean
*/
protected $blnForAttribute = true;
/**
* Template.
*
* @var string
*/
protected $strTemplate = 'be_widget';
/**
* Template name.
*
* @var string
*/
protected $widgetTemplate = 'be_widget_leaflet_geocode';
/**
* Validate the input.
*
* @param mixed $value Given value.
*
* @return mixed
*
* @SuppressWarnings(PHPMD.Superglobals)
*/
protected function validator($value)
{
$value = parent::validator($value);
if (!$value) {
return $value;
}
if (is_array($value)) {
foreach ($value as $key => $val) {
$value[$key] = $this->validator($val);
}
return $value;
}
// See: http://stackoverflow.com/a/18690202
if (!preg_match(
'#^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)(,[-+]?\d+)?$#',
$value
)) {
$this->addError(
sprintf(
$GLOBALS['TL_LANG']['ERR']['leafletInvalidCoordinate'],
$value
)
);
}
return $value;
}
/**
* Generate the widget.
*
* @return string
*/
public function generate()
{
$wrapperClass = 'wizard';
if (!$this->multiple || !$this->size) {
$this->size = 1;
} else {
$wrapperClass .= ' wizard_' . $this->size;
}
if (!is_array($this->value)) {
$this->value = [$this->value];
}
$buffer = '';
for ($index = 0; $index < $this->size; $index++) {
$template = new \BackendTemplate($this->widgetTemplate);
$template->setData(
[
'wrapperClass' => $wrapperClass,
'widget' => $this,
'value' => \StringUtil::specialchars($this->value[$index]),
'class' => $this->strClass ? ' ' . $this->strClass : '',
'id' => $this->strId . (($this->size > 1) ? '_' . $index : ''),
'name' => $this->strName . (($this->size > 1) ? '[]' : ''),
'attributes' => $this->getAttributes(),
'wizard' => $this->wizard,
'label' => $this->strLabel,
]
);
$buffer .= $template->parse();
}
return $buffer;
}
}