see cl 1.0.0-beta20

heimrichhannot · Jun 23, 2020 · c57b1c9 · c57b1c9
1 parent 9154be7
commit c57b1c9
Show file tree

Hide file tree

Showing 32 changed files with 67 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.0.0-beta20] - 2020-06-23
+
+- fixed fields for login-registration
+
 ## [1.0.0-beta19] - 2019-11-12
 
 - deleted .lock file

diff --git a/composer.json b/composer.json
@@ -5,8 +5,8 @@
   "license": "LGPL-3.0-or-later",
   "require": {
     "php": "^7.1",
-    "contao/core-bundle": "^4.4",
-    "heimrichhannot/contao-fieldpalette-bundle": "~0.2||~1.0",
+    "contao/core-bundle": "^4.4|^4.9",
+    "heimrichhannot/contao-fieldpalette-bundle": "^0.5",
     "heimrichhannot/contao-list-bundle": "^1.0-beta|^1.0",
     "heimrichhannot/contao-utils-bundle": "^2.0",
     "heimrichhannot/contao-formhybrid": "^3.0",

diff --git a/src/Backend/Member.php b/src/Backend/Member.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */
@@ -26,24 +26,14 @@ public function __construct(ContaoFrameworkInterface $framework)
 
     /**
      * Add an URI scheme if not existing to an url.
-     *
-     * @param string        $varValue
-     * @param DataContainer $dc
-     *
-     * @return string
      */
     public function addURIScheme(string $varValue, DataContainer $dc): string
     {
         return System::getContainer()->get('huh.utils.url')->addURIScheme($varValue);
     }
 
     /**
-     * @param string        $varValue
-     * @param DataContainer $dc
-     *
      * @throws \Exception
-     *
-     * @return string
      */
     public function generateAlias(string $varValue, DataContainer $dc): string
     {
@@ -63,8 +53,6 @@ public function generateAlias(string $varValue, DataContainer $dc): string
     /**
      * Get a list of job title choices.
      *
-     * @param DataContainer $dc
-     *
      * @return array List of job titles
      */
     public function getJobTitleChoices(DataContainer $dc): array

diff --git a/src/Choice/CityChoice.php b/src/Choice/CityChoice.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */
@@ -28,9 +28,7 @@ public function getBundles(ParserInterface $parser)
     /**
      * Allows a plugin to override extension configuration.
      *
-     * @param string           $extensionName
-     * @param array            $extensionConfigs
-     * @param ContainerBuilder $container
+     * @param string $extensionName
      *
      * @return
      */

diff --git a/src/DependencyInjection/HeimrichHannotContaoMemberBundleExtension.php b/src/DependencyInjection/HeimrichHannotContaoMemberBundleExtension.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Entity/Member.php b/src/Entity/Member.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Entity/MemberAddress.php b/src/Entity/MemberAddress.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/EventListener/HookListener.php b/src/EventListener/HookListener.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */
@@ -30,11 +30,8 @@ public function __construct(ContaoFrameworkInterface $framework)
     /**
      * Switch Address with member address based on filter data.
      *
-     * @param                 $result
-     * @param                 $item
-     * @param Module          $moduleList
-     * @param FilterConfig    $filterConfig
-     * @param ListConfigModel $listConfig
+     * @param $result
+     * @param $item
      *
      * @return mixed
      */

diff --git a/src/Filter/CityType.php b/src/Filter/CityType.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Form/FormPasswordNoConfirm.php b/src/Form/FormPasswordNoConfirm.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Form/MemberLoginRegistrationForm.php b/src/Form/MemberLoginRegistrationForm.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */
@@ -11,6 +11,7 @@
 use Contao\Config;
 use Contao\Controller;
 use Contao\PageModel;
+use Contao\StringUtil;
 use Contao\System;
 use HeimrichHannot\FormHybrid\Form;
 use HeimrichHannot\Haste\Util\FormSubmission;
@@ -35,7 +36,7 @@ public function modifyDC(&$arrDca = null)
         }
 
         // add password to default palette
-        if (\in_array('password', deserialize($this->objModule->formHybridEditable), true)) {
+        if (\in_array('password', StringUtil::deserialize($this->objModule->formHybridEditable, true), true)) {
             $this->dca['palettes']['default'] = str_replace('login;', 'login,password,password_noConfirm;', $this->dca['palettes']['default']);
         }
 
@@ -250,7 +251,7 @@ protected function createNewUser($arrData)
         if (isset($GLOBALS['TL_HOOKS']['createNewUser']) && \is_array($GLOBALS['TL_HOOKS']['createNewUser'])) {
             foreach ($GLOBALS['TL_HOOKS']['createNewUser'] as $callback) {
                 $this->import($callback[0]);
-                $this->{$callback[0]}->{$callback[1]}($objNewUser->id, $arrData, $this);
+                $this->{$callback[0]}->{$callback[1]}($objNewUser->id, $arrData, $this->objModule);
             }
         }
 

diff --git a/src/Form/MemberRegistrationPlusForm.php b/src/Form/MemberRegistrationPlusForm.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/HeimrichHannotContaoMemberBundle.php b/src/HeimrichHannotContaoMemberBundle.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Manager/MemberMessageManager.php b/src/Manager/MemberMessageManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Manager/RegistrationManager.php b/src/Manager/RegistrationManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Model/MemberAddressModel.php b/src/Model/MemberAddressModel.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Model/MemberPlusModel.php b/src/Model/MemberPlusModel.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Module/ModuleLoginRegistration.php b/src/Module/ModuleLoginRegistration.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Module/ModuleRegistrationPlus.php b/src/Module/ModuleRegistrationPlus.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/src/Resources/contao/dca/tl_member.php b/src/Resources/contao/dca/tl_member.php
@@ -40,6 +40,11 @@
 
 $dca['subpalettes']['addImage'] = 'singleSRC,alt,imageTitle,size,imagemargin,imageUrl,fullsize,caption,floating';
 
+if(TL_MODE == 'FE') {
+    unset($dca['palettes']['__selector__']);
+}
+
+
 $fields = [
     'headline'            => [
         'label'     => &$GLOBALS['TL_LANG']['tl_member']['headline'],

diff --git a/src/Resources/contao/dca/tl_module.php b/src/Resources/contao/dca/tl_module.php
@@ -54,6 +54,24 @@
         'eval'      => ['submitOnChange' => true, 'tl_class' => 'w50 clr'],
         'sql'       => "char(1) NOT NULL default ''",
     ],
+    'bypassPasswordConfirm' => [
+        'label'     => &$GLOBALS['TL_LANG']['tl_module']['bypassPasswordConfirm'],
+        'exclude'   => true,
+        'inputType' => 'checkbox',
+        'eval'      => ['tl_class' => 'w50 clr'],
+        'sql'       => "char(1) NOT NULL default ''"
+    ],
+    'redirectLogin'  => [
+    'label'      => &$GLOBALS['TL_LANG']['tl_module']['redirectLogin'],
+    'exclude'    => true,
+    'inputType'  => 'pageTree',
+    'foreignKey' => 'tl_page.title',
+    'eval'       => ['fieldType' => 'radio', 'tl_class' => 'w50 clr'],
+    'sql'        => "int(10) unsigned NOT NULL default '0'",
+    'relation'   => ['type' => 'hasOne', 'load' => 'lazy']
+    ]
 ];
 
-$dc['fields'] = array_merge($dc['fields'], $arrFields);
+
+
+$dc['fields'] = array_merge($dc['fields'], $arrFields);
diff --git a/src/Resources/contao/languages/de/tl_module.php b/src/Resources/contao/languages/de/tl_module.php
@@ -14,6 +14,10 @@
  */
 $GLOBALS['TL_LANG']['tl_module']['reg_activate_plus'][0] = '';
 $GLOBALS['TL_LANG']['tl_module']['reg_activate_plus'][1] = '';
+$GLOBALS['TL_LANG']['tl_module']['bypassPasswordConfirm'][0] = 'Passwortbestätigung deaktivieren';
+$GLOBALS['TL_LANG']['tl_module']['bypassPasswordConfirm'][1] = 'Wählen Sie diese Option, wenn beim Login-/Registrierungsformular kein Feld für die Bestätigung des Passworts aufgeführt werden soll.';
+$GLOBALS['TL_LANG']['tl_module']['redirectLogin'][0] = 'Weiterleitung nach Login';
+$GLOBALS['TL_LANG']['tl_module']['redirectLogin'][1] = 'Wählen Sie hier die Seite aus, zu der ein Nutzer bei Login über das Formular weitergeleitet werden soll.';
 
 /**
  * Legends

diff --git a/tests/Backend/HooksTest.php b/tests/Backend/HooksTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/Choice/CityChoiceTest.php b/tests/Choice/CityChoiceTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/ContaoManager/PluginTest.php b/tests/ContaoManager/PluginTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */
@@ -59,9 +59,6 @@ public function testGetExtensionConfig()
     /**
      * Mocks the plugin loader.
      *
-     * @param Invocation $expects
-     * @param array      $plugins
-     *
      * @return PluginLoader|\PHPUnit_Framework_MockObject_MockObject
      */
     private function mockPluginLoader(Invocation $expects, array $plugins = [])

diff --git a/tests/DependencyInjection/HeimrichHannotContaoMemberBundleExtensionTest.php b/tests/DependencyInjection/HeimrichHannotContaoMemberBundleExtensionTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/Entity/MemberAddressTest.php b/tests/Entity/MemberAddressTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/Entity/MemberTest.php b/tests/Entity/MemberTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */

diff --git a/tests/Filter/CityTypeTest.php b/tests/Filter/CityTypeTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2019 Heimrich & Hannot GmbH
+ * Copyright (c) 2020 Heimrich & Hannot GmbH
  *
  * @license LGPL-3.0-or-later
  */