---- ./lib/eventum/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200
-+++ ./lib/eventum/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
-@@ -157,6 +165,7 @@
- 'permission' => 100,
- ),
- );
-+ $required_directories = array();
- foreach ($required_directories as $dir_path => $options) {
- // check if directory exists
- if (!file_exists($dir_path)) {
---- trunk/init.php~ 2009-06-27 17:31:32.000000000 +0300
-+++ trunk/init.php 2009-06-27 17:33:35.745565456 +0300
-@@ -26,7 +26,7 @@
- // | Authors: Elan Ruusamäe <glen@delfi.ee> |
- // +----------------------------------------------------------------------+
+--- eventum-3.10.1/src/Config/Paths.php~ 2020-12-02 23:16:35.000000000 +0200
++++ eventum-3.10.1/src/Config/Paths.php 2021-03-24 21:56:18.672527936 +0200
+@@ -22,18 +22,16 @@
+ public const APP_PUBLIC_PATH = APP_PATH . '/htdocs';
+ public const APP_INC_PATH = APP_PATH . '/lib/eventum';
--if (!file_exists(dirname(__FILE__) . '/config/config.php')) {
-+if (!file_exists('/etc/webapps/eventum/config.php')) {
- Header('Location: setup/');
- exit;
- }
-@@ -46,7 +46,7 @@
-
- // define base path
- define('APP_PATH', realpath(dirname(__FILE__)));
--define('APP_CONFIG_PATH', APP_PATH . '/config');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum');
-
- // include local site config. may override any default
- require_once APP_CONFIG_PATH . '/config.php';
-@@ -61,19 +61,15 @@
- }
-
- 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')) {
- define('APP_INC_PATH', APP_PATH . '/lib/eventum');
- }
+- // "/var" path for writable data
+- private const APP_VAR_PATH = APP_PATH . '/var';
+- public const APP_SPOOL_PATH = self::APP_VAR_PATH . '/spool';
+- public const APP_CACHE_PATH = self::APP_VAR_PATH . '/cache';
++ public const APP_SPOOL_PATH = '/var/spool/eventum';
++ public const APP_CACHE_PATH = '/var/cache/eventum';
--if (!defined('APP_PEAR_PATH')) {
-- define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
--}
--
- if (!defined('APP_SMARTY_PATH')) {
-- define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
-+ define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
- }
-
- if (!defined('APP_JPGRAPH_PATH')) {
-@@ -81,7 +77,7 @@
- }
-
- if (!defined('APP_LOCKS_PATH')) {
-- define('APP_LOCKS_PATH', APP_PATH . '/locks');
-+ define('APP_LOCKS_PATH', '/var/run/eventum/');
- }
-
- if (!defined('APP_SQL_PATCHES_PATH')) {
-@@ -89,7 +85,7 @@
- }
+ // define other paths
+ public const APP_TPL_PATH = APP_PATH . '/templates';
+ public const APP_TPL_COMPILE_PATH = self::APP_CACHE_PATH . '/smarty';
+- public const APP_LOG_PATH = self::APP_VAR_PATH . '/log';
+- public const APP_LOCKS_PATH = self::APP_VAR_PATH . '/lock';
++ public const APP_LOG_PATH = '/var/log/eventum';
++ public const 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');
+ // fonts directory for phplot
+- public const APP_FONTS_PATH = APP_PATH . '/vendor/fonts/liberation';
++ public const APP_FONTS_PATH = '/usr/share/fonts/TTF';
+ public const APP_HELP_PATH = APP_PATH . '/docs/help';
}
+--- eventum-3.9.11.org/src/Setup/Requirements.php 2020-08-01 20:21:08.000000000 +0200
++++ eventum-3.9.11/src/Setup/Requirements.php 2021-03-10 15:18:12.361997906 +0100
+@@ -69,10 +69,6 @@ class Requirements
+ $privateKeyPath = Setup::getPrivateKeyPath();
+ $setupFile = Setup::getSetupFile();
- if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
---- trunk/htdocs/setup/index.php~ 2009-06-27 17:34:22.000000000 +0300
-+++ trunk/htdocs/setup/index.php 2009-06-27 17:35:07.108898271 +0300
-@@ -42,14 +42,14 @@
- define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
- define('APP_INC_PATH', APP_PATH . '/lib/eventum');
- define('APP_PEAR_PATH', APP_INC_PATH . '/lib/pear');
--define('APP_SMARTY_PATH', APP_INC_PATH . '/lib/Smarty');
--define('APP_CONFIG_PATH', APP_PATH . '/config');
-+define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- 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');
+- $error = $this->checkPermissions($configPath, "Directory '" . $configPath . "'", true);
+- if (!empty($error)) {
+- $errors[] = $error;
+- }
+ $error = $this->checkPermissions($setupFile, "File '" . $setupFile . "'");
+ if (!empty($error)) {
+ $errors[] = $error;
+--- eventum-3.9.0/src/Console/Command/MonitorCommand.php~ 2019-10-21 22:17:43.000000000 +0300
++++ eventum-3.9.0/src/Console/Command/MonitorCommand.php 2020-07-02 00:40:16.042698823 +0300
+@@ -68,9 +68,9 @@
+ $required_files = [
+ $configPath . '/setup.php' => [
+ 'check_owner' => true,
+- 'owner' => 'apache',
++ 'owner' => 'http',
+ 'check_group' => true,
+- 'group' => 'apache',
++ 'group' => 'http',
+ 'check_permission' => true,
+ 'permission' => 660,
+ 'check_filesize' => true,
+--- eventum-3.9.11.org/config/sphinx.conf.php 2020-05-05 08:20:33.000000000 +0200
++++ eventum-3.9.11/config/sphinx.conf.php 2021-03-10 15:18:12.361997906 +0100
+@@ -4,7 +4,7 @@
+ use Eventum\Config\SphinxConfig;
+ use Eventum\ServiceContainer;
- header('Content-Type: text/html; charset=' . APP_CHARSET);
+-require_once __DIR__ . '/../init.php';
++require_once '/usr/share/eventum/init.php';
-@@ -192,10 +192,6 @@
- if (ini_get('file_uploads') != "1") {
- $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_LOCKS_PATH, "Directory '" . APP_LOCKS_PATH . "'", TRUE);
- if (!empty($error)) {
- $errors[] = $error;
-@@ -329,10 +325,6 @@
- $setup_file_path = APP_SETUP_FILE;
+ /** @var SphinxConfig $config */
+ $config = ServiceContainer::get(SphinxConfig::class);
+--- eventum-3.7.4-440-gcc5ad3db5/src/Attachment/StorageManager.php~ 2019-08-11 22:49:07.000000000 +0300
++++ eventum-3.7.4-440-gcc5ad3db5/src/Attachment/StorageManager.php 2019-08-21 23:33:19.325911295 +0300
+@@ -33,7 +33,7 @@
+ *
+ * @var string
+ */
+- private const STORAGE_PATH = Paths::APP_PATH . '/var/storage/';
++ private const STORAGE_PATH = '/var/lib/eventum/storage/';
- clearstatcache();
-- // check if config directory is writable
-- if (!is_writable(APP_CONFIG_PATH)) {
-- return "The file '" . APP_CONFIG_PATH . "' directory needs to be writable by the web server user. Please correct this problem and try again.";
-- }
- // need to create a random private key variable
- $private_key = '<?php
- $private_key = "' . md5(microtime()) . '";
+ /**
+ * @var MountManager
projects / packages / eventum.git / blobdiff