Up to 3.10.12

[packages/eventum.git] / eventum-paths.patch

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 288fde9569c31e9740c3544b60e1b1f669613575..aad990328ce2451253009864419122d7d4163c49 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,42 +1,75 @@
---- eventum-1.4/setup/index.php~       2005-01-14 19:23:25.334500007 +0200
-+++ eventum-1.4/setup/index.php        2005-01-14 19:23:32.743136482 +0200
-@@ -417,23 +417,8 @@
-     $tpl->assign('is_imap_enabled', function_exists('imap_open'));\r
- }\r
- \r
--\r
--$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);\r
--$pieces = explode("/", $full_url);\r
--$relative_url = array();\r
--$relative_url[] = '';\r
--foreach ($pieces as $piece) {\r
--    if ((!empty($piece)) && ($piece != 'setup')) {\r
--        $relative_url[] = $piece;\r
--    }\r
--}\r
--$relative_url[] = '';\r
--$relative_url = implode("/", $relative_url);\r
--\r
--if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {\r
--    $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);\r
--}\r
--$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;\r
-+$installation_path = "/usr/share/eventum";\r
-+$relative_url = "/eventum/";\r
- \r
- $tpl->assign("phpversion", phpversion());\r
- $tpl->assign("rel_url", $relative_url);\r
---- eventum-1.4.orig/setup/config.inc.php      2005-01-05 01:05:58.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php   2005-01-19 02:28:23.000000000 +0200
-@@ -56,9 +56,9 @@
- @define("APP_INC_PATH", APP_PATH . "include/");\r
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
- @define("APP_TPL_PATH", APP_PATH . "templates/");\r
--@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");\r
-+@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");\r
- @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");\r
--@define("APP_LOG_PATH", APP_PATH . "logs/");\r
-+@define("APP_LOG_PATH", "/var/log/eventum/");\r
- @define("APP_LOCKS_PATH", APP_PATH . "locks/");\r
- if (stristr(PHP_OS, 'darwin')) {\r
-     ini_set("include_path", ".:" . APP_PEAR_PATH);\r
+--- 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';
+ 
+-    // "/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';
+ 
+     // 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';
+ 
+     // 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();
+ 
+-        $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;
+ 
+-require_once __DIR__ . '/../init.php';
++require_once '/usr/share/eventum/init.php';
+ 
+ /** @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/';
+ 
+     /**
+      * @var MountManager