AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new constant DATA_DIR

Browse Source
This commit is contained in:
Frederic Guillot
2016-04-14 22:08:39 -04:00
parent f4e8eb176f
commit cc9f3e69c6
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/common.php
View File

@@ -14,12 +14,16 @@ if (getenv('DATABASE_URL')) {
define('DB_NAME', ltrim($dbopts["path"], '/')); define('DB_NAME', ltrim($dbopts["path"], '/'));
} }
if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'config.php')) { $config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'config.php'));
require __DIR__.DIRECTORY_SEPARATOR.'config.php';
if (file_exists($config_file)) {
require $config_file;
} }
if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'config.php')) { $config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'data', 'config.php'));
require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'config.php';
if (file_exists($config_file)) {
require $config_file;
} }
require __DIR__.'/constants.php'; require __DIR__.'/constants.php';

19
app/constants.php
View File

@@ -1,11 +1,17 @@
<?php <?php
// Data directory location
defined('DATA_DIR') or define('DATA_DIR', implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'data')));
// Files directory (attachments)
defined('FILES_DIR') or define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files');
// Plugins directory
defined('PLUGINS_DIR') or define('PLUGINS_DIR', implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'plugins')));
// Enable/disable debug // Enable/disable debug
defined('DEBUG') or define('DEBUG', getenv('DEBUG')); defined('DEBUG') or define('DEBUG', getenv('DEBUG'));
defined('DEBUG_FILE') or define('DEBUG_FILE', getenv('DEBUG_FILE') ?: __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'debug.log'); defined('DEBUG_FILE') or define('DEBUG_FILE', getenv('DEBUG_FILE') ?: DATA_DIR.DIRECTORY_SEPARATOR.'debug.log');
// Plugin directory
defined('PLUGINS_DIR') or define('PLUGINS_DIR', __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins');
// Application version // Application version
defined('APP_VERSION') or define('APP_VERSION', build_app_version('$Format:%d$', '$Format:%H$')); defined('APP_VERSION') or define('APP_VERSION', build_app_version('$Format:%d$', '$Format:%H$'));
@@ -14,7 +20,7 @@ defined('APP_VERSION') or define('APP_VERSION', build_app_version('$Format:%d$',
defined('DB_DRIVER') or define('DB_DRIVER', 'sqlite'); defined('DB_DRIVER') or define('DB_DRIVER', 'sqlite');
// Sqlite configuration // Sqlite configuration
defined('DB_FILENAME') or define('DB_FILENAME', 'data'.DIRECTORY_SEPARATOR.'db.sqlite'); defined('DB_FILENAME') or define('DB_FILENAME', DATA_DIR.DIRECTORY_SEPARATOR.'db.sqlite');
// Mysql/Postgres configuration // Mysql/Postgres configuration
defined('DB_USERNAME') or define('DB_USERNAME', 'root'); defined('DB_USERNAME') or define('DB_USERNAME', 'root');
@@ -82,9 +88,6 @@ defined('ENABLE_XFRAME') or define('ENABLE_XFRAME', true);
// Syslog // Syslog
defined('ENABLE_SYSLOG') or define('ENABLE_SYSLOG', getenv('ENABLE_SYSLOG')); defined('ENABLE_SYSLOG') or define('ENABLE_SYSLOG', getenv('ENABLE_SYSLOG'));
// Default files directory
defined('FILES_DIR') or define('FILES_DIR', 'data'.DIRECTORY_SEPARATOR.'files');
// Escape html inside markdown text // Escape html inside markdown text
defined('MARKDOWN_ESCAPE_HTML') or define('MARKDOWN_ESCAPE_HTML', true); defined('MARKDOWN_ESCAPE_HTML') or define('MARKDOWN_ESCAPE_HTML', true);