Skip to content

Commit

Permalink
Merge pull request #319 from Bearsampp/july
Browse files Browse the repository at this point in the history 
July 318
  • Loading branch information
@jwaisner
jwaisner committed Jul 30, 2023
2 parents 61f6a37 + 905e85a commit 5f65834
Show file tree
Hide file tree
Showing 31 changed files with 406 additions and 333 deletions.
2 changes: 1 addition & 1 deletion build.properties
View file
@@ -1,7 +1,7 @@
dev.dir = ../dev
build.dir = bin

release.default.version = 2023.05.09
release.default.version = 2023.7.29
release.format = 7z
release.release.type =

Expand Down
14 changes: 7 additions & 7 deletions core/resources/homepage/ajax/ajax.filezilla.php
View file
Expand Up @@ -15,25 +15,25 @@

if ($bearsamppBins->getFilezilla()->isEnable()) {
if ($bearsamppBins->getFilezilla()->checkPort($sslPort, true)) {
$result['checkport'] .= '<span class="float-right ms-1 badge text-bg-success">' . sprintf($textServiceStarted, $sslPort) . ' (SSL)</span>';
$result['checkport'] .= '<span class="float-right m-1 badge text-bg-success">' . sprintf($textServiceStarted, $sslPort) . ' (SSL)</span>';
} else {
$result['checkport'] .= '<span class="float-right ms-1 badge text-bg-danger">' . $textServiceStopped . ' (SSL)</span>';
$result['checkport'] .= '<span class="float-right m-1 badge text-bg-danger">' . $textServiceStopped . ' (SSL)</span>';
}
if ($bearsamppBins->getFilezilla()->checkPort($port)) {
$result['checkport'] .= '<span class="float-right badge text-bg-success">' . sprintf($textServiceStarted, $port) . '</span>';
$result['checkport'] .= '<span class="float-right m-1 badge text-bg-success">' . sprintf($textServiceStarted, $port) . '</span>';
} else {
$result['checkport'] .= '<span class="float-right badge text-bg-danger">' . $textServiceStopped . '</span>';
$result['checkport'] .= '<span class="float-right m-1 badge text-bg-danger">' . $textServiceStopped . '</span>';
}
} else {
$result['checkport'] = '<span class="float-right badge text-bg-secondary">' . $textDisabled . '</span>';
$result['checkport'] = '<span class="float-right m-1 badge text-bg-secondary">' . $textDisabled . '</span>';
}

// Versions
foreach ($bearsamppBins->getFilezilla()->getVersionList() as $version) {
if ($version != $bearsamppBins->getFilezilla()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getFilezilla()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getFilezilla()->getVersion() . '</span>';

echo json_encode($result);
4 changes: 2 additions & 2 deletions core/resources/homepage/ajax/ajax.mailhog.php
View file
Expand Up @@ -25,9 +25,9 @@
// Versions
foreach ($bearsamppBins->getMailhog()->getVersionList() as $version) {
if ($version != $bearsamppBins->getMailhog()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getMailhog()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getMailhog()->getVersion() . '</span>';

echo json_encode($result);
4 changes: 2 additions & 2 deletions core/resources/homepage/ajax/ajax.mariadb.php
View file
Expand Up @@ -25,9 +25,9 @@
// Versions
foreach ($bearsamppBins->getMariadb()->getVersionList() as $version) {
if ($version != $bearsamppBins->getMariadb()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getMariadb()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getMariadb()->getVersion() . '</span>';

echo json_encode($result);
4 changes: 2 additions & 2 deletions core/resources/homepage/ajax/ajax.memcached.php
View file
Expand Up @@ -25,9 +25,9 @@
// Versions
foreach ($bearsamppBins->getMemcached()->getVersionList() as $version) {
if ($version != $bearsamppBins->getMemcached()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getMemcached()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getMemcached()->getVersion() . '</span>';

echo json_encode($result);
4 changes: 2 additions & 2 deletions core/resources/homepage/ajax/ajax.mysql.php
View file
Expand Up @@ -25,9 +25,9 @@
// Versions
foreach ($bearsamppBins->getMysql()->getVersionList() as $version) {
if ($version != $bearsamppBins->getMysql()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getMysql()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getMysql()->getVersion() . '</span>';

echo json_encode($result);
4 changes: 2 additions & 2 deletions core/resources/homepage/ajax/ajax.nodejs.php
View file
Expand Up @@ -15,9 +15,9 @@
// Versions
foreach ($bearsamppBins->getNodejs()->getVersionList() as $version) {
if ($version != $bearsamppBins->getNodejs()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getNodejs()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getNodejs()->getVersion() . '</span>';

echo json_encode($result);
4 changes: 2 additions & 2 deletions core/resources/homepage/ajax/ajax.php.php
View file
Expand Up @@ -18,10 +18,10 @@
// Versions
foreach ($bearsamppBins->getPhp()->getVersionList() as $version) {
if ($version != $bearsamppBins->getPhp()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getPhp()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getPhp()->getVersion() . '</span>';

// Extensions count
$exts = count($bearsamppBins->getPhp()->getExtensions());
Expand Down
4 changes: 2 additions & 2 deletions core/resources/homepage/ajax/ajax.postgresql.php
View file
Expand Up @@ -25,9 +25,9 @@
// Versions
foreach ($bearsamppBins->getPostgresql()->getVersionList() as $version) {
if ($version != $bearsamppBins->getPostgresql()->getVersion()) {
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-secondary">' . $version . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-secondary">' . $version . '</span>';
}
}
$result['versions'] .= '<span class="float-right ms-1 badge text-bg-primary">' . $bearsamppBins->getPostgresql()->getVersion() . '</span>';
$result['versions'] .= '<span class="m-1 badge text-bg-primary">' . $bearsamppBins->getPostgresql()->getVersion() . '</span>';

echo json_encode($result);
12 changes: 5 additions & 7 deletions core/resources/homepage/alias.conf
View file
@@ -1,11 +1,9 @@
Alias /707fae68448717b46d73b4bc6ff257b1 "~BEARSAMPP_LIN_PATH~/core/resources/homepage"
Alias /9bc1e145ed65e1597936833dc199de04 "E:/Bearsampp/core/resources/homepage"

<Directory "~BEARSAMPP_LIN_PATH~/core/resources/homepage">
<Directory "E:/Bearsampp/core/resources/homepage">
Options Indexes FollowSymLinks MultiViews
AllowOverride all
# START switchOnline tag - Do not replace!
Order Deny,Allow
Deny from all
Allow from 127.0.0.1 ::1
# END switchOnline tag - Do not replace!
# START switchOnline tag - Do not replace!
Require all granted
# END switchOnline tag - Do not replace!
</Directory>

0 comments on commit 5f65834

Please sign in to comment.