TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some control for knwoing if user is in install mode

Browse Source
This commit is contained in:
Manuel Raynaud
2013-10-24 08:31:49 +02:00
parent 5bf51dd47e
commit 3f7300bdee
5 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/bootstrap.php
View File

@@ -17,8 +17,10 @@ $loader = require __DIR__ . "/vendor/autoload.php";
if (!file_exists(THELIA_ROOT . '/local/config/database.yml')) {
define('THELIA_INSTALL_MODE',true);
if (!file_exists(THELIA_ROOT . '/local/config/database.yml') && !defined('THELIA_INSTALL_MODE')) {
$request = \Thelia\Core\HttpFoundation\Request::createFromGlobals();
header('location: '.$request->getSchemeAndHttpHost() . '/install');
exit;
}
/*else {
define('THELIA_INSTALL_MODE',true);

5
core/lib/Thelia/Core/Thelia.php
View File

@@ -96,7 +96,10 @@ class Thelia extends Kernel
{
parent::boot();
$this->getContainer()->get("event_dispatcher")->dispatch(TheliaEvents::BOOT);
if (file_exists(THELIA_ROOT . '/local/config/database.yml') === true) {
$this->getContainer()->get("event_dispatcher")->dispatch(TheliaEvents::BOOT);
}
}
/**

0
web/cache/.gitkeep vendored
View File

2
web/install/bootstrap.php
View File

@@ -20,7 +20,7 @@
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
define('THELIA_INSTALL_MODE', true);
include __DIR__ . "/../../core/bootstrap.php";
$thelia = new \Thelia\Core\Thelia("install", false);

25
web/test_to_remove/admin-stats.json
View File

@@ -1,25 +0,0 @@
{
"title" : "Stats on September 2013",
"series" : [
{
"datas" : [[0,10.00],[1,200.00],[2,5.00],[3,2.75],[4,20.30],[5,14.09],[6,5],[7,23],[8,5],[9,42],[10,0],[11,4],[12,78],[13,75],[14,70],[15,65],[16,102],[17,50],[18,27],[19,35],[20,37],[21,29],[22,56],[23,52],[24,12],[25,6],[26,82],[27,32],[28,15],[29,50],[30,42]],
"color" : "#adadad"
},
{
"datas" : [[0,2],[1,5],[2,5],[3,7],[4,8],[5,9],[6,5],[7,2],[8,5],[9,4],[10,0],[11,4],[12,7],[13,7],[14,7],[15,6],[16,1],[17,5],[18,2],[19,3],[20,3],[21,2],[22,5],[23,5],[24,1],[25,6],[26,8],[27,3],[28,1],[29,5],[30,4]],
"color" : "#f39922"
},
{
"datas" : [[0,15],[1,20],[2,1],[3,1],[4,2],[5,3]],
"color" : "#5cb85c"
},
{
"datas" : [[0,45],[1,40],[2,41],[3,41],[4,42],[5,43]],
"color" : "#5bc0de"
},
{
"datas" : [[0,25],[1,20],[2,21],[3,21],[4,22],[5,23]],
"color" : "#d9534f"
}
]
}