Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
136e85dd14 | |||
2fc3338d0f |
@ -1,17 +1,3 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
closeNow
|
||||
|
||||
|
||||
|
||||
listSitePolls
|
||||
|
||||
|
||||
<?php
|
||||
/**
|
||||
* app/plugins/feedback/models/feedback.php
|
||||
@ -87,3 +73,16 @@ class Feedback extends DatabaseModel {
|
||||
return self::$db->lastId();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// closeNow
|
||||
|
||||
|
||||
|
||||
// listSitePolls
|
11
install.php
11
install.php
@ -207,6 +207,9 @@ class Install extends Controller {
|
||||
],
|
||||
],
|
||||
'database' => [
|
||||
'dbEnabled' => [
|
||||
'value' => true,
|
||||
],
|
||||
'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
|
||||
if ( Route::testRouting() ) {
|
||||
Session::flash( 'success', 'Routing is working as expected.' );
|
||||
$this->nextStep( 'models', true );
|
||||
return $this->nextStep( 'models', true );
|
||||
} else {
|
||||
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() ] );
|
||||
} else {
|
||||
Session::flash( 'success', [ 'Models Have been installed successfully.' => $this->installer->getErrors() ] );
|
||||
$this->nextStep( 'plugins', true );
|
||||
return $this->nextStep( 'plugins', true );
|
||||
}
|
||||
} elseif ( Input::exists( 'submit' ) ) {
|
||||
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()] );
|
||||
} else {
|
||||
Session::flash( 'success', [ 'Plugins Have been installed successfully.' => $this->installer->getErrors() ] );
|
||||
$this->nextStep( 'resources', true );
|
||||
return $this->nextStep( 'resources', true );
|
||||
}
|
||||
} elseif ( Input::exists( 'submit' ) ) {
|
||||
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()] );
|
||||
} else {
|
||||
Session::flash( 'success', ['Resources have been installed successfully.' => $this->installer->getErrors()] );
|
||||
$this->nextStep( 'user', true );
|
||||
return $this->nextStep( 'user', true );
|
||||
}
|
||||
} elseif ( Input::exists( 'submit' ) ) {
|
||||
Issues::add( 'error', ['There was an error with your form.' => Check::userErrors()] );
|
||||
|
Reference in New Issue
Block a user