mirror of
https://github.com/bitinflow/expose.git
synced 2026-03-13 13:35:54 +00:00
Merge branch 'master' of github.com:beyondcode/phunnel
This commit is contained in:
@@ -5,7 +5,6 @@ namespace App\Server\Http\Controllers\Admin;
|
||||
use App\Http\Controllers\Controller;
|
||||
use GuzzleHttp\Psr7\Message;
|
||||
use GuzzleHttp\Psr7\Response;
|
||||
use function GuzzleHttp\Psr7\str;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Str;
|
||||
use Ratchet\ConnectionInterface;
|
||||
|
||||
@@ -49,6 +49,7 @@ class GetSitesController extends AdminController
|
||||
$users = collect($users);
|
||||
$sites = collect($sites)->map(function ($site) use ($users) {
|
||||
$site['user'] = $users->firstWhere('auth_token', $site['auth_token']);
|
||||
|
||||
return $site;
|
||||
})->toArray();
|
||||
|
||||
|
||||
@@ -49,6 +49,7 @@ class GetTcpConnectionsController extends AdminController
|
||||
$users = collect($users);
|
||||
$connections = collect($connections)->map(function ($connection) use ($users) {
|
||||
$connection['user'] = $users->firstWhere('auth_token', $connection['auth_token']);
|
||||
|
||||
return $connection;
|
||||
})->toArray();
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin;
|
||||
|
||||
use App\Contracts\ConnectionManager;
|
||||
use App\Server\Configuration;
|
||||
use App\Server\Connections\ControlConnection;
|
||||
use Illuminate\Http\Request;
|
||||
use Ratchet\ConnectionInterface;
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin;
|
||||
|
||||
use App\Contracts\ConnectionManager;
|
||||
use App\Server\Configuration;
|
||||
use App\Server\Connections\TcpControlConnection;
|
||||
use Illuminate\Http\Request;
|
||||
use Ratchet\ConnectionInterface;
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace App\Server\Http\Controllers\Admin;
|
||||
|
||||
use App\Contracts\UserRepository;
|
||||
use function GuzzleHttp\Psr7\str;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
Reference in New Issue
Block a user