beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[Feat] Language additions

Browse source 
[Bug] ControlPanel leftovers changed to CtrlPanel
This commit is contained in:
AGuyNamedJens 2024-05-22 15:02:28 +02:00
parent 130a3b308b
commit ca3d1b00a0
39 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/ISSUE_TEMPLATE/bug.yml vendored
View file

@ -31,10 +31,10 @@ body:
validations:
required: false
- type: textarea
id: controlpanel-logs
id: ctrlpanel-logs
attributes:
label: Controlpanel Logs
description: Please copy and paste your laravel-log output. You may also provide a link to it using the following command `tail -n 100 /var/www/controlpanel/storage/logs/laravel.log | nc pteropaste.com 99`
label: CtrlPanel Logs
description: Please copy and paste your laravel-log output. You may also provide a link to it using the following command `tail -n 100 /var/www/ctrlpanel/storage/logs/laravel.log | nc pteropaste.com 99`
render: Shell
- type: textarea
id: additional-info

4
.github/SECURITY.md vendored
View file

@ -12,6 +12,6 @@ At this time, we only accept vulnerability reports through GitHub Advisories. We
## Supported Versions
### ControlPanel Versions
### CtrlPanel Versions
We strongly recommend using or upgrading to the latest version of ControlPanel to ensure you have access to the latest security fixes and enhancements.
We strongly recommend using or upgrading to the latest version of CtrlPanel to ensure you have access to the latest security fixes and enhancements.

2
app/Http/Controllers/ServerController.php
View file

@ -398,7 +398,7 @@ class ServerController extends Controller
// Remove the allocation property from the server object as it is not a column in the database
unset($server->allocation);
// Update the server on controlpanel
// Update the server on CtrlPanel
$server->update([
'product_id' => $newProduct->id,
'updated_at' => now(),

2
app/Traits/Invoiceable.php
View file

@ -54,7 +54,7 @@ trait Invoiceable
$invoice = DailyInvoice::make()
->template('controlpanel')
->template('CtrlPanel')
->name(__("Invoice"))
->buyer($customer)
->seller($seller)

6
docker/README.md
View file

@ -3,9 +3,9 @@
cd into the project directory and run the following command: `sh bin/startdocker.sh`
This should start building the images and start the containers.
After that you need to go into the controlpanel_php container and run some commands:
After that you need to go into the ctrlpanel_php container and run some commands:
Type `docker exec -it controlpanel_php ash` to go into the container and run the following commands:
Type `docker exec -it ctrlpanel_php ash` to go into the container and run the following commands:
```shell
composer install
@ -17,7 +17,7 @@ php artisan migrate --seed --force
## Setting up testing environment
Create the .env.testing file to your needs. Then once done you need to go into your phpmyadmin to create a new database named __controlpanel_test__.
Create the .env.testing file to your needs. Then once done you need to go into your phpmyadmin to create a new database named __ctrlpanel_test__.
Visit http://127.0.0.1:8080/ and create your database.
Now you're ready to run the following commands which switches to the testing config, migrates the test database and seeds it.

16
docker/docker-compose.yml
View file

@ -8,7 +8,7 @@ services:
build:
context: ../
dockerfile: docker/nginx/Dockerfile
container_name: controlpanel_nginx
container_name: ctrlpanel_nginx
ports:
- 80:80
volumes:
@ -21,14 +21,14 @@ services:
mysql:
image: mysql
container_name: controlpanel_mysql
container_name: ctrlpanel_mysql
restart: unless-stopped
tty: true
ports:
- "3306:3306"
environment:
MYSQL_DATABASE: controlpanel
MYSQL_USER: controlpanel
MYSQL_DATABASE: ctrlpanel
MYSQL_USER: ctrlpanel
MYSQL_PASSWORD: root
MYSQL_ROOT_PASSWORD: root
volumes:
@ -40,7 +40,7 @@ services:
build:
context: ../
dockerfile: docker/php/Dockerfile
container_name: controlpanel_php
container_name: ctrlpanel_php
volumes:
- "../:/var/www/html"
networks:
@ -48,13 +48,13 @@ services:
phpmyadmin:
image: phpmyadmin/phpmyadmin
container_name: controlpanel_phpmyadmin
container_name: ctrlpanel_phpmyadmin
depends_on:
- mysql
ports:
- '8080:80'
environment:
- PMA_HOST=controlpanel_mysql
- PMA_HOST=ctrlpanel_mysql
- PMA_USER=root
- PMA_PASSWORD=root
- PMA_ARBITRARY=1
@ -62,4 +62,4 @@ services:
- laravel
volumes:
mysql:
mysql:

2
lang/bg.json
View file

@ -126,7 +126,7 @@
"Support server": "Сървър за поддръжка",
"Documentation": "Документация",
"Github": "GitHub",
"Support ControlPanel": "Подкрепете Control Panel",
"Support CtrlPanel": "Подкрепете CtrlPanel",
"Servers": "Сървъри",
"Total": "Общо",
"Payments": "Плащания",

2
lang/bs.json
View file

@ -112,7 +112,7 @@
"Support server": "Support server",
"Documentation": "Documentation",
"Github": "Github",
"Support ControlPanel": "Support ControlPanel",
"Support CtrlPanel": "Support CtrlPanel",
"Servers": "Servers",
"Total": "Total",
"Payments": "Payments",

2
lang/cs.json
View file

@ -126,7 +126,7 @@
"Support server": "Server podpory",
"Documentation": "Dokumentace",
"Github": "GitHub",
"Support ControlPanel": "Podpořit ControlPanel",
"Support CtrlPanel": "Podpořit CtrlPanel",
"Servers": "Servery",
"Total": "Celkem",
"Payments": "Platby",

2
lang/de.json
View file

@ -126,7 +126,7 @@
"Support server": "Discord Server",
"Documentation": "Dokumentation",
"Github": "Github",
"Support ControlPanel": "Unterstütze CtrlPanel.gg",
"Support CtrlPanel": "Unterstütze CtrlPanel.gg",
"Servers": "Server",
"Total": "Gesamt",
"Payments": "Zahlungen",

4
lang/en.json
View file

@ -145,7 +145,7 @@
"Support server": "Support server",
"Documentation": "Documentation",
"Github": "Github",
"Support ControlPanel": "Support ControlPanel",
"Support CtrlPanel": "Support CtrlPanel",
"Servers": "Servers",
"Total": "Total",
"Payments": "Payments",
@ -166,7 +166,7 @@
"You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.": "You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.",
"You can do that in settings.": "You can do that in settings.",
"Note": "Note",
"If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel. Try clicking the button below.": "If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel. Try clicking the button below.",
"If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on CtrlPanel. Try clicking the button below.": "If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on CtrlPanel. Try clicking the button below.",
"Sync servers": "Sync servers",
"Node": "Node",
"Server count": "Server count",

2
lang/es.json
View file

@ -126,7 +126,7 @@
"Support server": "Servidor de Ayuda",
"Documentation": "Documentación",
"Github": "GitHub",
"Support ControlPanel": "Apoya ControlPanel",
"Support CtrlPanel": "Apoya CtrlPanel",
"Servers": "Servidores",
"Total": "Total",
"Payments": "Pagos",

2
lang/fr.json
View file

@ -126,7 +126,7 @@
"Support server": "Serveur de support",
"Documentation": "Documentation",
"Github": "Github",
"Support ControlPanel": "ControlPanel Support",
"Support CtrlPanel": "CtrlPanel Support",
"Servers": "Serveurs",
"Total": "Total",
"Payments": "Paiments",

2
lang/he.json
View file

@ -126,7 +126,7 @@
"Support server": "שרת תמיכה",
"Documentation": "מדריך",
"Github": "Github/גיטאהב",
"Support ControlPanel": "תמיכת ControlPanel",
"Support CtrlPanel": "תמיכת CtrlPanel",
"Servers": "שרתים",
"Total": "בסך הכל",
"Payments": "תשלומים",

2
lang/hi.json
View file

@ -126,7 +126,7 @@
"Support server": "समर्थन सर्वर",
"Documentation": "प्रलेखन",
"Github": "गिटहब",
"Support ControlPanel": "समर्थन नियंत्रण पैनल",
"Support CtrlPanel": "CtrlPanel का समर्थन करें",
"Servers": "सर्वरस",
"Total": "कुल",
"Payments": "भुगतान",

2
lang/hu.json
View file

@ -126,7 +126,7 @@
"Support server": "Szerver támogatása",
"Documentation": "Dokumentáció",
"Github": "Github",
"Support ControlPanel": "ControlPanel támogatása",
"Support CtrlPanel": "CtrlPanel támogatása",
"Servers": "Szerverek",
"Total": "Összesen",
"Payments": "Fizetések",

2
lang/it.json
View file

@ -126,7 +126,7 @@
"Support server": "Server di supporto",
"Documentation": "Documentazione",
"Github": "GitHub",
"Support ControlPanel": "Supporta ControlPanel",
"Support CtrlPanel": "Supporta CtrlPanel",
"Servers": "Servers",
"Total": "Totale",
"Payments": "Pagamenti",

2
lang/nl.json
View file

@ -126,7 +126,7 @@
"Support server": "Ondersteuningsserver",
"Documentation": "Documentatie",
"Github": "Github",
"Support ControlPanel": "Ondersteuning ControlPanel",
"Support CtrlPanel": "Ondersteuning CtrlPanel",
"Servers": "Servers",
"Total": "Totaal",
"Payments": "Betalingen",

2
lang/pl.json
View file

@ -126,7 +126,7 @@
"Support server": "Serwer pomocy",
"Documentation": "Dokumentacja",
"Github": "Github",
"Support ControlPanel": "Wesprzyj ControlPanel",
"Support CtrlPanel": "Wesprzyj CtrlPanel",
"Servers": "Serwery",
"Total": "Razem",
"Payments": "Płatności",

2
lang/pt.json
View file

@ -126,7 +126,7 @@
"Support server": "Servidor de suporte",
"Documentation": "Documentação",
"Github": "Github",
"Support ControlPanel": "Suporte para ControlPanel",
"Support CtrlPanel": "Suporte para CtrlPanel",
"Servers": "Servidores",
"Total": "Total",
"Payments": "Pagamentos",

2
lang/ro.json
View file

@ -126,7 +126,7 @@
"Support server": "Support server",
"Documentation": "Documentation",
"Github": "Github",
"Support ControlPanel": "Support ControlPanel",
"Support CtrlPanel": "Support CtrlPanel",
"Servers": "Servers",
"Total": "Total",
"Payments": "Payments",

2
lang/ru.json
View file

@ -126,7 +126,7 @@
"Support server": "Сервер поддержки",
"Documentation": "Документация",
"Github": "GitHub",
"Support ControlPanel": "Поддержка панели управления",
"Support CtrlPanel": "Поддержка CtrlPanel",
"Servers": "Серверы",
"Total": "Всего",
"Payments": "Оплаты",

2
lang/sh.json
View file

@ -112,7 +112,7 @@
"Support server": "Support server",
"Documentation": "Documentation",
"Github": "Github",
"Support ControlPanel": "Support ControlPanel",
"Support CtrlPanel": "Support CtrlPanel",
"Servers": "Servers",
"Total": "Total",
"Payments": "Payments",

2
lang/sk.json
View file

@ -126,7 +126,7 @@
"Support server": "Server podpory",
"Documentation": "Dokumentácia",
"Github": "Github",
"Support ControlPanel": "Podporiť ControlPanel",
"Support CtrlPanel": "Podporiť CtrlPanel",
"Servers": "Servery",
"Total": "Celkom",
"Payments": "Platby",

2
lang/sr.json
View file

@ -126,7 +126,7 @@
"Support server": "Server za podršku",
"Documentation": "Dokumentacija",
"Github": "GitHub",
"Support ControlPanel": "Podrži ControlPanel",
"Support CtrlPanel": "Podrži CtrlPanel",
"Servers": "Serveri",
"Total": "Ukupno",
"Payments": "Plaćanja",

2
lang/sv.json
View file

@ -126,7 +126,7 @@
"Support server": "Stödservern",
"Documentation": "Dokumentation",
"Github": "Github",
"Support ControlPanel": "Support ControlPanel",
"Support CtrlPanel": "Support CtrlPanel",
"Servers": "Servers",
"Total": "Total",
"Payments": "Payments",

2
lang/tr.json
View file

@ -126,7 +126,7 @@
"Support server": "Destek sunucusu",
"Documentation": "Dökümantasyon",
"Github": "GitHub",
"Support ControlPanel": "ContrılPanel'i destekle",
"Support CtrlPanel": "CtrlPanel'i destekle",
"Servers": "Sunucular",
"Total": "Toplam",
"Payments": "Ödemeler",

2
lang/zh.json
View file

@ -126,7 +126,7 @@
"Support server": "支持服务器",
"Documentation": "文档",
"Github": "Github",
"Support ControlPanel": "支持我们",
"Support CtrlPanel": "支持我们",
"Servers": "服务器",
"Total": "总数",
"Payments": "支付费用",

2
package-lock.json generated
View file

@ -1,5 +1,5 @@
{
"name": "controlpanel",
"name": "CtrlPanel",
"lockfileVersion": 2,
"requires": true,
"packages": {

2
phpunit.xml
View file

@ -22,7 +22,7 @@
<env name="BCRYPT_ROUNDS" value="4"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="DB_CONNECTION" value="mysql"/>
<env name="DB_DATABASE" value="controlpanel_test"/>
<env name="DB_DATABASE" value="ctrlpanel_test"/>
<env name="MAIL_MAILER" value="array"/>
<env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/>

2
public/install/forms.php
View file

@ -87,7 +87,7 @@ if (isset($_POST['feedDB'])) {
header('LOCATION: index.php?step=3');
} catch (\Throwable $th) {
wh_log('Feeding the Database failed', 'error');
header("LOCATION: index.php?step=2.5&message=" . $th->getMessage() . " <br>Please check the installer.log file in /var/www/controlpanel/storage/logs !");
header("LOCATION: index.php?step=2.5&message=" . $th->getMessage() . " <br>Please check the installer.log file in /var/www/ctrlpanel/storage/logs !");
}
}

2
public/install/functions.php
View file

@ -262,7 +262,7 @@ function wh_log(string $message, string $level = 'info', array $context = []): v
$stream = new StreamHandler(dirname(__FILE__, 3) . '/storage/logs/installer.log', Logger::DEBUG);
$stream->setFormatter($formatter);
$log = new Logger('ControlPanel');
$log = new Logger('CtrlPanel');
$log->pushHandler($stream);
switch (strtolower($level)) {

4
public/install/index.php
View file

@ -143,7 +143,7 @@ function cardStart($title, $subtitle = null)
<div class="form-group">
<div class="flex flex-col mb-3">
<label for="databaseuser">Database User</label>
<input x-model="databaseuser" id="databaseuser" name="databaseuser" type="text" required value="controlpaneluser" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
<input x-model="databaseuser" id="databaseuser" name="databaseuser" type="text" required value="ctrlpanel" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
</div>
</div>
<div class="form-group">
@ -156,7 +156,7 @@ function cardStart($title, $subtitle = null)
<div class="form-group">
<div class="flex flex-col">
<label for="database">Database</label>
<input x-model="database" id="database" name="database" type="text" required value="controlpanel" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
<input x-model="database" id="database" name="database" type="text" required value="ctrlpanel" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
</div>
</div>

2
themes/BlueInfinity/views/layouts/app.blade.php
View file

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="{{ config('SETTINGS::SYSTEM:SEO_TITLE') }}" property="og:title">
<meta content="{{ config('SETTINGS::SYSTEM:SEO_DESCRIPTION') }}" property="og:description">
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}' property="og:image">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">

4
themes/BlueInfinity/views/layouts/main.blade.php
View file

@ -11,7 +11,7 @@
<meta content="{{ $website_settings->seo_title }}" property="og:title">
<meta content="{{ $website_settings->seo_description }}" property="og:description">
<meta
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}'
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}'
property="og:image">
<title>{{ config('app.name', 'Laravel') }}</title>
<link rel="icon"
@ -201,7 +201,7 @@
<!-- Brand Logo -->
<a href="{{ route('home') }}" class="brand-link">
<img width="64" height="64"
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/ctrlpanel_logo.png') }}"
alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
style="opacity: .8">
<span class="brand-text font-weight-light">{{ config('app.name', 'CtrlPanel.gg') }}</span>

6
themes/default/views/admin/settings/index.blade.php
View file

@ -120,7 +120,7 @@
<div class="row">
<div class="ml-5 card" style="width: 18rem;">
<span class="text-center h3">{{ __('FavIcon') }} </span>
<img src="{{ Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('images/controlpanel_logo.png') }}"
<img src="{{ Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('images/ctrlpanel_logo.png') }}"
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
class="card-img-top" alt="...">
<div class="card-body">
@ -132,7 +132,7 @@
<div class="ml-5 card" style="width: 18rem;">
<span class="text-center h3">{{ __('Icon') }} </span>
<img src="{{ Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
<img src="{{ Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/ctrlpanel_logo.png') }}"
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
class="card-img-top" alt="...">
<div class="card-body">
@ -144,7 +144,7 @@
<div class="ml-5 card" style="width: 18rem;">
<span class="text-center h3">{{ __('Login-page Logo') }} </span>
<img src="{{ Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}"
<img src="{{ Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}"
style="width:5vw;display: block; margin-left: auto;margin-right: auto"
class="card-img-top" alt="...">
<div class="card-body">

2
themes/default/views/auth/login.blade.php
View file

@ -10,7 +10,7 @@
<a href="{{ route('welcome') }}" class="h1 mb-2"><b
class="mr-1">{{ config('app.name', 'Laravel') }}</b></a>
@if ($website_settings->enable_login_logo)
<img src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}"
<img src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}"
alt="{{ config('app.name', 'CtrlPanel.gg') }} Logo" style="opacity: .8; max-width:100%; height: 150px; margin-top: 10px;">
@endif
</div>

2
themes/default/views/layouts/app.blade.php
View file

@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="{{ $website_settings->seo_title }}" property="og:title">
<meta content="{{ $website_settings->seo_description }}" property="og:description">
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
<meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('/logo.png') : asset('images/ctrlpanel_logo.png') }}' property="og:image">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">

4
themes/default/views/layouts/main.blade.php
View file

@ -11,7 +11,7 @@
<meta content="{{ $website_settings->seo_title }}" property="og:title">
<meta content="{{ $website_settings->seo_description }}" property="og:description">
<meta
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}'
content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/ctrlpanel_logo.png') }}'
property="og:image">
<title>{{ config('app.name', 'Laravel') }}</title>
<link rel="icon"
@ -201,7 +201,7 @@
<!-- Brand Logo -->
<a href="{{ route('home') }}" class="brand-link">
<img width="64" height="64"
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/controlpanel_logo.png') }}"
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/ctrlpanel_logo.png') }}"
alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
style="opacity: .8">
<span class="brand-text font-weight-light">{{ config('app.name', 'CtrlPanel.gg') }}</span>