@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | rrmdir(app_path("CBPlugins/".$key)); |
104 | 104 | |
105 | 105 | return response()->json(['status'=>true, 'message'=>'Plugin has been uninstalled!']); |
106 | - }else{ |
|
106 | + } else{ |
|
107 | 107 | return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin is not found']); |
108 | 108 | } |
109 | - }else { |
|
109 | + } else { |
|
110 | 110 | return response()->json(['status'=>false,'message'=>'Failed to uninstall, plugin key is not found']); |
111 | 111 | } |
112 | 112 | } |
@@ -118,8 +118,7 @@ discard block |
||
118 | 118 | if (( $file != '.' ) && ( $file != '..' )) { |
119 | 119 | if ( is_dir($src . '/' . $file) ) { |
120 | 120 | $this->recursiveCopy($src . '/' . $file,$dst . '/' . $file); |
121 | - } |
|
122 | - else { |
|
121 | + } else { |
|
123 | 122 | copy($src . '/' . $file,$dst . '/' . $file); |
124 | 123 | } |
125 | 124 | } |
@@ -165,7 +164,9 @@ discard block |
||
165 | 164 | fclose($temp); |
166 | 165 | |
167 | 166 | // Rename |
168 | - if(file_exists(app_path("CBPlugins/".$key))) rrmdir(app_path("CBPlugins/".$key)); |
|
167 | + if(file_exists(app_path("CBPlugins/".$key))) { |
|
168 | + rrmdir(app_path("CBPlugins/".$key)); |
|
169 | + } |
|
169 | 170 | rename(app_path("CBPlugins/".$dirName), app_path("CBPlugins/".$key)); |
170 | 171 | |
171 | 172 | // Read Plugin JSON |
@@ -192,7 +193,7 @@ discard block |
||
192 | 193 | } |
193 | 194 | } |
194 | 195 | |
195 | - }else{ |
|
196 | + } else{ |
|
196 | 197 | return response()->json(['status'=>false,'message'=>'Failed to install/update, plugin key is not found']); |
197 | 198 | } |
198 | 199 | } catch (\Exception $e) { |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | $menu['type'] = request('type'); |
56 | 56 | if(request('type') == 'module') { |
57 | 57 | $menu['cb_modules_id'] = request('cb_modules_id'); |
58 | - }elseif (request('type') == 'url') { |
|
58 | + } elseif (request('type') == 'url') { |
|
59 | 59 | $menu['path'] = request('url_value'); |
60 | - }elseif (request('type') == 'path') { |
|
60 | + } elseif (request('type') == 'path') { |
|
61 | 61 | $menu['path'] = request('path_value'); |
62 | 62 | } elseif (request("type") == "empty") { |
63 | 63 | $menu['path'] = "javascript:void(0);"; |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | $menu['type'] = request('type'); |
85 | 85 | if(request('type') == 'module') { |
86 | 86 | $menu['cb_modules_id'] = request('cb_modules_id'); |
87 | - }elseif (request('type') == 'url') { |
|
87 | + } elseif (request('type') == 'url') { |
|
88 | 88 | $menu['path'] = request('url_value'); |
89 | - }elseif (request('type') == 'path') { |
|
89 | + } elseif (request('type') == 'path') { |
|
90 | 90 | $menu['path'] = request('path_value'); |
91 | 91 | } elseif (request("type") == "empty") { |
92 | 92 | $menu['path'] = "javascript:void(0);"; |
@@ -90,45 +90,60 @@ discard block |
||
90 | 90 | |
91 | 91 | public function canBrowse() { |
92 | 92 | if($this->privilege) { |
93 | - if($this->privilege->can_browse) return true; |
|
94 | - else return false; |
|
95 | - }else{ |
|
93 | + if($this->privilege->can_browse) { |
|
94 | + return true; |
|
95 | + } else { |
|
96 | + return false; |
|
97 | + } |
|
98 | + } else{ |
|
96 | 99 | return true; |
97 | 100 | } |
98 | 101 | } |
99 | 102 | |
100 | 103 | public function canCreate() { |
101 | 104 | if($this->privilege) { |
102 | - if($this->privilege->can_create) return true; |
|
103 | - else return false; |
|
104 | - }else{ |
|
105 | + if($this->privilege->can_create) { |
|
106 | + return true; |
|
107 | + } else { |
|
108 | + return false; |
|
109 | + } |
|
110 | + } else{ |
|
105 | 111 | return true; |
106 | 112 | } |
107 | 113 | } |
108 | 114 | |
109 | 115 | public function canRead() { |
110 | 116 | if($this->privilege) { |
111 | - if($this->privilege->can_read) return true; |
|
112 | - else return false; |
|
113 | - }else{ |
|
117 | + if($this->privilege->can_read) { |
|
118 | + return true; |
|
119 | + } else { |
|
120 | + return false; |
|
121 | + } |
|
122 | + } else{ |
|
114 | 123 | return true; |
115 | 124 | } |
116 | 125 | } |
117 | 126 | |
118 | 127 | public function canUpdate() { |
119 | 128 | if($this->privilege) { |
120 | - if($this->privilege->can_update) return true; |
|
121 | - else return false; |
|
122 | - }else{ |
|
129 | + if($this->privilege->can_update) { |
|
130 | + return true; |
|
131 | + } else { |
|
132 | + return false; |
|
133 | + } |
|
134 | + } else{ |
|
123 | 135 | return true; |
124 | 136 | } |
125 | 137 | } |
126 | 138 | |
127 | 139 | public function canDelete() { |
128 | 140 | if($this->privilege) { |
129 | - if($this->privilege->can_delete) return true; |
|
130 | - else return false; |
|
131 | - }else{ |
|
141 | + if($this->privilege->can_delete) { |
|
142 | + return true; |
|
143 | + } else { |
|
144 | + return false; |
|
145 | + } |
|
146 | + } else{ |
|
132 | 147 | return true; |
133 | 148 | } |
134 | 149 | } |
@@ -137,7 +152,7 @@ discard block |
||
137 | 152 | { |
138 | 153 | if($this->controller_class && method_exists($this->controller_class, 'getAdd')) { |
139 | 154 | return action($this->controller.'@getAdd'); |
140 | - }else{ |
|
155 | + } else{ |
|
141 | 156 | return null; |
142 | 157 | } |
143 | 158 | } |
@@ -146,7 +161,7 @@ discard block |
||
146 | 161 | { |
147 | 162 | if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) { |
148 | 163 | return action($this->controller.'@postAddSave'); |
149 | - }else{ |
|
164 | + } else{ |
|
150 | 165 | return null; |
151 | 166 | } |
152 | 167 | } |
@@ -155,7 +170,7 @@ discard block |
||
155 | 170 | { |
156 | 171 | if($this->controller_class && method_exists($this->controller_class, 'getEdit')) { |
157 | 172 | return action($this->controller.'@getEdit')."/".$id; |
158 | - }else{ |
|
173 | + } else{ |
|
159 | 174 | return null; |
160 | 175 | } |
161 | 176 | } |
@@ -164,7 +179,7 @@ discard block |
||
164 | 179 | { |
165 | 180 | if(method_exists($this->controller_class, 'postEditSave')) { |
166 | 181 | return action($this->controller.'@postEditSave')."/".$id; |
167 | - }else{ |
|
182 | + } else{ |
|
168 | 183 | return null; |
169 | 184 | } |
170 | 185 | } |
@@ -173,7 +188,7 @@ discard block |
||
173 | 188 | { |
174 | 189 | if($this->controller_class && method_exists($this->controller_class, 'getDetail')) { |
175 | 190 | return action($this->controller.'@getDetail')."/".$id; |
176 | - }else{ |
|
191 | + } else{ |
|
177 | 192 | return null; |
178 | 193 | } |
179 | 194 | } |
@@ -182,7 +197,7 @@ discard block |
||
182 | 197 | { |
183 | 198 | if($this->controller_class && method_exists($this->controller_class, 'getDelete')) { |
184 | 199 | return action($this->controller.'@getDelete')."/".$id; |
185 | - }else{ |
|
200 | + } else{ |
|
186 | 201 | return null; |
187 | 202 | } |
188 | 203 | } |
@@ -191,7 +206,7 @@ discard block |
||
191 | 206 | { |
192 | 207 | if($this->controller_class && method_exists($this->controller_class, 'getIndex')) { |
193 | 208 | return trim(action($this->controller.'@getIndex').'/'.$path,'/'); |
194 | - }else{ |
|
209 | + } else{ |
|
195 | 210 | return null; |
196 | 211 | } |
197 | 212 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) { |
49 | 49 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
50 | 50 | } |
51 | - }else{ |
|
51 | + } else{ |
|
52 | 52 | $query->addSelect($column->getField()); |
53 | 53 | } |
54 | 54 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $keyword = sanitizeXSS(request("q")); |
69 | 69 | if(isset($this->data['hook_search_query'])) { |
70 | 70 | $query = call_user_func($this->data['hook_search_query'], $query, $keyword); |
71 | - }else{ |
|
71 | + } else{ |
|
72 | 72 | $query->where(function ($where) use ($columns, $keyword) { |
73 | 73 | /** |
74 | 74 | * @var $where Builder |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | { |
78 | 78 | if(strpos($column->getField(),".") === false) { |
79 | 79 | $field = $this->data['table'].'.'.$column->getField(); |
80 | - }else{ |
|
80 | + } else{ |
|
81 | 81 | $field = $column->getField(); |
82 | 82 | } |
83 | 83 | $where->orWhere($field, 'like', '%'.$keyword.'%'); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $query->orderBy(request('order_by'), request('order_sort')); |
120 | 120 | } |
121 | 121 | } |
122 | - }else{ |
|
122 | + } else{ |
|
123 | 123 | /* |
124 | 124 | * For default, query will be order by primary key as descending |
125 | 125 | */ |
@@ -72,7 +72,9 @@ discard block |
||
72 | 72 | curl_setopt($ch, CURLOPT_REFERER, $this->referer); |
73 | 73 | if($this->cookie === true) { |
74 | 74 | $cookie_dir = storage_path("cookies"); |
75 | - if(!file_exists($cookie_dir)) mkdir($cookie_dir); |
|
75 | + if(!file_exists($cookie_dir)) { |
|
76 | + mkdir($cookie_dir); |
|
77 | + } |
|
76 | 78 | $cookie_file = $cookie_dir."/".md5(request()->ip()).".txt"; |
77 | 79 | curl_setopt($ch, CURLOPT_COOKIEFILE, $cookie_file); |
78 | 80 | curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file); |
@@ -84,7 +86,7 @@ discard block |
||
84 | 86 | |
85 | 87 | if($err) { |
86 | 88 | return $err; |
87 | - }else { |
|
89 | + } else { |
|
88 | 90 | return $response; |
89 | 91 | } |
90 | 92 | } |