Bug fix

app/Http/Controllers/ApplicationsController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Application;
 use App\Server;
@@ -42,7 +43,7 @@ class ApplicationsController extends Controller {
         if(!$server) {
             return abort(403);
         }
-        $user   = sha1($request->ip.uniqid().$request->server_id.microtime().$request->domain);
+        $user   = 'u'.hash('crc32', (Str::uuid()->toString())).rand(1,9);
         $pass   = sha1(uniqid().microtime().$request->domain);
         $dbpass = sha1(microtime().uniqid().$request->ip);
         $appcode= sha1(uniqid().$request->domain.microtime().$request->server_id);

app/Http/Controllers/ServersController.php

@@ -16,7 +16,7 @@ class ServersController extends Controller
 
 
     public function api() {
-        return Server::orderBy('name')->get();
+        return Server::orderBy('name')->orderBy('ip')->where('complete', 2)->get();
     }
 
 

app/Http/Controllers/ShellController.php

@@ -58,10 +58,10 @@ class ShellController extends Controller
             $basepath = '/home/'.$application->username.'/web';
         }
         $script = Storage::get('scripts/haget.conf');
-        $script = Str::replace('???USER???', $application->username, $script);
-        $script = Str::replace('???BASE???', $basepath, $script);
-        $script = Str::replace('???PHP???', $application->php, $script);
-        $script = Str::replace('???DOMAIN???', $application->domain, $script);
+        $script = str_replace('???USER???', $application->username, $script);
+        $script = str_replace('???BASE???', $basepath, $script);
+        $script = str_replace('???PHP???', $application->php, $script);
+        $script = str_replace('???DOMAIN???', $application->domain, $script);
         return response($script)->withHeaders(['Content-Type' =>'text/plain']);
     }
 
@@ -116,10 +116,10 @@ class ShellController extends Controller
             $basepath = '/home/'.$application->username.'/web';
         }
         $script = Storage::get('scripts/haget.conf');
-        $script = Str::replace('???USER???', $application->username, $script);
-        $script = Str::replace('???BASE???', $basepath, $script);
-        $script = Str::replace('???PHP???', $application->php, $script);
-        $script = Str::replace('???DOMAIN???', $domain, $script);
+        $script = str_replace('???USER???', $application->username, $script);
+        $script = str_replace('???BASE???', $basepath, $script);
+        $script = str_replace('???PHP???', $application->php, $script);
+        $script = str_replace('???DOMAIN???', $domain, $script);
         return response($script)->withHeaders(['Content-Type' =>'text/plain']);
     }
 

storage/app/scripts/haget.conf

@@ -7,7 +7,7 @@ server {
 
     server_name ???DOMAIN???
 
-    root ???BASE??
+    root ???BASE???
 
     access_log /home/???USER???/nginx/log/???DOMAIN???.access.log;
     error_log /home/???USER???/nginx/log/???DOMAIN???.error.log;