flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix fuckup in the init thing and deprecate sys.flashii.net

Browse source
This commit is contained in:
flash 2015-03-29 18:28:41 +02:00
parent 360ae2148d
commit 510afc0fa4
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
_sakura/config/config.php
View file

@ -1,27 +1,26 @@
<?php
// Flashii Configuration
$fiiConf = array(); // Define configuration array
$sakuraConf = array(); // Define configuration array
// PDO Database Connection
$fiiConf['db'] = array();
$fiiConf['db']['driver'] = 'mysql';
$fiiConf['db']['unixsocket'] = false;
$fiiConf['db']['host'] = 'localhost';
$fiiConf['db']['port'] = 3306;
$fiiConf['db']['username'] = 'flashii';
$fiiConf['db']['password'] = 'Ky2YQMr4vu4zcZE&yLZT!gQ&Wdf-CxrQLej+^PS6jS5AgAQh52yf6Br&mq-C8J=F3Yw$3wnMU7?ebA9r+Abe4J_kzzs57C8U22&#wytuf-veF9WEuHfP-GRHQ^?5pXbx';
$fiiConf['db']['database'] = 'flashii';
$fiiConf['db']['prefix'] = 'fii_';
$sakuraConf['db'] = array();
$sakuraConf['db']['driver'] = 'mysql';
$sakuraConf['db']['unixsocket'] = false;
$sakuraConf['db']['host'] = 'localhost';
$sakuraConf['db']['port'] = 3306;
$sakuraConf['db']['username'] = 'flashii';
$sakuraConf['db']['password'] = 'Ky2YQMr4vu4zcZE&yLZT!gQ&Wdf-CxrQLej+^PS6jS5AgAQh52yf6Br&mq-C8J=F3Yw$3wnMU7?ebA9r+Abe4J_kzzs57C8U22&#wytuf-veF9WEuHfP-GRHQ^?5pXbx';
$sakuraConf['db']['database'] = 'flashii';
$sakuraConf['db']['prefix'] = 'fii_';
// URLs (for modularity)
$fiiConf['urls']['main'] = 'iihsalf.net';
$fiiConf['urls']['api'] = 'api.iihsalf.net';
$fiiConf['urls']['content'] = 'cdn.iihsalf.net';
$fiiConf['urls']['chat'] = 'chat.iihsalf.net';
$fiiConf['urls']['manage'] = 'manage.iihsalf.net';
$fiiConf['urls']['system'] = 'sys.iihsalf.net';
$sakuraConf['urls']['main'] = 'iihsalf.net';
$sakuraConf['urls']['api'] = 'api.iihsalf.net';
$sakuraConf['urls']['content'] = 'cdn.iihsalf.net';
$sakuraConf['urls']['chat'] = 'chat.iihsalf.net';
$sakuraConf['urls']['manage'] = 'manage.iihsalf.net';
// Errata
$fiiConf['etc']['localPath'] = '/var/www/flashii.net/';
$fiiConf['etc']['templatesPath'] = $fiiConf['etc']['localPath'] .'_sakura/templates/';
$fiiConf['etc']['design'] = 'yuuno';
$sakuraConf['etc']['localPath'] = '/var/www/flashii.net/';
$sakuraConf['etc']['templatesPath'] = $sakuraConf['etc']['localPath'] .'_sakura/templates/';
$sakuraConf['etc']['design'] = 'yuuno';

4
_sakura/sakura.php
View file

@ -31,7 +31,7 @@ require_once ROOT_DIRECTORY .'_sakura/components/Sessions.php';
require_once ROOT_DIRECTORY .'_sakura/components/Users.php';
// Generate path to database driver
$_DBNGNPATH = ROOT_DIRECTORY .'_sakura/components/database/'. Configuration::getLocalConfig('db', 'driver') .'.php';
$_DBNGNPATH = ROOT_DIRECTORY .'_sakura/components/database/'. $sakuraConf['db']['driver'] .'.php';
// Include database driver
if(file_exists($_DBNGNPATH))
@ -43,7 +43,7 @@ else
set_error_handler(array('Sakura\Main', 'ErrorHandler'));
// Initialise Flashii Class
Main::init($fiiConf);
Main::init($sakuraConf);
// Set base page rendering data
$renderData = array(