@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | use App\User; |
7 | - |
|
8 | 7 | use WhiteHat101\Crypt\APR1_MD5; |
9 | 8 | |
10 | 9 | class Account extends Model |
@@ -5,8 +5,6 @@ |
||
5 | 5 | use Validator; |
6 | 6 | use Illuminate\Http\Request; |
7 | 7 | use Illuminate\Routing\Redirector; |
8 | -use Illuminate\Support\Facades\Artisan; |
|
9 | -use App\Http\Requests; |
|
10 | 8 | use App\Http\Helpers\Installer\DatabaseManager; |
11 | 9 | use App\Http\Helpers\Installer\EnvironmentManager; |
12 | 10 | use App\Http\Helpers\Installer\PermissionsChecker; |
@@ -212,7 +212,7 @@ |
||
212 | 212 | $response = $databaseManager->migrateAndSeed(); |
213 | 213 | |
214 | 214 | return redirect()->route('KleisInstaller::stepFinal') |
215 | - ->with(['message' => $response]); |
|
215 | + ->with(['message' => $response]); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | /** |
@@ -72,8 +72,8 @@ |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
75 | - * check database type. If SQLite, then create the database file. |
|
76 | - */ |
|
75 | + * check database type. If SQLite, then create the database file. |
|
76 | + */ |
|
77 | 77 | private function sqlite() |
78 | 78 | { |
79 | 79 | if(DB::connection() instanceof SQLiteConnection) { |
@@ -27,7 +27,7 @@ |
||
27 | 27 | } |
28 | 28 | } |
29 | 29 | $view->with('enable', $enable) |
30 | - ->with('title', $title) |
|
31 | - ->with('contents', $contents); |
|
30 | + ->with('title', $title) |
|
31 | + ->with('contents', $contents); |
|
32 | 32 | } |
33 | 33 | } |
@@ -68,10 +68,10 @@ |
||
68 | 68 | $credentials = $request->only('email', 'password'); |
69 | 69 | |
70 | 70 | if (Auth::attempt([ |
71 | - 'email' => $credentials['email'], |
|
72 | - 'password' => $credentials['password'], |
|
73 | - 'status' => App\User::USER_ENABLED |
|
74 | - ])) { |
|
71 | + 'email' => $credentials['email'], |
|
72 | + 'password' => $credentials['password'], |
|
73 | + 'status' => App\User::USER_ENABLED |
|
74 | + ])) { |
|
75 | 75 | // Authentication passed... |
76 | 76 | return redirect()->intended('home'); |
77 | 77 | } |
@@ -47,19 +47,19 @@ |
||
47 | 47 | |
48 | 48 | $flagCI = $this->option('ci'); |
49 | 49 | if ($flagCI === false) { |
50 | - $bar = $this->output->createProgressBar($count); |
|
50 | + $bar = $this->output->createProgressBar($count); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | foreach ($accounts as $account) { |
54 | 54 | $account->disable(); |
55 | 55 | if (isset($bar)) { |
56 | - $bar->advance(); |
|
56 | + $bar->advance(); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
60 | 60 | if (isset($bar)) { |
61 | - $bar->finish(); |
|
62 | - $this->info("\n"); |
|
61 | + $bar->finish(); |
|
62 | + $this->info("\n"); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | $this->info("{$count} accounts disabled"); |
@@ -36,31 +36,31 @@ |
||
36 | 36 | * |
37 | 37 | * @return mixed |
38 | 38 | */ |
39 | - public function handle() |
|
40 | - { |
|
41 | - $categories = Category::get(); |
|
39 | + public function handle() |
|
40 | + { |
|
41 | + $categories = Category::get(); |
|
42 | 42 | |
43 | - if ($categories->isEmpty()) { |
|
44 | - $this->info("No categories to export"); |
|
45 | - return; |
|
46 | - } |
|
43 | + if ($categories->isEmpty()) { |
|
44 | + $this->info("No categories to export"); |
|
45 | + return; |
|
46 | + } |
|
47 | 47 | |
48 | - foreach ($categories as $category){ |
|
49 | - $accounts = $this->fecthAccounts(['category_id' => $category->id]); |
|
48 | + foreach ($categories as $category){ |
|
49 | + $accounts = $this->fecthAccounts(['category_id' => $category->id]); |
|
50 | 50 | |
51 | - $name = normalise($category->name); |
|
52 | - $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}"; |
|
51 | + $name = normalise($category->name); |
|
52 | + $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}"; |
|
53 | 53 | |
54 | - $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci')); |
|
54 | + $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci')); |
|
55 | 55 | |
56 | - try { |
|
57 | - $url = $this->exportToLocation($filename); |
|
58 | - } catch(\Exception $e) { |
|
59 | - $this->error('Export cancelled by user!'); |
|
60 | - return; |
|
61 | - } |
|
56 | + try { |
|
57 | + $url = $this->exportToLocation($filename); |
|
58 | + } catch(\Exception $e) { |
|
59 | + $this->error('Export cancelled by user!'); |
|
60 | + return; |
|
61 | + } |
|
62 | 62 | |
63 | - $this->info("{$count} accounts '{$category->name}' exported into file '{$url}'"); |
|
64 | - } |
|
65 | - } |
|
63 | + $this->info("{$count} accounts '{$category->name}' exported into file '{$url}'"); |
|
64 | + } |
|
65 | + } |
|
66 | 66 | } |
@@ -66,19 +66,19 @@ |
||
66 | 66 | |
67 | 67 | $flagCI = $this->option('ci'); |
68 | 68 | if ($flagCI === false) { |
69 | - $bar = $this->output->createProgressBar($count); |
|
69 | + $bar = $this->output->createProgressBar($count); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | foreach ($items as $item) { |
73 | 73 | $this->storage->prepend($filename, "{$item->value}"); |
74 | 74 | if (isset($bar)) { |
75 | - $bar->advance(); |
|
75 | + $bar->advance(); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | 79 | if (isset($bar)) { |
80 | - $bar->finish(); |
|
81 | - $this->info("\n"); |
|
80 | + $bar->finish(); |
|
81 | + $this->info("\n"); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | try { |
@@ -36,31 +36,31 @@ |
||
36 | 36 | * |
37 | 37 | * @return mixed |
38 | 38 | */ |
39 | - public function handle() |
|
40 | - { |
|
41 | - $groups = Group::get(); |
|
39 | + public function handle() |
|
40 | + { |
|
41 | + $groups = Group::get(); |
|
42 | 42 | |
43 | - if ($groups->isEmpty()) { |
|
44 | - $this->info("No groups to export"); |
|
45 | - return; |
|
46 | - } |
|
43 | + if ($groups->isEmpty()) { |
|
44 | + $this->info("No groups to export"); |
|
45 | + return; |
|
46 | + } |
|
47 | 47 | |
48 | - foreach ($groups as $group){ |
|
48 | + foreach ($groups as $group){ |
|
49 | 49 | $accounts = $this->fecthAccounts(['group_id' => $group->id]); |
50 | 50 | |
51 | - $name = normalise($group->name); |
|
52 | - $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}"; |
|
51 | + $name = normalise($group->name); |
|
52 | + $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}"; |
|
53 | 53 | |
54 | - $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci')); |
|
54 | + $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci')); |
|
55 | 55 | |
56 | - try { |
|
57 | - $url = $this->exportToLocation($filename); |
|
58 | - } catch(\Exception $e) { |
|
59 | - $this->error('Export cancelled by user!'); |
|
60 | - return; |
|
61 | - } |
|
56 | + try { |
|
57 | + $url = $this->exportToLocation($filename); |
|
58 | + } catch(\Exception $e) { |
|
59 | + $this->error('Export cancelled by user!'); |
|
60 | + return; |
|
61 | + } |
|
62 | 62 | |
63 | - $this->info("{$count} accounts '{$group->name}' exported into file '{$url}'"); |
|
64 | - } |
|
65 | - } |
|
63 | + $this->info("{$count} accounts '{$group->name}' exported into file '{$url}'"); |
|
64 | + } |
|
65 | + } |
|
66 | 66 | } |