[TASK] Cleanup EXT:felogin directory structure 99/43399/4
authorBenjamin Mack <benni@typo3.org>
Thu, 17 Sep 2015 13:54:52 +0000 (15:54 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Thu, 17 Sep 2015 21:11:26 +0000 (23:11 +0200)
Move template, language file (easy one) and flexform
in the right place, also make sure to use closures() for the
php files that reside in Configuration/TCA/Overrides/

Resolves: #68293
Resolves: #69921
Releases: master
Change-Id: I704e644eb90be6af0859c7154b4c22ac92d014ca
Reviewed-on: http://review.typo3.org/43399
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
15 files changed:
typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
typo3/sysext/felogin/Configuration/FlexForms/Login.xml [new file with mode: 0644]
typo3/sysext/felogin/Configuration/TCA/Overrides/fe_groups.php
typo3/sysext/felogin/Configuration/TCA/Overrides/fe_users.php
typo3/sysext/felogin/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/felogin/Documentation/Configuration/Index.rst
typo3/sysext/felogin/Resources/Private/Language/Database.xlf [new file with mode: 0644]
typo3/sysext/felogin/Resources/Private/Language/locallang.xlf [new file with mode: 0644]
typo3/sysext/felogin/Resources/Private/Templates/FrontendLogin.html [new file with mode: 0644]
typo3/sysext/felogin/ext_localconf.php
typo3/sysext/felogin/ext_typoscript_setup.txt
typo3/sysext/felogin/flexform.xml [deleted file]
typo3/sysext/felogin/locallang_db.xlf [deleted file]
typo3/sysext/felogin/pi1/locallang.xlf [deleted file]
typo3/sysext/felogin/template.html [deleted file]

index ebd67e3..688092b 100644 (file)
@@ -30,14 +30,6 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
        public $prefixId = 'tx_felogin_pi1';
 
        /**
-        * Path to this script relative to the extension dir.
-        *
-        * @var string
-        * @TODO This is still set to the "old" class location since the locallang.xlf file in the same dir is loaded by pi_loadLL
-        */
-       public $scriptRelPath = 'pi1/class.tx_felogin_pi1.php';
-
-       /**
         * The extension key.
         *
         * @var string
@@ -124,7 +116,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                // Loading default pivars
                $this->pi_setPiVarDefaults();
                // Loading language-labels
-               $this->pi_loadLL();
+               $this->pi_loadLL('EXT:felogin/Resources/Private/Language/locallang.xlf');
                // Init FlexForm configuration for plugin:
                $this->pi_initPIflexForm();
                $this->mergeflexFormValuesIntoConf();
@@ -153,7 +145,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                }
                $this->redirectUrl = $this->validateRedirectUrl($this->redirectUrl);
                // Get Template
-               $templateFile = $this->conf['templateFile'] ?: 'EXT:felogin/template.html';
+               $templateFile = $this->conf['templateFile'] ?: 'EXT:felogin/Resources/Private/Templates/FrontendLogin.html';
                $this->template = $this->cObj->fileResource($templateFile);
                // Is user logged in?
                $this->userIsLoggedIn = $this->frontendController->loginUser;
diff --git a/typo3/sysext/felogin/Configuration/FlexForms/Login.xml b/typo3/sysext/felogin/Configuration/FlexForms/Login.xml
new file mode 100644 (file)
index 0000000..7113418
--- /dev/null
@@ -0,0 +1,399 @@
+<T3DataStructure>
+       <meta>
+               <langDisable>1</langDisable>
+       </meta>
+       <sheets>
+               <sDEF>
+                       <ROOT>
+                               <TCEforms>
+                                       <sheetTitle>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.sheet_general</sheetTitle>
+                               </TCEforms>
+                               <type>array</type>
+                               <el>
+                                       <showForgotPassword>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.show_forgot_password</label>
+                                                       <config>
+                                                               <type>check</type>
+                                                               <items type="array">
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+                                                                               <numIndex index="1">1</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                       </config>
+                                               </TCEforms>
+                                       </showForgotPassword>
+                                       <showPermaLogin>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.show_permalogin</label>
+                                                       <config>
+                                                               <default>1</default>
+                                                               <type>check</type>
+                                                               <items type="array">
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+                                                                               <numIndex index="1">1</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                       </config>
+                                               </TCEforms>
+                                       </showPermaLogin>
+                                       <showLogoutFormAfterLogin>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.show_logoutFormAfterLogin</label>
+                                                       <config>
+                                                               <default></default>
+                                                               <type>check</type>
+                                                               <items type="array">
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+                                                                               <numIndex index="1">1</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                       </config>
+                                               </TCEforms>
+                                       </showLogoutFormAfterLogin>
+                                       <pages>
+                                               <TCEforms>
+                                                       <exclude>1</exclude>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.user_storage</label>
+                                                       <config>
+                                                               <type>group</type>
+                                                               <internal_type>db</internal_type>
+                                                               <allowed>pages</allowed>
+                                                               <size>3</size>
+                                                               <maxitems>22</maxitems>
+                                                               <minitems>0</minitems>
+                                                               <show_thumbs>1</show_thumbs>
+                                                               <wizards>
+                                                                       <suggest>
+                                                                               <type>suggest</type>
+                                                                       </suggest>
+                                                               </wizards>
+                                                       </config>
+                                               </TCEforms>
+                                       </pages>
+
+                                       <recursive>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:lang/locallang_general.xlf:LGL.recursive</label>
+                                                       <config>
+                                                               <type>select</type>
+                                                               <items type="array">
+                                                                       <numIndex index="0" type="array">
+                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
+                                                                               <numIndex index="1"></numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
+                                                                               <numIndex index="1">1</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="2" type="array">
+                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
+                                                                               <numIndex index="1">2</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="3" type="array">
+                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
+                                                                               <numIndex index="1">3</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="4" type="array">
+                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
+                                                                               <numIndex index="1">4</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="5" type="array">
+                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
+                                                                               <numIndex index="1">250</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                               <minitems>0</minitems>
+                                                               <maxitems>1</maxitems>
+                                                               <size>1</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </recursive>
+                                       <templateFile>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.template_file</label>
+                                                       <config>
+                                                               <type>group</type>
+                                                               <internal_type>file</internal_type>
+                                                               <allowed>tmpl,html,htm</allowed>
+                                                               <max_size>100</max_size>
+                                                               <uploadfolder>uploads/tx_felogin</uploadfolder>
+                                                               <maxitems>1</maxitems>
+                                                               <size>1</size>
+                                                               <selectedListStyle>width:180px</selectedListStyle>
+                                                       </config>
+                                               </TCEforms>
+                                       </templateFile>
+                               </el>
+                       </ROOT>
+               </sDEF>
+               <s_redirect>
+                       <ROOT>
+                               <TCEforms>
+                                       <sheetTitle>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.sheet_redirect</sheetTitle>
+                               </TCEforms>
+                               <type>array</type>
+                               <el>
+                                       <redirectMode>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode</label>
+                                                       <config>
+                                                               <type>select</type>
+                                                               <items type="array">
+                                                                       <numIndex index="0" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.0</numIndex>
+                                                                               <numIndex index="1">groupLogin</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.1</numIndex>
+                                                                               <numIndex index="1">userLogin</numIndex>
+                                                                       </numIndex>
+
+                                                                       <numIndex index="2" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.2</numIndex>
+                                                                               <numIndex index="1">login</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="3" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.3</numIndex>
+                                                                               <numIndex index="1">logout</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="4" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.4</numIndex>
+                                                                               <numIndex index="1">loginError</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="5" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.5</numIndex>
+                                                                               <numIndex index="1">getpost</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="6" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.6</numIndex>
+                                                                               <numIndex index="1">referer</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="7" type="array">
+                                                                               <numIndex index="0">LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectMode.I.7</numIndex>
+                                                                               <numIndex index="1">refererDomains</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                               <size>8</size>
+                                                               <minitems>0</minitems>
+                                                               <maxitems>8</maxitems>
+                                                       </config>
+                                               </TCEforms>
+                                       </redirectMode>
+                                       <redirectFirstMethod>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectFirstMethod</label>
+                                                       <config>
+                                                               <type>check</type>
+                                                               <items type="array">
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+                                                                               <numIndex index="1">1</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                       </config>
+                                               </TCEforms>
+                                       </redirectFirstMethod>
+                                       <redirectPageLogin>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectPageLogin</label>
+                                                       <config>
+                                                               <type>group</type>
+                                                               <internal_type>db</internal_type>
+                                                               <allowed>pages</allowed>
+                                                               <size>1</size>
+                                                               <maxitems>1</maxitems>
+                                                               <minitems>0</minitems>
+                                                               <show_thumbs>1</show_thumbs>
+                                                               <wizards>
+                                                                       <suggest>
+                                                                               <type>suggest</type>
+                                                                       </suggest>
+                                                               </wizards>
+                                                       </config>
+                                               </TCEforms>
+                                       </redirectPageLogin>
+                                       <redirectPageLoginError>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectPageLoginError</label>
+                                                       <config>
+                                                               <type>group</type>
+                                                               <internal_type>db</internal_type>
+                                                               <allowed>pages</allowed>
+                                                               <size>1</size>
+                                                               <maxitems>1</maxitems>
+                                                               <minitems>0</minitems>
+                                                               <show_thumbs>1</show_thumbs>
+                                                               <wizards>
+                                                                       <suggest>
+                                                                               <type>suggest</type>
+                                                                       </suggest>
+                                                               </wizards>
+                                                       </config>
+                                               </TCEforms>
+                                       </redirectPageLoginError>
+                                       <redirectPageLogout>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectPageLogout</label>
+                                                       <config>
+                                                               <type>group</type>
+                                                               <internal_type>db</internal_type>
+                                                               <allowed>pages</allowed>
+                                                               <size>1</size>
+                                                               <maxitems>1</maxitems>
+                                                               <minitems>0</minitems>
+                                                               <show_thumbs>1</show_thumbs>
+                                                               <wizards>
+                                                                       <suggest>
+                                                                               <type>suggest</type>
+                                                                       </suggest>
+                                                               </wizards>
+                                                       </config>
+                                               </TCEforms>
+                                       </redirectPageLogout>
+                                       <redirectDisable>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.redirectDisable</label>
+                                                       <config>
+                                                               <type>check</type>
+                                                               <items type="array">
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:lang/locallang_common.xlf:disable</numIndex>
+                                                                               <numIndex index="1">1</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                       </config>
+                                               </TCEforms>
+                                       </redirectDisable>
+                               </el>
+                       </ROOT>
+               </s_redirect>
+               <s_messages>
+                       <ROOT>
+                               <TCEforms>
+                                       <sheetTitle>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.sheet_messages</sheetTitle>
+                               </TCEforms>
+                               <type>array</type>
+                               <el>
+                                       <welcome_header>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.welcome_header</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>30</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </welcome_header>
+                                       <welcome_message>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.welcome_message</label>
+                                                       <config>
+                                                               <type>text</type>
+                                                               <cols>30</cols>
+                                                               <rows>5</rows>
+                                                       </config>
+                                               </TCEforms>
+                                       </welcome_message>
+                                       <success_header>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.success_header</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>30</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </success_header>
+                                       <success_message>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.success_message</label>
+                                                       <config>
+                                                               <type>text</type>
+                                                               <cols>30</cols>
+                                                               <rows>5</rows>
+                                                       </config>
+                                               </TCEforms>
+                                       </success_message>
+                                       <error_header>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.error_header</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>30</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </error_header>
+                                       <error_message>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.error_message</label>
+                                                       <config>
+                                                               <type>text</type>
+                                                               <cols>30</cols>
+                                                               <rows>5</rows>
+                                                       </config>
+                                               </TCEforms>
+                                       </error_message>
+                                       <status_header>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.status_header</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>30</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </status_header>
+                                       <status_message>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.status_message</label>
+                                                       <config>
+                                                               <type>text</type>
+                                                               <cols>30</cols>
+                                                               <rows>5</rows>
+                                                       </config>
+                                               </TCEforms>
+                                       </status_message>
+                                       <logout_header>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.logout_header</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>30</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </logout_header>
+                                       <logout_message>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.logout_message</label>
+                                                       <config>
+                                                               <type>text</type>
+                                                               <cols>30</cols>
+                                                               <rows>5</rows>
+                                                       </config>
+                                               </TCEforms>
+                                       </logout_message>
+                                       <forgot_header>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.forgot_header</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>30</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </forgot_header>
+                                       <forgot_reset_message>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:felogin/Resources/Private/Language/Database.xlf:tt_content.pi_flexform.forgot_message</label>
+                                                       <config>
+                                                               <type>text</type>
+                                                               <cols>30</cols>
+                                                               <rows>5</rows>
+                                                       </config>
+                                               </TCEforms>
+                                       </forgot_reset_message>
+                               </el>
+                       </ROOT>
+               </s_messages>
+       </sheets>
+</T3DataStructure>
index 78c45c9..9b84ae5 100644 (file)
@@ -1,25 +1,29 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-// Adds the redirect field to the fe_groups table
-$tempColumns = array(
-       'felogin_redirectPid' => array(
-               'exclude' => 1,
-               'label' => 'LLL:EXT:felogin/locallang_db.xlf:felogin_redirectPid',
-               'config' => array(
-                       'type' => 'group',
-                       'internal_type' => 'db',
-                       'allowed' => 'pages',
-                       'size' => 1,
-                       'minitems' => 0,
-                       'maxitems' => 1,
-                       'wizards' => array(
-                               'suggest' => array(
-                                       'type' => 'suggest'
-                               )
-                       )
-               )
-       )
-);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_groups', $tempColumns);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('fe_groups', 'felogin_redirectPid', '', 'after:TSconfig');
+call_user_func(function() {
+
+       // Adds the redirect field to the fe_groups table
+       $additionalColumns = [
+               'felogin_redirectPid' => [
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:felogin/Resources/Private/Language/Database.xlf:felogin_redirectPid',
+                       'config' => [
+                               'type' => 'group',
+                               'internal_type' => 'db',
+                               'allowed' => 'pages',
+                               'size' => 1,
+                               'minitems' => 0,
+                               'maxitems' => 1,
+                               'wizards' => [
+                                       'suggest' => [
+                                               'type' => 'suggest'
+                                       ]
+                               ]
+                       ]
+               ]
+       ];
+
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_groups', $additionalColumns);
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('fe_groups', 'felogin_redirectPid', '', 'after:TSconfig');
+});
\ No newline at end of file
index b419867..d1e6e70 100644 (file)
@@ -1,32 +1,36 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-// Adds the redirect field and the forgotHash field to the fe_users-table
-$tempColumns = array(
-       'felogin_redirectPid' => array(
-               'exclude' => 1,
-               'label' => 'LLL:EXT:felogin/locallang_db.xlf:felogin_redirectPid',
-               'config' => array(
-                       'type' => 'group',
-                       'internal_type' => 'db',
-                       'allowed' => 'pages',
-                       'size' => 1,
-                       'minitems' => 0,
-                       'maxitems' => 1,
-                       'wizards' => array(
-                               'suggest' => array(
-                                       'type' => 'suggest'
-                               )
-                       )
-               )
-       ),
-       'felogin_forgotHash' => array(
-               'exclude' => 1,
-               'label' => 'LLL:EXT:felogin/locallang_db.xlf:felogin_forgotHash',
-               'config' => array(
-                       'type' => 'passthrough'
-               )
-       )
-);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_users', $tempColumns);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('fe_users', 'felogin_redirectPid', '', 'after:TSconfig');
+call_user_func(function() {
+
+       // Adds the redirect field and the forgotHash field to the fe_users-table
+       $additionalColumns = [
+               'felogin_redirectPid' => [
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:felogin/Resources/Private/Language/Database.xlf:felogin_redirectPid',
+                       'config' => [
+                               'type' => 'group',
+                               'internal_type' => 'db',
+                               'allowed' => 'pages',
+                               'size' => 1,
+                               'minitems' => 0,
+                               'maxitems' => 1,
+                               'wizards' => [
+                                       'suggest' => [
+                                               'type' => 'suggest'
+                                       ]
+                               ]
+                       ]
+               ],
+               'felogin_forgotHash' => [
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:felogin/Resources/Private/Language/Database.xlf:felogin_forgotHash',
+                       'config' => [
+                               'type' => 'passthrough'
+                       ]
+               ]
+       ];
+
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_users', $additionalColumns);
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('fe_users', 'felogin_redirectPid', '', 'after:TSconfig');
+});
\ No newline at end of file
index 6a621a5..3f229d3 100644 (file)
@@ -1,52 +1,53 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
-       '*',
-       'FILE:EXT:felogin/flexform.xml',
-       'login'
-);
-
+call_user_func(function() {
+       // Add the FlexForm
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+               '*',
+               'FILE:EXT:felogin/Configuration/FlexForms/Login.xml',
+               'login'
+       );
 
-// check if there is already a forms tab and add the item after that, otherwise
-// add the tab item as well
-$additionalCTypeItem = array(
-       'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.10',
-       'login',
-       'EXT:t3skin/icons/gfx/i/tt_content_login.gif'
-);
+       // check if there is already a forms tab and add the item after that, otherwise
+       // add the tab item as well
+       $additionalCTypeItem = array(
+               'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.10',
+               'login',
+               'EXT:t3skin/icons/gfx/i/tt_content_login.gif'
+       );
 
-$existingCTypeItems = $GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'];
-$groupFound = FALSE;
-$groupPosition = FALSE;
-foreach ($existingCTypeItems as $position => $item) {
-       if ($item[0] === 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms') {
-               $groupFound = TRUE;
-               $groupPosition = $position;
-               break;
+       $existingCTypeItems = $GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'];
+       $groupFound = FALSE;
+       $groupPosition = FALSE;
+       foreach ($existingCTypeItems as $position => $item) {
+               if ($item[0] === 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms') {
+                       $groupFound = TRUE;
+                       $groupPosition = $position;
+                       break;
+               }
        }
-}
-
-if ($groupFound && $groupPosition) {
-       // add the new CType item below CType
-       array_splice($GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'], $groupPosition, 0, array(0 => $additionalCTypeItem));
-} else {
-       // nothing found, add two items (group + new CType) at the bottom of the list
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType',
-               array('LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms', '--div--')
-       );
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType', $additionalCTypeItem);
-}
 
+       if ($groupFound && $groupPosition) {
+               // add the new CType item below CType
+               array_splice($GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'], $groupPosition, 0, array(0 => $additionalCTypeItem));
+       } else {
+               // nothing found, add two items (group + new CType) at the bottom of the list
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType',
+                       array('LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.forms', '--div--')
+               );
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType', $additionalCTypeItem);
+       }
 
-$GLOBALS['TCA']['tt_content']['types']['login']['showitem'] =
-       '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,'
-       . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,'
-       . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.plugin,pi_flexform,'
-       . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,'
-       . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,'
-       . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,'
-       . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,'
-       . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,'
-       . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,'
-       . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended';
+       $GLOBALS['TCA']['tt_content']['types']['login']['showitem'] =
+               '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.general;general,'
+               . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.header;header,'
+               . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.plugin,pi_flexform,'
+               . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access,'
+               . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.visibility;visibility,'
+               . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.access;access,'
+               . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.appearance,'
+               . '--palette--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:palette.frames;frames,'
+               . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.behaviour,'
+               . '--div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.extended';
+});
index 1d02549..8d55716 100644 (file)
@@ -78,7 +78,7 @@ templateFile
          The Template File
 
    Default
-         EXT:felogin/template.html
+         EXT:felogin/Resources/Private/Templates/FrontendLogin.html
 
 
 
diff --git a/typo3/sysext/felogin/Resources/Private/Language/Database.xlf b/typo3/sysext/felogin/Resources/Private/Language/Database.xlf
new file mode 100644 (file)
index 0000000..4487076
--- /dev/null
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814820" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="felogin">
+               <header/>
+               <body>
+                       <trans-unit id="tt_content.CType_pi1">
+                               <source>Website User Login</source>
+                       </trans-unit>
+                       <trans-unit id="felogin_redirectPid">
+                               <source>Redirect at Login to Page (felogin)</source>
+                       </trans-unit>
+                       <trans-unit id="felogin_forgotHash">
+                               <source>Forgot hash</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.general_header">
+                               <source>General Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.general_message">
+                               <source>General Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirect_header">
+                               <source>Redirect Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirect_message">
+                               <source>Redirect Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.welcome_header">
+                               <source>Welcome Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.welcome_message">
+                               <source>Welcome Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.success_header">
+                               <source>Login Success Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.success_message">
+                               <source>Login Success Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.error_header">
+                               <source>Login Error Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.error_message">
+                               <source>Login Error Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.status_header">
+                               <source>Status Display Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.status_message">
+                               <source>Status Display Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.logout_header">
+                               <source>Logout Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.logout_message">
+                               <source>Logout Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.forgot_header">
+                               <source>Forgot Password Header</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.forgot_message">
+                               <source>Forgot Password Message</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.sheet_general">
+                               <source>General</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.sheet_redirect">
+                               <source>Redirects</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.sheet_messages">
+                               <source>Messages</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.show_forgot_password">
+                               <source>Display Password Recovery Link</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.show_permalogin">
+                               <source>Display Remember Login Option</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.show_logoutFormAfterLogin">
+                               <source>Disable redirect after successful login, but display logout-form</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.groupSelectmode">
+                               <source>FE group select mode:</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_showAll">
+                               <source>Show all</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_showSelected">
+                               <source>Show selected</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_DontShowSelected">
+                               <source>Dont show selected</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_FromTS">
+                               <source>(from Typoscript)</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.groupSelection">
+                               <source>FE group selection:</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.groupSelection_noGroup">
+                               <source>no group</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.field_manualOrder">
+                               <source>Using fieldlists below:</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.field_orderList">
+                               <source>User Fields/list:</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.field_orderDetails">
+                               <source>User Fields/details:</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode">
+                               <source>Redirect Mode</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.0">
+                               <source>Defined by Usergroup Record</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.1">
+                               <source>Defined by User Record</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.2">
+                               <source>After Login (TS or Flexform)</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.3">
+                               <source>After Logout (TS or Flexform)</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.4">
+                               <source>After Login Error (TS or Flexform)</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.5">
+                               <source>Defined by GET/POST Parameters</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.6">
+                               <source>Defined by Referrer</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.7">
+                               <source>Defined by Domain Entries</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectFirstMethod">
+                               <source>Use First Supported Mode from Selection</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectDisable">
+                               <source>Disable Redirect</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectPageLogin">
+                               <source>After Successful Login Redirect to Page</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectPageLoginError">
+                               <source>After Failed Login Redirect to Page</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.redirectPageLogout">
+                               <source>After Logout Redirect to Page</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.template_file">
+                               <source>Template File</source>
+                       </trans-unit>
+                       <trans-unit id="tt_content.pi_flexform.user_storage">
+                               <source>User Storage Page</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/felogin/Resources/Private/Language/locallang.xlf b/typo3/sysext/felogin/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..f742b5a
--- /dev/null
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814821" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="felogin">
+               <header/>
+               <body>
+                       <trans-unit id="ll_welcome_header">
+                               <source>User login</source>
+                       </trans-unit>
+                       <trans-unit id="ll_welcome_message">
+                               <source>Enter your username and password here in order to log in on the website:</source>
+                       </trans-unit>
+                       <trans-unit id="ll_logout_header">
+                               <source>You have logged out.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_logout_message">
+                               <source>You just logged out from your user session on this website. You can login again or as another user by the form below.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_error_header">
+                               <source>Login failure</source>
+                       </trans-unit>
+                       <trans-unit id="ll_error_message" xml:space="preserve">
+                               <source>An error occurred during login. Most likely you didn't enter the username or password correctly.
+Be certain that you enter them precisely as they are, including upper/lower case.
+Another possibility is that cookies might be disabled in your web browser.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_success_header">
+                               <source>Login successful</source>
+                       </trans-unit>
+                       <trans-unit id="ll_success_message">
+                               <source>You are now logged in as '###USER###'</source>
+                       </trans-unit>
+                       <trans-unit id="ll_status_header">
+                               <source>Current status</source>
+                       </trans-unit>
+                       <trans-unit id="ll_status_message">
+                               <source>This is your current status:</source>
+                       </trans-unit>
+                       <trans-unit id="cookie_warning">
+                               <source>Warning: There is a possibility that cookies are not enabled in your web browser! If your login disappears on your next click that is the case and you should enable cookies (or accept cookies from this website) immediately!</source>
+                       </trans-unit>
+                       <trans-unit id="username">
+                               <source>Username:</source>
+                       </trans-unit>
+                       <trans-unit id="password">
+                               <source>Password:</source>
+                       </trans-unit>
+                       <trans-unit id="login">
+                               <source>Login</source>
+                       </trans-unit>
+                       <trans-unit id="permalogin">
+                               <source>Stay logged in:</source>
+                       </trans-unit>
+                       <trans-unit id="logout">
+                               <source>Logout</source>
+                       </trans-unit>
+                       <trans-unit id="send_password">
+                               <source>Send password</source>
+                       </trans-unit>
+                       <trans-unit id="reset_password">
+                               <source>Reset Password</source>
+                       </trans-unit>
+                       <trans-unit id="ll_change_password_header">
+                               <source>Change your password</source>
+                       </trans-unit>
+                       <trans-unit id="ll_change_password_message">
+                               <source>Please enter your new password twice. Password needs a minimum length of %s chars.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_change_password_nolinkprefix_message">
+                               <source>Error: there is no prefix for the link. Please set one of the following in your typoscript template: plugin.tx_felogin_pi1.feloginBaseURL = http://yourdomain/, config.baseURL = http://yourdomain/, config.absRefPrefix = /</source>
+                       </trans-unit>
+                       <trans-unit id="ll_change_password_notvalid_message">
+                               <source>The link you clicked is not valid. Please repeat the forgot message procedure.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_change_password_notequal_message">
+                               <source>The passwords are not equal, please enter your new password twice. Password needs a minimum length of %s chars.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_change_password_tooshort_message">
+                               <source>The password length is too short. Please enter your new password twice. Password needs a minimum length of %s chars.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_change_password_done_message">
+                               <source>Your password has been saved. You can now login with your new password.</source>
+                       </trans-unit>
+                       <trans-unit id="change_password">
+                               <source>Change your password</source>
+                       </trans-unit>
+                       <trans-unit id="newpassword_label1">
+                               <source>Enter new password</source>
+                       </trans-unit>
+                       <trans-unit id="newpassword_label2">
+                               <source>Repeat new password</source>
+                       </trans-unit>
+                       <trans-unit id="your_email">
+                               <source>Your email:</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_header">
+                               <source>Forgot your password?</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_email_password" xml:space="preserve">
+                               <source>Your password
+Hi %s
+
+Your username is "%s"
+Your password is "%s"</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_email_nopassword" xml:space="preserve">
+                               <source>Your password
+Hi %s
+
+We couldn't find a username for this email address and so cannot send the password to you. Probably you misspelled the email address (upper/lower case makes a difference) or maybe you even didn't register yet?</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_validate_reset_password" xml:space="preserve">
+                               <source>Your new password
+Dear %s,
+
+This email was sent in response to your request to reset your password. Please click on the link below.
+%s
+
+For security reasons, this link is only active until %s. If you do not visit the link before then, you will need to repeat the password reset steps.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_message">
+                               <source>Please enter the email address by which you registered your user account. Then press "Send password" and your password will immediately be emailed to you. Make sure to spell your email address correctly.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_message_emailSent">
+                               <source>Your password has now been sent to the email address %s</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_reset_message">
+                               <source>Please enter your username or email address. Instructions for resetting the password will be immediately emailed to you.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_reset_message_emailSent">
+                               <source>An email has been sent to the address stored in your account and contains a link to reset your password. If you do not receive an email, your account or email address was not found.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_reset_message_error">
+                               <source>Your account or email address does not exist.</source>
+                       </trans-unit>
+                       <trans-unit id="ll_forgot_header_backToLogin">
+                               <source>Return to login form</source>
+                       </trans-unit>
+                       <trans-unit id="ll_enter_your_data">
+                               <source>Username or email address:</source>
+                       </trans-unit>
+                       <trans-unit id="noValidRedirectUrl">
+                               <source>Url "%s" for redirect was not accepted!</source>
+                       </trans-unit>
+                       <trans-unit id="xssAttackDetected">
+                               <source>Url "%s" contained an XSS attack and was cleaned!</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/felogin/Resources/Private/Templates/FrontendLogin.html b/typo3/sysext/felogin/Resources/Private/Templates/FrontendLogin.html
new file mode 100644 (file)
index 0000000..90d5305
--- /dev/null
@@ -0,0 +1,170 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+       <title>Templates for felogin</title>
+</head>
+<body>
+
+<h1>Common markers</h1>
+<p>These are substituted in all felogin item displaying templates.</p>
+
+<h2>Markers</h2>
+<ul>
+       <li>###ACTION_URI###     - URI of the request for the login/logout form</li>
+       <li>###EXTRA_HIDDEN###   - Hook required (additional hidden field used by kb_md5fepw extension by Kraft Bernhard)</li>
+       <li>###ON_SUBMIT###      - Hook required (used by kb_md5fepw extension by Kraft Bernhard)</li>
+       <li>###PREFIXID###       - Same as class name ('tx_felogin_pi1') useful to get a unique classname prefix</li>
+       <li>###REDIRECT_URL###   - URL of redirection upon login</li>
+       <li>###NOREDIRECT###     - if set, no redirect will be done</li>
+       <li>###STORAGE_PID###    - explicit enough I guess (if not : id of the page where user are stored)</li>
+       <li>###STATUS_HEADER###  - depends of the template</li>
+       <li>###STATUS_MESSAGE### - depends of the template</li>
+</ul>
+
+<h2>Wrap parts</h2>
+<ul>
+       <li>###HEADER_VALID###  - useful to define what to show/hide</li>
+       <li>###MESSAGE_VALID### - useful to define what to show/hide</li>
+       <li>###FORGOTP_VALID### - useful to define what to show/hide</li>
+       <li>###PERMALOGIN_VALID### - useful to define what to show/hide</li>
+</ul>
+
+<h2>felogin Language Markers (see pi/locallang.xlf)</h2>
+<ul>
+       <li>###EMAIL_LABEL###                 - corresponding to 'your_email'</li>
+       <li>###FORGOT_PASSWORD###             - corresponding to 'forgot_password'</li>
+       <li>###FORGOT_PASSWORD_BACKTOLOGIN### - corresponding to 'forgot_password_backToLogin'</li>
+       <li>###FORGOT_PASSWORD_ENTEREMAIL###  - corresponding to 'forgot_password_enterEmail'</li>
+       <li>###LOGIN_LABEL###                 - corresponding to 'login'</li>
+       <li>###PASSWORD_LABEL###              - corresponding to 'password'</li>
+       <li>###SEND_PASSWORD###               - corresponding to 'send_password'</li>
+       <li>###USERNAME_LABEL###              - corresponding to 'username'</li>
+</ul>
+
+<!--###TEMPLATE_LOGIN###-->
+
+###STATUS_HEADER###
+###STATUS_MESSAGE###
+<!-- ###LOGIN_FORM### -->
+<form action="###ACTION_URI###" target="_top" method="post" onsubmit="###ON_SUBMIT###">
+       <fieldset>
+       <legend>###LEGEND###</legend>
+       <div>
+               <label for="user">###USERNAME_LABEL###</label>
+               <input type="text" id="user" name="user" value="" />
+       </div>
+       <div>
+               <label for="pass">###PASSWORD_LABEL###</label>
+               <input type="password" id="pass" name="pass" value="" data-rsa-encryption="" />
+       </div>
+
+       <!--###PERMALOGIN_VALID###-->
+               <div>
+                       <label for="permalogin">###PERMALOGIN###</label>
+                       <input name="permalogin" value="0" type="hidden" ###PERMALOGIN_HIDDENFIELD_ATTRIBUTES### id="permaloginHiddenField" />
+                       <input name="permalogin" value="1" type="checkbox" ###PERMALOGIN_CHECKBOX_ATTRIBUTES### id="permalogin"  onclick="document.getElementById('permaloginHiddenField').disabled = this.checked;" />
+               </div>
+       <!--###PERMALOGIN_VALID###-->
+
+       <div>
+               <input type="submit" name="submit" value="###LOGIN_LABEL###" />
+       </div>
+
+       <div class="felogin-hidden">
+               <input type="hidden" name="logintype" value="login" />
+               <input type="hidden" name="pid" value="###STORAGE_PID###" />
+               <input type="hidden" name="redirect_url" value="###REDIRECT_URL###" />
+               <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
+               ###EXTRA_HIDDEN###
+       </div>
+       </fieldset>
+</form>
+
+<!--###FORGOTP_VALID###-->
+<p><!--###FORGOT_PASSWORD_LINK###-->###FORGOT_PASSWORD###<!--###FORGOT_PASSWORD_LINK###--></p>
+<!--###FORGOTP_VALID###-->
+
+<!-- ###LOGIN_FORM### -->
+
+<!--###TEMPLATE_LOGIN###-->
+
+<!--###TEMPLATE_LOGOUT###-->
+
+###STATUS_HEADER###
+###STATUS_MESSAGE###
+
+<form action="###ACTION_URI###" target="_top" method="post">
+       <fieldset>
+       <legend>###LEGEND###</legend>
+       <div>
+               <label>###USERNAME_LABEL###</label>
+               ###USERNAME###
+    </div>
+       <div>
+               <input type="submit" name="submit" value="###LOGOUT_LABEL###" />
+        </div>
+
+       <div class="felogin-hidden">
+               <input type="hidden" name="logintype" value="logout" />
+               <input type="hidden" name="pid" value="###STORAGE_PID###" />
+               <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
+       </div>
+       </fieldset>
+</form>
+
+<!--###TEMPLATE_LOGOUT###-->
+
+<!--###TEMPLATE_FORGOT###-->
+
+###STATUS_HEADER###
+###STATUS_MESSAGE###
+
+
+<!-- ###FORGOT_FORM### -->
+<form action="###ACTION_URI###" method="post">
+    <div class="felogin-hidden">
+               <input type="hidden" name="tx_felogin_pi1[forgot_hash]" value="###FORGOTHASH###" />
+       </div>
+       <fieldset>
+       <legend>###LEGEND###</legend>
+       <div>
+               <label for="tx_felogin_pi1-forgot-email">###DATA_LABEL###</label>
+               <input type="text" name="###FORGOT_EMAIL###" id="tx_felogin_pi1-forgot-email" />
+       </div>
+       <div>
+               <input type="submit" name="submit" value="###SEND_PASSWORD###" />
+        </div>
+       </fieldset>
+</form>
+<!-- ###FORGOT_FORM### -->
+<p>###BACKLINK_LOGIN###&nbsp;</p>
+<!--###TEMPLATE_FORGOT###-->
+
+<!--###TEMPLATE_CHANGEPASSWORD###-->
+
+###STATUS_HEADER###
+###STATUS_MESSAGE###
+
+
+<!-- ###CHANGEPASSWORD_FORM### -->
+<form action="###ACTION_URI###" method="post">
+       <fieldset>
+               <legend>###LEGEND###</legend>
+               <div>
+                       <label for="tx_felogin_pi1-newpassword1">###NEWPASSWORD1_LABEL###</label>
+                       <input type="password" name="###NEWPASSWORD1###" id="tx_felogin_pi1-newpassword1" />
+               </div>
+               <div>
+                       <label for="tx_felogin_pi1-newpassword2">###NEWPASSWORD2_LABEL###</label>
+                       <input type="password" name="###NEWPASSWORD2###" id="tx_felogin_pi1-newpassword2" />
+               </div>
+               <div>
+                       <input type="submit" name="tx_felogin_pi1[changepasswordsubmit]" value="###SEND_PASSWORD###" />
+                </div>
+       </fieldset>
+
+</form>
+<!-- ###CHANGEPASSWORD_FORM### -->
+###BACKLINK_LOGIN###
+<!--###TEMPLATE_CHANGEPASSWORD###-->
\ No newline at end of file
index 3914de6..6af1067 100644 (file)
@@ -7,7 +7,7 @@ styles.content.loginform {
     # cat=content/cLogin; type=int+; label= PID of user archive: Enter the page-uid number (PID) of the folder where you keep your fe_users that are supposed to login on this site. This setting is necessary, if login is going to work!
   pid =
     # cat=content/cLogin; type=; label= Login template: Enter the path for the HTML template to be used
-  templateFile = EXT:felogin/template.html
+  templateFile = EXT:felogin/Resources/Private/Templates/FrontendLogin.html
 }
 ', 'defaultContentRendering');
 
index 8ad6c67..ede72d3 100644 (file)
@@ -7,7 +7,7 @@ plugin.tx_felogin_pi1 {
        storagePid = {$styles.content.loginform.pid}
        recursive =
 
-       # Location of the template file, it is EXT:felogin/template.html by default
+       # Location of the template file, it is EXT:felogin/Resources/Private/Templates/FrontendLogin.html by default
        templateFile = {$styles.content.loginform.templateFile}
 
        # baseURL for the link generation
diff --git a/typo3/sysext/felogin/flexform.xml b/typo3/sysext/felogin/flexform.xml
deleted file mode 100644 (file)
index e8cf739..0000000
+++ /dev/null
@@ -1,399 +0,0 @@
-<T3DataStructure>
-       <meta>
-               <langDisable>1</langDisable>
-       </meta>
-       <sheets>
-               <sDEF>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.sheet_general</sheetTitle>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <showForgotPassword>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.show_forgot_password</label>
-                                                       <config>
-                                                               <type>check</type>
-                                                               <items type="array">
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
-                                                                               <numIndex index="1">1</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                       </config>
-                                               </TCEforms>
-                                       </showForgotPassword>
-                                       <showPermaLogin>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.show_permalogin</label>
-                                                       <config>
-                                                               <default>1</default>
-                                                               <type>check</type>
-                                                               <items type="array">
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
-                                                                               <numIndex index="1">1</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                       </config>
-                                               </TCEforms>
-                                       </showPermaLogin>
-                                       <showLogoutFormAfterLogin>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.show_logoutFormAfterLogin</label>
-                                                       <config>
-                                                               <default></default>
-                                                               <type>check</type>
-                                                               <items type="array">
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
-                                                                               <numIndex index="1">1</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                       </config>
-                                               </TCEforms>
-                                       </showLogoutFormAfterLogin>
-                                       <pages>
-                                               <TCEforms>
-                                                       <exclude>1</exclude>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.user_storage</label>
-                                                       <config>
-                                                               <type>group</type>
-                                                               <internal_type>db</internal_type>
-                                                               <allowed>pages</allowed>
-                                                               <size>3</size>
-                                                               <maxitems>22</maxitems>
-                                                               <minitems>0</minitems>
-                                                               <show_thumbs>1</show_thumbs>
-                                                               <wizards>
-                                                                       <suggest>
-                                                                               <type>suggest</type>
-                                                                       </suggest>
-                                                               </wizards>
-                                                       </config>
-                                               </TCEforms>
-                                       </pages>
-
-                                       <recursive>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:lang/locallang_general.xlf:LGL.recursive</label>
-                                                       <config>
-                                                               <type>select</type>
-                                                               <items type="array">
-                                                                       <numIndex index="0" type="array">
-                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
-                                                                               <numIndex index="1"></numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
-                                                                               <numIndex index="1">1</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="2" type="array">
-                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
-                                                                               <numIndex index="1">2</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="3" type="array">
-                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
-                                                                               <numIndex index="1">3</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="4" type="array">
-                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
-                                                                               <numIndex index="1">4</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="5" type="array">
-                                                                               <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
-                                                                               <numIndex index="1">250</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                               <minitems>0</minitems>
-                                                               <maxitems>1</maxitems>
-                                                               <size>1</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </recursive>
-                                       <templateFile>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.template_file</label>
-                                                       <config>
-                                                               <type>group</type>
-                                                               <internal_type>file</internal_type>
-                                                               <allowed>tmpl,html,htm</allowed>
-                                                               <max_size>100</max_size>
-                                                               <uploadfolder>uploads/tx_felogin</uploadfolder>
-                                                               <maxitems>1</maxitems>
-                                                               <size>1</size>
-                                                               <selectedListStyle>width:180px</selectedListStyle>
-                                                       </config>
-                                               </TCEforms>
-                                       </templateFile>
-                               </el>
-                       </ROOT>
-               </sDEF>
-               <s_redirect>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.sheet_redirect</sheetTitle>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <redirectMode>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode</label>
-                                                       <config>
-                                                               <type>select</type>
-                                                               <items type="array">
-                                                                       <numIndex index="0" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.0</numIndex>
-                                                                               <numIndex index="1">groupLogin</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.1</numIndex>
-                                                                               <numIndex index="1">userLogin</numIndex>
-                                                                       </numIndex>
-
-                                                                       <numIndex index="2" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.2</numIndex>
-                                                                               <numIndex index="1">login</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="3" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.3</numIndex>
-                                                                               <numIndex index="1">logout</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="4" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.4</numIndex>
-                                                                               <numIndex index="1">loginError</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="5" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.5</numIndex>
-                                                                               <numIndex index="1">getpost</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="6" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.6</numIndex>
-                                                                               <numIndex index="1">referer</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="7" type="array">
-                                                                               <numIndex index="0">LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectMode.I.7</numIndex>
-                                                                               <numIndex index="1">refererDomains</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                               <size>8</size>
-                                                               <minitems>0</minitems>
-                                                               <maxitems>8</maxitems>
-                                                       </config>
-                                               </TCEforms>
-                                       </redirectMode>
-                                       <redirectFirstMethod>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectFirstMethod</label>
-                                                       <config>
-                                                               <type>check</type>
-                                                               <items type="array">
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
-                                                                               <numIndex index="1">1</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                       </config>
-                                               </TCEforms>
-                                       </redirectFirstMethod>
-                                       <redirectPageLogin>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectPageLogin</label>
-                                                       <config>
-                                                               <type>group</type>
-                                                               <internal_type>db</internal_type>
-                                                               <allowed>pages</allowed>
-                                                               <size>1</size>
-                                                               <maxitems>1</maxitems>
-                                                               <minitems>0</minitems>
-                                                               <show_thumbs>1</show_thumbs>
-                                                               <wizards>
-                                                                       <suggest>
-                                                                               <type>suggest</type>
-                                                                       </suggest>
-                                                               </wizards>
-                                                       </config>
-                                               </TCEforms>
-                                       </redirectPageLogin>
-                                       <redirectPageLoginError>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectPageLoginError</label>
-                                                       <config>
-                                                               <type>group</type>
-                                                               <internal_type>db</internal_type>
-                                                               <allowed>pages</allowed>
-                                                               <size>1</size>
-                                                               <maxitems>1</maxitems>
-                                                               <minitems>0</minitems>
-                                                               <show_thumbs>1</show_thumbs>
-                                                               <wizards>
-                                                                       <suggest>
-                                                                               <type>suggest</type>
-                                                                       </suggest>
-                                                               </wizards>
-                                                       </config>
-                                               </TCEforms>
-                                       </redirectPageLoginError>
-                                       <redirectPageLogout>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectPageLogout</label>
-                                                       <config>
-                                                               <type>group</type>
-                                                               <internal_type>db</internal_type>
-                                                               <allowed>pages</allowed>
-                                                               <size>1</size>
-                                                               <maxitems>1</maxitems>
-                                                               <minitems>0</minitems>
-                                                               <show_thumbs>1</show_thumbs>
-                                                               <wizards>
-                                                                       <suggest>
-                                                                               <type>suggest</type>
-                                                                       </suggest>
-                                                               </wizards>
-                                                       </config>
-                                               </TCEforms>
-                                       </redirectPageLogout>
-                                       <redirectDisable>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.redirectDisable</label>
-                                                       <config>
-                                                               <type>check</type>
-                                                               <items type="array">
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:lang/locallang_common.xlf:disable</numIndex>
-                                                                               <numIndex index="1">1</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                       </config>
-                                               </TCEforms>
-                                       </redirectDisable>
-                               </el>
-                       </ROOT>
-               </s_redirect>
-               <s_messages>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.sheet_messages</sheetTitle>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <welcome_header>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.welcome_header</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>30</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </welcome_header>
-                                       <welcome_message>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.welcome_message</label>
-                                                       <config>
-                                                               <type>text</type>
-                                                               <cols>30</cols>
-                                                               <rows>5</rows>
-                                                       </config>
-                                               </TCEforms>
-                                       </welcome_message>
-                                       <success_header>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.success_header</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>30</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </success_header>
-                                       <success_message>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.success_message</label>
-                                                       <config>
-                                                               <type>text</type>
-                                                               <cols>30</cols>
-                                                               <rows>5</rows>
-                                                       </config>
-                                               </TCEforms>
-                                       </success_message>
-                                       <error_header>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.error_header</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>30</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </error_header>
-                                       <error_message>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.error_message</label>
-                                                       <config>
-                                                               <type>text</type>
-                                                               <cols>30</cols>
-                                                               <rows>5</rows>
-                                                       </config>
-                                               </TCEforms>
-                                       </error_message>
-                                       <status_header>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.status_header</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>30</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </status_header>
-                                       <status_message>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.status_message</label>
-                                                       <config>
-                                                               <type>text</type>
-                                                               <cols>30</cols>
-                                                               <rows>5</rows>
-                                                       </config>
-                                               </TCEforms>
-                                       </status_message>
-                                       <logout_header>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.logout_header</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>30</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </logout_header>
-                                       <logout_message>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.logout_message</label>
-                                                       <config>
-                                                               <type>text</type>
-                                                               <cols>30</cols>
-                                                               <rows>5</rows>
-                                                       </config>
-                                               </TCEforms>
-                                       </logout_message>
-                                       <forgot_header>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.forgot_header</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>30</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </forgot_header>
-                                       <forgot_reset_message>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:felogin/locallang_db.xml:tt_content.pi_flexform.forgot_message</label>
-                                                       <config>
-                                                               <type>text</type>
-                                                               <cols>30</cols>
-                                                               <rows>5</rows>
-                                                       </config>
-                                               </TCEforms>
-                                       </forgot_reset_message>
-                               </el>
-                       </ROOT>
-               </s_messages>
-       </sheets>
-</T3DataStructure>
diff --git a/typo3/sysext/felogin/locallang_db.xlf b/typo3/sysext/felogin/locallang_db.xlf
deleted file mode 100644 (file)
index 4487076..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814820" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="felogin">
-               <header/>
-               <body>
-                       <trans-unit id="tt_content.CType_pi1">
-                               <source>Website User Login</source>
-                       </trans-unit>
-                       <trans-unit id="felogin_redirectPid">
-                               <source>Redirect at Login to Page (felogin)</source>
-                       </trans-unit>
-                       <trans-unit id="felogin_forgotHash">
-                               <source>Forgot hash</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.general_header">
-                               <source>General Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.general_message">
-                               <source>General Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirect_header">
-                               <source>Redirect Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirect_message">
-                               <source>Redirect Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.welcome_header">
-                               <source>Welcome Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.welcome_message">
-                               <source>Welcome Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.success_header">
-                               <source>Login Success Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.success_message">
-                               <source>Login Success Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.error_header">
-                               <source>Login Error Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.error_message">
-                               <source>Login Error Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.status_header">
-                               <source>Status Display Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.status_message">
-                               <source>Status Display Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.logout_header">
-                               <source>Logout Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.logout_message">
-                               <source>Logout Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.forgot_header">
-                               <source>Forgot Password Header</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.forgot_message">
-                               <source>Forgot Password Message</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.sheet_general">
-                               <source>General</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.sheet_redirect">
-                               <source>Redirects</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.sheet_messages">
-                               <source>Messages</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.show_forgot_password">
-                               <source>Display Password Recovery Link</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.show_permalogin">
-                               <source>Display Remember Login Option</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.show_logoutFormAfterLogin">
-                               <source>Disable redirect after successful login, but display logout-form</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.groupSelectmode">
-                               <source>FE group select mode:</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_showAll">
-                               <source>Show all</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_showSelected">
-                               <source>Show selected</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_DontShowSelected">
-                               <source>Dont show selected</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.groupSelectmode_FromTS">
-                               <source>(from Typoscript)</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.groupSelection">
-                               <source>FE group selection:</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.groupSelection_noGroup">
-                               <source>no group</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.field_manualOrder">
-                               <source>Using fieldlists below:</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.field_orderList">
-                               <source>User Fields/list:</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.field_orderDetails">
-                               <source>User Fields/details:</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode">
-                               <source>Redirect Mode</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.0">
-                               <source>Defined by Usergroup Record</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.1">
-                               <source>Defined by User Record</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.2">
-                               <source>After Login (TS or Flexform)</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.3">
-                               <source>After Logout (TS or Flexform)</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.4">
-                               <source>After Login Error (TS or Flexform)</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.5">
-                               <source>Defined by GET/POST Parameters</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.6">
-                               <source>Defined by Referrer</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectMode.I.7">
-                               <source>Defined by Domain Entries</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectFirstMethod">
-                               <source>Use First Supported Mode from Selection</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectDisable">
-                               <source>Disable Redirect</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectPageLogin">
-                               <source>After Successful Login Redirect to Page</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectPageLoginError">
-                               <source>After Failed Login Redirect to Page</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.redirectPageLogout">
-                               <source>After Logout Redirect to Page</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.template_file">
-                               <source>Template File</source>
-                       </trans-unit>
-                       <trans-unit id="tt_content.pi_flexform.user_storage">
-                               <source>User Storage Page</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/felogin/pi1/locallang.xlf b/typo3/sysext/felogin/pi1/locallang.xlf
deleted file mode 100644 (file)
index f742b5a..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814821" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="felogin">
-               <header/>
-               <body>
-                       <trans-unit id="ll_welcome_header">
-                               <source>User login</source>
-                       </trans-unit>
-                       <trans-unit id="ll_welcome_message">
-                               <source>Enter your username and password here in order to log in on the website:</source>
-                       </trans-unit>
-                       <trans-unit id="ll_logout_header">
-                               <source>You have logged out.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_logout_message">
-                               <source>You just logged out from your user session on this website. You can login again or as another user by the form below.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_error_header">
-                               <source>Login failure</source>
-                       </trans-unit>
-                       <trans-unit id="ll_error_message" xml:space="preserve">
-                               <source>An error occurred during login. Most likely you didn't enter the username or password correctly.
-Be certain that you enter them precisely as they are, including upper/lower case.
-Another possibility is that cookies might be disabled in your web browser.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_success_header">
-                               <source>Login successful</source>
-                       </trans-unit>
-                       <trans-unit id="ll_success_message">
-                               <source>You are now logged in as '###USER###'</source>
-                       </trans-unit>
-                       <trans-unit id="ll_status_header">
-                               <source>Current status</source>
-                       </trans-unit>
-                       <trans-unit id="ll_status_message">
-                               <source>This is your current status:</source>
-                       </trans-unit>
-                       <trans-unit id="cookie_warning">
-                               <source>Warning: There is a possibility that cookies are not enabled in your web browser! If your login disappears on your next click that is the case and you should enable cookies (or accept cookies from this website) immediately!</source>
-                       </trans-unit>
-                       <trans-unit id="username">
-                               <source>Username:</source>
-                       </trans-unit>
-                       <trans-unit id="password">
-                               <source>Password:</source>
-                       </trans-unit>
-                       <trans-unit id="login">
-                               <source>Login</source>
-                       </trans-unit>
-                       <trans-unit id="permalogin">
-                               <source>Stay logged in:</source>
-                       </trans-unit>
-                       <trans-unit id="logout">
-                               <source>Logout</source>
-                       </trans-unit>
-                       <trans-unit id="send_password">
-                               <source>Send password</source>
-                       </trans-unit>
-                       <trans-unit id="reset_password">
-                               <source>Reset Password</source>
-                       </trans-unit>
-                       <trans-unit id="ll_change_password_header">
-                               <source>Change your password</source>
-                       </trans-unit>
-                       <trans-unit id="ll_change_password_message">
-                               <source>Please enter your new password twice. Password needs a minimum length of %s chars.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_change_password_nolinkprefix_message">
-                               <source>Error: there is no prefix for the link. Please set one of the following in your typoscript template: plugin.tx_felogin_pi1.feloginBaseURL = http://yourdomain/, config.baseURL = http://yourdomain/, config.absRefPrefix = /</source>
-                       </trans-unit>
-                       <trans-unit id="ll_change_password_notvalid_message">
-                               <source>The link you clicked is not valid. Please repeat the forgot message procedure.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_change_password_notequal_message">
-                               <source>The passwords are not equal, please enter your new password twice. Password needs a minimum length of %s chars.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_change_password_tooshort_message">
-                               <source>The password length is too short. Please enter your new password twice. Password needs a minimum length of %s chars.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_change_password_done_message">
-                               <source>Your password has been saved. You can now login with your new password.</source>
-                       </trans-unit>
-                       <trans-unit id="change_password">
-                               <source>Change your password</source>
-                       </trans-unit>
-                       <trans-unit id="newpassword_label1">
-                               <source>Enter new password</source>
-                       </trans-unit>
-                       <trans-unit id="newpassword_label2">
-                               <source>Repeat new password</source>
-                       </trans-unit>
-                       <trans-unit id="your_email">
-                               <source>Your email:</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_header">
-                               <source>Forgot your password?</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_email_password" xml:space="preserve">
-                               <source>Your password
-Hi %s
-
-Your username is "%s"
-Your password is "%s"</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_email_nopassword" xml:space="preserve">
-                               <source>Your password
-Hi %s
-
-We couldn't find a username for this email address and so cannot send the password to you. Probably you misspelled the email address (upper/lower case makes a difference) or maybe you even didn't register yet?</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_validate_reset_password" xml:space="preserve">
-                               <source>Your new password
-Dear %s,
-
-This email was sent in response to your request to reset your password. Please click on the link below.
-%s
-
-For security reasons, this link is only active until %s. If you do not visit the link before then, you will need to repeat the password reset steps.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_message">
-                               <source>Please enter the email address by which you registered your user account. Then press "Send password" and your password will immediately be emailed to you. Make sure to spell your email address correctly.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_message_emailSent">
-                               <source>Your password has now been sent to the email address %s</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_reset_message">
-                               <source>Please enter your username or email address. Instructions for resetting the password will be immediately emailed to you.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_reset_message_emailSent">
-                               <source>An email has been sent to the address stored in your account and contains a link to reset your password. If you do not receive an email, your account or email address was not found.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_reset_message_error">
-                               <source>Your account or email address does not exist.</source>
-                       </trans-unit>
-                       <trans-unit id="ll_forgot_header_backToLogin">
-                               <source>Return to login form</source>
-                       </trans-unit>
-                       <trans-unit id="ll_enter_your_data">
-                               <source>Username or email address:</source>
-                       </trans-unit>
-                       <trans-unit id="noValidRedirectUrl">
-                               <source>Url "%s" for redirect was not accepted!</source>
-                       </trans-unit>
-                       <trans-unit id="xssAttackDetected">
-                               <source>Url "%s" contained an XSS attack and was cleaned!</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/felogin/template.html b/typo3/sysext/felogin/template.html
deleted file mode 100644 (file)
index 90d5305..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-       <title>Templates for felogin</title>
-</head>
-<body>
-
-<h1>Common markers</h1>
-<p>These are substituted in all felogin item displaying templates.</p>
-
-<h2>Markers</h2>
-<ul>
-       <li>###ACTION_URI###     - URI of the request for the login/logout form</li>
-       <li>###EXTRA_HIDDEN###   - Hook required (additional hidden field used by kb_md5fepw extension by Kraft Bernhard)</li>
-       <li>###ON_SUBMIT###      - Hook required (used by kb_md5fepw extension by Kraft Bernhard)</li>
-       <li>###PREFIXID###       - Same as class name ('tx_felogin_pi1') useful to get a unique classname prefix</li>
-       <li>###REDIRECT_URL###   - URL of redirection upon login</li>
-       <li>###NOREDIRECT###     - if set, no redirect will be done</li>
-       <li>###STORAGE_PID###    - explicit enough I guess (if not : id of the page where user are stored)</li>
-       <li>###STATUS_HEADER###  - depends of the template</li>
-       <li>###STATUS_MESSAGE### - depends of the template</li>
-</ul>
-
-<h2>Wrap parts</h2>
-<ul>
-       <li>###HEADER_VALID###  - useful to define what to show/hide</li>
-       <li>###MESSAGE_VALID### - useful to define what to show/hide</li>
-       <li>###FORGOTP_VALID### - useful to define what to show/hide</li>
-       <li>###PERMALOGIN_VALID### - useful to define what to show/hide</li>
-</ul>
-
-<h2>felogin Language Markers (see pi/locallang.xlf)</h2>
-<ul>
-       <li>###EMAIL_LABEL###                 - corresponding to 'your_email'</li>
-       <li>###FORGOT_PASSWORD###             - corresponding to 'forgot_password'</li>
-       <li>###FORGOT_PASSWORD_BACKTOLOGIN### - corresponding to 'forgot_password_backToLogin'</li>
-       <li>###FORGOT_PASSWORD_ENTEREMAIL###  - corresponding to 'forgot_password_enterEmail'</li>
-       <li>###LOGIN_LABEL###                 - corresponding to 'login'</li>
-       <li>###PASSWORD_LABEL###              - corresponding to 'password'</li>
-       <li>###SEND_PASSWORD###               - corresponding to 'send_password'</li>
-       <li>###USERNAME_LABEL###              - corresponding to 'username'</li>
-</ul>
-
-<!--###TEMPLATE_LOGIN###-->
-
-###STATUS_HEADER###
-###STATUS_MESSAGE###
-<!-- ###LOGIN_FORM### -->
-<form action="###ACTION_URI###" target="_top" method="post" onsubmit="###ON_SUBMIT###">
-       <fieldset>
-       <legend>###LEGEND###</legend>
-       <div>
-               <label for="user">###USERNAME_LABEL###</label>
-               <input type="text" id="user" name="user" value="" />
-       </div>
-       <div>
-               <label for="pass">###PASSWORD_LABEL###</label>
-               <input type="password" id="pass" name="pass" value="" data-rsa-encryption="" />
-       </div>
-
-       <!--###PERMALOGIN_VALID###-->
-               <div>
-                       <label for="permalogin">###PERMALOGIN###</label>
-                       <input name="permalogin" value="0" type="hidden" ###PERMALOGIN_HIDDENFIELD_ATTRIBUTES### id="permaloginHiddenField" />
-                       <input name="permalogin" value="1" type="checkbox" ###PERMALOGIN_CHECKBOX_ATTRIBUTES### id="permalogin"  onclick="document.getElementById('permaloginHiddenField').disabled = this.checked;" />
-               </div>
-       <!--###PERMALOGIN_VALID###-->
-
-       <div>
-               <input type="submit" name="submit" value="###LOGIN_LABEL###" />
-       </div>
-
-       <div class="felogin-hidden">
-               <input type="hidden" name="logintype" value="login" />
-               <input type="hidden" name="pid" value="###STORAGE_PID###" />
-               <input type="hidden" name="redirect_url" value="###REDIRECT_URL###" />
-               <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
-               ###EXTRA_HIDDEN###
-       </div>
-       </fieldset>
-</form>
-
-<!--###FORGOTP_VALID###-->
-<p><!--###FORGOT_PASSWORD_LINK###-->###FORGOT_PASSWORD###<!--###FORGOT_PASSWORD_LINK###--></p>
-<!--###FORGOTP_VALID###-->
-
-<!-- ###LOGIN_FORM### -->
-
-<!--###TEMPLATE_LOGIN###-->
-
-<!--###TEMPLATE_LOGOUT###-->
-
-###STATUS_HEADER###
-###STATUS_MESSAGE###
-
-<form action="###ACTION_URI###" target="_top" method="post">
-       <fieldset>
-       <legend>###LEGEND###</legend>
-       <div>
-               <label>###USERNAME_LABEL###</label>
-               ###USERNAME###
-    </div>
-       <div>
-               <input type="submit" name="submit" value="###LOGOUT_LABEL###" />
-        </div>
-
-       <div class="felogin-hidden">
-               <input type="hidden" name="logintype" value="logout" />
-               <input type="hidden" name="pid" value="###STORAGE_PID###" />
-               <input type="hidden" name="###PREFIXID###[noredirect]" value="###NOREDIRECT###" />
-       </div>
-       </fieldset>
-</form>
-
-<!--###TEMPLATE_LOGOUT###-->
-
-<!--###TEMPLATE_FORGOT###-->
-
-###STATUS_HEADER###
-###STATUS_MESSAGE###
-
-
-<!-- ###FORGOT_FORM### -->
-<form action="###ACTION_URI###" method="post">
-    <div class="felogin-hidden">
-               <input type="hidden" name="tx_felogin_pi1[forgot_hash]" value="###FORGOTHASH###" />
-       </div>
-       <fieldset>
-       <legend>###LEGEND###</legend>
-       <div>
-               <label for="tx_felogin_pi1-forgot-email">###DATA_LABEL###</label>
-               <input type="text" name="###FORGOT_EMAIL###" id="tx_felogin_pi1-forgot-email" />
-       </div>
-       <div>
-               <input type="submit" name="submit" value="###SEND_PASSWORD###" />
-        </div>
-       </fieldset>
-</form>
-<!-- ###FORGOT_FORM### -->
-<p>###BACKLINK_LOGIN###&nbsp;</p>
-<!--###TEMPLATE_FORGOT###-->
-
-<!--###TEMPLATE_CHANGEPASSWORD###-->
-
-###STATUS_HEADER###
-###STATUS_MESSAGE###
-
-
-<!-- ###CHANGEPASSWORD_FORM### -->
-<form action="###ACTION_URI###" method="post">
-       <fieldset>
-               <legend>###LEGEND###</legend>
-               <div>
-                       <label for="tx_felogin_pi1-newpassword1">###NEWPASSWORD1_LABEL###</label>
-                       <input type="password" name="###NEWPASSWORD1###" id="tx_felogin_pi1-newpassword1" />
-               </div>
-               <div>
-                       <label for="tx_felogin_pi1-newpassword2">###NEWPASSWORD2_LABEL###</label>
-                       <input type="password" name="###NEWPASSWORD2###" id="tx_felogin_pi1-newpassword2" />
-               </div>
-               <div>
-                       <input type="submit" name="tx_felogin_pi1[changepasswordsubmit]" value="###SEND_PASSWORD###" />
-                </div>
-       </fieldset>
-
-</form>
-<!-- ###CHANGEPASSWORD_FORM### -->
-###BACKLINK_LOGIN###
-<!--###TEMPLATE_CHANGEPASSWORD###-->
\ No newline at end of file