Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
services
t3o sites
extensions.typo3.org
extensions.typo3.org
Commits
425a3937
Commit
425a3937
authored
Mar 03, 2017
by
Jonathan IROULIN
Committed by
Thomas Löffler
Apr 21, 2017
Browse files
Use extbase User Model Repository
parent
0b618283
Changes
5
Hide whitespace changes
Inline
Side-by-side
html/typo3conf/ext/ter_fe2/Classes/Controller/ExtensionController.php
View file @
425a3937
...
...
@@ -65,7 +65,7 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
protected
$persistenceManager
;
/**
* @var
Tx_TerFe2_
Domain
_
Repository
_
UserRepository
* @var
\TYPO3\CMS\Extbase\
Domain
\
Repository
\Frontend
UserRepository
*/
protected
$ownerRepository
;
...
...
@@ -85,7 +85,7 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
$this
->
tagRepository
=
$this
->
objectManager
->
get
(
'Tx_TerFe2_Domain_Repository_TagRepository'
);
$this
->
versionRepository
=
$this
->
objectManager
->
get
(
'Tx_TerFe2_Domain_Repository_VersionRepository'
);
$this
->
authorRepository
=
$this
->
objectManager
->
get
(
'Tx_TerFe2_Domain_Repository_AuthorRepository'
);
$this
->
ownerRepository
=
$this
->
objectManager
->
get
(
Tx_TerFe2_
Domain
_
Repository
_
UserRepository
::
class
);
$this
->
ownerRepository
=
$this
->
objectManager
->
get
(
\
TYPO3\CMS\Extbase\
Domain
\
Repository
\Frontend
UserRepository
::
class
);
$this
->
providerManager
=
$this
->
objectManager
->
get
(
'Tx_TerFe2_Provider_ProviderManager'
);
$this
->
session
=
$this
->
objectManager
->
get
(
'Tx_TerFe2_Persistence_Session'
);
$this
->
persistenceManager
=
$this
->
objectManager
->
get
(
\
TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
::
class
);
...
...
@@ -196,7 +196,7 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
$versionHistoryCount
=
(
!
empty
(
$this
->
settings
[
'versionHistoryCount'
])
?
$this
->
settings
[
'versionHistoryCount'
]
:
5
);
$skipLatestVersion
=
(
isset
(
$this
->
settings
[
'skipLatestVersion'
])
?
$this
->
settings
[
'skipLatestVersion'
]
:
TRUE
);
$loggedInUser
=
$this
->
ownerRepository
->
findCurrent
();
//
$loggedInUser = $this->ownerRepository->findCurrent();
if
(
$extension
!==
NULL
&&
$extension
instanceof
Tx_TerFe2_Domain_Model_Extension
&&
...
...
@@ -212,8 +212,8 @@ class Tx_TerFe2_Controller_ExtensionController extends Tx_TerFe2_Controller_Abst
$this
->
view
->
assign
(
'loggedInUser'
,
$loggedInUser
);
/** @var Tx_TerFe2_Service_Documentation $documentationService */
$documentationService
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
makeInstance
(
'Tx_TerFe2_Service_Documentation'
);
$documentationLink
=
$documentationService
->
getDocumentationLink
(
$extension
->
getExtKey
(),
$extension
->
getLastVersion
()
->
getVersionString
());
//
$documentationService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Tx_TerFe2_Service_Documentation');
//
$documentationLink = $documentationService->getDocumentationLink($extension->getExtKey(), $extension->getLastVersion()->getVersionString());
$this
->
view
->
assign
(
'documentationLink'
,
$documentationLink
);
$GLOBALS
[
'TSFE'
]
->
getPageRenderer
()
->
addMetaTag
(
'<meta name="description" content="'
.
htmlspecialchars
(
$extension
->
getLastVersion
()
->
getDescription
())
.
'" />'
);
...
...
html/typo3conf/ext/ter_fe2/Classes/Controller/RegisterkeyController.php
View file @
425a3937
...
...
@@ -42,7 +42,7 @@ class Tx_TerFe2_Controller_RegisterkeyController extends Tx_TerFe2_Controller_Ab
protected
$versionRepository
;
/**
* @var
Tx_TerFe2_
Domain
_
Repository
_
UserRepository
* @var
\TYPO3\CMS\Extbase\
Domain
\
Repository
\Frontend
UserRepository
*/
protected
$userRepository
;
...
...
@@ -119,9 +119,9 @@ class Tx_TerFe2_Controller_RegisterkeyController extends Tx_TerFe2_Controller_Ab
$extension
=
$this
->
extensionRepository
->
findOneByExtKey
(
$extensionKey
);
$message
=
''
;
if
(
$extension
instanceof
Tx_TerFe2_Domain_Model_Extension
&&
$extension
->
getFrontendUser
())
{
/** @var
Tx_Ajaxlogin_
Domain
_
Model
_
User $frontendUser */
/** @var
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User $frontendUser */
$frontendUser
=
$this
->
userRepository
->
findOneByUsername
(
$extension
->
getFrontendUser
());
if
(
$frontendUser
instanceof
Tx_Ajaxlogin_
Domain
_
Model
_
User
)
{
if
(
$frontendUser
instanceof
\
TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User
)
{
$message
=
$this
->
resolveWSErrorMessage
(
$error
.
'.message'
,
array
(
...
...
html/typo3conf/ext/ter_fe2/Classes/Domain/Repository/UserRepository.php
View file @
425a3937
<?php
class
Tx_TerFe2_
Domain
_
Repository
_
UserRepository
extends
\
TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository
class
\
TYPO3\CMS\Extbase\
Domain
\
Repository
\Frontend
UserRepository
extends
\
TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository
{
/**
* Find an Object using the UID of the current fe_user
* @return
Tx_Ajaxlogin_
Domain
_
Model
_
User the current fe_user or null if none
* @return
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User the current fe_user or null if none
*/
public
function
findCurrent
()
{
...
...
@@ -23,7 +23,7 @@ class Tx_TerFe2_Domain_Repository_UserRepository extends \TYPO3\CMS\Extbase\Doma
/**
* Find an Object using the UID of the current fe_user
* @return
Tx_Ajaxlogin_
Domain
_
Model
_
User
* @return
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User
*/
public
function
findOneByForgotHashAndEmail
(
$forgotHash
,
$email
)
{
...
...
@@ -43,7 +43,7 @@ class Tx_TerFe2_Domain_Repository_UserRepository extends \TYPO3\CMS\Extbase\Doma
/**
* Find an Object using the UID of the current fe_user
* @return
Tx_Ajaxlogin_
Domain
_
Model
_
User
* @return
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User
*/
public
function
findOneByVerificationHashAndEmail
(
$verificationHash
,
$email
)
{
...
...
@@ -62,7 +62,7 @@ class Tx_TerFe2_Domain_Repository_UserRepository extends \TYPO3\CMS\Extbase\Doma
}
/**
* @return
Tx_Ajaxlogin_
Domain
_
Model
_
User
* @return
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User
*/
public
function
findOneByEmail
(
$email
)
{
...
...
@@ -80,7 +80,7 @@ class Tx_TerFe2_Domain_Repository_UserRepository extends \TYPO3\CMS\Extbase\Doma
}
/**
* @return
Tx_Ajaxlogin_
Domain
_
Model
_
User
* @return
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User
*/
public
function
findOneByUsername
(
$username
)
{
...
...
@@ -101,7 +101,7 @@ class Tx_TerFe2_Domain_Repository_UserRepository extends \TYPO3\CMS\Extbase\Doma
/**
* Find an Object using the UID of the current fe_user
* @return
Tx_Ajaxlogin_
Domain
_
Model
_
User
* @return
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User
*/
public
function
findOneByEnableHash
(
$enableHash
)
{
...
...
@@ -143,7 +143,7 @@ class Tx_TerFe2_Domain_Repository_UserRepository extends \TYPO3\CMS\Extbase\Doma
/**
* @param $uid
*
* @return
Tx_Ajaxlogin_
Domain
_
Model
_
User
* @return
\TYPO3\CMS\Extbase\
Domain
\
Model
\Frontend
User
*/
public
function
findUserByUid
(
$uid
)
{
...
...
html/typo3conf/ext/ter_fe2/Configuration/TypoScript/Default/setup.txt
View file @
425a3937
...
...
@@ -73,6 +73,11 @@ plugin.tx_terfe2 {
}
}
}
\TYPO3\CMS\Extbase\Domain\Model\FrontendUser {
mapping {
tableName = fe_users
}
}
}
}
...
...
html/typo3conf/ext/ter_fe2/Resources/Private/Partials/ExtensionSingleInfo.html
View file @
425a3937
...
...
@@ -175,7 +175,6 @@
<td>
{owner.name}
<br/>
<terfe2:userImage
user=
"{owner}"
alt=
"{owner.name}"
size=
"mid"
/>
</td>
</tr>
</f:if>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment