Merge pull request pterodactyl#226 from hammerdawn/APICHANGE

DaneEveritt · web-flow · commit 39731f99da03 · 2017-01-02T22:00:45.000-05:00
Allow listing a user by both ID and email. Useful for checking if a u…
diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php
@@ -75,7 +75,7 @@ public function lists(Request $request)
      */
     public function view(Request $request, $id)
     {
-        $query = Models\User::where('id', $id);
+        $query = Models\User::where((is_numeric($id) ? 'id' : 'email'), $id);
 
         if (! is_null($request->input('fields'))) {
             foreach (explode(',', $request->input('fields')) as $field) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function lists(Request $request)`
`75`	`75`	`*/`
`76`	`76`	`public function view(Request $request, $id)`
`77`	`77`	`{`
`78`		`- $query = Models\User::where('id', $id);`
	`78`	`+ $query = Models\User::where((is_numeric($id) ? 'id' : 'email'), $id);`
`79`	`79`
`80`	`80`	`if (! is_null($request->input('fields'))) {`
`81`	`81`	`foreach (explode(',', $request->input('fields')) as $field) {`