edno / kleis

app/Console/Commands/ExportCategories.php

Indentation +21 added lines, -21 removed lines

@@ -36,31 +36,31 @@
      *
      * @return mixed
      */
-     public function handle()
-     {
-         $categories = Category::get();
+        public function handle()
+        {
+            $categories = Category::get();
 
-         if ($categories->isEmpty()) {
-             $this->info("No categories to export");
-             return;
-         }
+            if ($categories->isEmpty()) {
+                $this->info("No categories to export");
+                return;
+            }
 
-         foreach ($categories as $category){
-             $accounts = $this->fecthAccounts(['category_id' => $category->id]);
+            foreach ($categories as $category){
+                $accounts = $this->fecthAccounts(['category_id' => $category->id]);
 
-             $name = normalise($category->name);
-             $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}";
+                $name = normalise($category->name);
+                $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}";
 
-             $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci'));
+                $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci'));
 
-             try {
-                 $url = $this->exportToLocation($filename);
-             } catch(\Exception $e) {
-                 $this->error('Export cancelled by user!');
-                 return;
-             }
+                try {
+                    $url = $this->exportToLocation($filename);
+                } catch(\Exception $e) {
+                    $this->error('Export cancelled by user!');
+                    return;
+                }
 
-             $this->info("{$count} accounts '{$category->name}' exported into file '{$url}'");
-         }
-     }
+                $this->info("{$count} accounts '{$category->name}' exported into file '{$url}'");
+            }
+        }
 }

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
              return;
          }
 
