[TASK] Cleanup felogin 95/17995/2
authorWouter Wolters <typo3@wouterwolters.nl>
Sun, 3 Feb 2013 22:51:45 +0000 (23:51 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 4 Feb 2013 12:30:50 +0000 (13:30 +0100)
Change-Id: I9ceeb1e7c142a3daaf20886f94c8a1d3295df99a
Resolves: #45123
Releases: 6.1
Reviewed-on: https://review.typo3.org/17995
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
typo3/sysext/felogin/Classes/Hooks/CmsLayout.php
typo3/sysext/felogin/ext_localconf.php
typo3/sysext/felogin/ext_tables.php
typo3/sysext/felogin/ext_typoscript_setup.txt
typo3/sysext/felogin/template.html

index 8bcbf9e..6001719 100644 (file)
@@ -27,6 +27,7 @@ namespace TYPO3\CMS\Felogin\Controller;
  *
  *  The code was adapted from newloginbox, see manual for detailed description
  ***************************************************************/
+
 /**
  * Plugin 'Website User Login' for the 'felogin' extension.
  *
@@ -34,44 +35,77 @@ namespace TYPO3\CMS\Felogin\Controller;
  */
 class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 
-       // Same as class name
        /**
+        * Same as class name
+        *
         * @todo Define visibility
         */
        public $prefixId = 'tx_felogin_pi1';
 
-       // Path to this script relative to the extension dir.
        /**
+        * Path to this script relative to the extension dir.
+        *
         * @todo Define visibility
         */
        public $scriptRelPath = 'pi1/class.tx_felogin_pi1.php';
 
-       // The extension key.
        /**
+        * The extension key.
+        *
         * @todo Define visibility
         */
        public $extKey = 'felogin';
 
+       /**
+        * @var boolean
+        */
        public $pi_checkCHash = FALSE;
 
+       /**
+        * @var boolean
+        */
        public $pi_USER_INT_obj = TRUE;
 
-       // Is user logged in?
+       /**
+        * Is user logged in?
+        *
+        * @var boolean
+        */
        protected $userIsLoggedIn;
 
-       // holds the template for FE rendering
+       /**
+        * Holds the template for FE rendering
+        *
+        * @var string
+        */
        protected $template;
 
-       // upload dir, used for flexform template files
+       /**
+        * Upload directory, used for flexform template files
+        *
+        * @var string
+        */
        protected $uploadDir;
 
-       // URL for the redirect
+       /**
+        * URL for the redirect
+        *
+        * @var string
+        */
        protected $redirectUrl;
 
-       // flag for disable the redirect
+       /**
+        * Flag for disable the redirect
+        *
+        * @var boolean
+        */
        protected $noRedirect = FALSE;
 
-       // logintype (given as GPvar), possible: login, logout
+       /**
+        * Logintype (given as GPvar), possible: login, logout
+        *
+        * @var string
+        */
        protected $logintype;
 
        /**
@@ -191,7 +225,11 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                $row = FALSE;
                                // Look for user record
                                $data = $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['forgot_email'], 'fe_users');
-                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid, username, password, email', 'fe_users', '(email=' . $data . ' OR username=' . $data . ') AND pid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->spid) . ') ' . $this->cObj->enableFields('fe_users'));
+                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                                       'uid, username, password, email',
+                                       'fe_users',
+                                       '(email=' . $data . ' OR username=' . $data . ') AND pid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->spid) . ') ' . $this->cObj->enableFields('fe_users')
+                               );
                                if ($GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
                                        $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
                                }
@@ -206,7 +244,10 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                if ($error) {
                                        $markerArray['###STATUS_MESSAGE###'] = $this->cObj->stdWrap($error, $this->conf['forgotErrorMessage_stdWrap.']);
                                } else {
-                                       $markerArray['###STATUS_MESSAGE###'] = $this->cObj->stdWrap($this->pi_getLL('ll_forgot_reset_message_emailSent', '', 1), $this->conf['forgotResetMessageEmailSentMessage_stdWrap.']);
+                                       $markerArray['###STATUS_MESSAGE###'] = $this->cObj->stdWrap(
+                                               $this->pi_getLL('ll_forgot_reset_message_emailSent', '', 1),
+                                               $this->conf['forgotResetMessageEmailSentMessage_stdWrap.']
+                                       );
                                }
                                $subpartArray['###FORGOT_FORM###'] = '';
                        } else {
@@ -268,9 +309,17 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                $postData = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST($this->prefixId);
                                if (isset($postData['changepasswordsubmit'])) {
                                        if (strlen($postData['password1']) < $minLength) {
-                                               $markerArray['###STATUS_MESSAGE###'] = sprintf($this->getDisplayText('change_password_tooshort_message', $this->conf['changePasswordTooShortMessage_stdWrap.']), $minLength);
+                                               $markerArray['###STATUS_MESSAGE###'] = sprintf($this->getDisplayText(
+                                                       'change_password_tooshort_message',
+                                                       $this->conf['changePasswordTooShortMessage_stdWrap.']),
+                                                       $minLength
+                                               );
                                        } elseif ($postData['password1'] != $postData['password2']) {
-                                               $markerArray['###STATUS_MESSAGE###'] = sprintf($this->getDisplayText('change_password_notequal_message', $this->conf['changePasswordNotEqualMessage_stdWrap.']), $minLength);
+                                               $markerArray['###STATUS_MESSAGE###'] = sprintf($this->getDisplayText(
+                                                       'change_password_notequal_message',
+                                                       $this->conf['changePasswordNotEqualMessage_stdWrap.']),
+                                                       $minLength
+                                               );
                                        } else {
                                                $newPass = $postData['password1'];
                                                if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['password_changed']) {
@@ -290,7 +339,10 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                                $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('change_password_done_message', $this->conf['changePasswordDoneMessage_stdWrap.']);
                                                $done = TRUE;
                                                $subpartArray['###CHANGEPASSWORD_FORM###'] = '';
-                                               $markerArray['###BACKLINK_LOGIN###'] = $this->getPageLink($this->pi_getLL('ll_forgot_header_backToLogin', '', 1), array($this->prefixId . '[redirectReferrer]' => 'off'));
+                                               $markerArray['###BACKLINK_LOGIN###'] = $this->getPageLink(
+                                                       $this->pi_getLL('ll_forgot_header_backToLogin', '', 1),
+                                                       array($this->prefixId . '[redirectReferrer]' => 'off')
+                                               );
                                        }
                                }
                                if (!$done) {
@@ -466,7 +518,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('welcome_message', $this->conf['welcomeMessage_stdWrap.']);
                        }
                }
-               // Hook (used by kb_md5fepw extension by Kraft Bernhard <kraftb@gmx.net>)
+
                // This hook allows to call User JS functions.
                // The methods should also set the required JS functions to get included
                $onSubmit = '';
@@ -550,74 +602,74 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                if ($GLOBALS['TSFE']->loginUser && $this->logintype === 'login') {
                                        // Logintype is needed because the login-page wouldn't be accessible anymore after a login (would always redirect)
                                        switch ($redirMethod) {
-                                       case 'groupLogin':
-                                               // taken from dkd_redirect_at_login written by Ingmar Schlecht; database-field changed
-                                               $groupData = $GLOBALS['TSFE']->fe_user->groupData;
-                                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('felogin_redirectPid', $GLOBALS['TSFE']->fe_user->usergroup_table, 'felogin_redirectPid<>\'\' AND uid IN (' . implode(',', $groupData['uid']) . ')');
-                                               if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_row($res)) {
-                                                       // take the first group with a redirect page
-                                                       $redirect_url[] = $this->pi_getPageLink($row[0]);
-                                               }
-                                               break;
-                                       case 'userLogin':
-                                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('felogin_redirectPid', $GLOBALS['TSFE']->fe_user->user_table, $GLOBALS['TSFE']->fe_user->userid_column . '=' . $GLOBALS['TSFE']->fe_user->user['uid'] . ' AND felogin_redirectPid<>\'\'');
-                                               if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_row($res)) {
-                                                       $redirect_url[] = $this->pi_getPageLink($row[0]);
-                                               }
-                                               break;
-                                       case 'login':
-                                               if ($this->conf['redirectPageLogin']) {
-                                                       $redirect_url[] = $this->pi_getPageLink(intval($this->conf['redirectPageLogin']));
-                                               }
-                                               break;
-                                       case 'getpost':
-                                               $redirect_url[] = $this->redirectUrl;
-                                               break;
-                                       case 'referer':
-                                               // Avoid redirect when logging in after changing password
-                                               if ($this->piVars['redirectReferrer'] !== 'off') {
-                                                       // Avoid forced logout, when trying to login immediately after a logout
-                                                       $redirect_url[] = preg_replace('/[&?]logintype=[a-z]+/', '', $this->referer);
-                                               }
-                                               break;
-                                       case 'refererDomains':
-                                               // Auto redirect.
-                                               // Feature to redirect to the page where the user came from (HTTP_REFERER).
-                                               // Allowed domains to redirect to, can be configured with plugin.tx_felogin_pi1.domains
-                                               // Thanks to plan2.net / Martin Kutschker for implementing this feature.
-                                               // also avoid redirect when logging in after changing password
-                                               if ($this->conf['domains'] && $this->piVars['redirectReferrer'] !== 'off') {
-                                                       $url = $this->referer;
-                                                       // Is referring url allowed to redirect?
-                                                       $match = array();
-                                                       if (preg_match('/^http://([[:alnum:]._-]+)//', $url, $match)) {
-                                                               $redirect_domain = $match[1];
-                                                               $found = FALSE;
-                                                               foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['domains'], TRUE) as $d) {
-                                                                       if (preg_match('/(^|\\.)/' . $d . '$', $redirect_domain)) {
-                                                                               $found = TRUE;
-                                                                               break;
+                                               case 'groupLogin':
+                                                       // taken from dkd_redirect_at_login written by Ingmar Schlecht; database-field changed
+                                                       $groupData = $GLOBALS['TSFE']->fe_user->groupData;
+                                                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('felogin_redirectPid', $GLOBALS['TSFE']->fe_user->usergroup_table, 'felogin_redirectPid<>\'\' AND uid IN (' . implode(',', $groupData['uid']) . ')');
+                                                       if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_row($res)) {
+                                                               // take the first group with a redirect page
+                                                               $redirect_url[] = $this->pi_getPageLink($row[0]);
+                                                       }
+                                                       break;
+                                               case 'userLogin':
+                                                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('felogin_redirectPid', $GLOBALS['TSFE']->fe_user->user_table, $GLOBALS['TSFE']->fe_user->userid_column . '=' . $GLOBALS['TSFE']->fe_user->user['uid'] . ' AND felogin_redirectPid<>\'\'');
+                                                       if ($row = $GLOBALS['TYPO3_DB']->sql_fetch_row($res)) {
+                                                               $redirect_url[] = $this->pi_getPageLink($row[0]);
+                                                       }
+                                                       break;
+                                               case 'login':
+                                                       if ($this->conf['redirectPageLogin']) {
+                                                               $redirect_url[] = $this->pi_getPageLink(intval($this->conf['redirectPageLogin']));
+                                                       }
+                                                       break;
+                                               case 'getpost':
+                                                       $redirect_url[] = $this->redirectUrl;
+                                                       break;
+                                               case 'referer':
+                                                       // Avoid redirect when logging in after changing password
+                                                       if ($this->piVars['redirectReferrer'] !== 'off') {
+                                                               // Avoid forced logout, when trying to login immediately after a logout
+                                                               $redirect_url[] = preg_replace('/[&?]logintype=[a-z]+/', '', $this->referer);
+                                                       }
+                                                       break;
+                                               case 'refererDomains':
+                                                       // Auto redirect.
+                                                       // Feature to redirect to the page where the user came from (HTTP_REFERER).
+                                                       // Allowed domains to redirect to, can be configured with plugin.tx_felogin_pi1.domains
+                                                       // Thanks to plan2.net / Martin Kutschker for implementing this feature.
+                                                       // also avoid redirect when logging in after changing password
+                                                       if ($this->conf['domains'] && $this->piVars['redirectReferrer'] !== 'off') {
+                                                               $url = $this->referer;
+                                                               // Is referring url allowed to redirect?
+                                                               $match = array();
+                                                               if (preg_match('/^http://([[:alnum:]._-]+)//', $url, $match)) {
+                                                                       $redirect_domain = $match[1];
+                                                                       $found = FALSE;
+                                                                       foreach (\TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['domains'], TRUE) as $d) {
+                                                                               if (preg_match('/(^|\\.)/' . $d . '$', $redirect_domain)) {
+                                                                                       $found = TRUE;
+                                                                                       break;
+                                                                               }
+                                                                       }
+                                                                       if (!$found) {
+                                                                               $url = '';
                                                                        }
                                                                }
-                                                               if (!$found) {
-                                                                       $url = '';
+                                                               // Avoid forced logout, when trying to login immediately after a logout
+                                                               if ($url) {
+                                                                       $redirect_url[] = preg_replace('/[&?]logintype=[a-z]+/', '', $url);
                                                                }
                                                        }
-                                                       // Avoid forced logout, when trying to login immediately after a logout
-                                                       if ($url) {
-                                                               $redirect_url[] = preg_replace('/[&?]logintype=[a-z]+/', '', $url);
-                                                       }
-                                               }
-                                               break;
+                                                       break;
                                        }
                                } elseif ($this->logintype === 'login') {
                                        // after login-error
                                        switch ($redirMethod) {
-                                       case 'loginError':
-                                               if ($this->conf['redirectPageLoginError']) {
-                                                       $redirect_url[] = $this->pi_getPageLink(intval($this->conf['redirectPageLoginError']));
-                                               }
-                                               break;
+                                               case 'loginError':
+                                                       if ($this->conf['redirectPageLoginError']) {
+                                                               $redirect_url[] = $this->pi_getPageLink(intval($this->conf['redirectPageLoginError']));
+                                                       }
+                                                       break;
                                        }
                                } elseif ($this->logintype == '' && $redirMethod == 'login' && $this->conf['redirectPageLogin']) {
                                        // If login and page not accessible
@@ -641,20 +693,20 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                                }
                                        }
                                        switch ($redirMethod) {
-                                       case 'logout':
-                                               if ($this->conf['redirectPageLogout']) {
-                                                       $redirect_url[] = $this->pi_getPageLink(intval($this->conf['redirectPageLogout']));
-                                               }
-                                               break;
+                                               case 'logout':
+                                                       if ($this->conf['redirectPageLogout']) {
+                                                               $redirect_url[] = $this->pi_getPageLink(intval($this->conf['redirectPageLogout']));
+                                                       }
+                                                       break;
                                        }
                                } else {
                                        // not logged in
                                        // Placeholder for maybe future options
                                        switch ($redirMethod) {
-                                       case 'getpost':
-                                               // Preserve the get/post value
-                                               $redirect_url[] = $this->redirectUrl;
-                                               break;
+                                               case 'getpost':
+                                                       // Preserve the get/post value
+                                                       $redirect_url[] = $this->redirectUrl;
+                                                       break;
                                        }
                                }
                        }
@@ -924,5 +976,4 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
 
 }
 
-
 ?>
\ No newline at end of file
index c7c383e..02991f4 100644 (file)
@@ -43,7 +43,7 @@ class CmsLayout implements \TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInt
        public function preProcess(\TYPO3\CMS\Backend\View\PageLayoutView &$parentObject, &$drawItem, &$headerContent, &$itemContent, array &$row) {
                if ($row['CType'] === 'login') {
                        $drawItem = FALSE;
-                       $itemContent .= '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms_login_title', TRUE) . '</strong>';
+                       $itemContent .= '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms_login_title', TRUE) . '</strong>';
                }
        }
 
index 222bde6..8566158 100644 (file)
@@ -27,8 +27,8 @@ mod.wizards.newContentElement.wizardItems.forms {
        elements {
                login {
                        icon = gfx/c_wiz/login_form.gif
-                       title = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms_login_title
-                       description = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms_login_description
+                       title = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms_login_title
+                       description = LLL:EXT:cms/layout/locallang_db_new_content_el.xlf:forms_login_description
                        tt_content_defValues {
                                CType = login
                        }
@@ -37,12 +37,6 @@ mod.wizards.newContentElement.wizardItems.forms {
        show :=addToList(login)
 }
 ');
-// Activate support for kb_md5fepw
-if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('kb_md5fepw') && TYPO3_MODE == 'FE') {
-       $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['felogin']['loginFormOnSubmitFuncs'][] = 'tx_kbmd5fepw_newloginbox->loginFormOnSubmit';
-       require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('kb_md5fepw') . 'pi1/class.tx_kbmd5fepw_newloginbox.php';
-}
-
 
 // Page module hook
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem'][$_EXTKEY] =
index 2e58c81..8f8ada6 100644 (file)
@@ -4,32 +4,29 @@ if (!defined('TYPO3_MODE')) {
 }
 $_EXTCONF = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['felogin']);
 \TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('tt_content');
-if (\TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 4002000) {
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:' . $_EXTKEY . '/flexform.xml', 'login');
-} else {
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('default', 'FILE:EXT:' . $_EXTKEY . '/flexform.xml');
-}
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:' . $_EXTKEY . '/flexform.xml', 'login');
+
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem('tt_content', 'CType', array(
-       'LLL:EXT:cms/locallang_ttc.xml:CType.I.10',
+       'LLL:EXT:cms/locallang_ttc.xlf:CType.I.10',
        'login',
        'i/tt_content_login.gif'
 ), 'mailform', 'after');
-$TCA['tt_content']['types']['login']['showitem'] = '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.plugin,
+$GLOBALS['TCA']['tt_content']['types']['login']['showitem'] = '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.plugin,
                                                                                                        pi_flexform;;;;1-1-1,
-                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.behaviour,
-                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended';
+                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+                                                                                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.behaviour,
+                                                                                                       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended';
 // Adds the redirect field to the fe_groups table
 $tempColumns = array(
        'felogin_redirectPid' => array(
                'exclude' => 1,
-               'label' => 'LLL:EXT:felogin/locallang_db.xml:felogin_redirectPid',
+               'label' => 'LLL:EXT:felogin/locallang_db.xlf:felogin_redirectPid',
                'config' => array(
                        'type' => 'group',
                        'internal_type' => 'db',
@@ -52,7 +49,7 @@ $tempColumns = array(
 $tempColumns = array(
        'felogin_redirectPid' => array(
                'exclude' => 1,
-               'label' => 'LLL:EXT:felogin/locallang_db.xml:felogin_redirectPid',
+               'label' => 'LLL:EXT:felogin/locallang_db.xlf:felogin_redirectPid',
                'config' => array(
                        'type' => 'group',
                        'internal_type' => 'db',
@@ -69,7 +66,7 @@ $tempColumns = array(
        ),
        'felogin_forgotHash' => array(
                'exclude' => 1,
-               'label' => 'LLL:EXT:felogin/locallang_db.xml:felogin_forgotHash',
+               'label' => 'LLL:EXT:felogin/locallang_db.xlf:felogin_forgotHash',
                'config' => array(
                        'type' => 'passthrough'
                )
index ef723a1..3cf23ac 100644 (file)
@@ -1,36 +1,36 @@
 plugin.tx_felogin_pi1 {
                #storagePid - where are the user records? use single value or a commaseperated list
        storagePid = {$styles.content.loginform.pid}
-       recursive = 
-       
+       recursive =
+
                #Template File
        templateFile = {$styles.content.loginform.templateFile}
-       
+
                #baseURL for the link generation
-       feloginBaseURL = 
-       
+       feloginBaseURL =
+
                #wrapContentInBaseClass
        wrapContentInBaseClass = 1
-       
-       
+
+
                #typolink-configuration for links / urls
                #parameter and additionalParams are set by extension
        linkConfig {
-               target = 
+               target =
                ATagParams = rel="nofollow"
        }
-       
+
                #preserve GET vars - define "all" or commaseperated list of GET-vars that should be included by link generation
        preserveGETvars = all
-       
-       
+
+
                #additional fields
        showForgotPasswordLink =
        showPermaLogin =
-       
+
                # time in hours how long the link for forget password is valid
        forgotLinkHashValidTime = 12
-       
+
        newPasswordMinLength = 6
 
        welcomeHeader_stdWrap {
@@ -39,28 +39,28 @@ plugin.tx_felogin_pi1 {
        welcomeMessage_stdWrap {
                wrap = <div>|</div>
        }
-       
+
        successHeader_stdWrap {
                wrap = <h3>|</h3>
        }
        successMessage_stdWrap {
                wrap = <div>|</div>
        }
-       
+
        logoutHeader_stdWrap {
                wrap = <h3>|</h3>
        }
        logoutMessage_stdWrap {
                wrap = <div>|</div>
        }
-       
+
        errorHeader_stdWrap {
                wrap = <h3>|</h3>
        }
        errorMessage_stdWrap {
                wrap = <div>|</div>
        }
-       
+
        forgotHeader_stdWrap {
                wrap = <h3>|</h3>
        }
@@ -82,7 +82,7 @@ plugin.tx_felogin_pi1 {
        changePasswordNotEqualMessage_stdWrap {
                wrap = <div>|</div>
        }
-       
+
        changePasswordHeader_stdWrap {
                wrap = <h3>|</h3>
        }
@@ -96,7 +96,7 @@ plugin.tx_felogin_pi1 {
        cookieWarning_stdWrap {
                wrap = <p style="color:red; font-weight:bold;">|</p>
        }
-       
+
        # stdWrap for fe_users fields used in Messages
        userfields {
                username {
@@ -104,28 +104,28 @@ plugin.tx_felogin_pi1 {
                        wrap = <strong>|</strong>
                }
        }
-       
+
                #redirect
        redirectMode =
-       redirectFirstMethod = 
+       redirectFirstMethod =
        redirectPageLogin =
        redirectPageLoginError =
        redirectPageLogout =
-       
+
        #disable redirect with one switch
-       redirectDisable = 
-       
+       redirectDisable =
+
        email_from =
        email_fromName =
        replyTo =
-       
-       
+
+
        # Allowed Referrer-Redirect-Domains:
        domains =
-       
+
        # Show logout form direct after login
        showLogoutFormAfterLogin =
-       
+
        dateFormat = Y-m-d H:i
 
        # Expose the information on whether or not the account for which a new password was requested exists. By default, that information is not disclosed for privacy reasons.
@@ -142,7 +142,4 @@ plugin.tx_felogin_pi1._LOCAL_LANG.default {
 }
 
 plugin.tx_felogin_pi1._DEFAULT_PI_VARS {
-}
-
-
-
+}
\ No newline at end of file
index f97aa9e..4cd830f 100644 (file)
        <li>###USERNAME_LABEL###              - corresponding to 'username'</li>
 </ul>
 
-
-
-
-
 <!--###TEMPLATE_LOGIN###-->
 
 ###STATUS_HEADER###
 
 <!--###TEMPLATE_LOGIN###-->
 
-
-
-
-
-
-
-
-
-
-
-
 <!--###TEMPLATE_LOGOUT###-->
 
 ###STATUS_HEADER###
 
 <!--###TEMPLATE_LOGOUT###-->
 
-
-
-
-
-
-
 <!--###TEMPLATE_FORGOT###-->
 
 ###STATUS_HEADER###
 <p>###BACKLINK_LOGIN###&nbsp;</p>
 <!--###TEMPLATE_FORGOT###-->
 
-
-
 <!--###TEMPLATE_CHANGEPASSWORD###-->
 
 ###STATUS_HEADER###
 </form>
 <!-- ###CHANGEPASSWORD_FORM### -->
 ###BACKLINK_LOGIN###
-<!--###TEMPLATE_CHANGEPASSWORD###-->
-
-
+<!--###TEMPLATE_CHANGEPASSWORD###-->
\ No newline at end of file