Completed
Pull Request — master (#228)
by
unknown
04:29
created
app/Logic/Macros/HtmlMacros.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-HTML::macro('image_link', function ($url = '', $img = '', $alt = '', $link_name = '', $param = '', $active = true, $ssl = false) {
3
+HTML::macro('image_link', function($url = '', $img = '', $alt = '', $link_name = '', $param = '', $active = true, $ssl = false) {
4 4
     $url = $ssl == true ? URL::to_secure($url) : URL::to($url);
5 5
     $img = HTML::image($img, $alt);
6 6
     $img .= $link_name;
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
     return $link;
11 11
 });
12 12
 
13
-HTML::macro('icon_link', function ($url = '', $icon = '', $link_name = '', $param = '', $active = true, $ssl = false) {
13
+HTML::macro('icon_link', function($url = '', $icon = '', $link_name = '', $param = '', $active = true, $ssl = false) {
14 14
     $url = $ssl == true ? URL::to_secure($url) : URL::to($url);
15 15
     $icon = '<i class="'.$icon.'" aria-hidden="true"></i>'.$link_name;
16 16
     $link = $active == true ? HTML::link($url, '#', $param) : $icon;
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     return $link;
20 20
 });
21 21
 
22
-HTML::macro('icon_btn', function ($url = '', $icon = '', $link_name = '', $param = '', $active = true, $ssl = false) {
22
+HTML::macro('icon_btn', function($url = '', $icon = '', $link_name = '', $param = '', $active = true, $ssl = false) {
23 23
     $url = $ssl == true ? URL::to_secure($url) : URL::to($url);
24 24
     $icon = $link_name.' <i class="'.$icon.'" aria-hidden="true"></i>';
25 25
     $link = $active == true ? HTML::link($url, '#', $param) : $icon;
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 });
30 30
 
31 31
 // SHOW USERNAME
32
-HTML::macro('show_username', function () {
32
+HTML::macro('show_username', function() {
33 33
     $the_username = (Auth::user()->name === Auth::user()->email) ? ((is_null(Auth::user()->first_name)) ? (Auth::user()->name) : (Auth::user()->first_name)) : (((is_null(Auth::user()->name)) ? (Auth::user()->email) : (Auth::user()->name)));
34 34
 
35 35
     return $the_username;
Please login to merge, or discard this patch.
app/Http/Controllers/CrudController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -44,14 +44,14 @@  discard block
 block discarded – undo
44 44
         /**
45 45
          * Make sure we do not already have this module
46 46
          */
47
-        $directories = glob(base_path() . '/resources/views/*', GLOB_ONLYDIR);
48
-        foreach ( $directories as $dir ){
49
-            $this_name = str_replace(base_path() . '/resources/views/','',$dir);
47
+        $directories = glob(base_path().'/resources/views/*', GLOB_ONLYDIR);
48
+        foreach ($directories as $dir) {
49
+            $this_name = str_replace(base_path().'/resources/views/', '', $dir);
50 50
             $used_names[] = $this_name;
51 51
         }
52 52
         //dd($request->crud_name);
53 53
 
54
-        if (in_array(strtolower($request->crud_name), $used_names)){
54
+        if (in_array(strtolower($request->crud_name), $used_names)) {
55 55
             return Redirect::back()->withErrors(['Name Exists or Restricted']);
56 56
         }
57 57
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
                     $validationsArray[] = $field;
69 69
                 }
70 70
 
71
-                $fieldsArray[] = $field . '#' . $request->fields_type[$x];
71
+                $fieldsArray[] = $field.'#'.$request->fields_type[$x];
72 72
 
73 73
                 $x++;
74 74
             }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         }
78 78
 
79 79
         if (!empty($validationsArray)) {
80
-            $commandArg['--validations'] = implode("#required;", $validationsArray) . "#required";
80
+            $commandArg['--validations'] = implode("#required;", $validationsArray)."#required";
81 81
         }
82 82
 
83 83
         if ($request->has('route')) {
@@ -118,13 +118,13 @@  discard block
 block discarded – undo
118 118
             $menus = json_decode(File::get(base_path('resources/laravel-admin/menus.json')));
119 119
 
120 120
             $name = $commandArg['name'];
121
-            $routeName = ($commandArg['--route-group']) ? $commandArg['--route-group'] . '/' . snake_case($name, '-') : snake_case($name, '-');
121
+            $routeName = ($commandArg['--route-group']) ? $commandArg['--route-group'].'/'.snake_case($name, '-') : snake_case($name, '-');
122 122
 
123
-            $menus->menus = array_map(function ($menu) use ($name, $routeName) {
123
+            $menus->menus = array_map(function($menu) use ($name, $routeName) {
124 124
                 if ($menu->section == 'Resources') {
125 125
                     array_push($menu->items, (object) [
126 126
                         'title' => $name,
127
-                        'url' => '/' . $routeName,
127
+                        'url' => '/'.$routeName,
128 128
                     ]);
129 129
                 }
130 130
 
Please login to merge, or discard this patch.