$message
"), + ]; + } + + /** + * Avoid information disclosure by displaying the same status, regardless wether the email address actually exists + * + * @param array $data + * @return HTTPResponse + */ + protected function redirectToSuccess(array $data) + { + $link = $this->link('passwordsent').'?email='.$data['Email']; + + return $this->redirect($this->addBackURLParam($link)); + } +} diff --git a/app/src/Extensions/PlaceholderFormExtension.php b/app/src/Extensions/PlaceholderFormExtension.php new file mode 100644 index 0000000..7168ddb --- /dev/null +++ b/app/src/Extensions/PlaceholderFormExtension.php @@ -0,0 +1,37 @@ +setPlaceholder($field); + } + } + + private function setPlaceholder($field) + { + if(is_a($field, TextField::class)) { + $field->setAttribute( + 'placeholder', + $field->Title() + .($field->hasClass('requiredField') ? '*' : '') + ); + $field->setTitle(''); + } + + if(is_a($field, CompositeField::class)) { + $children = $field->getChildren(); + foreach ($children as $child) { + $this->setPlaceholder($child); + } + } + } +} diff --git a/app/src/Extensions/SiteConfigExtension.php b/app/src/Extensions/SiteConfigExtension.php index dcd58fe..620df96 100644 --- a/app/src/Extensions/SiteConfigExtension.php +++ b/app/src/Extensions/SiteConfigExtension.php @@ -11,6 +11,7 @@ use SilverStripe\ORM\DataExtension; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\TreeMultiselectField; +use SilverStripe\Forms\DropdownField; use BetterBrief\GoogleMapField; class SiteConfigExtension extends DataExtension diff --git a/app/src/Extensions/UserDefinedFormExtension.php b/app/src/Extensions/UserDefinedFormExtension.php new file mode 100644 index 0000000..5167979 --- /dev/null +++ b/app/src/Extensions/UserDefinedFormExtension.php @@ -0,0 +1,79 @@ + 'HTMLText', + 'RedirectOnComplete' => 'Boolean(0)', + 'RedirectOnCompleteURL' => 'Varchar(255)', + ]; + + private static $many_many = [ + 'SubmissionColumns' => EditableFormField::class, + ]; + + public function updateCMSFields(FieldList $fields) + { + parent::updateCMSFields($fields); + + $fields->removeByName('RedirectOnComplete'); + $fields->removeByName('RedirectOnCompleteURL'); + + $fields->removeByName('SubmissionColumns'); + + $fields->addFieldToTab( + 'Root.Main', + ListboxField::create( + 'SubmissionColumns', + 'Display following columns at submissions list', + $this->owner->Fields()->map('ID', 'Title') + ) + ); + + $tab = $fields->findOrMakeTab('Root.FormOptions'); + + /*$tab->push(CheckboxField::create('RedirectOnComplete')); + $tab->push(TextField::create('RedirectOnCompleteURL'));*/ + $tab->push(TextareaField::create('CustomThankYouCode')); + + $grid = $fields->dataFieldByName('Submissions'); + + $config = $grid->getConfig(); + $config->getComponentByType(GridFieldPaginator::class)->setItemsPerPage(100); + + $cols = $this->owner->SubmissionColumns(); + if ($grid && $cols->count()) { + $dataCols = $config->getComponentByType(GridFieldDataColumns::class); + + $columns = [ + 'ID' => 'ID', + 'Created' => 'Created', + ]; + + foreach ($cols as $col) { + $title = $col->getField('Title'); + $name = $col->getField('Name'); + $columns[$name] = [ + 'title' => $title, + 'callback' => function($item) use ($name) { + return $item->relField($name); + } + ]; + } + + $columns['Actions'] = 'Actions'; + + $dataCols->setDisplayFields($columns); + } + } +} diff --git a/app/src/Pages/PageController.php b/app/src/Pages/PageController.php index e3d7e52..791f1eb 100644 --- a/app/src/Pages/PageController.php +++ b/app/src/Pages/PageController.php @@ -18,6 +18,8 @@ use SilverStripe\Forms\RequiredFields; use SilverStripe\Control\HTTPRequest; use SilverStripe\ORM\ArrayList; use DNADesign\Elemental\Models\ElementContent; +use DNADesign\Elemental\Models\ElementalArea; +use DNADesign\ElementalUserForms\Control\ElementFormController; class PageController extends ContentController { @@ -38,6 +40,26 @@ class PageController extends ContentController return $this->render(); } + public function ElementalArea() + { + if($this->CurrentElement()) { + return false; + } + + return ElementalArea::get()->byID($this->getField('ElementalAreaID')); + } + + public function CurrentElement() + { + $contoller_curr = Controller::curr(); + + if(is_a($contoller_curr, ElementFormController::class)) { + return $contoller_curr; + } + + return false; + } + public function SearchForm() { return Form::create( @@ -98,7 +120,7 @@ class PageController extends ContentController $results->removeDuplicates(); return ArrayData::create([ - 'Title' => 'Search query "'.$term.'"', + 'Title' => 'You searched for: "'.$term.'"', 'Results' => PaginatedList::create($results), ]); } @@ -124,8 +146,10 @@ class PageController extends ContentController public function getSiteWideMessage() { - if (!$this->site_message) { - $session = $this->getRequest()->getSession(); + $request = $this->getRequest(); + + if ($request->isGET() && !$this->site_message) { + $session = $request->getSession(); $this->site_message = $session->get('SiteWideMessage'); $session->clear('SiteWideMessage'); } diff --git a/app/src/Templates/DeferedRequirements.php b/app/src/Templates/DeferedRequirements.php index c3b62b1..793318e 100644 --- a/app/src/Templates/DeferedRequirements.php +++ b/app/src/Templates/DeferedRequirements.php @@ -36,6 +36,7 @@ class DeferedRequirements implements TemplateGlobalProvider public static function Auto($class = false) { $config = Config::inst()->get(self::class); + $themeName = WebpackTemplateProvider::themeName(); // Initialization Requirements::block(THIRDPARTY_DIR.'/jquery/jquery.js'); @@ -50,10 +51,10 @@ class DeferedRequirements implements TemplateGlobalProvider } // App libs if (!$config['nofontawesome']) { - DeferedRequirements::loadCSS('//use.fontawesome.com/releases/v5.3.1/css/all.css'); + DeferedRequirements::loadCSS('//use.fontawesome.com/releases/v5.4.0/css/all.css'); } - DeferedRequirements::loadCSS('app.css'); - DeferedRequirements::loadJS('app.js'); + DeferedRequirements::loadCSS($themeName.'.css'); + DeferedRequirements::loadJS($themeName.'.js'); // Class libs $class = get_class(Controller::curr()); @@ -72,17 +73,17 @@ class DeferedRequirements implements TemplateGlobalProvider $dir = Path::join( Director::publicFolder(), ManifestFileFinder::RESOURCES_DIR, - 'app', + $themeName, 'client', 'dist' ); - if (file_exists(Path::join($dir, 'css', $class . '.css'))) { - DeferedRequirements::loadCSS($class . '.css'); + if (file_exists(Path::join($dir, 'css', $themeName.'_'.$class . '.css'))) { + DeferedRequirements::loadCSS($themeName.'_'.$class . '.css'); } - if (file_exists(Path::join($dir, 'js', $class . '.js'))) { - DeferedRequirements::loadJS($class . '.js'); + if (file_exists(Path::join($dir, 'js', $themeName.'_'.$class . '.js'))) { + DeferedRequirements::loadJS($themeName.'_'.$class . '.js'); } return self::forTemplate(); @@ -90,7 +91,8 @@ class DeferedRequirements implements TemplateGlobalProvider public static function loadCSS($css) { - if (self::$defered && !self::_webpackActive()) { + $external = (mb_substr($css, 0, 2) === '//' || mb_substr($css, 0, 4) === 'http'); + if ($external || (self::$defered && !self::_webpackActive())) { self::$css[] = $css; } else { WebpackTemplateProvider::loadCSS($css); @@ -99,6 +101,9 @@ class DeferedRequirements implements TemplateGlobalProvider public static function loadJS($js) { + /*$external = (mb_substr($js, 0, 2) === '//' || mb_substr($js, 0, 4) === 'http'); + if ($external || (self::$defered && !self::_webpackActive())) {*/ + // webpack supposed to load external JS if (self::$defered && !self::_webpackActive()) { self::$js[] = $js; } else { @@ -118,10 +123,6 @@ class DeferedRequirements implements TemplateGlobalProvider public static function forTemplate() { - if (!self::$defered || self::_webpackActive()) { - return false; - } - $result = ''; foreach (self::$css as $css) { $result .= ''; @@ -137,7 +138,7 @@ class DeferedRequirements implements TemplateGlobalProvider .'function lscd(a){a| File | Size limit |
|---|---|
| '.$k.' | '.$size.' |
'; + $msgs = $result->getMessages(); + foreach ($msgs as $msg) { + echo self::error($msg['fieldName'].': '.$msg['message']); + } + echo '
'; + } +} diff --git a/app/templates/Includes/Content.ss b/app/templates/Includes/Content.ss index 309ed0a..59b2378 100644 --- a/app/templates/Includes/Content.ss +++ b/app/templates/Includes/Content.ss @@ -2,7 +2,11 @@}){kind=logo}
+ })