--- eventum-3.0.2-28-g0d12f69.old/init.php 2015-09-14 13:20:59.450996838 +0300 +++ eventum-3.0.2-28-g0d12f69/init.php 2015-09-11 23:17:34.000000000 +0300 @@ -28,7 +28,7 @@ // | Authors: Elan Ruusamäe | // +----------------------------------------------------------------------+ -if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) { +if (!file_exists('/etc/webapps/eventum/config.php') || !filesize('/etc/webapps/eventum/config.php')) { Header('Location: setup/'); exit(0); } @@ -45,7 +45,7 @@ // define base path define('APP_PATH', realpath(dirname(__FILE__))); if (!defined('APP_CONFIG_PATH')) { - define('APP_CONFIG_PATH', APP_PATH . '/config'); + define('APP_CONFIG_PATH', '/etc/webapps/eventum'); } // include local site config. may override any default @@ -78,7 +78,7 @@ } if (!defined('APP_TPL_COMPILE_PATH')) { - define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); + define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); } if (!defined('APP_INC_PATH')) { @@ -86,11 +86,11 @@ } if (!defined('APP_LOCKS_PATH')) { - define('APP_LOCKS_PATH', APP_PATH . '/locks'); + define('APP_LOCKS_PATH', '/var/run/eventum/'); } if (!defined('APP_LOG_PATH')) { - define('APP_LOG_PATH', APP_PATH . '/logs'); + define('APP_LOG_PATH', '/var/log/eventum'); } if (!defined('APP_ERROR_LOG')) { --- eventum-3.0.0/htdocs/setup/index.php~ 2015-02-02 20:03:49.507010317 +0200 +++ eventum-3.0.0/htdocs/setup/index.php 2015-02-02 20:05:00.139257552 +0200 @@ -44,10 +44,10 @@ define('APP_CONFIG_PATH', APP_PATH . '/config'); define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php'); define('APP_TPL_PATH', APP_PATH . '/templates'); -define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); -define('APP_LOG_PATH', APP_PATH . '/logs'); +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); +define('APP_LOG_PATH', '/var/log/eventum'); define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); -define('APP_LOCKS_PATH', APP_PATH . '/locks'); +define('APP_LOCKS_PATH', '/var/run/eventum'); define('APP_LOCAL_PATH', APP_CONFIG_PATH); header('Content-Type: text/html; charset=' . APP_CHARSET); @@ -254,10 +254,6 @@ $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly."; } - $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true); - if (!empty($error)) { - $errors[] = $error; - } $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'"); if (!empty($error)) { $errors[] = $error; --- eventum-2.2/irc/eventum-irc-bot.php~ 2009-07-23 14:03:41.422211655 +0300 +++ eventum-2.2/irc/eventum-irc-bot.php 2009-07-23 13:54:22.000000000 +0300 @@ -32,7 +32,7 @@ ini_set('memory_limit', '1024M'); -require_once dirname(__FILE__) . '/../init.php'; +require_once '/usr/share/eventum/init.php'; if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) { fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n"); --- eventum/bin/monitor.php 2010-11-24 17:24:23.000000000 +0200 +++ eventum/bin/monitor.php 2010-11-24 18:23:09.664934996 +0200 @@ -37,17 +37,17 @@ $required_files = array( APP_CONFIG_PATH . '/config.php' => array( 'check_owner' => true, - 'owner' => 'apache', + 'owner' => 'root', 'check_group' => true, - 'group' => 'apache', + 'group' => 'http', 'check_permission' => true, 'permission' => 640, ), APP_CONFIG_PATH . '/setup.php' => array( 'check_owner' => true, - 'owner' => 'apache', + 'owner' => 'root', 'check_group' => true, - 'group' => 'apache', + 'group' => 'http', 'check_permission' => true, 'permission' => 660, 'check_filesize' => true, --- eventum-2.3.3/config/sphinx.conf.php~ 2012-06-27 14:59:39.000000000 +0300 +++ eventum-2.3.3/config/sphinx.conf.php 2012-06-27 15:04:52.928810689 +0300 @@ -26,7 +26,7 @@ // | Authors: Bryan Alsdorf | // | Authors: Elan Ruusamäe | // +----------------------------------------------------------------------+ -require_once dirname(__FILE__) . "/../init.php"; +require_once '/usr/share/eventum/init.php'; if (!defined('SPHINX_LOG_PATH')) { define('SPHINX_LOG_PATH', '/var/log/sphinx/'); --- eventum-3.0.0-285-g72865b8/autoload.php~ 2015-04-20 23:14:34.904789824 +0300 +++ eventum-3.0.0-285-g72865b8/autoload.php 2015-04-20 23:22:44.240566443 +0300 @@ -54,11 +54,11 @@ */ if (!defined('APP_PEAR_PATH')) { - define('APP_PEAR_PATH', ''); + define('APP_PEAR_PATH', '/usr/share/pear'); } if (!defined('APP_PHP_PATH')) { - define('APP_PHP_PATH', ''); + define('APP_PHP_PATH', '/usr/share/php'); } if (!defined('APP_FONTS_PATH')) { @@ -66,7 +66,7 @@ } if (!defined('APP_SPHINXAPI_PATH')) { - define('APP_SPHINXAPI_PATH', ''); + define('APP_SPHINXAPI_PATH', APP_PHP_PATH); } if (!defined('APP_PHP_GETTEXT_PATH')) { @@ -74,7 +74,7 @@ } if (!defined('APP_SMARTY_PATH')) { - define('APP_SMARTY_PATH', ''); + define('APP_SMARTY_PATH', APP_PHP_PATH . '/Smarty3'); } // add PEAR to the include path, required by PEAR classes