Commit ca86f65a authored by David Morley's avatar David Morley

hotfixes

parent db18d2fd
Pipeline #532 passed with stage
in 2 minutes and 24 seconds
...@@ -9,6 +9,10 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic ...@@ -9,6 +9,10 @@ The format is based on [Keep a Changelog] and this project adheres to [Semantic
### Fixed ### Fixed
### Security ### Security
## [2.4.2] - 2018-10-18
### Fixed
- Fixed db setup calls for cleaner links
## [2.4.1] - 2018-10-18 ## [2.4.1] - 2018-10-18
:exclamation: DB migrations required! (see [SQL migration script][2.4.1-sql-migration]) :exclamation: DB migrations required! (see [SQL migration script][2.4.1-sql-migration])
### Added ### Added
......
...@@ -25,11 +25,6 @@ $_podmin_notify_level = $_GET['podmin_notify_level'] ?? 50; ...@@ -25,11 +25,6 @@ $_podmin_notify_level = $_GET['podmin_notify_level'] ?? 50;
require_once __DIR__ . '/../boot.php'; require_once __DIR__ . '/../boot.php';
// Set up global DB connection.
R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
R::testConnection() || die('Error in DB connection');
R::usePartialBeans(true);
try { try {
$pod = R::findOne('pods', 'domain = ?', [$_domain]); $pod = R::findOne('pods', 'domain = ?', [$_domain]);
$pod || die('domain not found'); $pod || die('domain not found');
...@@ -151,7 +146,7 @@ Authorized to edit <b><?php echo $_domain; ?></b> for <?php echo (new Carbon($po ...@@ -151,7 +146,7 @@ Authorized to edit <b><?php echo $_domain; ?></b> for <?php echo (new Carbon($po
<small id="undelete" class="form-text text-muted"> <small id="undelete" class="form-text text-muted">
Unpause/Undelete - Start checking and Start showing your pod. Unpause/Undelete - Start checking and Start showing your pod.
</small> </small>
<input value="debug" type="button" aria-describedby="debug" data-featherlight="/db/pull.php?debug=1&nowrite=1&domain=<?php echo $_domain; ?>"/> <input value="debug" type="button" aria-describedby="debug" data-featherlight="/db/update.php?debug=1&nowrite=1&domain=<?php echo $_domain; ?>"/>
<small id="debug" class="form-text text-muted"> <small id="debug" class="form-text text-muted">
Do a debug pull of your pod. Won't update the database just show what it would look like on a pass. Do a debug pull of your pod. Won't update the database just show what it would look like on a pass.
</small> </small>
...@@ -16,12 +16,6 @@ $_email = $_GET['email'] ?? ''; ...@@ -16,12 +16,6 @@ $_email = $_GET['email'] ?? '';
require_once __DIR__ . '/../boot.php'; require_once __DIR__ . '/../boot.php';
// Set up global DB connection.
R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
R::testConnection() || die('Error in DB connection');
R::usePartialBeans(true);
try { try {
$pod = R::findOne('pods', 'domain = ?', [$_domain]); $pod = R::findOne('pods', 'domain = ?', [$_domain]);
$pod || die('domain not found'); $pod || die('domain not found');
......
...@@ -24,11 +24,6 @@ if ($country_code) { ...@@ -24,11 +24,6 @@ if ($country_code) {
define('PODUPTIME', microtime(true)); define('PODUPTIME', microtime(true));
// Set up global DB connection.
R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
R::testConnection() || die('Error in DB connection');
R::usePartialBeans(true);
// CloudFlare country code pull. // CloudFlare country code pull.
$country_code = $_SERVER['HTTP_CF_IPCOUNTRY'] ?? ''; $country_code = $_SERVER['HTTP_CF_IPCOUNTRY'] ?? '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment