Compare commits

...

2 Commits
3.0.6 ... 3.0.7

Author SHA1 Message Date
136e85dd14 install bugfix 2024-08-09 18:00:56 -04:00
2fc3338d0f poll bugfix 2024-08-09 17:58:30 -04:00
2 changed files with 20 additions and 18 deletions

View File

@ -1,17 +1,3 @@
closeNow
listSitePolls
<?php <?php
/** /**
* app/plugins/feedback/models/feedback.php * app/plugins/feedback/models/feedback.php
@ -87,3 +73,16 @@ class Feedback extends DatabaseModel {
return self::$db->lastId(); return self::$db->lastId();
} }
} }
// closeNow
// listSitePolls

View File

@ -207,6 +207,9 @@ class Install extends Controller {
], ],
], ],
'database' => [ 'database' => [
'dbEnabled' => [
'value' => true,
],
'dbHost' => [ 'dbHost' => [
'value' => Input::postNull( 'dbHost' ), 'value' => Input::postNull( 'dbHost' ),
], ],
@ -254,7 +257,7 @@ class Install extends Controller {
// Apache should have the htaccess now, and Nginx should have been configured this way out of the box // Apache should have the htaccess now, and Nginx should have been configured this way out of the box
if ( Route::testRouting() ) { if ( Route::testRouting() ) {
Session::flash( 'success', 'Routing is working as expected.' ); Session::flash( 'success', 'Routing is working as expected.' );
$this->nextStep( 'models', true ); return $this->nextStep( 'models', true );
} else { } else {
Issues::add( 'error', 'Could not verify url routing' ); Issues::add( 'error', 'Could not verify url routing' );
} }
@ -291,7 +294,7 @@ class Install extends Controller {
Issues::add( 'error', [ 'There was an error with the Installation.' => $this->installer->getErrors() ] ); Issues::add( 'error', [ 'There was an error with the Installation.' => $this->installer->getErrors() ] );
} else { } else {
Session::flash( 'success', [ 'Models Have been installed successfully.' => $this->installer->getErrors() ] ); Session::flash( 'success', [ 'Models Have been installed successfully.' => $this->installer->getErrors() ] );
$this->nextStep( 'plugins', true ); return $this->nextStep( 'plugins', true );
} }
} elseif ( Input::exists( 'submit' ) ) { } elseif ( Input::exists( 'submit' ) ) {
Issues::add( 'error', [ 'There was an error with your form.' => Check::userErrors() ] ); Issues::add( 'error', [ 'There was an error with your form.' => Check::userErrors() ] );
@ -326,7 +329,7 @@ class Install extends Controller {
Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] ); Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] );
} else { } else {
Session::flash( 'success', [ 'Plugins Have been installed successfully.' => $this->installer->getErrors() ] ); Session::flash( 'success', [ 'Plugins Have been installed successfully.' => $this->installer->getErrors() ] );
$this->nextStep( 'resources', true ); return $this->nextStep( 'resources', true );
} }
} elseif ( Input::exists( 'submit' ) ) { } elseif ( Input::exists( 'submit' ) ) {
Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] ); Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] );
@ -361,7 +364,7 @@ class Install extends Controller {
Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] ); Issues::add( 'error', ['There was an error with the Installation.' => $this->installer->getErrors()] );
} else { } else {
Session::flash( 'success', ['Resources have been installed successfully.' => $this->installer->getErrors()] ); Session::flash( 'success', ['Resources have been installed successfully.' => $this->installer->getErrors()] );
$this->nextStep( 'user', true ); return $this->nextStep( 'user', true );
} }
} elseif ( Input::exists( 'submit' ) ) { } elseif ( Input::exists( 'submit' ) ) {
Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] ); Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] );