Controlpanel.ggControlpanel.gg
CtrlPanel.ggThank you for using our Software
If you have any questions, make sure to join our Discord
(you can change this message in the Settings )
' @@ -23,7 +23,7 @@ class CreateWebsiteSettings extends SettingsMigration $this->migrator->add('website.show_privacy', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SHOW_PRIVACY") : false); $this->migrator->add('website.show_tos', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SHOW_TOS") : false); $this->migrator->add('website.useful_links_enabled', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:USEFULLINKS_ENABLED") : true); - $this->migrator->add('website.seo_title', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SEO_TITLE") : 'ControlPanel.gg'); + $this->migrator->add('website.seo_title', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SEO_TITLE") : 'CtrlPanel.gg'); $this->migrator->add('website.seo_description', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SEO_DESCRIPTION") : 'Billing software for Pterodactyl Panel.'); $this->migrator->add('website.enable_login_logo', true); } diff --git a/lang/de.json b/lang/de.json index 9107634b..638ede32 100644 --- a/lang/de.json +++ b/lang/de.json @@ -126,7 +126,7 @@ "Support server": "Discord Server", "Documentation": "Dokumentation", "Github": "Github", - "Support ControlPanel": "Unterstütze Controlpanel.gg", + "Support ControlPanel": "Unterstütze CtrlPanel.gg", "Servers": "Server", "Total": "Gesamt", "Payments": "Zahlungen", diff --git a/lang/en.json b/lang/en.json index c0aa6431..af1126bd 100644 --- a/lang/en.json +++ b/lang/en.json @@ -177,7 +177,7 @@ "Title": "Title", "User": "User", "Last updated": "Last updated", - "Controlpanel.gg": "Controlpanel.gg", + "CtrlPanel.gg": "CtrlPanel.gg", "Version": "Version", "Individual nodes": "Individual nodes", "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.", @@ -654,4 +654,4 @@ "sv": "Swedish", "sk": "Slovakish", "hu": "Hungarian" -} \ No newline at end of file +} diff --git a/public/install/forms.php b/public/install/forms.php index 9a772a57..762222c6 100644 --- a/public/install/forms.php +++ b/public/install/forms.php @@ -1,5 +1,6 @@ getMessage()); exit(); } - + foreach ($values as $key => $value) { $param = $_POST[$value]; @@ -131,7 +132,7 @@ if (isset($_POST['checkSMTP'])) { 'mail_host' => $_POST['host'], 'mail_port' => $_POST['port'], 'mail_username' => $_POST['user'], - 'mail_password' => encryptSettingsValue($_POST['pass']), + 'mail_password' => $_POST['pass'], 'mail_encryption' => $_POST['encryption'], 'mail_from_address' => $_POST['user'], ]; @@ -196,8 +197,8 @@ if (isset($_POST['checkPtero'])) { wh_log('Pterodactyl Settings are correct', 'debug'); wh_log('Updating Database', 'debug'); - $key = encryptSettingsValue($key); - $clientkey = encryptSettingsValue($clientkey); + $key = $key; + $clientkey = $clientkey; $query1 = 'UPDATE `' . getenv('DB_DATABASE') . "`.`settings` SET `payload` = '" . json_encode($url) . "' WHERE (`name` = 'panel_url' AND `group` = 'pterodactyl')"; $query2 = 'UPDATE `' . getenv('DB_DATABASE') . "`.`settings` SET `payload` = '" . json_encode($key) . "' WHERE (`name` = 'admin_token' AND `group` = 'pterodactyl')"; @@ -234,10 +235,10 @@ if (isset($_POST['createUser'])) { $repass = $_POST['repass']; $key = $db->query('SELECT `payload` FROM `' . getenv('DB_DATABASE') . "`.`settings` WHERE `name` = 'admin_token' AND `group` = 'pterodactyl'")->fetch_assoc(); - $key = encryptSettingsValue($key['value']); + $key = removeQuotes($key['payload']); $pterobaseurl = $db->query('SELECT `payload` FROM `' . getenv('DB_DATABASE') . "`.`settings` WHERE `name` = 'panel_url' AND `group` = 'pterodactyl'")->fetch_assoc(); - $pteroURL = $pterobaseurl['value'] . '/api/application/users/' . $pteroID; + $pteroURL = removeQuotes($pterobaseurl['payload']) . '/api/application/users/' . $pteroID; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $pteroURL); @@ -264,7 +265,7 @@ if (isset($_POST['createUser'])) { $name = $result['attributes']['username']; $pass = password_hash($pass, PASSWORD_DEFAULT); - $pteroURL = $pterobaseurl['value'] . '/api/application/users/' . $pteroID; + $pteroURL = removeQuotes($pterobaseurl['payload']) . '/api/application/users/' . $pteroID; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $pteroURL); @@ -272,7 +273,7 @@ if (isset($_POST['createUser'])) { curl_setopt($ch, CURLOPT_HTTPHEADER, [ 'Accept: application/json', 'Content-Type: application/json', - 'Authorization: Bearer ' . $key['value'], + 'Authorization: Bearer ' . $key, ]); curl_setopt($ch, CURLOPT_POSTFIELDS, [ 'email' => $mail, @@ -300,4 +301,4 @@ if (isset($_POST['createUser'])) { wh_log($db->error, 'error'); header('LOCATION: index.php?step=6&message=Something went wrong when communicating with the Database'); } -} \ No newline at end of file +} diff --git a/public/install/functions.php b/public/install/functions.php index a7952046..ebba003b 100644 --- a/public/install/functions.php +++ b/public/install/functions.php @@ -150,6 +150,10 @@ function checkExtensions(): array return $not_ok; } +function removeQuotes($string){ + return str_replace('"', "", $string); +} + /** * Sets the environment variable into the env file * @param string $envKey The environment key to set or modify diff --git a/public/install/index.php b/public/install/index.php index 54eb254d..3a05e2b0 100644 --- a/public/install/index.php +++ b/public/install/index.php @@ -9,7 +9,7 @@ function cardStart($title, $subtitle = null) { return "$subtitle
" : ""); @@ -19,7 +19,7 @@ function cardStart($title, $subtitle = null) -