diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 9b5f3af6f..77a04d370 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -4,7 +4,7 @@
use App\Models\AdminNotification;
use App\Models\Notification;
-use App\Models\User;
+use App\User;
use App\Http\Controllers\MarketController;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
diff --git a/app/Events/ExtensionRendered.php b/app/Events/ExtensionRendered.php
new file mode 100644
index 000000000..dc08d3945
--- /dev/null
+++ b/app/Events/ExtensionRendered.php
@@ -0,0 +1,38 @@
+output = $output;
+ }
+
+ /**
+ * Get the channels the event should broadcast on.
+ *
+ * @return \Illuminate\Broadcasting\Channel|array
+ */
+ public function broadcastOn()
+ {
+ return new PrivateChannel('channel-name');
+ }
+}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index e4684dc16..8887844a5 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -9,7 +9,7 @@
use Carbon\Carbon;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
-use App\Models\User;
+use App\User;
use App\Models\RoleMapping;
use App\Models\RoleUser;
use Illuminate\Support\Facades\Event;
diff --git a/app/Http/Controllers/Extension/MainController.php b/app/Http/Controllers/Extension/MainController.php
index 2e8c7aafa..eae813019 100644
--- a/app/Http/Controllers/Extension/MainController.php
+++ b/app/Http/Controllers/Extension/MainController.php
@@ -92,7 +92,7 @@ public function upload()
} catch (\Exception $exception) {
return respond("Lütfen geçerli bir eklenti giriniz.", 201);
}
-
+ $verify = false;
$zipFile = request()->file('extension');
if (
endsWith(
@@ -146,7 +146,7 @@ public function upload()
);
}
}
- list($error, $new) = self::setupNewExtension($zipFile);
+ list($error, $new) = self::setupNewExtension($zipFile,$verify);
if ($error) {
return $error;
@@ -159,7 +159,7 @@ public function upload()
return respond("Eklenti Başarıyla yüklendi.", 200);
}
- public function setupNewExtension($zipFile)
+ public function setupNewExtension($zipFile, $verify = false)
{
// Initialize Zip Archive Object to use it later.
$zip = new ZipArchive();
@@ -199,7 +199,7 @@ public function setupNewExtension($zipFile)
];
}
- if (isset($verify)) {
+ if ($verify) {
$json["issuer"] = explode(" ", $verify, 4)[3];
} else {
$json["issuer"] = "";
@@ -223,55 +223,21 @@ public function setupNewExtension($zipFile)
}
$new->fill($json);
$new->save();
+
+ $system = rootSystem();
- // Add User if not exists
- if (
- intval(
- shell_exec("grep -c '^" . cleanDash($new->id) . "' /etc/passwd")
- )
- ? false
- : true
- ) {
- shell_exec('sudo useradd -r -s /bin/sh ' . cleanDash($new->id));
- }
+ $system->userAdd($new->id);
- $extension_folder = "/liman/extensions/" . strtolower($json["name"]);
$passPath = '/liman/keys' . DIRECTORY_SEPARATOR . $new->id;
file_put_contents($passPath, Str::random(32));
- shell_exec(
- "
- sudo chown liman:" .
- cleanDash($new->id) .
- " $passPath;
- sudo chmod 640 $passPath;
- sudo mkdir -p $extension_folder;
- sudo cp -r " .
- $path .
- "/* " .
- $extension_folder .
- DIRECTORY_SEPARATOR .
- ";
- sudo chown " .
- cleanDash($new->id) .
- ":liman $extension_folder;
- sudo chmod 770 $extension_folder;
- sudo chown -R " .
- cleanDash($new->id) .
- ":liman $extension_folder;
- sudo chmod -R 770 $extension_folder;
- sudo chown liman:" .
- cleanDash($new->id) .
- " " .
- $extension_folder .
- DIRECTORY_SEPARATOR .
- "db.json;
- sudo chmod 640 " .
- $extension_folder .
- DIRECTORY_SEPARATOR .
- "db.json;
- "
- );
+ $extension_folder = "/liman/extensions/" . strtolower($json["name"]);
+
+ `mkdir -p $extension_folder`;
+ `cp -r $path/* $extension_folder/.`;
+
+ $system->fixExtensionPermissions($new->id, $new->name);
+
return [null, $new];
}
@@ -338,26 +304,12 @@ public function newExtension()
json_encode($json, JSON_PRETTY_PRINT)
);
- if (
- intval(
- shell_exec("grep -c '^" . cleanDash($ext->id) . "' /etc/passwd")
- )
- ? false
- : true
- ) {
- shell_exec('sudo useradd -r -s /bin/sh ' . cleanDash($ext->id));
- }
+ $system = rootSystem();
+
+ $system->userAdd($ext->id);
$passPath = '/liman/keys' . DIRECTORY_SEPARATOR . $ext->id;
file_put_contents($passPath, Str::random(32));
- shell_exec(
- "
- sudo chown liman:" .
- cleanDash($ext->id) .
- " $passPath;
- sudo chmod 640 $passPath;
- "
- );
request()->request->add(['server' => "none"]);
request()->request->add(['extension_id' => $ext->id]);
@@ -366,22 +318,7 @@ public function newExtension()
touch($folder . "/views/$file");
}
- shell_exec(
- "
- sudo chown -R " .
- cleanDash($ext->id) .
- ":liman $folder;
- sudo chmod -R 770 $folder;
- sudo chown liman:" .
- cleanDash($ext->id) .
- " $folder" .
- DIRECTORY_SEPARATOR .
- "db.json;
- sudo chmod 640 $folder" .
- DIRECTORY_SEPARATOR .
- "db.json;
- "
- );
+ $system->fixExtensionPermissions($ext->id, $ext->name);
system_log(6, "EXTENSION_CREATE", [
"extension_id" => $ext->id,
diff --git a/app/Http/Controllers/Extension/OneController.php b/app/Http/Controllers/Extension/OneController.php
index af0b12b44..d17371e5d 100644
--- a/app/Http/Controllers/Extension/OneController.php
+++ b/app/Http/Controllers/Extension/OneController.php
@@ -90,7 +90,7 @@ public function serverSettings()
$extension["verification"],
$extensionDb
);
- $output = shell_exec($command);
+ $output = rootSystem()->runCommand($command);
if (isJson($output)) {
$message = json_decode($output);
if (isset($message->message)) {
@@ -251,7 +251,7 @@ public function remove()
hook('extension_delete_attempt', extension());
try {
shell_exec(
- "sudo rm -r " .
+ "rm -rf " .
"/liman/extensions/" .
strtolower(extension()->name)
);
@@ -259,18 +259,7 @@ public function remove()
}
try {
- shell_exec(
- "
- sudo userdel " .
- cleanDash(extension()->id) .
- ";
- rm " .
- '/liman/keys/' .
- DIRECTORY_SEPARATOR .
- extension()->id .
- ";
- "
- );
+ rootSystem()->userRemove(extension()->id);
extension()->delete();
} catch (\Exception $exception) {
}
diff --git a/app/Http/Controllers/Extension/Sandbox/InternalController.php b/app/Http/Controllers/Extension/Sandbox/InternalController.php
index 32c8eced1..8940cc1f5 100644
--- a/app/Http/Controllers/Extension/Sandbox/InternalController.php
+++ b/app/Http/Controllers/Extension/Sandbox/InternalController.php
@@ -271,14 +271,8 @@ public function getFile()
);
// Update Permissions
- shell_exec("sudo chmod 770 " . request('localPath'));
- shell_exec(
- "sudo chown " .
- cleanDash(extension()->id) .
- ":liman " .
- request('localPath')
- );
-
+ rootSystem()->fixExtensionPermissions(extension()->id, extension()->name);
+
system_log(7, "EXTENSION_INTERNAL_RECEIVE_FILE", [
"extension_id" => extension()->id,
"server_id" => server()->id,
diff --git a/app/Http/Controllers/Extension/Sandbox/MainController.php b/app/Http/Controllers/Extension/Sandbox/MainController.php
index 9deee0d24..0afd37fc8 100644
--- a/app/Http/Controllers/Extension/Sandbox/MainController.php
+++ b/app/Http/Controllers/Extension/Sandbox/MainController.php
@@ -221,7 +221,7 @@ private function executeSandbox($function)
$command = $this->sandbox->command($function);
$before = Carbon::now();
- $output = shell_exec($command);
+ $output = rootSystem()->runCommand($command);
return [$output, $before->diffInMilliseconds(Carbon::now()) / 1000];
}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 89cf4baa2..fd1e163c2 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -4,7 +4,7 @@
use App\Models\LimanRequest;
use App\Models\Server;
-use App\Models\User;
+use App\User;
use App\Models\UserSettings;
use App\Models\Extension;
use App\Models\Widget;
diff --git a/app/Http/Controllers/Notification/MainController.php b/app/Http/Controllers/Notification/MainController.php
index 3959ccab9..46653a561 100644
--- a/app/Http/Controllers/Notification/MainController.php
+++ b/app/Http/Controllers/Notification/MainController.php
@@ -6,7 +6,7 @@
use App\Models\Notification;
use App\Http\Controllers\Controller;
use App\Notifications\NotificationSent;
-use App\Models\User;
+use App\User;
class MainController extends Controller
{
diff --git a/app/Http/Controllers/Permission/MainController.php b/app/Http/Controllers/Permission/MainController.php
index 43b54f6d7..68b5cd264 100644
--- a/app/Http/Controllers/Permission/MainController.php
+++ b/app/Http/Controllers/Permission/MainController.php
@@ -4,7 +4,7 @@
use App\Models\LimanRequest;
use App\Models\Notification;
-use App\Models\User;
+use App\User;
use App\Http\Controllers\Controller;
class MainController extends Controller
diff --git a/app/Http/Controllers/Server/OneController.php b/app/Http/Controllers/Server/OneController.php
index 02ca547e7..7a4ec1b28 100644
--- a/app/Http/Controllers/Server/OneController.php
+++ b/app/Http/Controllers/Server/OneController.php
@@ -8,7 +8,7 @@
use App\Models\Extension;
use App\Http\Controllers\Controller;
use App\Models\Notification;
-use App\Models\User;
+use App\User;
use App\Models\Permission;
use Carbon\Carbon;
use Exception;
diff --git a/app/Http/Controllers/Settings/MainController.php b/app/Http/Controllers/Settings/MainController.php
index 5ac6a4743..42c9c4acd 100755
--- a/app/Http/Controllers/Settings/MainController.php
+++ b/app/Http/Controllers/Settings/MainController.php
@@ -5,7 +5,7 @@
use App\Models\Extension;
use App\Models\Permission;
use App\Models\Server;
-use App\Models\User;
+use App\User;
use App\Models\Role;
use App\Http\Controllers\Controller;
use App\Models\AdminNotification;
@@ -69,7 +69,7 @@ public function one(User $user)
public function getUserList()
{
return view('l.table', [
- "value" => \App\Models\User::all(),
+ "value" => \App\User::all(),
"title" => ["Kullanıcı Adı", "Email", "*hidden*"],
"display" => ["name", "email", "id:user_id"],
"menu" => [
@@ -611,12 +611,16 @@ public function getDNSServers()
{
$data = `grep nameserver /etc/resolv.conf | grep -v "#" | grep nameserver`;
$arr = explode("\n", $data);
+ $arr = array_filter($arr);
$clean = [];
foreach ($arr as $ip) {
if ($ip == "") {
continue;
}
$foo = explode(" ", trim($ip));
+ if (count($foo) == 1) {
+ continue;
+ }
array_push($clean, $foo[1]);
}
return respond($clean);
@@ -624,22 +628,13 @@ public function getDNSServers()
public function setDNSServers()
{
- `sudo chattr -i /etc/resolv.conf`;
- $str = "
-options rotate timeout:1 retries:1
-";
- foreach ([request('dns1'), request('dns2'), request('dns3')] as $ip) {
- if ($ip == null) {
- continue;
- }
- $str .= "nameserver $ip
-";
- }
- $str = trim($str);
- $output = `echo "$str" | sudo tee /etc/resolv.conf`;
- $compare = trim(`cat /etc/resolv.conf`) == $str ? true : false;
- if ($compare) {
- `sudo chattr +i /etc/resolv.conf`;
+ $system = rootSystem();
+ $flag = $system->dnsUpdate(
+ request('dns1'),
+ request('dns2'),
+ request('dns3')
+ );
+ if ($flag) {
return respond("DNS Ayarları güncellendi!");
} else {
return respond("DNS Ayarları güncellenemedi!", 201);
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 99df26adf..dcc8a673e 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -4,7 +4,7 @@
use App\Models\Permission;
use App\Models\RoleUser;
-use App\Models\User;
+use App\User;
use App\Models\UserSettings;
use App\Models\AccessToken;
use App\Models\Server;
diff --git a/app/Http/Helpers.php b/app/Http/Helpers.php
index efca9b5f5..160323e61 100755
--- a/app/Http/Helpers.php
+++ b/app/Http/Helpers.php
@@ -17,7 +17,7 @@
use Carbon\Carbon;
use Illuminate\Support\Str;
use Jenssegers\Blade\Blade;
-
+use App\System\Helper;
if (!function_exists('respond')) {
/**
* @param $message
@@ -66,6 +66,13 @@ function strposX($haystack, $needle, $number)
}
}
+if (!function_exists('rootSystem')) {
+ function rootSystem()
+ {
+ return new Helper();
+ }
+}
+
if (!function_exists('registerModuleRoutes')) {
function registerModuleRoutes()
{
@@ -363,13 +370,7 @@ function adminNotifications()
*/
function addCertificate($hostname, $port, $path)
{
- $file = "liman-" . $hostname . "_" . $port . ".crt";
- $cert = file_get_contents('/tmp/' . $path);
- shell_exec(
- "echo '$cert'| sudo tee /usr/local/share/ca-certificates/" .
- strtolower($file)
- );
- shell_exec("sudo update-ca-certificates");
+ rootSystem()->addCertificate('/tmp/' . $path, "liman-" . $hostname . "_" . $port);
// Create Certificate Object.
return Certificate::create([
@@ -379,6 +380,16 @@ function addCertificate($hostname, $port, $path)
}
}
+if (!function_exists('getLimanId')) {
+ /**
+ * @return mixed
+ */
+ function getLimanId()
+ {
+ return md5("l1m@ns3cur1ty".trim(shell_exec("ls /dev/disk/by-uuid -1"))).PHP_EOL;
+ }
+}
+
if (!function_exists('system_log')) {
/**
* @param $level
diff --git a/app/Jobs/ExtensionJob.php b/app/Jobs/ExtensionJob.php
index 1cf300834..624f76e9b 100644
--- a/app/Jobs/ExtensionJob.php
+++ b/app/Jobs/ExtensionJob.php
@@ -1,6 +1,6 @@
sandbox->command($this->function);
- $output = shell_exec($command);
+ $output = rootSystem()->runCommand($command);
- system_log(7, "EXTENSION_BACKGROUND_RUN", [
- "extension_id" => $this->extension->id,
- "server_id" => $this->server->id,
- "target_name" => $this->function,
- ]);
+ // system_log(7, "EXTENSION_BACKGROUND_RUN", [
+ // "extension_id" => $this->extension->id,
+ // "server_id" => $this->server->id,
+ // "target_name" => $this->function,
+ // ]);
$code = 200;
try {
diff --git a/app/Models/Certificate.php b/app/Models/Certificate.php
index 3b7af55c4..3221d4728 100644
--- a/app/Models/Certificate.php
+++ b/app/Models/Certificate.php
@@ -12,22 +12,12 @@ class Certificate extends Model
public function addToSystem($tmpCertLocation)
{
- $file =
- "liman-" . $this->server_hostname . "_" . $this->origin . ".crt";
- $contents = file_get_contents($tmpCertLocation);
- shell_exec(
- "echo '$contents'| sudo tee /usr/local/share/ca-certificates/" .
- strtolower($file)
- );
- shell_exec("sudo update-ca-certificates");
+ rootSystem()->addCertificate($tmpCertLocation, "liman-" . $this->server_hostname . "_" . $this->origin);
}
public function removeFromSystem()
{
- $file =
- "liman-" . $this->server_hostname . "_" . $this->origin . ".crt";
- shell_exec('sudo rm /usr/local/share/ca-certificates/ ' . $file);
- shell_exec("sudo update-ca-certificates -f");
+ rootSystem()->removeCertificate("liman-" . $this->server_hostname . "_" . $this->origin);
$this->save();
}
}
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
index 2824cf50d..5f73ed680 100644
--- a/app/Models/Permission.php
+++ b/app/Models/Permission.php
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
+use App\User;
class Permission extends Model
{
diff --git a/app/Models/Role.php b/app/Models/Role.php
index 842798878..bb7955131 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -17,6 +17,6 @@ public function permissions()
public function users()
{
- return $this->belongsToMany('App\Models\User', "role_users");
+ return $this->belongsToMany('App\User', "role_users");
}
}
diff --git a/app/Models/RoleUser.php b/app/Models/RoleUser.php
index ce39e6b69..a0cbe50d1 100644
--- a/app/Models/RoleUser.php
+++ b/app/Models/RoleUser.php
@@ -12,7 +12,7 @@ class RoleUser extends Model
public function user()
{
- return $this->belongsTo('App\Models\User');
+ return $this->belongsTo('App\User');
}
public function role()
diff --git a/app/Observers/AdminNotificationObserver.php b/app/Observers/AdminNotificationObserver.php
index 5609eeac1..94f43683b 100644
--- a/app/Observers/AdminNotificationObserver.php
+++ b/app/Observers/AdminNotificationObserver.php
@@ -3,7 +3,7 @@
namespace App\Observers;
use App\Models\AdminNotification;
-use App\Models\User;
+use App\User;
use App\Notifications\NotificationSent;
class AdminNotificationObserver
diff --git a/app/Observers/NotificationObserver.php b/app/Observers/NotificationObserver.php
index 250f9c518..bce25ad50 100644
--- a/app/Observers/NotificationObserver.php
+++ b/app/Observers/NotificationObserver.php
@@ -3,7 +3,7 @@
namespace App\Observers;
use App\Models\Notification;
-use App\Models\User;
+use App\User;
use App\Notifications\NotificationSent;
class NotificationObserver
diff --git a/app/Policies/ServerPolicy.php b/app/Policies/ServerPolicy.php
index bf5b11a4a..dcb8873f8 100644
--- a/app/Policies/ServerPolicy.php
+++ b/app/Policies/ServerPolicy.php
@@ -3,7 +3,7 @@
namespace App\Policies;
use App\Models\Permission;
-use App\Models\User;
+use App\User;
use App\Models\Server;
use Illuminate\Auth\Access\HandlesAuthorization;
@@ -14,7 +14,7 @@ class ServerPolicy
/**
* Determine whether the user can view any servers.
*
- * @param \App\Models\User $user
+ * @param \App\User $user
* @return mixed
*/
public function viewAny(User $user)
@@ -25,7 +25,7 @@ public function viewAny(User $user)
/**
* Determine whether the user can view the server.
*
- * @param \App\Models\User $user
+ * @param \App\User $user
* @param \App\Models\Server $server
* @return mixed
*/
@@ -37,7 +37,7 @@ public function view(User $user, Server $server)
/**
* Determine whether the user can create servers.
*
- * @param \App\Models\User $user
+ * @param \App\User $user
* @return mixed
*/
public function create(User $user)
@@ -49,7 +49,7 @@ public function create(User $user)
/**
* Determine whether the user can update the server.
*
- * @param \App\Models\User $user
+ * @param \App\User $user
* @param \App\Models\Server $server
* @return mixed
*/
@@ -61,7 +61,7 @@ public function update(User $user, Server $server)
/**
* Determine whether the user can delete the server.
*
- * @param \App\Models\User $user
+ * @param \App\User $user
* @param \App\Models\Server $server
* @return mixed
*/
@@ -73,7 +73,7 @@ public function delete(User $user, Server $server)
/**
* Determine whether the user can restore the server.
*
- * @param \App\Models\User $user
+ * @param \App\User $user
* @param \App\Models\Server $server
* @return mixed
*/
@@ -85,7 +85,7 @@ public function restore(User $user, Server $server)
/**
* Determine whether the user can permanently delete the server.
*
- * @param \App\Models\User $user
+ * @param \App\User $user
* @param \App\Models\Server $server
* @return mixed
*/
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 48a909d3f..512e7699f 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -30,7 +30,7 @@ public function boot(
Notification::observe(NotificationObserver::class);
AdminNotification::observe(AdminNotificationObserver::class);
Relation::morphMap([
- 'users' => 'App\Models\User',
+ 'users' => 'App\User',
'roles' => 'App\Models\Role',
]);
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 6db8dc6e8..6ce8286d6 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -27,5 +27,9 @@ class AuthServiceProvider extends ServiceProvider
public function boot()
{
$this->registerPolicies();
+
+ Gate::define('viewWebSocketsDashboard', function ($user = null) {
+ return false;
+ });
}
}
diff --git a/app/System/Helper.php b/app/System/Helper.php
new file mode 100644
index 000000000..eaa7e3121
--- /dev/null
+++ b/app/System/Helper.php
@@ -0,0 +1,127 @@
+authKey = file_get_contents("/liman/keys/service.key");
+ $this->client = new Client([
+ "base_uri" => "http://127.0.0.1:3008",
+ ]);
+ }
+
+ public function userAdd($extension_id)
+ {
+ try{
+ $this->client->get('/userAdd',[
+ 'query' => [
+ 'extension_id' => cleanDash($extension_id),
+ 'liman_token' => $this->authKey
+ ]
+ ]);
+ }catch(\Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ public function userRemove($extension_id)
+ {
+ try{
+ $this->client->get('/userRemove',[
+ 'query' => [
+ 'extension_id' => cleanDash($extension_id),
+ 'liman_token' => $this->authKey
+ ]
+ ]);
+ }catch(\Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ public function dnsUpdate($server1, $server2, $server3)
+ {
+ try{
+ $this->client->get('/dns',[
+ 'query' => [
+ 'liman_token' => $this->authKey,
+ 'server1' => $server1 ?: "",
+ 'server2' => $server2 ?: "",
+ 'server3' => $server3 ?: ""
+ ]
+ ]);
+ }catch(\Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ public function addCertificate($tmpPath, $targetName)
+ {
+ try{
+ $this->client->get('/certificateAdd',[
+ 'query' => [
+ 'liman_token' => $this->authKey,
+ 'tmpPath' => $tmpPath,
+ 'targetName' => $targetName,
+ ]
+ ]);
+ }catch(\Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ public function removeCertificate($targetName)
+ {
+ try{
+ $this->client->get('/certificateRemove',[
+ 'query' => [
+ 'liman_token' => $this->authKey,
+ 'targetName' => $targetName,
+ ]
+ ]);
+ }catch(\Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ public function fixExtensionPermissions($extension_id, $extension_name)
+ {
+ try{
+ $this->client->get('/fixPermissions',[
+ 'query' => [
+ 'liman_token' => $this->authKey,
+ 'extension_id' => cleanDash($extension_id),
+ 'extension_name' => strtolower($extension_name)
+ ]
+ ]);
+ }catch(\Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ public function runCommand($command)
+ {
+ try{
+ $response = $this->client->get('/extensionRun',[
+ 'query' => [
+ 'liman_token' => $this->authKey,
+ 'command' => $command,
+ ]
+ ]);
+ }catch(\Exception $e){
+ return "Unknown System Error";
+ }
+ return $response->getBody()->getContents();
+ }
+}
\ No newline at end of file
diff --git a/app/Models/User.php b/app/User.php
similarity index 96%
rename from app/Models/User.php
rename to app/User.php
index 352ec6a73..aa5b76a99 100644
--- a/app/Models/User.php
+++ b/app/User.php
@@ -1,14 +1,17 @@
=5.4.2",
- "ratchet/rfc6455": "^0.2",
+ "ratchet/rfc6455": "^0.3",
"react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5",
"symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0",
"symfony/routing": "^2.6|^3.0|^4.0|^5.0"
@@ -184,6 +184,10 @@
"name": "Chris Boden",
"email": "cboden@gmail.com",
"role": "Developer"
+ },
+ {
+ "name": "Matt Bonneau",
+ "role": "Developer"
}
],
"description": "PHP WebSocket library",
@@ -195,7 +199,7 @@
"sockets",
"websocket"
],
- "time": "2020-01-27T23:08:40+00:00"
+ "time": "2020-07-07T15:50:14+00:00"
},
{
"name": "clue/buzz-react",
@@ -330,16 +334,16 @@
},
{
"name": "doctrine/cache",
- "version": "1.10.1",
+ "version": "1.10.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
+ "reference": "13e3381b25847283a91948d04640543941309727"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
- "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
+ "reference": "13e3381b25847283a91948d04640543941309727",
"shasum": ""
},
"require": {
@@ -422,7 +426,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-27T16:24:54+00:00"
+ "time": "2020-07-07T18:54:01+00:00"
},
{
"name": "doctrine/dbal",
@@ -932,21 +936,26 @@
},
{
"name": "facade/ignition-contracts",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition-contracts.git",
- "reference": "f445db0fb86f48e205787b2592840dd9c80ded28"
+ "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28",
- "reference": "f445db0fb86f48e205787b2592840dd9c80ded28",
+ "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b",
+ "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b",
"shasum": ""
},
"require": {
"php": "^7.1"
},
+ "require-dev": {
+ "friendsofphp/php-cs-fixer": "^2.14",
+ "phpunit/phpunit": "^7.5|^8.0",
+ "vimeo/psalm": "^3.12"
+ },
"type": "library",
"autoload": {
"psr-4": {
@@ -972,7 +981,7 @@
"flare",
"ignition"
],
- "time": "2019-08-30T14:06:08+00:00"
+ "time": "2020-07-14T10:10:28+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -1295,16 +1304,16 @@
},
{
"name": "laravel/framework",
- "version": "v6.18.23",
+ "version": "v6.18.25",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "c914a3ec0706c6973a39183f8bc45f3d9a099d90"
+ "reference": "fd4c42cb49b8777473d1161ef15d1104b2a33d6c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/c914a3ec0706c6973a39183f8bc45f3d9a099d90",
- "reference": "c914a3ec0706c6973a39183f8bc45f3d9a099d90",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/fd4c42cb49b8777473d1161ef15d1104b2a33d6c",
+ "reference": "fd4c42cb49b8777473d1161ef15d1104b2a33d6c",
"shasum": ""
},
"require": {
@@ -1439,7 +1448,7 @@
"framework",
"laravel"
],
- "time": "2020-06-30T13:52:04+00:00"
+ "time": "2020-07-10T16:41:03+00:00"
},
{
"name": "laravel/helpers",
@@ -2114,16 +2123,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.27",
+ "version": "2.0.28",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
+ "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
- "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
+ "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
"shasum": ""
},
"require": {
@@ -2202,7 +2211,21 @@
"x.509",
"x509"
],
- "time": "2020-04-04T23:17:33+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/terrafrost",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/phpseclib",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-08T09:08:33+00:00"
},
{
"name": "predis/predis",
@@ -2631,16 +2654,16 @@
},
{
"name": "ratchet/rfc6455",
- "version": "v0.2.6",
+ "version": "v0.3",
"source": {
"type": "git",
"url": "https://github.com/ratchetphp/RFC6455.git",
- "reference": "879e48c840f8dbc296d68d6a5030673df79bd916"
+ "reference": "c8651c7938651c2d55f5d8c2422ac5e57a183341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/879e48c840f8dbc296d68d6a5030673df79bd916",
- "reference": "879e48c840f8dbc296d68d6a5030673df79bd916",
+ "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/c8651c7938651c2d55f5d8c2422ac5e57a183341",
+ "reference": "c8651c7938651c2d55f5d8c2422ac5e57a183341",
"shasum": ""
},
"require": {
@@ -2648,7 +2671,7 @@
"php": ">=5.4.2"
},
"require-dev": {
- "phpunit/phpunit": "4.8.*",
+ "phpunit/phpunit": "5.7.*",
"react/socket": "^1.3"
},
"type": "library",
@@ -2666,6 +2689,10 @@
"name": "Chris Boden",
"email": "cboden@gmail.com",
"role": "Developer"
+ },
+ {
+ "name": "Matt Bonneau",
+ "role": "Developer"
}
],
"description": "RFC6455 WebSocket protocol handler",
@@ -2675,7 +2702,7 @@
"rfc6455",
"websocket"
],
- "time": "2019-12-15T10:18:18+00:00"
+ "time": "2020-05-15T18:31:24+00:00"
},
{
"name": "react/cache",
@@ -2719,28 +2746,28 @@
},
{
"name": "react/dns",
- "version": "v1.2.0",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/dns.git",
- "reference": "a214d90c2884dac18d0cac6176202f247b66d762"
+ "reference": "89d83794e959ef3e0f1ab792f070b0157de1abf2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/dns/zipball/a214d90c2884dac18d0cac6176202f247b66d762",
- "reference": "a214d90c2884dac18d0cac6176202f247b66d762",
+ "url": "https://api.github.com/repos/reactphp/dns/zipball/89d83794e959ef3e0f1ab792f070b0157de1abf2",
+ "reference": "89d83794e959ef3e0f1ab792f070b0157de1abf2",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"react/cache": "^1.0 || ^0.6 || ^0.5",
"react/event-loop": "^1.0 || ^0.5",
- "react/promise": "^2.7 || ^1.2.1",
+ "react/promise": "^3.0 || ^2.7 || ^1.2.1",
"react/promise-timer": "^1.2"
},
"require-dev": {
"clue/block-react": "^1.2",
- "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
+ "phpunit/phpunit": "^9.0 || ^4.8.35"
},
"type": "library",
"autoload": {
@@ -2759,7 +2786,7 @@
"dns-resolver",
"reactphp"
],
- "time": "2019-08-15T09:06:31+00:00"
+ "time": "2020-07-10T12:12:50+00:00"
},
{
"name": "react/event-loop",
@@ -2951,25 +2978,25 @@
},
{
"name": "react/promise-timer",
- "version": "v1.5.1",
+ "version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise-timer.git",
- "reference": "35fb910604fd86b00023fc5cda477c8074ad0abc"
+ "reference": "daee9baf6ef30c43ea4c86399f828bb5f558f6e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/promise-timer/zipball/35fb910604fd86b00023fc5cda477c8074ad0abc",
- "reference": "35fb910604fd86b00023fc5cda477c8074ad0abc",
+ "url": "https://api.github.com/repos/reactphp/promise-timer/zipball/daee9baf6ef30c43ea4c86399f828bb5f558f6e6",
+ "reference": "daee9baf6ef30c43ea4c86399f828bb5f558f6e6",
"shasum": ""
},
"require": {
"php": ">=5.3",
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
- "react/promise": "^2.7.0 || ^1.2.1"
+ "react/promise": "^3.0 || ^2.7.0 || ^1.2.1"
},
"require-dev": {
- "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+ "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
},
"type": "library",
"autoload": {
@@ -3000,7 +3027,7 @@
"timeout",
"timer"
],
- "time": "2019-03-27T18:10:32+00:00"
+ "time": "2020-07-10T12:18:06+00:00"
},
{
"name": "react/socket",
@@ -3602,20 +3629,20 @@
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v1.1.7",
+ "version": "v1.1.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+ "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
- "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7",
+ "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": ">=7.1.3"
},
"suggest": {
"psr/event-dispatcher": "",
@@ -3625,6 +3652,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -3656,7 +3687,21 @@
"interoperability",
"standards"
],
- "time": "2019-09-17T09:54:03+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-06T13:19:58+00:00"
},
{
"name": "symfony/finder",
@@ -3974,16 +4019,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.17.1",
+ "version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
+ "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
- "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
+ "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
"shasum": ""
},
"require": {
@@ -3995,7 +4040,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4046,20 +4091,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-06T08:46:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.17.1",
+ "version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035"
+ "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035",
- "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36",
+ "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36",
"shasum": ""
},
"require": {
@@ -4071,7 +4116,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4123,25 +4168,26 @@
"type": "tidelift"
}
],
- "time": "2020-06-06T08:46:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.17.1",
+ "version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "a57f8161502549a742a63c09f0a604997bf47027"
+ "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027",
- "reference": "a57f8161502549a742a63c09f0a604997bf47027",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
+ "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "symfony/polyfill-mbstring": "^1.3",
+ "symfony/polyfill-intl-normalizer": "^1.10",
+ "symfony/polyfill-php70": "^1.10",
"symfony/polyfill-php72": "^1.10"
},
"suggest": {
@@ -4150,7 +4196,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4174,6 +4220,10 @@
"name": "Laurent Bassin",
"email": "laurent@bassin.info"
},
+ {
+ "name": "Trevor Rowbotham",
+ "email": "trevor.rowbotham@pm.me"
+ },
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
@@ -4203,20 +4253,101 @@
"type": "tidelift"
}
],
- "time": "2020-06-06T08:46:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
+ },
+ {
+ "name": "symfony/polyfill-intl-normalizer",
+ "version": "v1.18.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+ "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+ "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-intl": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ],
+ "classmap": [
+ "Resources/stubs"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for intl's Normalizer class and related functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "intl",
+ "normalizer",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.17.1",
+ "version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "7110338d81ce1cbc3e273136e4574663627037a7"
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
- "reference": "7110338d81ce1cbc3e273136e4574663627037a7",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
"shasum": ""
},
"require": {
@@ -4228,7 +4359,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4280,20 +4411,97 @@
"type": "tidelift"
}
],
- "time": "2020-06-06T08:46:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php70",
+ "version": "v1.18.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php70.git",
+ "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+ "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+ "shasum": ""
+ },
+ "require": {
+ "paragonie/random_compat": "~1.0|~2.0|~9.99",
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php70\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ],
+ "classmap": [
+ "Resources/stubs"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.17.0",
+ "version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+ "reference": "639447d008615574653fb3bc60d1986d7172eaae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
- "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+ "reference": "639447d008615574653fb3bc60d1986d7172eaae",
"shasum": ""
},
"require": {
@@ -4302,7 +4510,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -4349,20 +4561,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:47:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.17.1",
+ "version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a"
+ "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a",
- "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+ "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
"shasum": ""
},
"require": {
@@ -4371,7 +4583,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4425,20 +4637,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-06T08:46:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.17.1",
+ "version": "v1.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2"
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2",
- "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
"shasum": ""
},
"require": {
@@ -4447,7 +4659,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -4505,7 +4717,7 @@
"type": "tidelift"
}
],
- "time": "2020-06-06T08:46:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/process",
@@ -4740,16 +4952,16 @@
},
{
"name": "symfony/service-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
+ "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
- "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
+ "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
"shasum": ""
},
"require": {
@@ -4763,6 +4975,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4808,7 +5024,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/translation",
@@ -4902,16 +5118,16 @@
},
{
"name": "symfony/translation-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e"
+ "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e5ca07c8f817f865f618aa072c2fe8e0e637340e",
- "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/616a9773c853097607cf9dd6577d5b143ffdcd63",
+ "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63",
"shasum": ""
},
"require": {
@@ -4924,6 +5140,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4969,7 +5189,7 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/var-dumper",
@@ -5064,26 +5284,26 @@
},
{
"name": "tijsverkoyen/css-to-inline-styles",
- "version": "2.2.2",
+ "version": "2.2.3",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
- "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15"
+ "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
- "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
+ "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5",
+ "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
- "php": "^5.5 || ^7.0",
+ "php": "^5.5 || ^7.0 || ^8.0",
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5"
},
"type": "library",
"extra": {
@@ -5109,26 +5329,26 @@
],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
- "time": "2019-10-24T08:53:34+00:00"
+ "time": "2020-07-13T06:12:54+00:00"
},
{
"name": "vlucas/phpdotenv",
- "version": "v3.6.6",
+ "version": "v3.6.7",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "4669484ccbc38fe7c4e0c50456778f2010566aad"
+ "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/4669484ccbc38fe7c4e0c50456778f2010566aad",
- "reference": "4669484ccbc38fe7c4e0c50456778f2010566aad",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2065beda6cbe75e2603686907b2e45f6f3a5ad82",
+ "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82",
"shasum": ""
},
"require": {
"php": "^5.4 || ^7.0 || ^8.0",
"phpoption/phpoption": "^1.5.2",
- "symfony/polyfill-ctype": "^1.16"
+ "symfony/polyfill-ctype": "^1.17"
},
"require-dev": {
"ext-filter": "*",
@@ -5182,7 +5402,7 @@
"type": "tidelift"
}
],
- "time": "2020-06-02T14:08:54+00:00"
+ "time": "2020-07-14T19:04:52+00:00"
}
],
"packages-dev": [
@@ -5474,16 +5694,16 @@
},
{
"name": "composer/spdx-licenses",
- "version": "1.5.3",
+ "version": "1.5.4",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
+ "reference": "6946f785871e2314c60b4524851f3702ea4f2223"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
- "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223",
+ "reference": "6946f785871e2314c60b4524851f3702ea4f2223",
"shasum": ""
},
"require": {
@@ -5530,7 +5750,21 @@
"spdx",
"validator"
],
- "time": "2020-02-14T07:44:31+00:00"
+ "funding": [
+ {
+ "url": "https://packagist.com",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/composer",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-15T15:35:07+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -5695,16 +5929,16 @@
},
{
"name": "facade/flare-client-php",
- "version": "1.3.2",
+ "version": "1.3.4",
"source": {
"type": "git",
"url": "https://github.com/facade/flare-client-php.git",
- "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004"
+ "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/flare-client-php/zipball/db1e03426e7f9472c9ecd1092aff00f56aa6c004",
- "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004",
+ "url": "https://api.github.com/repos/facade/flare-client-php/zipball/0eeb0de4fc1078433f0915010bd8f41e998adcb4",
+ "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4",
"shasum": ""
},
"require": {
@@ -5712,9 +5946,11 @@
"illuminate/pipeline": "^5.5|^6.0|^7.0",
"php": "^7.1",
"symfony/http-foundation": "^3.3|^4.1|^5.0",
+ "symfony/mime": "^3.4|^4.0|^5.1",
"symfony/var-dumper": "^3.4|^4.0|^5.0"
},
"require-dev": {
+ "friendsofphp/php-cs-fixer": "^2.14",
"larapack/dd": "^1.1",
"phpunit/phpunit": "^7.5.16",
"spatie/phpunit-snapshot-assertions": "^2.0"
@@ -5747,24 +5983,24 @@
],
"funding": [
{
- "url": "https://www.patreon.com/spatie",
- "type": "patreon"
+ "url": "https://github.com/spatie",
+ "type": "github"
}
],
- "time": "2020-03-02T15:52:04+00:00"
+ "time": "2020-07-13T23:25:57+00:00"
},
{
"name": "facade/ignition",
- "version": "1.16.1",
+ "version": "1.16.3",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "af05ac5ee8587395d7474ec0681c08776a2cb09d"
+ "reference": "19674150bb46a4de0ba138c747f538fe7be11dbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/af05ac5ee8587395d7474ec0681c08776a2cb09d",
- "reference": "af05ac5ee8587395d7474ec0681c08776a2cb09d",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/19674150bb46a4de0ba138c747f538fe7be11dbc",
+ "reference": "19674150bb46a4de0ba138c747f538fe7be11dbc",
"shasum": ""
},
"require": {
@@ -5822,7 +6058,7 @@
"laravel",
"page"
],
- "time": "2020-03-05T12:39:07+00:00"
+ "time": "2020-07-13T15:54:05+00:00"
},
{
"name": "filp/whoops",
@@ -5937,20 +6173,20 @@
},
{
"name": "hamcrest/hamcrest-php",
- "version": "v2.0.0",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/hamcrest/hamcrest-php.git",
- "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad"
+ "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad",
- "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad",
+ "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
+ "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
"shasum": ""
},
"require": {
- "php": "^5.3|^7.0"
+ "php": "^5.3|^7.0|^8.0"
},
"replace": {
"cordoval/hamcrest-php": "*",
@@ -5958,14 +6194,13 @@
"kodova/hamcrest-php": "*"
},
"require-dev": {
- "phpunit/php-file-iterator": "1.3.3",
- "phpunit/phpunit": "~4.0",
- "satooshi/php-coveralls": "^1.0"
+ "phpunit/php-file-iterator": "^1.4 || ^2.0",
+ "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "2.1-dev"
}
},
"autoload": {
@@ -5975,13 +6210,13 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD"
+ "BSD-3-Clause"
],
"description": "This is the PHP port of Hamcrest Matchers",
"keywords": [
"test"
],
- "time": "2016-01-20T08:20:44+00:00"
+ "time": "2020-07-09T08:09:16+00:00"
},
{
"name": "jakub-onderka/php-console-color",
@@ -6204,28 +6439,28 @@
},
{
"name": "mockery/mockery",
- "version": "1.4.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "6c6a7c533469873deacf998237e7649fc6b36223"
+ "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/6c6a7c533469873deacf998237e7649fc6b36223",
- "reference": "6c6a7c533469873deacf998237e7649fc6b36223",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/1404386ca3410b04fe58b9517e85d702ab33b2c6",
+ "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6",
"shasum": ""
},
"require": {
- "hamcrest/hamcrest-php": "~2.0",
+ "hamcrest/hamcrest-php": "^2.0.1",
"lib-pcre": ">=7.0",
- "php": "^7.3.0"
+ "php": "^7.3 || ^8.0"
},
"conflict": {
"phpunit/phpunit": "<8.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.0.0 || ^9.0.0"
+ "phpunit/phpunit": "^8.5 || ^9.0"
},
"type": "library",
"extra": {
@@ -6268,7 +6503,7 @@
"test double",
"testing"
],
- "time": "2020-05-19T14:25:16+00:00"
+ "time": "2020-07-09T08:31:54+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -6691,33 +6926,33 @@
},
{
"name": "phpspec/prophecy",
- "version": "v1.10.3",
+ "version": "1.11.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "451c3cd1418cf640de218914901e51b064abb093"
+ "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
- "reference": "451c3cd1418cf640de218914901e51b064abb093",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
+ "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.0.2",
- "php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
- "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
- "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+ "doctrine/instantiator": "^1.2",
+ "php": "^7.2",
+ "phpdocumentor/reflection-docblock": "^5.0",
+ "sebastian/comparator": "^3.0 || ^4.0",
+ "sebastian/recursion-context": "^3.0 || ^4.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.5 || ^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+ "phpspec/phpspec": "^6.0",
+ "phpunit/phpunit": "^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.10.x-dev"
+ "dev-master": "1.11.x-dev"
}
},
"autoload": {
@@ -6750,7 +6985,7 @@
"spy",
"stub"
],
- "time": "2020-03-05T15:02:03+00:00"
+ "time": "2020-07-08T12:44:21+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -7922,16 +8157,16 @@
},
{
"name": "seld/phar-utils",
- "version": "1.1.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/phar-utils.git",
- "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
+ "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
- "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
+ "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
+ "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
"shasum": ""
},
"require": {
@@ -7962,7 +8197,7 @@
"keywords": [
"phar"
],
- "time": "2020-02-14T15:25:33+00:00"
+ "time": "2020-07-07T18:42:57+00:00"
},
{
"name": "spatie/laravel-web-tinker",
@@ -8098,23 +8333,23 @@
},
{
"name": "theseer/tokenizer",
- "version": "1.1.3",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+ "reference": "75a63c33a8577608444246075ea0af0d052e452a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
- "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+ "reference": "75a63c33a8577608444246075ea0af0d052e452a",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
- "php": "^7.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"autoload": {
@@ -8134,24 +8369,30 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2019-06-13T22:48:21+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/theseer",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-12T23:59:07+00:00"
},
{
"name": "webmozart/assert",
- "version": "1.9.0",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
+ "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
- "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+ "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0",
+ "php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
@@ -8183,7 +8424,7 @@
"check",
"validate"
],
- "time": "2020-06-16T10:16:42+00:00"
+ "time": "2020-07-08T17:02:28+00:00"
}
],
"aliases": [],
diff --git a/config/auth.php b/config/auth.php
index 24a767cc6..febf2d6bf 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -66,7 +66,7 @@
'providers' => [
'users' => [
'driver' => 'eloquent',
- 'model' => App\Models\User::class,
+ 'model' => App\User::class,
],
// 'users' => [
diff --git a/config/services.php b/config/services.php
index cbbf0d178..014303a72 100644
--- a/config/services.php
+++ b/config/services.php
@@ -30,7 +30,7 @@
],
'stripe' => [
- 'model' => App\Models\User::class,
+ 'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
'webhook' => [
diff --git a/config/websockets.php b/config/websockets.php
index ce68beafe..034f3b4dd 100644
--- a/config/websockets.php
+++ b/config/websockets.php
@@ -29,7 +29,7 @@
'path' => env('PUSHER_APP_PATH'),
'capacity' => null,
'enable_client_messages' => true,
- 'enable_statistics' => true,
+ 'enable_statistics' => false,
],
],
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 92b7a04fb..14b7e22ff 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -13,7 +13,7 @@
|
*/
-$factory->define(App\Models\User::class, function (Faker $faker) {
+$factory->define(App\User::class, function (Faker $faker) {
return [
'name' => $faker->name,
'email' => $faker->unique()->safeEmail,
diff --git a/database/migrations/2019_07_30_082636_update_extension_settings.php b/database/migrations/2019_07_30_082636_update_extension_settings.php
index a9b761677..4ddaeda21 100644
--- a/database/migrations/2019_07_30_082636_update_extension_settings.php
+++ b/database/migrations/2019_07_30_082636_update_extension_settings.php
@@ -19,13 +19,6 @@ public function up()
foreach ($extensions as $extension) {
$passPath = '/liman/keys/' . DIRECTORY_SEPARATOR . $extension->id;
file_put_contents($passPath, Str::random(32));
- shell_exec(
- "sudo chown liman:" .
- cleanDash($extension->id) .
- " " .
- $passPath
- );
- shell_exec("sudo chmod 640 " . $passPath);
}
// Encrypt Values in Database
diff --git a/public/favicon.ico b/public/favicon.ico
index 425fe4281..5ef5772c9 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/resources/views/extension_pages/manager.blade.php b/resources/views/extension_pages/manager.blade.php
index 63e12cc8d..e65fa30e3 100644
--- a/resources/views/extension_pages/manager.blade.php
+++ b/resources/views/extension_pages/manager.blade.php
@@ -244,7 +244,7 @@ function extensionUploadError(response){
@if(env('EXTENSION_DEVELOPER_MODE') == true)
function extensionDetails(element){
var extension_id = element.querySelector('#extension_id').innerHTML;
- partialPageRequest("/eklentiler/" + extension_id);
+ window.location.href = "/eklentiler/" + extension_id;
}
@endif
\ No newline at end of file
diff --git a/resources/views/extension_pages/one.blade.php b/resources/views/extension_pages/one.blade.php
index 1e23c8f15..f22e64f8a 100644
--- a/resources/views/extension_pages/one.blade.php
+++ b/resources/views/extension_pages/one.blade.php
@@ -315,7 +315,7 @@
customRequestData["extension_id"] = "{{extension()->id}}";
function editPage(element){
var page = $(element).find("#name").text();
- partialPageRequest(location.protocol+'//'+location.host+location.pathname + "/" + page);
+ window.location.href = location.protocol+'//'+location.host+location.pathname + "/" + page;
}
function updateExtension(type,tableId = null){
diff --git a/resources/views/extension_pages/server.blade.php b/resources/views/extension_pages/server.blade.php
index 44e83a9c9..0800ac59c 100644
--- a/resources/views/extension_pages/server.blade.php
+++ b/resources/views/extension_pages/server.blade.php
@@ -6,13 +6,13 @@
{{extension()->display_name . __(" - Ana Sayfa")}}