-         foreach ($categories as $category){
+         foreach ($categories as $category) {
              $accounts = $this->fecthAccounts(['category_id' => $category->id]);
 
              $name = normalise($category->name);
@@ -55,7 +55,7 @@ 
 
              try {
                  $url = $this->exportToLocation($filename);
-             } catch(\Exception $e) {
+             } catch (\Exception $e) {
                  $this->error('Export cancelled by user!');
                  return;
              }

app/Console/Commands/ExportWhitelists.php

Indentation +4 added lines, -4 removed lines

@@ -66,19 +66,19 @@
 
         $flagCI = $this->option('ci');
         if ($flagCI === false) {
-          $bar = $this->output->createProgressBar($count);
+            $bar = $this->output->createProgressBar($count);
         }
 
         foreach ($items as $item) {
             $this->storage->prepend($filename, "{$item->value}");
             if (isset($bar)) {
-              $bar->advance();
+                $bar->advance();
             }
         }
 
         if (isset($bar)) {
-          $bar->finish();
-          $this->info("\n");
+            $bar->finish();
+            $this->info("\n");
         }
 
         try {

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     public function handle()
     {
         $whitelist = empty($this->option('blacklist'));
-        if ( false === empty($this->option('list'))) {
+        if (false === empty($this->option('list'))) {
             $this->exportProxyList($this->option('list'), $whitelist);
         } else {
             $this->exportProxyList('domain', $whitelist);
@@ -83,7 +83,7 @@ 
 
         try {
             $url = $this->exportToLocation($filename);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->error('Export cancelled by user!');
             return;
         }

app/Console/Commands/ExportGroups.php

Indentation +20 added lines, -20 removed lines

@@ -36,31 +36,31 @@
      *
      * @return mixed
      */
-     public function handle()
-     {
-         $groups = Group::get();
+        public function handle()
+        {
+            $groups = Group::get();
 
-         if ($groups->isEmpty()) {
-             $this->info("No groups to export");
-             return;
-         }
+            if ($groups->isEmpty()) {
+                $this->info("No groups to export");
+                return;
+            }
 
-         foreach ($groups as $group){
+            foreach ($groups as $group){
             $accounts = $this->fecthAccounts(['group_id' => $group->id]);
 
-             $name = normalise($group->name);
-             $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}";
+                $name = normalise($group->name);
+                $filename = "{$this->exportFolder}/{$name}{$this->exportFileExt}";
 
-             $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci'));
+                $count = $this->exportAccounts($accounts, $filename, false, $this->option('ci'));
 
-             try {
-                 $url = $this->exportToLocation($filename);
-             } catch(\Exception $e) {
-                 $this->error('Export cancelled by user!');
-                 return;
-             }
+                try {
+                    $url = $this->exportToLocation($filename);
+                } catch(\Exception $e) {
+                    $this->error('Export cancelled by user!');
+                    return;
+                }
 
-             $this->info("{$count} accounts '{$group->name}' exported into file '{$url}'");
-         }
-     }
+                $this->info("{$count} accounts '{$group->name}' exported into file '{$url}'");
+            }
+        }
 }

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
              return;
          }
 
-         foreach ($groups as $group){
+         foreach ($groups as $group) {
             $accounts = $this->fecthAccounts(['group_id' => $group->id]);
 
              $name = normalise($group->name);
@@ -55,7 +55,7 @@ 
 
              try {
                  $url = $this->exportToLocation($filename);
-             } catch(\Exception $e) {
+             } catch (\Exception $e) {
                  $this->error('Export cancelled by user!');
                  return;
              }

app/Console/Commands/Export.php

Indentation +5 added lines, -5 removed lines

@@ -23,9 +23,9 @@ 
     protected $description = 'Export accounts, groups and categories at once';
 
     protected $commands = [
-      'export:accounts',
-      'export:groups',
-      'export:categories'
+        'export:accounts',
+        'export:groups',
+        'export:categories'
     ];
 
     /**
@@ -46,10 +46,10 @@ 
     public function handle()
     {
         foreach ($this->commands as $cmd) {
-          $this->call($cmd, [
+            $this->call($cmd, [
             '--ci' => $this->option('ci'),
             'output' => $this->argument('output'),
-          ]);
+            ]);
         }
     }
 }

app/Console/Commands/AbstractExportCommand.php

Indentation +7 added lines, -7 removed lines

@@ -97,7 +97,7 @@ 
         $count = count($accounts);
 
         if ($flagCI === false) {
-          $bar = $this->output->createProgressBar($count);
+            $bar = $this->output->createProgressBar($count);
         }
 
         foreach ($accounts as $account) {
@@ -105,13 +105,13 @@ 
             $record .= $password ? ":{$account->netpass}" : '';
             $this->storage->prepend($filename, $record);
             if (isset($bar)) {
-              $bar->advance();
+                $bar->advance();
             }
         }
 
         if (isset($bar)) {
-          $bar->finish();
-          $this->info("\n");
+            $bar->finish();
+            $this->info("\n");
         }
 
         return $count;
@@ -129,7 +129,7 @@ 
         $query = Account::where('status', Account::ACCOUNT_ENABLE);
 
         if(is_null($filter) === false && is_array($filter)) {
-          $query = $query->where($filter);
+            $query = $query->where($filter);
         }
 
         return $query->orderBy('netlogin', 'desc')->get();
@@ -151,7 +151,7 @@ 
                     if ($this->confirm("Overwrite existing '$target' ?")) {
                         $fs->delete($target);
                     } else {
-                      throw new \Exception();
+                        throw new \Exception();
                     }
                 }
             }
@@ -159,7 +159,7 @@ 
             $fs->rename($source, $target);
 
         } else {
-          $target = $source;
+            $target = $source;
         }
 
         return $target;

Spacing +5 added lines, -5 removed lines

@@ -124,11 +124,11 @@ 
      *
      * @return App\Account
      */
-    final protected function fecthAccounts($filter=null)
+    final protected function fecthAccounts($filter = null)
     {
         $query = Account::where('status', Account::ACCOUNT_ENABLE);
 
-        if(is_null($filter) === false && is_array($filter)) {
+        if (is_null($filter) === false && is_array($filter)) {
           $query = $query->where($filter);
         }
 
@@ -139,12 +139,12 @@ 
     {
         $source = $this->storage->path($filename);
 
-        if($this->argument('output')) {
-            $target = $this->argument('output') . '/' . $filename;
+        if ($this->argument('output')) {
+            $target = $this->argument('output').'/'.$filename;
 
             $fs = new Filesystem(new Local('/'));
 
-            if ($fs->has($target) ) {
+            if ($fs->has($target)) {
                 if ($this->option('ci')) {
                     $fs->delete($target);
                 } else {

app/Console/Commands/ExportAccounts.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
         try {
             $url = $this->exportToLocation($filename);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->error('Export cancelled by user!');
             return;
         }