Skip to content

Commit

Permalink
secret question, getQuestion from protected to public
Browse files Browse the repository at this point in the history
changed some default configurations
changed readme with latest features
  • Loading branch information
kokspflanze committed Aug 31, 2015
1 parent 6c5275b commit b3feb3a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 19 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,17 @@ You can find some screenshots @ [screenshot-directory](https://github.com/kokspf
- Download (modification in admin-panel)
- Ranking (TopGuild|TopPlayer) with detail pages
- ServerInfoPages (modification in admin-panel, possible to add more dynamic)
- Register (with mail confirmation, 2 pw system, secret question [optional, you can change that option in config])
- Register (with mail confirmation, 2 pw system [different pws for ingame and web])
- SecretQuestionSystem (possible to enable it in the config, and set the question in the admin panel)
- SecretLogin (you can define different roles, which has to confirm there mail before they can login)
- lost Password
- Donate (PaymentWall and Superreward, in default added)
- TicketSystem (with bb-code)
- TicketSystem (with bb-code) change TicketCategories in the Adminpanel
- AccountPanel (to change the web/ingame password)
- CharacterPanel (to show current status of a character)
- CharacterPanel (to show current status of a character, set main character[alias for ticket-system])
- AdminPanel with UserPanel, DonateStatistic, view Logs, edit different parts in page
- Vote4Coins (modification in admin-panel)
- RoleSystem, its possible to add more roles with different permissions
- easy to change the web, admin and email layout

## PHP Extensions
Expand Down
15 changes: 1 addition & 14 deletions config/module.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -524,25 +524,12 @@
],
],
'payment-api' => [
// more config params check https://github.com/kokspflanze/PaymentAPI/blob/master/config/module.config.php
'payment-wall' => [
/**
* WhiteList-Ips for PaymentWall
*/
'ip-white-list' => [
'174.36.92.186',
'174.36.96.66',
'174.36.92.187',
'174.36.92.192',
'174.37.14.28'
],
/**
* SecretKey
*/
'secret-key' => '',
/**
* ApiVersion, supported version atm 1,2,3
*/
'version' => 3
],
'super-reward' => [
/**
Expand Down
4 changes: 2 additions & 2 deletions src/PServerCMS/Service/SecretQuestion.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public function isAnswerAllowed( UserInterface $user, $answer )
{
$answerEntity = $this->getEntityManagerAnswer()->getAnswer4UserId($user->getId());

// @TODO better workflow, with ZendFilter
$realAnswer = strtolower(trim($answerEntity->getAnswer()));
$plainAnswer = strtolower(trim($answer));

Expand All @@ -57,7 +58,6 @@ public function getQuestionQueryBuilder()
return $this->getQuestionRepository()->getQuestionQueryBuilder();
}


/**
* @param array $data
* @param null|Entity $currentSecretQuestion
Expand Down Expand Up @@ -95,7 +95,7 @@ public function secretQuestion(array $data, $currentSecretQuestion = null)
*
* @return null|\PServerCMS\Entity\SecretQuestion
*/
protected function getQuestion4Id( $questionId )
public function getQuestion4Id( $questionId )
{
return $this->getQuestionRepository()->getQuestion4Id( $questionId );
}
Expand Down

0 comments on commit b3feb3a

Please sign in to comment.