Merge branch 'develop' of github.com:Pterodactyl/Panel into improve-password-reset
This commit is contained in:
Jakob Schrettenbrunner
commit
207e0131fc
18 changed files with 414 additions and 828 deletions
11
CHANGELOG.md
11
CHANGELOG.md
|
|
@ -3,6 +3,17 @@ This file is a running track of new features and fixes to each version of the pa
|
||||||
|
|
||||||
This project follows [Semantic Versioning](http://semver.org) guidelines.
|
This project follows [Semantic Versioning](http://semver.org) guidelines.
|
||||||
|
|
||||||
|
## v0.6.0-pre.8 (Courageous Carniadactylus)
|
||||||
|
### Fixed
|
||||||
|
* `[pre.7]` — Fixes bug with subuser checkbox display.
|
||||||
|
* `[pre.7]` — Fixes bug with injected JS that was causing `<!DOCTYPE html>` to be ignored in templates.
|
||||||
|
* `[pre.7]` — Fixes exception thrown when trying to delete a node due to a misnamed model.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
* Subuser permissions are now stored in `Permission::list()` to make views way cleaner and make adding to views significantly cleaner.
|
||||||
|
* `[pre.7]` — Sidebar for file manager now is a single link rather than a dropdown.
|
||||||
|
* Attempting to reset a password for an account that does not exist no longer returns an error, rather it displays a success message. Failed resets trigger a `Pterodactyl\Events\Auth\FailedPasswordReset` event that can be caught if needed to perform other actions.
|
||||||
|
|
||||||
## v0.6.0-pre.7 (Courageous Carniadactylus)
|
## v0.6.0-pre.7 (Courageous Carniadactylus)
|
||||||
### Fixed
|
### Fixed
|
||||||
* `[pre.6]` — Addresses misconfigured console queue that was still sending data way to quickly thus causing the console to explode on some devices when large amounts of data were sent.
|
* `[pre.6]` — Addresses misconfigured console queue that was still sending data way to quickly thus causing the console to explode on some devices when large amounts of data were sent.
|
||||||
|
|
|
||||||
59
app/Events/Auth/FailedPasswordReset.php
Normal file
59
app/Events/Auth/FailedPasswordReset.php
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pterodactyl\Events\Auth;
|
||||||
|
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
|
||||||
|
class FailedPasswordReset
|
||||||
|
{
|
||||||
|
use SerializesModels;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The IP that the request originated from.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $ip;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The email address that was used when the reset request failed.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $email;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new event instance.
|
||||||
|
*
|
||||||
|
* @param string $ip
|
||||||
|
* @param string $email
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct($ip, $email)
|
||||||
|
{
|
||||||
|
$this->ip = $ip;
|
||||||
|
$this->email = $email;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,8 +1,33 @@
|
||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Pterodactyl - Panel
|
||||||
|
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Pterodactyl\Http\Controllers\Auth;
|
namespace Pterodactyl\Http\Controllers\Auth;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Facades\Password;
|
||||||
use Pterodactyl\Http\Controllers\Controller;
|
use Pterodactyl\Http\Controllers\Controller;
|
||||||
|
use Pterodactyl\Events\Auth\FailedPasswordReset;
|
||||||
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
||||||
|
|
||||||
class ForgotPasswordController extends Controller
|
class ForgotPasswordController extends Controller
|
||||||
|
|
@ -29,4 +54,21 @@ class ForgotPasswordController extends Controller
|
||||||
{
|
{
|
||||||
$this->middleware('guest');
|
$this->middleware('guest');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the response for a failed password reset link.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request
|
||||||
|
* @param string $response
|
||||||
|
* @return \Illuminate\Http\RedirectResponse
|
||||||
|
*/
|
||||||
|
protected function sendResetLinkFailedResponse(Request $request, $response)
|
||||||
|
{
|
||||||
|
// As noted in #358 we will return success even if it failed
|
||||||
|
// to avoid pointing out that an account does or does not
|
||||||
|
// exist on the system.
|
||||||
|
event(new FailedPasswordReset($request->ip(), $request->only('email')));
|
||||||
|
|
||||||
|
return $this->sendResetLinkResponse(Password::RESET_LINK_SENT);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ class SubuserController extends Controller
|
||||||
'server' => $server,
|
'server' => $server,
|
||||||
'node' => $server->node,
|
'node' => $server->node,
|
||||||
'subuser' => $subuser,
|
'subuser' => $subuser,
|
||||||
|
'permlist' => Models\Permission::list(),
|
||||||
'permissions' => $subuser->permissions->mapWithKeys(function ($item, $key) {
|
'permissions' => $subuser->permissions->mapWithKeys(function ($item, $key) {
|
||||||
return [$item->permission => true];
|
return [$item->permission => true];
|
||||||
}),
|
}),
|
||||||
|
|
@ -146,6 +147,7 @@ class SubuserController extends Controller
|
||||||
|
|
||||||
return view('server.users.new', [
|
return view('server.users.new', [
|
||||||
'server' => $server,
|
'server' => $server,
|
||||||
|
'permissions' => Models\Permission::list(),
|
||||||
'node' => $server->node,
|
'node' => $server->node,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,80 @@ class Permission extends Model
|
||||||
'subuser_id' => 'integer',
|
'subuser_id' => 'integer',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A list of all permissions available for a user.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected static $permissions = [
|
||||||
|
'power' => [
|
||||||
|
'power-start' => 's:power:start',
|
||||||
|
'power-stop' => 's:power:stop',
|
||||||
|
'power-restart' => 's:power:restart',
|
||||||
|
'power-kill' => 's:power:kill',
|
||||||
|
'send-command' => 's:command',
|
||||||
|
],
|
||||||
|
'subuser' => [
|
||||||
|
'list-subusers' => null,
|
||||||
|
'view-subuser' => null,
|
||||||
|
'edit-subuser' => null,
|
||||||
|
'create-subuser' => null,
|
||||||
|
'delete-subuser' => null,
|
||||||
|
],
|
||||||
|
'server' => [
|
||||||
|
'set-connection' => null,
|
||||||
|
'view-startup' => null,
|
||||||
|
'edit-startup' => null,
|
||||||
|
],
|
||||||
|
'sftp' => [
|
||||||
|
'view-sftp' => null,
|
||||||
|
'view-sftp-password' => null,
|
||||||
|
'reset-sftp' => 's:set-password',
|
||||||
|
],
|
||||||
|
'file' => [
|
||||||
|
'list-files' => 's:files:get',
|
||||||
|
'edit-files' => 's:files:read',
|
||||||
|
'save-files' => 's:files:post',
|
||||||
|
'move-files' => 's:files:move',
|
||||||
|
'copy-files' => 's:files:copy',
|
||||||
|
'compress-files' => 's:files:compress',
|
||||||
|
'decompress-files' => 's:files:decompress',
|
||||||
|
'create-files' => 's:files:create',
|
||||||
|
'upload-files' => 's:files:upload',
|
||||||
|
'delete-files' => 's:files:delete',
|
||||||
|
'download-files' => null,
|
||||||
|
],
|
||||||
|
'task' => [
|
||||||
|
'list-tasks' => null,
|
||||||
|
'view-task' => null,
|
||||||
|
'toggle-task' => null,
|
||||||
|
'queue-task' => null,
|
||||||
|
'create-task' => null,
|
||||||
|
'delete-task' => null,
|
||||||
|
],
|
||||||
|
'database' => [
|
||||||
|
'view-databases' => null,
|
||||||
|
'reset-db-password' => null,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a collection of permissions available.
|
||||||
|
*
|
||||||
|
* @param array $single
|
||||||
|
* @return \Illuminate\Support\Collection|array
|
||||||
|
*/
|
||||||
|
public static function list($single = false)
|
||||||
|
{
|
||||||
|
if ($single) {
|
||||||
|
return collect(self::$permissions)->mapWithKeys(function ($item) {
|
||||||
|
return $item;
|
||||||
|
})->all();
|
||||||
|
}
|
||||||
|
|
||||||
|
return collect(self::$permissions);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Find permission by permission node.
|
* Find permission by permission node.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -277,13 +277,9 @@ class NodeRepository
|
||||||
throw new DisplayException('You cannot delete a node with servers currently attached to it.');
|
throw new DisplayException('You cannot delete a node with servers currently attached to it.');
|
||||||
}
|
}
|
||||||
|
|
||||||
DB::beginTransaction();
|
DB::transaction(function () use ($node) {
|
||||||
|
|
||||||
try {
|
|
||||||
// Unlink Database Servers
|
// Unlink Database Servers
|
||||||
Models\DatabaseServer::where('linked_node', $node->id)->update([
|
Models\DatabaseHost::where('node_id', $node->id)->update(['node_id' => null]);
|
||||||
'linked_node' => null,
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Delete Allocations
|
// Delete Allocations
|
||||||
Models\Allocation::where('node_id', $node->id)->delete();
|
Models\Allocation::where('node_id', $node->id)->delete();
|
||||||
|
|
@ -293,11 +289,6 @@ class NodeRepository
|
||||||
|
|
||||||
// Delete Node
|
// Delete Node
|
||||||
$node->delete();
|
$node->delete();
|
||||||
|
});
|
||||||
DB::commit();
|
|
||||||
} catch (\Exception $ex) {
|
|
||||||
DB::rollback();
|
|
||||||
throw $ex;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,62 +45,6 @@ class SubuserRepository
|
||||||
's:console',
|
's:console',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
|
||||||
* Allowed permissions and their related daemon permission.
|
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected $permissions = [
|
|
||||||
// Power Permissions
|
|
||||||
'power-start' => 's:power:start',
|
|
||||||
'power-stop' => 's:power:stop',
|
|
||||||
'power-restart' => 's:power:restart',
|
|
||||||
'power-kill' => 's:power:kill',
|
|
||||||
|
|
||||||
// Commands
|
|
||||||
'send-command' => 's:command',
|
|
||||||
|
|
||||||
// File Manager
|
|
||||||
'list-files' => 's:files:get',
|
|
||||||
'edit-files' => 's:files:read',
|
|
||||||
'save-files' => 's:files:post',
|
|
||||||
'create-files' => 's:files:create',
|
|
||||||
'download-files' => null,
|
|
||||||
'upload-files' => 's:files:upload',
|
|
||||||
'delete-files' => 's:files:delete',
|
|
||||||
'move-files' => 's:files:move',
|
|
||||||
'copy-files' => 's:files:copy',
|
|
||||||
'compress-files' => 's:files:compress',
|
|
||||||
'decompress-files' => 's:files:decompress',
|
|
||||||
|
|
||||||
// Subusers
|
|
||||||
'list-subusers' => null,
|
|
||||||
'view-subuser' => null,
|
|
||||||
'edit-subuser' => null,
|
|
||||||
'create-subuser' => null,
|
|
||||||
'delete-subuser' => null,
|
|
||||||
|
|
||||||
// Tasks
|
|
||||||
'list-tasks' => null,
|
|
||||||
'view-task' => null,
|
|
||||||
'toggle-task' => null,
|
|
||||||
'delete-task' => null,
|
|
||||||
'create-task' => null,
|
|
||||||
'queue-task' => null,
|
|
||||||
|
|
||||||
// Management
|
|
||||||
'set-connection' => null,
|
|
||||||
'view-startup' => null,
|
|
||||||
'edit-startup' => null,
|
|
||||||
'view-sftp' => null,
|
|
||||||
'reset-sftp' => 's:set-password',
|
|
||||||
'view-sftp-password' => null,
|
|
||||||
|
|
||||||
// Databases
|
|
||||||
'view-databases' => null,
|
|
||||||
'reset-db-password' => null,
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new subuser on the server.
|
* Creates a new subuser on the server.
|
||||||
*
|
*
|
||||||
|
|
@ -155,12 +99,14 @@ class SubuserRepository
|
||||||
'daemonSecret' => (string) $uuid->generate('servers', 'uuid'),
|
'daemonSecret' => (string) $uuid->generate('servers', 'uuid'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
$perms = Permission::list(true);
|
||||||
$daemonPermissions = $this->coreDaemonPermissions;
|
$daemonPermissions = $this->coreDaemonPermissions;
|
||||||
|
|
||||||
foreach ($data['permissions'] as $permission) {
|
foreach ($data['permissions'] as $permission) {
|
||||||
if (array_key_exists($permission, $this->permissions)) {
|
if (array_key_exists($permission, $perms)) {
|
||||||
// Build the daemon permissions array for sending.
|
// Build the daemon permissions array for sending.
|
||||||
if (! is_null($this->permissions[$permission])) {
|
if (! is_null($perms[$permission])) {
|
||||||
array_push($daemonPermissions, $this->permissions[$permission]);
|
array_push($daemonPermissions, $perms[$permission]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Models\Permission::create([
|
Models\Permission::create([
|
||||||
|
|
@ -272,12 +218,14 @@ class SubuserRepository
|
||||||
$permission->delete();
|
$permission->delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$perms = Permission::list(true);
|
||||||
$daemonPermissions = $this->coreDaemonPermissions;
|
$daemonPermissions = $this->coreDaemonPermissions;
|
||||||
|
|
||||||
foreach ($data['permissions'] as $permission) {
|
foreach ($data['permissions'] as $permission) {
|
||||||
if (array_key_exists($permission, $this->permissions)) {
|
if (array_key_exists($permission, $perms)) {
|
||||||
// Build the daemon permissions array for sending.
|
// Build the daemon permissions array for sending.
|
||||||
if (! is_null($this->permissions[$permission])) {
|
if (! is_null($perms[$permission])) {
|
||||||
array_push($daemonPermissions, $this->permissions[$permission]);
|
array_push($daemonPermissions, $perms[$permission]);
|
||||||
}
|
}
|
||||||
Models\Permission::create([
|
Models\Permission::create([
|
||||||
'subuser_id' => $subuser->id,
|
'subuser_id' => $subuser->id,
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.6.4",
|
"php": ">=5.6.4",
|
||||||
"laravel/framework": "5.3.21",
|
"laravel/framework": "5.3.31",
|
||||||
"barryvdh/laravel-debugbar": "2.2.3",
|
"barryvdh/laravel-debugbar": "2.2.3",
|
||||||
"doctrine/dbal": "2.5.5",
|
"doctrine/dbal": "2.5.5",
|
||||||
"guzzlehttp/guzzle": "6.2.2",
|
"guzzlehttp/guzzle": "6.2.2",
|
||||||
|
|
|
||||||
254
composer.lock
generated
254
composer.lock
generated
|
|
@ -4,8 +4,8 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "7c01d337ebab3d47ae3479360c63e68f",
|
"hash": "6de462d1565dfca583d5309a395e83a7",
|
||||||
"content-hash": "c2addd888e0a4fd26518ea7c691f6f25",
|
"content-hash": "05b632a5d4b74151245bcbf0d12a1693",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "aws/aws-sdk-php",
|
"name": "aws/aws-sdk-php",
|
||||||
|
|
@ -1403,16 +1403,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v5.3.21",
|
"version": "v5.3.31",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "140ad823863d5cc6f4580f1cdf9b18b9a6a457f4"
|
"reference": "e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/140ad823863d5cc6f4580f1cdf9b18b9a6a457f4",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89",
|
||||||
"reference": "140ad823863d5cc6f4580f1cdf9b18b9a6a457f4",
|
"reference": "e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1427,9 +1427,9 @@
|
||||||
"nesbot/carbon": "~1.20",
|
"nesbot/carbon": "~1.20",
|
||||||
"paragonie/random_compat": "~1.4|~2.0",
|
"paragonie/random_compat": "~1.4|~2.0",
|
||||||
"php": ">=5.6.4",
|
"php": ">=5.6.4",
|
||||||
"psy/psysh": "0.7.*",
|
"psy/psysh": "0.7.*|0.8.*",
|
||||||
"ramsey/uuid": "~3.0",
|
"ramsey/uuid": "~3.0",
|
||||||
"swiftmailer/swiftmailer": "~5.1",
|
"swiftmailer/swiftmailer": "~5.4",
|
||||||
"symfony/console": "3.1.*",
|
"symfony/console": "3.1.*",
|
||||||
"symfony/debug": "3.1.*",
|
"symfony/debug": "3.1.*",
|
||||||
"symfony/finder": "3.1.*",
|
"symfony/finder": "3.1.*",
|
||||||
|
|
@ -1527,20 +1527,20 @@
|
||||||
"framework",
|
"framework",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2016-10-26 13:27:05"
|
"time": "2017-03-24 16:31:06"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem",
|
"name": "league/flysystem",
|
||||||
"version": "1.0.35",
|
"version": "1.0.37",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem.git",
|
"url": "https://github.com/thephpleague/flysystem.git",
|
||||||
"reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062"
|
"reference": "78b5cc4feb61a882302df4fbaf63b7662e5e4ccd"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dda7f3ab94158a002d9846a97dc18ebfb7acc062",
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/78b5cc4feb61a882302df4fbaf63b7662e5e4ccd",
|
||||||
"reference": "dda7f3ab94158a002d9846a97dc18ebfb7acc062",
|
"reference": "78b5cc4feb61a882302df4fbaf63b7662e5e4ccd",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1610,7 +1610,7 @@
|
||||||
"sftp",
|
"sftp",
|
||||||
"storage"
|
"storage"
|
||||||
],
|
],
|
||||||
"time": "2017-02-09 11:33:58"
|
"time": "2017-03-22 15:43:14"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/fractal",
|
"name": "league/fractal",
|
||||||
|
|
@ -1789,16 +1789,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
"version": "1.22.0",
|
"version": "1.22.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Seldaek/monolog.git",
|
"url": "https://github.com/Seldaek/monolog.git",
|
||||||
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
|
"reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
|
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
|
||||||
"reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
|
"reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -1863,7 +1863,7 @@
|
||||||
"logging",
|
"logging",
|
||||||
"psr-3"
|
"psr-3"
|
||||||
],
|
],
|
||||||
"time": "2016-11-26 00:15:39"
|
"time": "2017-03-13 07:08:03"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mtdowling/cron-expression",
|
"name": "mtdowling/cron-expression",
|
||||||
|
|
@ -2059,24 +2059,24 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nikic/php-parser",
|
"name": "nikic/php-parser",
|
||||||
"version": "v2.1.1",
|
"version": "v3.0.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||||
"reference": "4dd659edadffdc2143e4753df655d866dbfeedf0"
|
"reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4dd659edadffdc2143e4753df655d866dbfeedf0",
|
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
|
||||||
"reference": "4dd659edadffdc2143e4753df655d866dbfeedf0",
|
"reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-tokenizer": "*",
|
"ext-tokenizer": "*",
|
||||||
"php": ">=5.4"
|
"php": ">=5.5"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "~4.0"
|
"phpunit/phpunit": "~4.0|~5.0"
|
||||||
},
|
},
|
||||||
"bin": [
|
"bin": [
|
||||||
"bin/php-parse"
|
"bin/php-parse"
|
||||||
|
|
@ -2084,7 +2084,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.1-dev"
|
"dev-master": "3.0-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -2106,20 +2106,20 @@
|
||||||
"parser",
|
"parser",
|
||||||
"php"
|
"php"
|
||||||
],
|
],
|
||||||
"time": "2016-09-16 12:04:44"
|
"time": "2017-03-05 18:23:57"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "paragonie/random_compat",
|
"name": "paragonie/random_compat",
|
||||||
"version": "v2.0.4",
|
"version": "v2.0.10",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/paragonie/random_compat.git",
|
"url": "https://github.com/paragonie/random_compat.git",
|
||||||
"reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e"
|
"reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
|
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
|
||||||
"reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
|
"reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -2154,7 +2154,7 @@
|
||||||
"pseudorandom",
|
"pseudorandom",
|
||||||
"random"
|
"random"
|
||||||
],
|
],
|
||||||
"time": "2016-11-07 23:38:38"
|
"time": "2017-03-13 16:27:32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/reflection-common",
|
"name": "phpdocumentor/reflection-common",
|
||||||
|
|
@ -2562,37 +2562,38 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psy/psysh",
|
"name": "psy/psysh",
|
||||||
"version": "v0.7.2",
|
"version": "v0.8.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/bobthecow/psysh.git",
|
"url": "https://github.com/bobthecow/psysh.git",
|
||||||
"reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280"
|
"reference": "1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/e64e10b20f8d229cac76399e1f3edddb57a0f280",
|
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e",
|
||||||
"reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280",
|
"reference": "1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"dnoegel/php-xdg-base-dir": "0.1",
|
"dnoegel/php-xdg-base-dir": "0.1",
|
||||||
"jakub-onderka/php-console-highlighter": "0.3.*",
|
"jakub-onderka/php-console-highlighter": "0.3.*",
|
||||||
"nikic/php-parser": "^1.2.1|~2.0",
|
"nikic/php-parser": "~1.3|~2.0|~3.0",
|
||||||
"php": ">=5.3.9",
|
"php": ">=5.3.9",
|
||||||
"symfony/console": "~2.3.10|^2.4.2|~3.0",
|
"symfony/console": "~2.3.10|^2.4.2|~3.0",
|
||||||
"symfony/var-dumper": "~2.7|~3.0"
|
"symfony/var-dumper": "~2.7|~3.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"fabpot/php-cs-fixer": "~1.5",
|
"friendsofphp/php-cs-fixer": "~1.11",
|
||||||
"phpunit/phpunit": "~3.7|~4.0|~5.0",
|
"hoa/console": "~3.16|~1.14",
|
||||||
"squizlabs/php_codesniffer": "~2.0",
|
"phpunit/phpunit": "~4.4|~5.0",
|
||||||
"symfony/finder": "~2.1|~3.0"
|
"symfony/finder": "~2.1|~3.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
|
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
|
||||||
"ext-pdo-sqlite": "The doc command requires SQLite to work.",
|
"ext-pdo-sqlite": "The doc command requires SQLite to work.",
|
||||||
"ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
|
"ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
|
||||||
"ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
|
"ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.",
|
||||||
|
"hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit."
|
||||||
},
|
},
|
||||||
"bin": [
|
"bin": [
|
||||||
"bin/psysh"
|
"bin/psysh"
|
||||||
|
|
@ -2600,7 +2601,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-develop": "0.8.x-dev"
|
"dev-develop": "0.9.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
@ -2630,34 +2631,34 @@
|
||||||
"interactive",
|
"interactive",
|
||||||
"shell"
|
"shell"
|
||||||
],
|
],
|
||||||
"time": "2016-03-09 05:03:14"
|
"time": "2017-03-19 21:40:44"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ramsey/uuid",
|
"name": "ramsey/uuid",
|
||||||
"version": "3.5.2",
|
"version": "3.6.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/ramsey/uuid.git",
|
"url": "https://github.com/ramsey/uuid.git",
|
||||||
"reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954"
|
"reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/ramsey/uuid/zipball/5677cfe02397dd6b58c861870dfaa5d9007d3954",
|
"url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
|
||||||
"reference": "5677cfe02397dd6b58c861870dfaa5d9007d3954",
|
"reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"paragonie/random_compat": "^1.0|^2.0",
|
"paragonie/random_compat": "^1.0|^2.0",
|
||||||
"php": ">=5.4"
|
"php": "^5.4 || ^7.0"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
"rhumsaa/uuid": "self.version"
|
"rhumsaa/uuid": "self.version"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"apigen/apigen": "^4.1",
|
"apigen/apigen": "^4.1",
|
||||||
"codeception/aspect-mock": "1.0.0",
|
"codeception/aspect-mock": "^1.0 | ^2.0",
|
||||||
"doctrine/annotations": "~1.2.0",
|
"doctrine/annotations": "~1.2.0",
|
||||||
"goaop/framework": "1.0.0-alpha.2",
|
"goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
|
||||||
"ircmaxell/random-lib": "^1.1",
|
"ircmaxell/random-lib": "^1.1",
|
||||||
"jakub-onderka/php-parallel-lint": "^0.9.0",
|
"jakub-onderka/php-parallel-lint": "^0.9.0",
|
||||||
"mockery/mockery": "^0.9.4",
|
"mockery/mockery": "^0.9.4",
|
||||||
|
|
@ -2712,7 +2713,7 @@
|
||||||
"identifier",
|
"identifier",
|
||||||
"uuid"
|
"uuid"
|
||||||
],
|
],
|
||||||
"time": "2016-11-22 19:21:44"
|
"time": "2017-03-26 20:37:53"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "s1lentium/iptools",
|
"name": "s1lentium/iptools",
|
||||||
|
|
@ -2766,16 +2767,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "swiftmailer/swiftmailer",
|
"name": "swiftmailer/swiftmailer",
|
||||||
"version": "v5.4.5",
|
"version": "v5.4.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
"url": "https://github.com/swiftmailer/swiftmailer.git",
|
||||||
"reference": "cd142238a339459b10da3d8234220963f392540c"
|
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/cd142238a339459b10da3d8234220963f392540c",
|
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
|
||||||
"reference": "cd142238a339459b10da3d8234220963f392540c",
|
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -2816,7 +2817,7 @@
|
||||||
"mail",
|
"mail",
|
||||||
"mailer"
|
"mailer"
|
||||||
],
|
],
|
||||||
"time": "2016-12-29 10:02:40"
|
"time": "2017-02-13 07:52:53"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/console",
|
"name": "symfony/console",
|
||||||
|
|
@ -2938,16 +2939,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher",
|
"name": "symfony/event-dispatcher",
|
||||||
"version": "v3.2.3",
|
"version": "v3.2.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||||
"reference": "9137eb3a3328e413212826d63eeeb0217836e2b6"
|
"reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6",
|
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
|
||||||
"reference": "9137eb3a3328e413212826d63eeeb0217836e2b6",
|
"reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -2994,7 +2995,7 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony EventDispatcher Component",
|
"description": "Symfony EventDispatcher Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2017-01-02 20:32:22"
|
"time": "2017-02-21 09:12:04"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/finder",
|
"name": "symfony/finder",
|
||||||
|
|
@ -4057,16 +4058,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mockery/mockery",
|
"name": "mockery/mockery",
|
||||||
"version": "0.9.8",
|
"version": "0.9.9",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/padraic/mockery.git",
|
"url": "https://github.com/padraic/mockery.git",
|
||||||
"reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855"
|
"reference": "6fdb61243844dc924071d3404bb23994ea0b6856"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/padraic/mockery/zipball/1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855",
|
"url": "https://api.github.com/repos/padraic/mockery/zipball/6fdb61243844dc924071d3404bb23994ea0b6856",
|
||||||
"reference": "1e5e2ffdc4d71d7358ed58a6fdd30a4a0c506855",
|
"reference": "6fdb61243844dc924071d3404bb23994ea0b6856",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4118,7 +4119,7 @@
|
||||||
"test double",
|
"test double",
|
||||||
"testing"
|
"testing"
|
||||||
],
|
],
|
||||||
"time": "2017-02-09 13:29:38"
|
"time": "2017-02-28 12:52:32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "myclabs/deep-copy",
|
"name": "myclabs/deep-copy",
|
||||||
|
|
@ -4164,27 +4165,27 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpspec/prophecy",
|
"name": "phpspec/prophecy",
|
||||||
"version": "v1.6.2",
|
"version": "v1.7.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpspec/prophecy.git",
|
"url": "https://github.com/phpspec/prophecy.git",
|
||||||
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
|
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
|
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
|
||||||
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
|
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"doctrine/instantiator": "^1.0.2",
|
"doctrine/instantiator": "^1.0.2",
|
||||||
"php": "^5.3|^7.0",
|
"php": "^5.3|^7.0",
|
||||||
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
|
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
|
||||||
"sebastian/comparator": "^1.1",
|
"sebastian/comparator": "^1.1|^2.0",
|
||||||
"sebastian/recursion-context": "^1.0|^2.0"
|
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpspec/phpspec": "^2.0",
|
"phpspec/phpspec": "^2.5|^3.2",
|
||||||
"phpunit/phpunit": "^4.8 || ^5.6.5"
|
"phpunit/phpunit": "^4.8 || ^5.6.5"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
|
|
@ -4223,39 +4224,39 @@
|
||||||
"spy",
|
"spy",
|
||||||
"stub"
|
"stub"
|
||||||
],
|
],
|
||||||
"time": "2016-11-21 14:58:47"
|
"time": "2017-03-02 20:05:34"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
"version": "4.0.5",
|
"version": "4.0.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||||
"reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971"
|
"reference": "09e2277d14ea467e5a984010f501343ef29ffc69"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c19cfc7cbb0e9338d8c469c7eedecc2a428b0971",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/09e2277d14ea467e5a984010f501343ef29ffc69",
|
||||||
"reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971",
|
"reference": "09e2277d14ea467e5a984010f501343ef29ffc69",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
"ext-dom": "*",
|
||||||
|
"ext-xmlwriter": "*",
|
||||||
"php": "^5.6 || ^7.0",
|
"php": "^5.6 || ^7.0",
|
||||||
"phpunit/php-file-iterator": "~1.3",
|
"phpunit/php-file-iterator": "^1.3",
|
||||||
"phpunit/php-text-template": "~1.2",
|
"phpunit/php-text-template": "^1.2",
|
||||||
"phpunit/php-token-stream": "^1.4.2",
|
"phpunit/php-token-stream": "^1.4.2 || ^2.0",
|
||||||
"sebastian/code-unit-reverse-lookup": "~1.0",
|
"sebastian/code-unit-reverse-lookup": "^1.0",
|
||||||
"sebastian/environment": "^1.3.2 || ^2.0",
|
"sebastian/environment": "^1.3.2 || ^2.0",
|
||||||
"sebastian/version": "~1.0|~2.0"
|
"sebastian/version": "^1.0 || ^2.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"ext-xdebug": ">=2.1.4",
|
"ext-xdebug": "^2.1.4",
|
||||||
"phpunit/phpunit": "^5.4"
|
"phpunit/phpunit": "^5.7"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-dom": "*",
|
"ext-xdebug": "^2.5.1"
|
||||||
"ext-xdebug": ">=2.4.0",
|
|
||||||
"ext-xmlwriter": "*"
|
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
|
|
@ -4286,7 +4287,7 @@
|
||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2017-01-20 15:06:43"
|
"time": "2017-03-01 09:12:17"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-file-iterator",
|
"name": "phpunit/php-file-iterator",
|
||||||
|
|
@ -4378,25 +4379,30 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-timer",
|
"name": "phpunit/php-timer",
|
||||||
"version": "1.0.8",
|
"version": "1.0.9",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-timer.git",
|
"url": "https://github.com/sebastianbergmann/php-timer.git",
|
||||||
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
|
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
|
||||||
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
|
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.3"
|
"php": "^5.3.3 || ^7.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "~4|~5"
|
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.0-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"classmap": [
|
"classmap": [
|
||||||
"src/"
|
"src/"
|
||||||
|
|
@ -4418,20 +4424,20 @@
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"timer"
|
"timer"
|
||||||
],
|
],
|
||||||
"time": "2016-05-12 18:03:57"
|
"time": "2017-02-26 11:10:40"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-token-stream",
|
"name": "phpunit/php-token-stream",
|
||||||
"version": "1.4.9",
|
"version": "1.4.11",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
||||||
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
|
"reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
|
||||||
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
|
"reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4467,20 +4473,20 @@
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"tokenizer"
|
"tokenizer"
|
||||||
],
|
],
|
||||||
"time": "2016-11-15 14:06:22"
|
"time": "2017-02-27 10:12:30"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "5.7.13",
|
"version": "5.7.17",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34"
|
"reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68752b665d3875f9a38a357e3ecb35c79f8673bf",
|
||||||
"reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
|
"reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4504,7 +4510,7 @@
|
||||||
"sebastian/global-state": "^1.1",
|
"sebastian/global-state": "^1.1",
|
||||||
"sebastian/object-enumerator": "~2.0",
|
"sebastian/object-enumerator": "~2.0",
|
||||||
"sebastian/resource-operations": "~1.0",
|
"sebastian/resource-operations": "~1.0",
|
||||||
"sebastian/version": "~1.0|~2.0",
|
"sebastian/version": "~1.0.3|~2.0",
|
||||||
"symfony/yaml": "~2.1|~3.0"
|
"symfony/yaml": "~2.1|~3.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
|
|
@ -4549,7 +4555,7 @@
|
||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2017-02-10 09:05:10"
|
"time": "2017-03-19 16:52:12"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-mock-objects",
|
"name": "phpunit/phpunit-mock-objects",
|
||||||
|
|
@ -4612,23 +4618,23 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/code-unit-reverse-lookup",
|
"name": "sebastian/code-unit-reverse-lookup",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
|
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
|
||||||
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
|
"reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
|
"url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
|
||||||
"reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
|
"reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.6"
|
"php": "^5.6 || ^7.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "~5"
|
"phpunit/phpunit": "^5.7 || ^6.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
|
|
@ -4653,7 +4659,7 @@
|
||||||
],
|
],
|
||||||
"description": "Looks up which function or method a line of code belongs to",
|
"description": "Looks up which function or method a line of code belongs to",
|
||||||
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
|
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
|
||||||
"time": "2016-02-13 06:45:14"
|
"time": "2017-03-04 06:30:41"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/comparator",
|
"name": "sebastian/comparator",
|
||||||
|
|
@ -4941,16 +4947,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/object-enumerator",
|
"name": "sebastian/object-enumerator",
|
||||||
"version": "2.0.0",
|
"version": "2.0.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
|
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
|
||||||
"reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35"
|
"reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
|
"url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
|
||||||
"reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
|
"reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4983,7 +4989,7 @@
|
||||||
],
|
],
|
||||||
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
|
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
|
||||||
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
|
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
|
||||||
"time": "2016-11-19 07:35:10"
|
"time": "2017-02-18 15:18:39"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/recursion-context",
|
"name": "sebastian/recursion-context",
|
||||||
|
|
@ -5290,16 +5296,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/yaml",
|
"name": "symfony/yaml",
|
||||||
"version": "v3.2.3",
|
"version": "v3.2.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/yaml.git",
|
"url": "https://github.com/symfony/yaml.git",
|
||||||
"reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b"
|
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b",
|
"url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a",
|
||||||
"reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b",
|
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -5341,7 +5347,7 @@
|
||||||
],
|
],
|
||||||
"description": "Symfony Yaml Component",
|
"description": "Symfony Yaml Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2017-01-21 17:06:35"
|
"time": "2017-03-07 16:47:02"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,7 @@ return [
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'bind_js_vars_to_this_view' => [
|
'bind_js_vars_to_this_view' => [
|
||||||
'layouts.master',
|
'layouts.scripts',
|
||||||
'layouts.admin',
|
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -276,3 +276,7 @@ span[aria-labelledby="select2-pUserId-container"] {
|
||||||
.btn-icon > i.fa {
|
.btn-icon > i.fa {
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.strong {
|
||||||
|
font-weight: bold !important;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,9 +38,13 @@ var Server = (function () {
|
||||||
},
|
},
|
||||||
newest_on_top: true,
|
newest_on_top: true,
|
||||||
delay: 2000,
|
delay: 2000,
|
||||||
|
offset: {
|
||||||
|
x: 20,
|
||||||
|
y: 60,
|
||||||
|
},
|
||||||
animate: {
|
animate: {
|
||||||
enter: 'animated zoomInDown',
|
enter: 'animated bounceInUp',
|
||||||
exit: 'animated zoomOutDown'
|
exit: 'animated bounceOutDown'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -56,7 +60,7 @@ var Server = (function () {
|
||||||
message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err,
|
message: 'There was an error attempting to establish a WebSocket connection to the Daemon. This panel will not work as expected.<br /><br />' + err,
|
||||||
}, {
|
}, {
|
||||||
type: 'danger',
|
type: 'danger',
|
||||||
delay: 0
|
delay: 0,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -59,24 +59,24 @@ return [
|
||||||
'server_header' => 'Server Management',
|
'server_header' => 'Server Management',
|
||||||
'task_header' => 'Task Management',
|
'task_header' => 'Task Management',
|
||||||
'sftp_header' => 'SFTP Management',
|
'sftp_header' => 'SFTP Management',
|
||||||
'db_header' => 'Database Management',
|
'database_header' => 'Database Management',
|
||||||
'start' => [
|
'power_start' => [
|
||||||
'title' => 'Start Server',
|
'title' => 'Start Server',
|
||||||
'description' => 'Allows user to start the server.',
|
'description' => 'Allows user to start the server.',
|
||||||
],
|
],
|
||||||
'stop' => [
|
'power_stop' => [
|
||||||
'title' => 'Stop Server',
|
'title' => 'Stop Server',
|
||||||
'description' => 'Allows user to stop the server.',
|
'description' => 'Allows user to stop the server.',
|
||||||
],
|
],
|
||||||
'restart' => [
|
'power_restart' => [
|
||||||
'title' => 'Restart Server',
|
'title' => 'Restart Server',
|
||||||
'description' => 'Allows user to restart the server.',
|
'description' => 'Allows user to restart the server.',
|
||||||
],
|
],
|
||||||
'kill' => [
|
'power_kill' => [
|
||||||
'title' => 'Kill Server',
|
'title' => 'Kill Server',
|
||||||
'description' => 'Allows user to kill the server process.',
|
'description' => 'Allows user to kill the server process.',
|
||||||
],
|
],
|
||||||
'command' => [
|
'send_command' => [
|
||||||
'title' => 'Send Console Command',
|
'title' => 'Send Console Command',
|
||||||
'description' => 'Allows sending a command from the console. If the user does not have stop or restart permissions they cannot send the application\'s stop command.',
|
'description' => 'Allows sending a command from the console. If the user does not have stop or restart permissions they cannot send the application\'s stop command.',
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
|
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
|
||||||
<meta name="_token" content="{{ csrf_token() }}">
|
<meta name="_token" content="{{ csrf_token() }}">
|
||||||
|
|
||||||
|
|
||||||
<link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
|
<link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
|
||||||
<link rel="icon" type="image/png" href="/favicons/favicon-32x32.png" sizes="32x32">
|
<link rel="icon" type="image/png" href="/favicons/favicon-32x32.png" sizes="32x32">
|
||||||
<link rel="icon" type="image/png" href="/favicons/favicon-16x16.png" sizes="16x16">
|
<link rel="icon" type="image/png" href="/favicons/favicon-16x16.png" sizes="16x16">
|
||||||
|
|
@ -36,6 +35,8 @@
|
||||||
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
|
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
|
||||||
<meta name="theme-color" content="#367fa9">
|
<meta name="theme-color" content="#367fa9">
|
||||||
|
|
||||||
|
@include('layouts.scripts')
|
||||||
|
|
||||||
@section('scripts')
|
@section('scripts')
|
||||||
{!! Theme::css('vendor/select2/select2.min.css') !!}
|
{!! Theme::css('vendor/select2/select2.min.css') !!}
|
||||||
{!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
|
{!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
|
||||||
|
|
@ -75,13 +76,13 @@
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="Quick Access"><i class="fa fa-fighter-jet" style="margin-top:4px;padding-bottom:2px;"></i></a>
|
<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="Quick Access"><i class="fa fa-fighter-jet"></i></a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server" style="margin-top:4px;padding-bottom:2px;"></i></a></li>
|
<li><a href="{{ route('index') }}" data-toggle="tooltip" data-placement="bottom" title="Exit Admin Control"><i class="fa fa-server"></i></a></li>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-power-off" style="margin-top:4px;padding-bottom:2px;"></i></a></li>
|
<li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-power-off"></i></a></li>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -171,8 +172,8 @@
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<footer class="main-footer">
|
<footer class="main-footer">
|
||||||
<div class="pull-right hidden-xs small text-gray">
|
<div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
|
||||||
<strong>v</strong> {{ config('app.version') }}
|
<strong>v</strong> {{ config('app.version') }} <small class="muted muted-hover"><a href="https://patreon.com/pterry" target="_blank"><i class="fa fa-credit-card"></i></a></small>
|
||||||
</div>
|
</div>
|
||||||
Copyright © 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
|
Copyright © 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
|
||||||
</footer>
|
</footer>
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,8 @@
|
||||||
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
|
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
|
||||||
<meta name="theme-color" content="#367fa9">
|
<meta name="theme-color" content="#367fa9">
|
||||||
|
|
||||||
|
@include('layouts.scripts')
|
||||||
|
|
||||||
@section('scripts')
|
@section('scripts')
|
||||||
{!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
|
{!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
|
||||||
{!! Theme::css('vendor/adminlte/admin.min.css') !!}
|
{!! Theme::css('vendor/adminlte/admin.min.css') !!}
|
||||||
|
|
@ -73,15 +75,15 @@
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server" style="margin-top:4px;padding-bottom:2px;"></i></a>
|
<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server"></i></a>
|
||||||
</li>
|
</li>
|
||||||
@if(Auth::user()->isRootAdmin())
|
@if(Auth::user()->isRootAdmin())
|
||||||
<li>
|
<li>
|
||||||
<li><a href="{{ route('admin.index') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.admin_cp') }}"><i class="fa fa-gears" style="margin-top:4px;padding-bottom:2px;"></i></a></li>
|
<li><a href="{{ route('admin.index') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.admin_cp') }}"><i class="fa fa-gears"></i></a></li>
|
||||||
</li>
|
</li>
|
||||||
@endif
|
@endif
|
||||||
<li>
|
<li>
|
||||||
<li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.logout') }}"><i class="fa fa-power-off" style="margin-top:4px;padding-bottom:2px;"></i></a></li>
|
<li><a href="{{ route('auth.logout') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.logout') }}"><i class="fa fa-power-off"></i></a></li>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -127,24 +129,14 @@
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@can('list-files', $server)
|
@can('list-files', $server)
|
||||||
<li class="treeview
|
<li
|
||||||
@if(in_array(Route::currentRouteName(), ['server.files.index', 'server.files.edit', 'server.files.add']))
|
@if(starts_with(Route::currentRouteName(), 'server.files'))
|
||||||
active
|
class="active"
|
||||||
@endif
|
@endif
|
||||||
">
|
>
|
||||||
<a href="#">
|
<a href="{{ route('server.files.index', $server->uuidShort) }}">
|
||||||
<i class="fa fa-files-o"></i>
|
<i class="fa fa-files-o"></i> <span>@lang('navigation.server.file_management')</span>
|
||||||
<span>@lang('navigation.server.file_management')</span>
|
|
||||||
<span class="pull-right-container">
|
|
||||||
<i class="fa fa-angle-left pull-right"></i>
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
<ul class="treeview-menu">
|
|
||||||
<li class="{{ (Route::currentRouteName() !== 'server.files.index' && Route::currentRouteName() !== 'server.files.edit') ?: 'active' }}"><a href="{{ route('server.files.index', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.file_browser')</a></li>
|
|
||||||
@can('create-files', $server)
|
|
||||||
<li class="{{ Route::currentRouteName() !== 'server.files.add' ?: 'active' }}"><a href="{{ route('server.files.add', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.create_file')</a></li>
|
|
||||||
@endcan
|
|
||||||
</ul>
|
|
||||||
</li>
|
</li>
|
||||||
@endcan
|
@endcan
|
||||||
@can('list-subusers', $server)
|
@can('list-subusers', $server)
|
||||||
|
|
@ -154,7 +146,7 @@
|
||||||
@endif
|
@endif
|
||||||
>
|
>
|
||||||
<a href="{{ route('server.subusers', $server->uuidShort)}}">
|
<a href="{{ route('server.subusers', $server->uuidShort)}}">
|
||||||
<i class="fa fa-users"></i> <span>Subusers</span>
|
<i class="fa fa-users"></i> <span>@lang('navigation.server.subusers')</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@endcan
|
@endcan
|
||||||
|
|
@ -235,8 +227,8 @@
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<footer class="main-footer">
|
<footer class="main-footer">
|
||||||
<div class="pull-right hidden-xs small text-gray">
|
<div class="pull-right hidden-xs small text-gray" style="margin-right:10px;">
|
||||||
<strong>v</strong> {{ config('app.version') }}
|
<strong>v</strong> {{ config('app.version') }} <small class="muted muted-hover"><a href="https://patreon.com/pterry" target="_blank"><i class="fa fa-credit-card"></i></a></small>
|
||||||
</div>
|
</div>
|
||||||
Copyright © 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
|
Copyright © 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/">Pterodactyl Software</a>.
|
||||||
</footer>
|
</footer>
|
||||||
|
|
|
||||||
1
resources/themes/pterodactyl/layouts/scripts.blade.php
Normal file
1
resources/themes/pterodactyl/layouts/scripts.blade.php
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{{-- Just here as a binder for dynamically rendered content. --}}
|
||||||
|
|
@ -60,340 +60,31 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6">
|
@foreach($permissions as $block => $perms)
|
||||||
{{-- Left Side --}}
|
<div class="col-sm-6">
|
||||||
<div class="row">
|
<div class="box">
|
||||||
<div class="col-sm-12">
|
<div class="box-header with-border">
|
||||||
<div class="box">
|
<h3 class="box-title">@lang('server.users.new.' . $block . '_header')</h3>
|
||||||
<div class="box-header with-border">
|
</div>
|
||||||
<h3 class="box-title">@lang('server.users.new.power_header')</h3>
|
<div class="box-body">
|
||||||
</div>
|
@foreach($perms as $permission => $daemon)
|
||||||
<div class="box-body">
|
<div class="form-group">
|
||||||
<div class="checkbox">
|
<div class="checkbox checkbox-primary no-margin-bottom">
|
||||||
<label>
|
<input id="{{ $permission }}" name="permissions[]" type="checkbox" value="{{ $permission }}"/>
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['power-start']))checked="checked"@endif value="power-start" />
|
<label for="{{ $permission }}" class="strong">
|
||||||
<strong>@lang('server.users.new.start.title')</strong>
|
@lang('server.users.new.' . str_replace('-', '_', $permission) . '.title')
|
||||||
<p class="text-muted small">@lang('server.users.new.start.description')</p>
|
</label>
|
||||||
</label>
|
</div>
|
||||||
|
<p class="text-muted small">@lang('server.users.new.' . str_replace('-', '_', $permission) . '.description')</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="checkbox">
|
@endforeach
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['power-stop']))checked="checked"@endif value="power-stop" />
|
|
||||||
<strong>@lang('server.users.new.stop.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.stop.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['power-restart']))checked="checked"@endif value="power-restart" />
|
|
||||||
<strong>@lang('server.users.new.restart.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.restart.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['power-kill']))checked="checked"@endif value="power-kill" />
|
|
||||||
<strong>@lang('server.users.new.kill.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.kill.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['send-command']))checked="checked"@endif value="send-command" />
|
|
||||||
<strong>@lang('server.users.new.command.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.command.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
@if ($loop->iteration % 2 === 0)
|
||||||
<div class="col-sm-12">
|
<div class="clearfix visible-lg-block visible-md-block visible-sm-block"></div>
|
||||||
<div class="box">
|
@endif
|
||||||
<div class="box-header with-border">
|
@endforeach
|
||||||
<h3 class="box-title">@lang('server.users.new.subuser_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['list-subusers']))checked="checked"@endif value="list-subusers" />
|
|
||||||
<strong>@lang('server.users.new.list_subusers.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.list_subusers.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['view-subuser']))checked="checked"@endif value="view-subuser" />
|
|
||||||
<strong>@lang('server.users.new.view_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_subuser.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['edit-subuser']))checked="checked"@endif value="edit-subuser" />
|
|
||||||
<strong>@lang('server.users.new.edit_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.edit_subuser.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['create-subuser']))checked="checked"@endif value="create-subuser" />
|
|
||||||
<strong>@lang('server.users.new.create_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.create_subuser.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['delete-subuser']))checked="checked"@endif value="delete-subuser" />
|
|
||||||
<strong>@lang('server.users.new.delete_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.delete_subuser.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.server_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['set-connection']))checked="checked"@endif value="set-connection" />
|
|
||||||
<strong>@lang('server.users.new.set_connection.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.set_connection.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['view-startup']))checked="checked"@endif value="view-startup" />
|
|
||||||
<strong>@lang('server.users.new.view_startup.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_startup.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['edit-startup']))checked="checked"@endif value="edit-startup" />
|
|
||||||
<strong>@lang('server.users.new.edit_startup.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.edit_startup.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.sftp_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['view-sftp']))checked="checked"@endif value="view-sftp" />
|
|
||||||
<strong>@lang('server.users.new.view_sftp.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_sftp.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['view-sftp-password']))checked="checked"@endif value="view-sftp-password" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.view_sftp_password.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_sftp_password.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['reset-sftp']))checked="checked"@endif value="reset-sftp" />
|
|
||||||
<strong>@lang('server.users.new.reset_sftp.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.reset_sftp.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-6">
|
|
||||||
{{-- Right Side --}}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.file_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['list-files']))checked="checked"@endif value="list-files" />
|
|
||||||
<strong>@lang('server.users.new.list_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.list_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['edit-files']))checked="checked"@endif value="edit-files" />
|
|
||||||
<strong>@lang('server.users.new.edit_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.edit_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['save-files']))checked="checked"@endif value="save-files" />
|
|
||||||
<strong>@lang('server.users.new.save_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.save_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['move-files']))checked="checked"@endif value="move-files" />
|
|
||||||
<strong>@lang('server.users.new.move_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.move_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['copy-files']))checked="checked"@endif value="copy-files" />
|
|
||||||
<strong>@lang('server.users.new.copy_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.copy_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['compress-files']))checked="checked"@endif value="compress-files" />
|
|
||||||
<strong>@lang('server.users.new.compress_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.compress_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['decompress-files']))checked="checked"@endif value="decompress-files" />
|
|
||||||
<strong>@lang('server.users.new.decompress_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.decompress_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['create-files']))checked="checked"@endif value="create-files" />
|
|
||||||
<strong>@lang('server.users.new.create_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.create_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['upload-files']))checked="checked"@endif value="upload-files" />
|
|
||||||
<strong>@lang('server.users.new.upload_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.upload_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['delete-files']))checked="checked"@endif value="delete-files" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.delete_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.delete_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['download-files']))checked="checked"@endif value="download-files" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.download_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.download_files.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.task_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['list-tasks']))checked="checked"@endif value="list-tasks" />
|
|
||||||
<strong>@lang('server.users.new.list_tasks.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.list_tasks.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['view-task']))checked="checked"@endif value="view-task" />
|
|
||||||
<strong>@lang('server.users.new.view_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_task.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['toggle-task']))checked="checked"@endif value="toggle-task" />
|
|
||||||
<strong>@lang('server.users.new.toggle_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.toggle_task.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['queue-task']))checked="checked"@endif value="queue-task" />
|
|
||||||
<strong>@lang('server.users.new.queue_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.queue_task.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['create-task']))checked="checked"@endif value="create-task" />
|
|
||||||
<strong>@lang('server.users.new.create_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.create_task.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['delete-task']))checked="checked"@endif value="delete-task" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.delete_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.delete_task.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.db_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['view-databases']))checked="checked"@endif value="view-databases" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.view_databases.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_databases.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="checkbox">
|
|
||||||
<label>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($oldInput['reset-db-password']))checked="checked"@endif value="reset-db-password" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.reset_db_password.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.reset_db_password.description')</p>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
||||||
|
|
@ -62,270 +62,31 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6">
|
@foreach($permlist as $block => $perms)
|
||||||
{{-- Left Side --}}
|
<div class="col-sm-6">
|
||||||
<div class="row">
|
<div class="box">
|
||||||
<div class="col-sm-12">
|
<div class="box-header with-border">
|
||||||
<div class="box">
|
<h3 class="box-title">@lang('server.users.new.' . $block . '_header')</h3>
|
||||||
<div class="box-header with-border">
|
</div>
|
||||||
<h3 class="box-title">@lang('server.users.new.power_header')</h3>
|
<div class="box-body">
|
||||||
</div>
|
@foreach($perms as $permission => $daemon)
|
||||||
<div class="box-body">
|
<div class="form-group">
|
||||||
<div>
|
<div class="checkbox checkbox-primary no-margin-bottom">
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['power-start']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="power-start" />
|
<input id="{{ $permission }}" name="permissions[]" type="checkbox" @if(isset($permissions['power-start']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="{{ $permission }}"/>
|
||||||
<label class="form-label">@lang('server.users.new.start.title')</label>
|
<label for="{{ $permission }}" class="strong">
|
||||||
<p class="text-muted small">@lang('server.users.new.start.description')</p>
|
@lang('server.users.new.' . str_replace('-', '_', $permission) . '.title')
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<p class="text-muted small">@lang('server.users.new.' . str_replace('-', '_', $permission) . '.description')</p>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
@endforeach
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['power-stop']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="power-stop" />
|
|
||||||
<strong>@lang('server.users.new.stop.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.stop.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['power-restart']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="power-restart" />
|
|
||||||
<strong>@lang('server.users.new.restart.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.restart.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['power-kill']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="power-kill" />
|
|
||||||
<strong>@lang('server.users.new.kill.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.kill.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['send-command']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="send-command" />
|
|
||||||
<strong>@lang('server.users.new.command.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.command.description')</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
@if ($loop->iteration % 2 === 0)
|
||||||
<div class="col-sm-12">
|
<div class="clearfix visible-lg-block visible-md-block visible-sm-block"></div>
|
||||||
<div class="box">
|
@endif
|
||||||
<div class="box-header with-border">
|
@endforeach
|
||||||
<h3 class="box-title">@lang('server.users.new.subuser_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['list-subusers']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="list-subusers" />
|
|
||||||
<strong>@lang('server.users.new.list_subusers.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.list_subusers.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['view-subuser']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="view-subuser" />
|
|
||||||
<strong>@lang('server.users.new.view_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_subuser.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['edit-subuser']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="edit-subuser" />
|
|
||||||
<strong>@lang('server.users.new.edit_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.edit_subuser.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['create-subuser']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="create-subuser" />
|
|
||||||
<strong>@lang('server.users.new.create_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.create_subuser.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['delete-subuser']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="delete-subuser" />
|
|
||||||
<strong>@lang('server.users.new.delete_subuser.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.delete_subuser.description')</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.server_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['set-connection']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="set-connection" />
|
|
||||||
<strong>@lang('server.users.new.set_connection.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.set_connection.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['view-startup']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="view-startup" />
|
|
||||||
<strong>@lang('server.users.new.view_startup.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_startup.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['edit-startup']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="edit-startup" />
|
|
||||||
<strong>@lang('server.users.new.edit_startup.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.edit_startup.description')</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.sftp_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['view-sftp']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="view-sftp" />
|
|
||||||
<strong>@lang('server.users.new.view_sftp.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_sftp.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['view-sftp-password']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="view-sftp-password" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.view_sftp_password.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_sftp_password.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['reset-sftp']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="reset-sftp" />
|
|
||||||
<strong>@lang('server.users.new.reset_sftp.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.reset_sftp.description')</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-6">
|
|
||||||
{{-- Right Side --}}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.file_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['list-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="list-files" />
|
|
||||||
<strong>@lang('server.users.new.list_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.list_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['edit-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="edit-files" />
|
|
||||||
<strong>@lang('server.users.new.edit_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.edit_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['save-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="save-files" />
|
|
||||||
<strong>@lang('server.users.new.save_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.save_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['move-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="move-files" />
|
|
||||||
<strong>@lang('server.users.new.move_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.move_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['copy-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="copy-files" />
|
|
||||||
<strong>@lang('server.users.new.copy_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.copy_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['compress-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="compress-files" />
|
|
||||||
<strong>@lang('server.users.new.compress_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.compress_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['decompress-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="decompress-files" />
|
|
||||||
<strong>@lang('server.users.new.decompress_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.decompress_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['create-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="create-files" />
|
|
||||||
<strong>@lang('server.users.new.create_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.create_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['upload-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="upload-files" />
|
|
||||||
<strong>@lang('server.users.new.upload_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.upload_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['delete-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="delete-files" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.delete_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.delete_files.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['download-files']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="download-files" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.download_files.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.download_files.description')</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.task_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['list-tasks']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="list-tasks" />
|
|
||||||
<strong>@lang('server.users.new.list_tasks.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.list_tasks.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['view-task']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="view-task" />
|
|
||||||
<strong>@lang('server.users.new.view_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_task.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['toggle-task']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="toggle-task" />
|
|
||||||
<strong>@lang('server.users.new.toggle_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.toggle_task.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['queue-task']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="queue-task" />
|
|
||||||
<strong>@lang('server.users.new.queue_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.queue_task.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['create-task']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="create-task" />
|
|
||||||
<strong>@lang('server.users.new.create_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.create_task.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['delete-task']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="delete-task" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.delete_task.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.delete_task.description')</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<div class="box">
|
|
||||||
<div class="box-header with-border">
|
|
||||||
<h3 class="box-title">@lang('server.users.new.db_header')</h3>
|
|
||||||
</div>
|
|
||||||
<div class="box-body">
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['view-databases']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="view-databases" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.view_databases.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.view_databases.description')</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="permissions[]" type="checkbox" @if(isset($permissions['reset-db-password']))checked="checked"@endif @cannot('edit-subuser', $server)disabled="disabled"@endcannot value="reset-db-password" />
|
|
||||||
<span class="label label-danger">@lang('strings.danger')</span>
|
|
||||||
<strong>@lang('server.users.new.reset_db_password.title')</strong>
|
|
||||||
<p class="text-muted small">@lang('server.users.new.reset_db_password.description')</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
@can('edit-subuser', $server)
|
@can('edit-subuser', $server)
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue