From 3e59c2792c9c31bb06b9cef7bd7e39a46825ab5f Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 2 Jul 2014 21:22:13 +0200 Subject: [PATCH] Updated some controllers and routes to exclude not yet finished stuff. --- .gitignore | 3 +- app/config/database.php | 14 +---- app/config/mail.php | 2 +- app/controllers/MigrationController.php | 5 +- app/controllers/RemindersController.php | 75 ------------------------- app/routes.php | 8 +-- 6 files changed, 11 insertions(+), 96 deletions(-) delete mode 100644 app/controllers/RemindersController.php diff --git a/.gitignore b/.gitignore index bdb298ec4d..3ac31004ca 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ composer.lock .env.php .DS_Store Thumbs.db -.idea/ \ No newline at end of file +.idea/ +tests/_output/* \ No newline at end of file diff --git a/app/config/database.php b/app/config/database.php index 3dc48bdd8e..54462ec9a5 100644 --- a/app/config/database.php +++ b/app/config/database.php @@ -4,7 +4,7 @@ return [ 'fetch' => PDO::FETCH_CLASS, 'default' => 'mysql', 'connections' => [ - 'mysql' => [ + 'mysql' => [ 'driver' => 'mysql', 'host' => 'localhost', 'database' => 'forge', @@ -14,18 +14,6 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', ], - // previous database, if present: - 'old-firefly' => [ - 'driver' => 'mysql', - 'host' => 'localhost', - 'database' => '(previous database)', - 'username' => '', - 'password' => '', - 'charset' => 'utf8', - 'collation' => 'utf8_unicode_ci', - 'prefix' => '', - ], - ], 'migrations' => 'migrations', 'redis' => [ diff --git a/app/config/mail.php b/app/config/mail.php index f9444f6c2e..a208c28e86 100644 --- a/app/config/mail.php +++ b/app/config/mail.php @@ -2,7 +2,7 @@ return [ 'driver' => 'smtp', - 'host' => ';', + 'host' => '', 'port' => 587, 'from' => ['address' => '', 'name' => 'Firefly V'], 'encryption' => 'tls', diff --git a/app/controllers/MigrationController.php b/app/controllers/MigrationController.php index cae33df1ab..025b93412e 100644 --- a/app/controllers/MigrationController.php +++ b/app/controllers/MigrationController.php @@ -2,6 +2,7 @@ class MigrationController extends BaseController { + /* public function index() { // check if database connection is present. @@ -19,7 +20,7 @@ class MigrationController extends BaseController return View::make('migrate.index')->with('error', $error); } - return Redirect::route('migrate.select-user'); + return Redirect::route('migrate.upload'); } @@ -47,7 +48,6 @@ class MigrationController extends BaseController return View::make('error')->with('message', 'No such user!'); } } - public function migrate($userID) { // import the data. @@ -424,4 +424,5 @@ class MigrationController extends BaseController return View::make('migrate.result')->with('messages', $messages); } + */ } \ No newline at end of file diff --git a/app/controllers/RemindersController.php b/app/controllers/RemindersController.php deleted file mode 100644 index ac59e48c26..0000000000 --- a/app/controllers/RemindersController.php +++ /dev/null @@ -1,75 +0,0 @@ -with('error', Lang::get($response)); - - case Password::REMINDER_SENT: - return Redirect::back()->with('status', Lang::get($response)); - } - } - - /** - * Display the password reset view for the given token. - * - * @param string $token - * @return Response - */ - public function getReset($token = null) - { - if (is_null($token)) App::abort(404); - - return View::make('password.reset')->with('token', $token); - } - - /** - * Handle a POST request to reset a user's password. - * - * @return Response - */ - public function postReset() - { - $credentials = Input::only( - 'email', 'password', 'password_confirmation', 'token' - ); - - $response = Password::reset($credentials, function($user, $password) - { - $user->password = Hash::make($password); - - $user->save(); - }); - - switch ($response) - { - case Password::INVALID_PASSWORD: - case Password::INVALID_TOKEN: - case Password::INVALID_USER: - return Redirect::back()->with('error', Lang::get($response)); - - case Password::PASSWORD_RESET: - return Redirect::to('/'); - } - } - -} diff --git a/app/routes.php b/app/routes.php index 324aaa29d4..0f748840c1 100644 --- a/app/routes.php +++ b/app/routes.php @@ -5,10 +5,10 @@ Route::get('/', ['uses' => 'HomeController@index','as' => 'index','before' => 'a Route::get('/start', ['uses' => 'HomeController@start','as' => 'start','before' => 'auth']); // migration controller: -Route::get('/migrate/index', ['uses' => 'MigrationController@index','as' => 'migrate.index', 'before' => 'auth']); -Route::get('/migrate/select-user', ['uses' => 'MigrationController@selectUser','as' => 'migrate.select-user', 'before' => 'auth']); -Route::post('/migrate/select-user', ['uses' => 'MigrationController@postSelectUser','before' => 'csrf|auth']); -Route::get('/migrate/migrate/{userID}', ['uses' => 'MigrationController@migrate','as' => 'migrate.migrate', 'before' => 'auth']); +//Route::get('/migrate/index', ['uses' => 'MigrationController@index','as' => 'migrate.index', 'before' => 'auth']); +//Route::get('/migrate/select-user', ['uses' => 'MigrationController@selectUser','as' => 'migrate.select-user', 'before' => 'auth']); +//Route::post('/migrate/select-user', ['uses' => 'MigrationController@postSelectUser','before' => 'csrf|auth']); +//Route::get('/migrate/migrate/{userID}', ['uses' => 'MigrationController@migrate','as' => 'migrate.migrate', 'before' => 'auth']); // login, register, logout: Route::get('/login',['uses' => 'UserController@login','as' => 'login','before' => 'guest']);