diff --git a/app/config/app.php b/app/config/app.php
index aa5a934..2534d17 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -78,9 +78,7 @@ return array(
|
*/
- 'key' => 'BxihI0sqIe0oWk27hzF8QCGyaS81SOOO',
-
- 'cipher' => MCRYPT_RIJNDAEL_128,
+ 'key' => 'EtdaG6JmXDqr3p4RpoEmqrd0CYdHKFiY',
/*
|--------------------------------------------------------------------------
@@ -182,7 +180,6 @@ return array(
'Schema' => 'Illuminate\Support\Facades\Schema',
'Seeder' => 'Illuminate\Database\Seeder',
'Session' => 'Illuminate\Support\Facades\Session',
- 'SoftDeletingTrait' => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
'SSH' => 'Illuminate\Support\Facades\SSH',
'Str' => 'Illuminate\Support\Str',
'URL' => 'Illuminate\Support\Facades\URL',
diff --git a/app/config/database.php b/app/config/database.php
index d9b4f5d..e6a32ce 100644
--- a/app/config/database.php
+++ b/app/config/database.php
@@ -55,9 +55,9 @@ return array(
'mysql' => array(
'driver' => 'mysql',
'host' => 'localhost',
- 'database' => 'mentors',
+ 'database' => 'database',
'username' => 'root',
- 'password' => 'kipsigei',
+ 'password' => '',
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
@@ -66,8 +66,8 @@ return array(
'pgsql' => array(
'driver' => 'pgsql',
'host' => 'localhost',
- 'database' => 'forge',
- 'username' => 'forge',
+ 'database' => 'database',
+ 'username' => 'root',
'password' => '',
'charset' => 'utf8',
'prefix' => '',
diff --git a/app/config/mail.php b/app/config/mail.php
index 76fd9e4..41b4c4b 100644
--- a/app/config/mail.php
+++ b/app/config/mail.php
@@ -11,7 +11,7 @@ return array(
| sending of e-mail. You may specify which one you're using throughout
| your application here. By default, Laravel is setup for SMTP mail.
|
- | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log"
+ | Supported: "smtp", "mail", "sendmail"
|
*/
@@ -35,9 +35,9 @@ return array(
| SMTP Host Port
|--------------------------------------------------------------------------
|
- | This is the SMTP port used by your application to deliver e-mails to
- | users of the application. Like the host we have set this value to
- | stay compatible with the Mailgun e-mail application by default.
+ | This is the SMTP port used by your application to delivery e-mails to
+ | users of your application. Like the host we have set this value to
+ | stay compatible with the Mailgun e-mail applications by default.
|
*/
diff --git a/app/config/queue.php b/app/config/queue.php
old mode 100755
new mode 100644
index 940a4cd..6a879f7
--- a/app/config/queue.php
+++ b/app/config/queue.php
@@ -11,7 +11,7 @@ return array(
| API, giving you convenient access to each back-end using the same
| syntax for each one. Here you may set the default queue driver.
|
- | Supported: "sync", "beanstalkd", "sqs", "iron", "redis"
+ | Supported: "sync", "beanstalkd", "sqs", "iron"
|
*/
@@ -55,7 +55,6 @@ return array(
'token' => 'your-token',
'project' => 'your-project-id',
'queue' => 'your-queue-name',
- 'encrypt' => true,
),
'redis' => array(
diff --git a/app/filters.php b/app/filters.php
index fd0b4bc..2a780f7 100644
--- a/app/filters.php
+++ b/app/filters.php
@@ -35,17 +35,7 @@ App::after(function($request, $response)
Route::filter('auth', function()
{
- if (Auth::guest())
- {
- if (Request::ajax())
- {
- return Response::make('Unauthorized', 401);
- }
- else
- {
- return Redirect::guest('login');
- }
- }
+ if (Auth::guest()) return Redirect::guest('login');
});
diff --git a/app/models/User.php b/app/models/User.php
index af00a49..3232050 100644
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -1,14 +1,10 @@
getKey();
+ }
+
+ /**
+ * Get the password for the user.
+ *
+ * @return string
+ */
+ public function getAuthPassword()
+ {
+ return $this->password;
+ }
+
+ /**
+ * Get the e-mail address where password reminders are sent.
+ *
+ * @return string
+ */
+ public function getReminderEmail()
+ {
+ return $this->email;
+ }
}
diff --git a/app/routes.php b/app/routes.php
index 82092be..3e10dcf 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -15,5 +15,3 @@ Route::get('/', function()
{
return View::make('hello');
});
-
-Route::resource('mentors', 'MentorController');
diff --git a/app/views/emails/auth/reminder.blade.php b/app/views/emails/auth/reminder.blade.php
index aebea9e..d92f2b3 100644
--- a/app/views/emails/auth/reminder.blade.php
+++ b/app/views/emails/auth/reminder.blade.php
@@ -7,8 +7,7 @@
Password Reset
- To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
- This link will expire in {{ Config::get('auth.reminder.expire', 60) }} minutes.
+ To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.