BigBad / golfleague

app/library/Storage/EloquentRepositories/EloquentSkinRepository.php

Indentation +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@
 
 class EloquentHoleScoreRepository implements SkinRepository
 {
-        public function all(){}
-        public function find($id){}
-        public function findByPlayer($playerId){}
-        public function findByMatch($matchId){}
-        public function create($input){}
-        public function update($round){}
+		public function all(){}
+		public function find($id){}
+		public function findByPlayer($playerId){}
+		public function findByMatch($matchId){}
+		public function create($input){}
+		public function update($round){}
 
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@
 
 class EloquentHoleScoreRepository implements SkinRepository
 {
-        public function all(){}
-        public function find($id){}
-        public function findByPlayer($playerId){}
-        public function findByMatch($matchId){}
-        public function create($input){}
-        public function update($round){}
+        public function all() {}
+        public function find($id) {}
+        public function findByPlayer($playerId) {}
+        public function findByMatch($matchId) {}
+        public function create($input) {}
+        public function update($round) {}
 
 }
\ No newline at end of file

Braces +19 added lines, -8 removed lines

@@ -2,13 +2,24 @@
 
 use \Skin as Skin;
 
-class EloquentHoleScoreRepository implements SkinRepository
-{
-        public function all(){}
-        public function find($id){}
-        public function findByPlayer($playerId){}
-        public function findByMatch($matchId){}
-        public function create($input){}
-        public function update($round){}
+class EloquentHoleScoreRepository implements SkinRepository {
+        public function all()
+        {
+}
+        public function find($id)
+        {
+}
+        public function findByPlayer($playerId)
+        {
+}
+        public function findByMatch($matchId)
+        {
+}
+        public function create($input)
+        {
+}
+        public function update($round)
+        {
+}
 
 }
\ No newline at end of file

app/library/Storage/EloquentRepositories/EloquentHoleScoreRepository.php

Indentation +15 added lines, -15 removed lines

@@ -13,25 +13,25 @@
    * Multideminsional Array of Hole Numbers and scores
    **/
 	public function __construct(Holescore $holescore)
-    {
-        $this->holescore = $holescore;
-    }
+	{
+		$this->holescore = $holescore;
+	}
 
-    public function all()
-    {
-        return $this->holescore->all();
-    }
+	public function all()
+	{
+		return $this->holescore->all();
+	}
 
 
-    public function find($id)
-    {
-        return Holescore::find($id);
-    }
+	public function find($id)
+	{
+		return Holescore::find($id);
+	}
 
-    public function create($input)
-    {
-        $this->holescore->create($input);
-    }
+	public function create($input)
+	{
+		$this->holescore->create($input);
+	}
 
 	public function update($id, $score)
 	{

Braces +2 added lines, -3 removed lines

@@ -3,8 +3,7 @@ 
 use \Holescore as Holescore;
 use \Player as Player;
 
-class EloquentHoleScoreRepository implements HoleScoreRepository
-{
+class EloquentHoleScoreRepository implements HoleScoreRepository {
   /*Return Score collections that include:
    * Player Name
    * Date
@@ -13,7 +12,7 @@ 
    * Multideminsional Array of Hole Numbers and scores
    **/
 	public function __construct(Holescore $holescore)
-    {
+	{
         $this->holescore = $holescore;
     }
 

app/library/Storage/EloquentRepositories/EloquentLeaderboardRepository.php

Indentation +7 added lines, -7 removed lines

@@ -6,13 +6,13 @@ 
 {
 
 	public function __construct(Match $match)
-    {
-        $this->match = $match;
-    }
+	{
+		$this->match = $match;
+	}
 
-    public function get($year)
-    {
-        //Get all match ids for a given year
+	public function get($year)
+	{
+		//Get all match ids for a given year
 		//get all player ids
 		//for each player id get total winnings from pivot where (player id and match id)
 		$year = $year . '-01-01';
@@ -45,5 +45,5 @@ 
 		}
 
 		return $moneyList;
-    }
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -15,31 +15,31 @@
         //Get all match ids for a given year
 		//get all player ids
 		//for each player id get total winnings from pivot where (player id and match id)
-		$year = $year . '-01-01';
+		$year = $year.'-01-01';
 		$matches = $this->match->with('players')->where('created_at', '>', $year)->get(); //get match eventually by year
 
 		//filter out players from match
 		$moneyList = array();
 		$players = array();
-		foreach($matches as $key => $item){
+		foreach ($matches as $key => $item) {
 			$players = $item->players;
-			foreach($players as $playersKey => $player){
+			foreach ($players as $playersKey => $player) {
 				if (array_key_exists($player->id, $moneyList)) {
 					//add previois to new
 					$moneyList[$player->id]['winnings'] = sprintf('%01.2f', ($moneyList[$player->id]['winnings'] + $player->pivot->winnings));
 					$moneyList[$player->id]['entryfees'] += 5;
-					$moneyList[$player->id]['entryfees'] = sprintf('%01.2f',$moneyList[$player->id]['entryfees']);
+					$moneyList[$player->id]['entryfees'] = sprintf('%01.2f', $moneyList[$player->id]['entryfees']);
 					$moneyList[$player->id]['net'] = $moneyList[$player->id]['winnings'] - $moneyList[$player->id]['entryfees'];
-					$moneyList[$player->id]['net'] = sprintf('%01.2f',$moneyList[$player->id]['net']);
+					$moneyList[$player->id]['net'] = sprintf('%01.2f', $moneyList[$player->id]['net']);
 				}
 				else {
 					$moneyList[$player->id]['id'] = $player->id;
 					$moneyList[$player->id]['name'] = $player->name;
-					$moneyList[$player->id]['winnings'] = sprintf('%01.2f',$player->pivot->winnings);
+					$moneyList[$player->id]['winnings'] = sprintf('%01.2f', $player->pivot->winnings);
 					$moneyList[$player->id]['entryfees'] = 5;
-					$moneyList[$player->id]['entryfees'] = sprintf('%01.2f',$moneyList[$player->id]['entryfees']);
+					$moneyList[$player->id]['entryfees'] = sprintf('%01.2f', $moneyList[$player->id]['entryfees']);
 					$moneyList[$player->id]['net'] = $moneyList[$player->id]['winnings'] - $moneyList[$player->id]['entryfees'];
-					$moneyList[$player->id]['net'] = sprintf('%01.2f',$moneyList[$player->id]['net']);
+					$moneyList[$player->id]['net'] = sprintf('%01.2f', $moneyList[$player->id]['net']);
 				}
 			}
 		}

Braces +5 added lines, -7 removed lines

@@ -2,11 +2,10 @@ 
 
 use \Match as Match;
 
-class EloquentLeaderboardRepository implements LeaderboardRepository
-{
+class EloquentLeaderboardRepository implements LeaderboardRepository {
 
 	public function __construct(Match $match)
-    {
+	{
         $this->match = $match;
     }
 
@@ -21,9 +20,9 @@ 
 		//filter out players from match
 		$moneyList = array();
 		$players = array();
-		foreach($matches as $key => $item){
+		foreach($matches as $key => $item) {
 			$players = $item->players;
-			foreach($players as $playersKey => $player){
+			foreach($players as $playersKey => $player) {
 				if (array_key_exists($player->id, $moneyList)) {
 					//add previois to new
 					$moneyList[$player->id]['winnings'] = sprintf('%01.2f', ($moneyList[$player->id]['winnings'] + $player->pivot->winnings));
@@ -31,8 +30,7 @@ 
 					$moneyList[$player->id]['entryfees'] = sprintf('%01.2f',$moneyList[$player->id]['entryfees']);
 					$moneyList[$player->id]['net'] = $moneyList[$player->id]['winnings'] - $moneyList[$player->id]['entryfees'];
 					$moneyList[$player->id]['net'] = sprintf('%01.2f',$moneyList[$player->id]['net']);
-				}
-				else {
+				} else {
 					$moneyList[$player->id]['id'] = $player->id;
 					$moneyList[$player->id]['name'] = $player->name;
 					$moneyList[$player->id]['winnings'] = sprintf('%01.2f',$player->pivot->winnings);

app/library/Storage/EloquentRepositories/EloquentPlayerRepository.php

Indentation +14 added lines, -14 removed lines

@@ -12,26 +12,26 @@
    * Multideminsional Array of Hole Numbers and scores   *
    **/
 	public function __construct(Player $player)
-    {
+	{
 		$this->player = $player;
-    }
+	}
 
-    public function all()
-    {
-        return $this->player->orderBy('handicap','asc')->get();
-    }
+	public function all()
+	{
+		return $this->player->orderBy('handicap','asc')->get();
+	}
 
-    //Find Player by Player Id
-    public function find($playerId)
-    {
-        return $this->player->find($playerId);
-    }
+	//Find Player by Player Id
+	public function find($playerId)
+	{
+		return $this->player->find($playerId);
+	}
 
-    public function create($name, $handicap)
-    {
+	public function create($name, $handicap)
+	{
 		$this->player->name = $name;
 		$this->player->handicap = $handicap;
 		$this->player->save();
-    }
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
     public function all()
     {
-        return $this->player->orderBy('handicap','asc')->get();
+        return $this->player->orderBy('handicap', 'asc')->get();
     }
 
     //Find Player by Player Id

Braces +2 added lines, -3 removed lines

@@ -2,8 +2,7 @@ 
 
 use \Player as Player;
 
-class EloquentPlayerRepository implements PlayerRepository
-{
+class EloquentPlayerRepository implements PlayerRepository {
   /*Return Score collections that include:
    * Player Name
    * Date
@@ -12,7 +11,7 @@ 
    * Multideminsional Array of Hole Numbers and scores   *
    **/
 	public function __construct(Player $player)
-    {
+	{
 		$this->player = $player;
     }
 

app/library/Storage/StorageServiceProvider.php

Braces +1 added lines, -2 removed lines

@@ -3,8 +3,7 @@
 use Illuminate\Support\ServiceProvider;
 
 
-class StorageServiceProvider extends ServiceProvider
-{
+class StorageServiceProvider extends ServiceProvider {
 
     public function register()
     {

Indentation +43 added lines, -43 removed lines

@@ -6,47 +6,47 @@
 class StorageServiceProvider extends ServiceProvider
 {
 
-    public function register()
-    {
-        $this->app->bind(
-          'GolfLeague\Storage\Round\RoundRepository',
-          'GolfLeague\Storage\Round\EloquentRoundRepository'
-        );
-		$this->app->bind(
-          'GolfLeague\Storage\Match\MatchRepository',
-          'GolfLeague\Storage\Match\EloquentMatchRepository'
-        );
-		$this->app->bind(
-          'GolfLeague\Storage\MatchRound\MatchRoundRepository',
-          'GolfLeague\Storage\MatchRound\EloquentMatchRoundRepository'
-        );
-		$this->app->bind(
-          'GolfLeague\Storage\Player\PlayerRepository',
-          'GolfLeague\Storage\Player\EloquentPlayerRepository'
-        );
-		$this->app->bind(
-          'GolfLeague\Storage\HoleScore\HoleScoreRepository',
-          'GolfLeague\Storage\HoleScore\EloquentHoleScoreRepository'
-        );
-		$this->app->bind(
-          'GolfLeague\Storage\Leaderboard\LeaderboardRepository',
-          'GolfLeague\Storage\Leaderboard\EloquentLeaderboardRepository'
-        );
-		$this->app->bind(
-          'GolfLeague\Storage\Skin\SkinRepository',
-          'GolfLeague\Storage\Skin\EloquentSkinRepository'
-        );
-		$this->app->bind(
-          'GolfLeague\Storage\Ctp\CtpRepository',
-          'GolfLeague\Storage\Ctp\EloquentCtpRepository'
-        );
-        $this->app->bind(
-            'GolfLeague\Storage\Team\TeamRepository',
-            'GolfLeague\Storage\Team\EloquentTeamRepository'
-        );
-        $this->app->bind(
-            'GolfLeague\Storage\Team\TeamMatchesRepository',
-            'GolfLeague\Storage\Team\EloquentTeamMatchesRepository'
-        );
-    }
+	public function register()
+	{
+		$this->app->bind(
+		  'GolfLeague\Storage\Round\RoundRepository',
+		  'GolfLeague\Storage\Round\EloquentRoundRepository'
+		);
+		$this->app->bind(
+		  'GolfLeague\Storage\Match\MatchRepository',
+		  'GolfLeague\Storage\Match\EloquentMatchRepository'
+		);
+		$this->app->bind(
+		  'GolfLeague\Storage\MatchRound\MatchRoundRepository',
+		  'GolfLeague\Storage\MatchRound\EloquentMatchRoundRepository'
+		);
+		$this->app->bind(
+		  'GolfLeague\Storage\Player\PlayerRepository',
+		  'GolfLeague\Storage\Player\EloquentPlayerRepository'
+		);
+		$this->app->bind(
+		  'GolfLeague\Storage\HoleScore\HoleScoreRepository',
+		  'GolfLeague\Storage\HoleScore\EloquentHoleScoreRepository'
+		);
+		$this->app->bind(
+		  'GolfLeague\Storage\Leaderboard\LeaderboardRepository',
+		  'GolfLeague\Storage\Leaderboard\EloquentLeaderboardRepository'
+		);
+		$this->app->bind(
+		  'GolfLeague\Storage\Skin\SkinRepository',
+		  'GolfLeague\Storage\Skin\EloquentSkinRepository'
+		);
+		$this->app->bind(
+		  'GolfLeague\Storage\Ctp\CtpRepository',
+		  'GolfLeague\Storage\Ctp\EloquentCtpRepository'
+		);
+		$this->app->bind(
+			'GolfLeague\Storage\Team\TeamRepository',
+			'GolfLeague\Storage\Team\EloquentTeamRepository'
+		);
+		$this->app->bind(
+			'GolfLeague\Storage\Team\TeamMatchesRepository',
+			'GolfLeague\Storage\Team\EloquentTeamMatchesRepository'
+		);
+	}
 }

app/library/Storage/SkinRepository.php

Indentation +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@
 
 interface SkinRepository {
 
-    public function all();
-    public function find($id);
-    public function findByPlayer($playerId);
-    public function findByMatch($matchId);
-    public function create($input);
-    public function update($round);
+	public function all();
+	public function find($id);
+	public function findByPlayer($playerId);
+	public function findByMatch($matchId);
+	public function create($input);
+	public function update($round);
 
 }
\ No newline at end of file

app/library/Storage/EloquentRepositories/EloquentMatchRepository.php

Spacing +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@ 
 
 	public function getYears()
 	{
-		$dates =  Match::orderBy('date', 'DESC')->get(['date']);
+		$dates = Match::orderBy('date', 'DESC')->get(['date']);
 		//return $dates;
-		$years = $dates->map(function($years){
+		$years = $dates->map(function($years) {
 			return substr($years->date, 0, 4);
 		})->toArray();
 
@@ -63,7 +63,7 @@ 
 
 		$this->match->save(); //save to match table
 
-		foreach ($matchdata['player'] as $key => $player){
+		foreach ($matchdata['player'] as $key => $player) {
 			$currentPlayer = $this->player->find($player['player_id']);
 			$attributes = array(
 				"level_id" => $player['level_id'],

Indentation +15 added lines, -15 removed lines

@@ -14,15 +14,15 @@ 
    * Multideminsional Array of Hole Numbers and scores   *
    **/
 	public function __construct(Match $match, Player $player)
-    {
-        $this->match = $match;
+	{
+		$this->match = $match;
 		$this->player = $player;
-    }
+	}
 
-    public function all()
-    {
+	public function all()
+	{
 		return Match::orderBy('date', 'DESC')->get();
-    }
+	}
 
 	public function get($matchid)
 	{
@@ -57,14 +57,14 @@ 
 
 		return array_unique($years);
 	}
-    //Find Scores by Player Id
-    public function find($playerId)
-    {
-        //return Round::with('player', 'holescores')->where('player_id', '=', $playerId)->get();
-    }
-
-    public function create($matchdata)
-    {
+	//Find Scores by Player Id
+	public function find($playerId)
+	{
+		//return Round::with('player', 'holescores')->where('player_id', '=', $playerId)->get();
+	}
+
+	public function create($matchdata)
+	{
 		//enter match data to Matches table
 		$this->match->date = $matchdata['date'];
 		$this->match->course_id = $matchdata['course'];
@@ -87,7 +87,7 @@ 
 			$currentPlayer->matches()->save($this->match, $attributes); //save match_player pivot data
 		}// End foreach
 		return $this->match->id;
-    }
+	}
 
 	public function update($matchdata)
 	{

Braces +5 added lines, -5 removed lines

@@ -5,8 +5,7 @@ 
 use \Round as Round;
 use \Player as Player;
 
-class EloquentMatchRepository implements MatchRepository
-{
+class EloquentMatchRepository implements MatchRepository {
   /*Return Score collections that include:
    * Player Name
    * Date
@@ -15,7 +14,7 @@ 
    * Multideminsional Array of Hole Numbers and scores   *
    **/
 	public function __construct(Match $match, Player $player)
-    {
+	{
         $this->match = $match;
 		$this->player = $player;
     }
@@ -52,7 +51,8 @@ 
 	{
 		$dates =  Match::orderBy('date', 'DESC')->get(['date']);
 		//return $dates;
-		$years = $dates->map(function($years){
+		$years = $dates->map(function($years)
+		{
 			return substr($years->date, 0, 4);
 		})->toArray();
 
@@ -77,7 +77,7 @@ 
 
 		$this->match->save(); //save to match table
 
-		foreach ($matchdata['player'] as $key => $player){
+		foreach ($matchdata['player'] as $key => $player) {
 			$currentPlayer = $this->player->find($player['player_id']);
 			$attributes = array(
 				"level_id" => $player['level_id'],

app/controllers/UsersController.php

Doc Comments +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
     /**
      * Log the user out of the application.
      *
-     * @return  Illuminate\Http\Response
+     * @return  Illuminate\Http\RedirectResponse
      */
     public function logout()
     {

Indentation +186 added lines, -186 removed lines

@@ -10,190 +10,190 @@
 class UsersController extends Controller
 {
 
-    /**
-     * Displays the form for account creation
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function create()
-    {
-        return View::make(Config::get('confide::signup_form'));
-    }
-
-    /**
-     * Stores new account
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function store()
-    {
-        $repo = App::make('UserRepository');
-        $user = $repo->signup(Input::all());
-
-        if ($user->id) {
-            if (Config::get('confide::signup_email')) {
-                Mail::queueOn(
-                    Config::get('confide::email_queue'),
-                    Config::get('confide::email_account_confirmation'),
-                    compact('user'),
-                    function ($message) use ($user) {
-                        $message
-                            ->to($user->email, $user->username)
-                            ->subject(Lang::get('confide::confide.email.account_confirmation.subject'));
-                    }
-                );
-            }
-
-            return Redirect::action('UsersController@login')
-                ->with('notice', Lang::get('confide::confide.alerts.account_created'));
-        } else {
-            $error = $user->errors()->all(':message');
-
-            return Redirect::action('UsersController@create')
-                ->withInput(Input::except('password'))
-                ->with('error', $error);
-        }
-    }
-
-    /**
-     * Displays the login form
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function login()
-    {
-        if (Confide::user()) {
-            return Redirect::to('/');
-        } else {
-            return View::make(Config::get('confide::login_form'));
-        }
-    }
-
-    /**
-     * Attempt to do login
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function doLogin()
-    {
-        $repo = App::make('UserRepository');
-        $input = Input::all();
-
-        if ($repo->login($input)) {
-            return Redirect::intended('/');
-        } else {
-            if ($repo->isThrottled($input)) {
-                $err_msg = Lang::get('confide::confide.alerts.too_many_attempts');
-            } elseif ($repo->existsButNotConfirmed($input)) {
-                $err_msg = Lang::get('confide::confide.alerts.not_confirmed');
-            } else {
-                $err_msg = Lang::get('confide::confide.alerts.wrong_credentials');
-            }
-
-            return Redirect::action('UsersController@login')
-                ->withInput(Input::except('password'))
-                ->with('error', $err_msg);
-        }
-    }
-
-    /**
-     * Attempt to confirm account with code
-     *
-     * @param  string $code
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function confirm($code)
-    {
-        if (Confide::confirm($code)) {
-            $notice_msg = Lang::get('confide::confide.alerts.confirmation');
-            return Redirect::action('UsersController@login')
-                ->with('notice', $notice_msg);
-        } else {
-            $error_msg = Lang::get('confide::confide.alerts.wrong_confirmation');
-            return Redirect::action('UsersController@login')
-                ->with('error', $error_msg);
-        }
-    }
-
-    /**
-     * Displays the forgot password form
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function forgotPassword()
-    {
-        return View::make(Config::get('confide::forgot_password_form'));
-    }
-
-    /**
-     * Attempt to send change password link to the given email
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function doForgotPassword()
-    {
-        if (Confide::forgotPassword(Input::get('email'))) {
-            $notice_msg = Lang::get('confide::confide.alerts.password_forgot');
-            return Redirect::action('UsersController@login')
-                ->with('notice', $notice_msg);
-        } else {
-            $error_msg = Lang::get('confide::confide.alerts.wrong_password_forgot');
-            return Redirect::action('UsersController@doForgotPassword')
-                ->withInput()
-                ->with('error', $error_msg);
-        }
-    }
-
-    /**
-     * Shows the change password form with the given token
-     *
-     * @param  string $token
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function resetPassword($token)
-    {
-        return View::make(Config::get('confide::reset_password_form'))
-                ->with('token', $token);
-    }
-
-    /**
-     * Attempt change password of the user
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function doResetPassword()
-    {
-        $repo = App::make('UserRepository');
-        $input = array(
-            'token'                 =>Input::get('token'),
-            'password'              =>Input::get('password'),
-            'password_confirmation' =>Input::get('password_confirmation'),
-        );
-
-        // By passing an array with the token, password and confirmation
-        if ($repo->resetPassword($input)) {
-            $notice_msg = Lang::get('confide::confide.alerts.password_reset');
-            return Redirect::action('UsersController@login')
-                ->with('notice', $notice_msg);
-        } else {
-            $error_msg = Lang::get('confide::confide.alerts.wrong_password_reset');
-            return Redirect::action('UsersController@resetPassword', array('token'=>$input['token']))
-                ->withInput()
-                ->with('error', $error_msg);
-        }
-    }
-
-    /**
-     * Log the user out of the application.
-     *
-     * @return  Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        Confide::logout();
-
-        return Redirect::to('/');
-    }
+	/**
+	 * Displays the form for account creation
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function create()
+	{
+		return View::make(Config::get('confide::signup_form'));
+	}
+
+	/**
+	 * Stores new account
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function store()
+	{
+		$repo = App::make('UserRepository');
+		$user = $repo->signup(Input::all());
+
+		if ($user->id) {
+			if (Config::get('confide::signup_email')) {
+				Mail::queueOn(
+					Config::get('confide::email_queue'),
+					Config::get('confide::email_account_confirmation'),
+					compact('user'),
+					function ($message) use ($user) {
+						$message
+							->to($user->email, $user->username)
+							->subject(Lang::get('confide::confide.email.account_confirmation.subject'));
+					}
+				);
+			}
+
+			return Redirect::action('UsersController@login')
+				->with('notice', Lang::get('confide::confide.alerts.account_created'));
+		} else {
+			$error = $user->errors()->all(':message');
+
+			return Redirect::action('UsersController@create')
+				->withInput(Input::except('password'))
+				->with('error', $error);
+		}
+	}
+
+	/**
+	 * Displays the login form
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function login()
+	{
+		if (Confide::user()) {
+			return Redirect::to('/');
+		} else {
+			return View::make(Config::get('confide::login_form'));
+		}
+	}
+
+	/**
+	 * Attempt to do login
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function doLogin()
+	{
+		$repo = App::make('UserRepository');
+		$input = Input::all();
+
+		if ($repo->login($input)) {
+			return Redirect::intended('/');
+		} else {
+			if ($repo->isThrottled($input)) {
+				$err_msg = Lang::get('confide::confide.alerts.too_many_attempts');
+			} elseif ($repo->existsButNotConfirmed($input)) {
+				$err_msg = Lang::get('confide::confide.alerts.not_confirmed');
+			} else {
+				$err_msg = Lang::get('confide::confide.alerts.wrong_credentials');
+			}
+
+			return Redirect::action('UsersController@login')
+				->withInput(Input::except('password'))
+				->with('error', $err_msg);
+		}
+	}
+
+	/**
+	 * Attempt to confirm account with code
+	 *
+	 * @param  string $code
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function confirm($code)
+	{
+		if (Confide::confirm($code)) {
+			$notice_msg = Lang::get('confide::confide.alerts.confirmation');
+			return Redirect::action('UsersController@login')
+				->with('notice', $notice_msg);
+		} else {
+			$error_msg = Lang::get('confide::confide.alerts.wrong_confirmation');
+			return Redirect::action('UsersController@login')
+				->with('error', $error_msg);
+		}
+	}
+
+	/**
+	 * Displays the forgot password form
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function forgotPassword()
+	{
+		return View::make(Config::get('confide::forgot_password_form'));
+	}
+
+	/**
+	 * Attempt to send change password link to the given email
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function doForgotPassword()
+	{
+		if (Confide::forgotPassword(Input::get('email'))) {
+			$notice_msg = Lang::get('confide::confide.alerts.password_forgot');
+			return Redirect::action('UsersController@login')
+				->with('notice', $notice_msg);
+		} else {
+			$error_msg = Lang::get('confide::confide.alerts.wrong_password_forgot');
+			return Redirect::action('UsersController@doForgotPassword')
+				->withInput()
+				->with('error', $error_msg);
+		}
+	}
+
+	/**
+	 * Shows the change password form with the given token
+	 *
+	 * @param  string $token
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function resetPassword($token)
+	{
+		return View::make(Config::get('confide::reset_password_form'))
+				->with('token', $token);
+	}
+
+	/**
+	 * Attempt change password of the user
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function doResetPassword()
+	{
+		$repo = App::make('UserRepository');
+		$input = array(
+			'token'                 =>Input::get('token'),
+			'password'              =>Input::get('password'),
+			'password_confirmation' =>Input::get('password_confirmation'),
+		);
+
+		// By passing an array with the token, password and confirmation
+		if ($repo->resetPassword($input)) {
+			$notice_msg = Lang::get('confide::confide.alerts.password_reset');
+			return Redirect::action('UsersController@login')
+				->with('notice', $notice_msg);
+		} else {
+			$error_msg = Lang::get('confide::confide.alerts.wrong_password_reset');
+			return Redirect::action('UsersController@resetPassword', array('token'=>$input['token']))
+				->withInput()
+				->with('error', $error_msg);
+		}
+	}
+
+	/**
+	 * Log the user out of the application.
+	 *
+	 * @return  Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		Confide::logout();
+
+		return Redirect::to('/');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
                     Config::get('confide::email_queue'),
                     Config::get('confide::email_account_confirmation'),
                     compact('user'),
-                    function ($message) use ($user) {
+                    function($message) use ($user) {
                         $message
                             ->to($user->email, $user->username)
                             ->subject(Lang::get('confide::confide.email.account_confirmation.subject'));

Braces +3 added lines, -3 removed lines

@@ -7,8 +7,7 @@ 
  *
  * Implements actions regarding user management
  */
-class UsersController extends Controller
-{
+class UsersController extends Controller {
 
     /**
      * Displays the form for account creation
@@ -36,7 +35,8 @@ 
                     Config::get('confide::email_queue'),
                     Config::get('confide::email_account_confirmation'),
                     compact('user'),
-                    function ($message) use ($user) {
+                    function ($message) use ($user)
+                    {
                         $message
                             ->to($user->email, $user->username)
                             ->subject(Lang::get('confide::confide.email.account_confirmation.subject'));

app/models/UserRepository.php

Doc Comments +1 added lines, -3 removed lines

@@ -58,7 +58,6 @@ 
      * Checks if the credentials has been throttled by too
      * much failed login attempts
      *
-     * @param  array $credentials Array containing the credentials (email and password)
      *
      * @return  boolean Is throttled
      */
@@ -71,9 +70,8 @@ 
      * Checks if the given credentials correponds to a user that exists but
      * is not confirmed
      *
-     * @param  array $credentials Array containing the credentials (email and password)
      *
-     * @return  boolean Exists and is not confirmed?
+     * @return  boolean|null Exists and is not confirmed?
      */
     public function existsButNotConfirmed($input)
     {

Indentation +116 added lines, -116 removed lines

@@ -10,120 +10,120 @@
  */
 class UserRepository
 {
-    /**
-     * Signup a new account with the given parameters
-     *
-     * @param  array $input Array containing 'email' and 'password'.
-     *
-     * @return  User User object that may or may not be saved successfully. Check the id to make sure.
-     */
-    public function signup($input)
-    {
-        $user = new User;
-
-        $user->email    = array_get($input, 'email');
-        $user->password = array_get($input, 'password');
-
-        // The password confirmation will be removed from model
-        // before saving. This field will be used in Ardent's
-        // auto validation.
-        $user->password_confirmation = array_get($input, 'password_confirmation');
-
-        // Generate a random confirmation code
-        $user->confirmation_code     = md5(uniqid(mt_rand(), true));
-
-        // Save if valid. Password field will be hashed before save
-        $this->save($user);
-
-        return $user;
-    }
-
-    /**
-     * Attempts to login with the given credentials.
-     *
-     * @param  array $input Array containing the credentials (email and password)
-     *
-     * @return  boolean Success?
-     */
-    public function login($input)
-    {
-        if (! isset($input['password'])) {
-            $input['password'] = null;
-        }
-
-        return Confide::logAttempt($input, Config::get('confide::signup_confirm'));
-    }
-
-    /**
-     * Checks if the credentials has been throttled by too
-     * much failed login attempts
-     *
-     * @param  array $credentials Array containing the credentials (email and password)
-     *
-     * @return  boolean Is throttled
-     */
-    public function isThrottled($input)
-    {
-        return Confide::isThrottled($input);
-    }
-
-    /**
-     * Checks if the given credentials correponds to a user that exists but
-     * is not confirmed
-     *
-     * @param  array $credentials Array containing the credentials (email and password)
-     *
-     * @return  boolean Exists and is not confirmed?
-     */
-    public function existsButNotConfirmed($input)
-    {
-        $user = Confide::getUserByEmailOrUsername($input);
-
-        if ($user) {
-            $correctPassword = Hash::check(
-                isset($input['password']) ? $input['password'] : false,
-                $user->password
-            );
-
-            return (! $user->confirmed && $correctPassword);
-        }
-    }
-
-    /**
-     * Resets a password of a user. The $input['token'] will tell which user.
-     *
-     * @param  array $input Array containing 'token', 'password' and 'password_confirmation' keys.
-     *
-     * @return  boolean Success
-     */
-    public function resetPassword($input)
-    {
-        $result = false;
-        $user   = Confide::userByResetPasswordToken($input['token']);
-
-        if ($user) {
-            $user->password              = $input['password'];
-            $user->password_confirmation = $input['password_confirmation'];
-            $result = $this->save($user);
-        }
-
-        // If result is positive, destroy token
-        if ($result) {
-            Confide::destroyForgotPasswordToken($input['token']);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Simply saves the given instance
-     *
-     * @param  User $instance
-     *
-     * @return  boolean Success
-     */
-    public function save(User $instance)
-    {
-        return $instance->save();
-    }
+	/**
+	 * Signup a new account with the given parameters
+	 *
+	 * @param  array $input Array containing 'email' and 'password'.
+	 *
+	 * @return  User User object that may or may not be saved successfully. Check the id to make sure.
+	 */
+	public function signup($input)
+	{
+		$user = new User;
+
+		$user->email    = array_get($input, 'email');
+		$user->password = array_get($input, 'password');
+
+		// The password confirmation will be removed from model
+		// before saving. This field will be used in Ardent's
+		// auto validation.
+		$user->password_confirmation = array_get($input, 'password_confirmation');
+
+		// Generate a random confirmation code
+		$user->confirmation_code     = md5(uniqid(mt_rand(), true));
+
+		// Save if valid. Password field will be hashed before save
+		$this->save($user);
+
+		return $user;
+	}
+
+	/**
+	 * Attempts to login with the given credentials.
+	 *
+	 * @param  array $input Array containing the credentials (email and password)
+	 *
+	 * @return  boolean Success?
+	 */
+	public function login($input)
+	{
+		if (! isset($input['password'])) {
+			$input['password'] = null;
+		}
+
+		return Confide::logAttempt($input, Config::get('confide::signup_confirm'));
+	}
+
+	/**
+	 * Checks if the credentials has been throttled by too
+	 * much failed login attempts
+	 *
+	 * @param  array $credentials Array containing the credentials (email and password)
+	 *
+	 * @return  boolean Is throttled
+	 */
+	public function isThrottled($input)
+	{
+		return Confide::isThrottled($input);
+	}
+
+	/**
+	 * Checks if the given credentials correponds to a user that exists but
+	 * is not confirmed
+	 *
+	 * @param  array $credentials Array containing the credentials (email and password)
+	 *
+	 * @return  boolean Exists and is not confirmed?
+	 */
+	public function existsButNotConfirmed($input)
+	{
+		$user = Confide::getUserByEmailOrUsername($input);
+
+		if ($user) {
+			$correctPassword = Hash::check(
+				isset($input['password']) ? $input['password'] : false,
+				$user->password
+			);
+
+			return (! $user->confirmed && $correctPassword);
+		}
+	}
+
+	/**
+	 * Resets a password of a user. The $input['token'] will tell which user.
+	 *
+	 * @param  array $input Array containing 'token', 'password' and 'password_confirmation' keys.
+	 *
+	 * @return  boolean Success
+	 */
+	public function resetPassword($input)
+	{
+		$result = false;
+		$user   = Confide::userByResetPasswordToken($input['token']);
+
+		if ($user) {
+			$user->password              = $input['password'];
+			$user->password_confirmation = $input['password_confirmation'];
+			$result = $this->save($user);
+		}
+
+		// If result is positive, destroy token
+		if ($result) {
+			Confide::destroyForgotPasswordToken($input['token']);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Simply saves the given instance
+	 *
+	 * @param  User $instance
+	 *
+	 * @return  boolean Success
+	 */
+	public function save(User $instance)
+	{
+		return $instance->save();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function login($input)
     {
-        if (! isset($input['password'])) {
+        if ( ! isset($input['password'])) {
             $input['password'] = null;
         }
 
@@ -85,7 +85,7 @@ 
                 $user->password
             );
 
-            return (! $user->confirmed && $correctPassword);
+            return ( ! $user->confirmed && $correctPassword);
         }
     }
 

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
  * This service abstracts some interactions that occurs between Confide and
  * the Database.
  */
-class UserRepository
-{
+class UserRepository {
     /**
      * Signup a new account with the given parameters
      *