X-Git-Url: http://git.pld-linux.org/?p=packages%2Feventum.git;a=blobdiff_plain;f=eventum-paths.patch;h=fc897ac637636a23e07caba9f5149d9481a0f356;hp=9ff09efe68de272aad9d939a2ea3c260a7cbdd02;hb=HEAD;hpb=816db75016c3e3738403f151984d9c9aed61c1e6

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 9ff09ef..aad9903 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,289 +1,75 @@
---- ./misc/cli/eventum~	2005-01-19 02:47:20.000000000 +0200
-+++ ./misc/cli/eventum	2005-01-19 03:02:40.119100405 +0200
-@@ -11,7 +11,7 @@
- //
- // @(#) $Id$
- //
--include_once("config.inc.php");
-+include_once("/etc/eventum/cli.php");
- include_once(APP_INC_PATH . "class.command_line.php");
- include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
- 
---- eventum-1.4.orig/misc/cli/config.inc.php	2005-01-26 00:00:58.000000000 +0200
-+++ eventum-1.4/misc/cli/config.inc.php	2005-01-25 23:57:39.000000000 +0200
-@@ -45,16 +45,10 @@
+--- 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';
  }
- 
- // definitions of path related variables
--@define("APP_PATH", dirname(__FILE__) . '/');
-+@define("APP_PATH", '/usr/share/eventum/cli/');
- @define("APP_INC_PATH", APP_PATH . "include/");
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
--if (stristr(PHP_OS, 'darwin')) {
--    ini_set("include_path", ".:" . APP_PEAR_PATH);
--} elseif (stristr(PHP_OS, 'win')) {
--    ini_set("include_path", ".;" . APP_PEAR_PATH);
--} else {
--    ini_set("include_path", ".:" . APP_PEAR_PATH);
--}
-+ini_set("include_path", ".:" . APP_PEAR_PATH);
- 
- @define("APP_BENCHMARK", false);
- ?>
---- eventum-1.4/misc/cli/config.inc.php~	2005-02-22 21:35:52.000000000 +0200
-+++ eventum-1.4/misc/cli/config.inc.php	2005-02-22 21:44:10.000000000 +0200
-@@ -46,9 +46,9 @@
- 
- // definitions of path related variables
- @define("APP_PATH", '/usr/share/eventum/cli/');
--@define("APP_INC_PATH", APP_PATH . "include/");
-+@define("APP_INC_PATH", APP_PATH);
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
- ini_set("include_path", ".:" . APP_PEAR_PATH);
- 
- @define("APP_BENCHMARK", false);
--?>
-\ No newline at end of file
-+?>
---- ./misc/cli/config.inc.php~	2005-02-22 21:49:37.000000000 +0200
-+++ ./misc/cli/config.inc.php	2005-02-22 21:50:01.000000000 +0200
-@@ -47,7 +47,7 @@
- // definitions of path related variables
- @define("APP_PATH", '/usr/share/eventum/cli/');
- @define("APP_INC_PATH", APP_PATH);
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
-+@define("APP_PEAR_PATH", "/usr/share/pear/");
- ini_set("include_path", ".:" . APP_PEAR_PATH);
- 
- @define("APP_BENCHMARK", false);
---- ./misc/cli/eventum~	2005-01-24 17:49:25.000000000 +0200
-+++ ./misc/cli/eventum	2005-01-25 15:48:56.000000000 +0200
-@@ -13,7 +13,7 @@
- //
- include_once("/etc/eventum/cli.php");
- include_once(APP_INC_PATH . "class.command_line.php");
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+include_once(APP_PEAR_PATH . "XML/RPC.php");
- 
- list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
- if (empty($port)) {
---- ./misc/cli/include/class.command_line.php	2005-01-05 01:06:03.000000000 +0200
-+++ ./misc/cli/include/class.command_line.php	2005-01-25 15:48:56.000000000 +0200
-@@ -29,7 +29,7 @@
- //
- 
- include_once(APP_INC_PATH . "class.misc.php");
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+include_once(APP_PEAR_PATH . "XML/RPC.php");
- 
- $_displayed_confirmation = false;
- 
---- ./include/class.template.php~	2005-02-27 17:49:54.000000000 +0200
-+++ ./include/class.template.php	2005-02-27 17:51:00.000000000 +0200
-@@ -60,7 +60,7 @@
-     {
-         $this->smarty = new Smarty;
-         $this->smarty->template_dir = APP_TPL_PATH . APP_CURRENT_LANG;
--        $this->smarty->compile_dir = APP_PATH . "templates_c";
-+        $this->smarty->compile_dir = "/var/cache/eventum";
-         $this->smarty->config_dir = '';
-         $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
-     }
---- ./include/class.monitor.php~	2005-02-22 21:50:49.000000000 +0200
-+++ ./include/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)) {
---- ./setup/index.php	2005-04-16 05:53:27.000000000 +0300
-+++ eventum-1.5.2.patched/setup/index.php	2005-04-16 05:53:05.000000000 +0300
-@@ -118,31 +118,31 @@
-     if (ini_get('allow_call_time_pass_reference') != "1") {
-         $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
-     }
--    $error = checkPermissions('../locks', "Directory 'locks'", TRUE);
-+    $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
-     if (!empty($error)) {
-         $errors[] = $error;
-     }
--    $error = checkPermissions('../logs', "Directory 'logs'", TRUE);
-+    $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
-     if (!empty($error)) {
-         $errors[] = $error;
-     }
--    $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);
-+    $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE);
-     if (!empty($error)) {
-         $errors[] = $error;
-     }
--    $error = checkPermissions('../config.inc.php', "File 'config.inc.php'");
-+    $error = checkPermissions('/etc/eventum/config.php', "File '/etc/eventum/config.php'");
-     if (!empty($error)) {
-         $errors[] = $error;
-     }
--    $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");
-+    $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
-     if (!empty($error)) {
-         $errors[] = $error;
-     }
--    $error = checkPermissions('../setup.conf.php', "File 'setup.conf.php'");
-+    $error = checkPermissions('/etc/eventum/setup.php', "File '/etc/eventum/setup.php'");
-     if (!empty($error)) {
-         $errors[] = $error;
-     }
--    $error = checkPermissions('../include/private_key.php', "File 'include/private_key.php'");
-+    $error = checkPermissions('/etc/eventum/private_key.php', "File '/etc/eventum/private_key.php'");
-     if (!empty($error)) {
-         $errors[] = $error;
-     }
-@@ -276,8 +276,8 @@
- 
-     clearstatcache();
-     // check if config.inc.php in the root directory is writable
--    if (!is_writable('../config.inc.php')) {
--        return "The file 'config.inc.php' in Eventum's root directory needs to be writable by the web server user. Please correct this problem and try again.";
-+    if (!is_writable('/etc/eventum/config.php')) {
-+        return "The file '/etc/eventum/config.php' needs to be writable by the web server user. Please correct this problem and try again.";
-     }
-     // gotta check and see if the provided installation path really exists...
-     if (!file_exists($HTTP_POST_VARS['path'])) {
-@@ -287,16 +287,16 @@
-     $private_key = '<?php
- $private_key = "' . md5(microtime()) . '";
- ?>';
--    if (!is_writable('../include/private_key.php')) {
--        return "The file 'include/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
-+    if (!is_writable('/etc/eventum/private_key.php')) {
-+        return "The file '/etc/eventum/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
-     }
--    $fp = @fopen('../include/private_key.php', 'w');
-+    $fp = @fopen('/etc/eventum/private_key.php', 'w');
-     if ($fp === FALSE) {
--        return "Could not open the file 'include/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
-+        return "Could not open the file '/etc/eventum/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
-     }
-     $res = fwrite($fp, $private_key);
-     if ($fp === FALSE) {
--        return "Could not write the configuration information to 'include/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
-+        return "Could not write the configuration information to '/etc/eventum/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
-     }
-     fclose($fp);
-     // check if we can connect
-@@ -425,23 +425,8 @@
-     $tpl->assign('is_imap_enabled', function_exists('imap_open'));
- }
- 
--
--$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);
--$pieces = explode("/", $full_url);
--$relative_url = array();
--$relative_url[] = '';
--foreach ($pieces as $piece) {
--    if ((!empty($piece)) && ($piece != 'setup')) {
--        $relative_url[] = $piece;
--    }
--}
--$relative_url[] = '';
--$relative_url = implode("/", $relative_url);
--
--if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {
--    $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);
--}
--$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;
-+$installation_path = "/usr/share/eventum";
-+$relative_url = "/eventum/";
- 
- $tpl->assign("phpversion", phpversion());
- $tpl->assign("rel_url", $relative_url);
---- ./index.php~	2005-04-22 18:33:06.556398818 +0300
-+++ ./index.php	2005-04-22 18:33:07.885180913 +0300
-@@ -33,8 +33,8 @@
- include_once(APP_INC_PATH . "db_access.php");
- 
- // check if templates_c is writable by the web server user
--if (!Misc::isWritableDirectory(APP_PATH . 'templates_c')) {
--    $errors = array("Directory 'templates_c' is not writable.");
-+if (!Misc::isWritableDirectory('/var/cache/eventum')) {
-+    $errors = array("Directory '/var/cache/eventum' is not writable.");
-     Misc::displayRequirementErrors($errors);
-     exit;
- }
---- ../include/class.support.php~	2005-07-10 15:40:57.000000000 +0300
-+++ ../include/class.support.php	2005-07-14 22:47:58.665843734 +0300
-@@ -259,7 +259,7 @@
-      */
-     function saveRoutedEmail($message)
-     {
--        $path = APP_PATH . "misc/routed_emails/";
-+        $path = "/var/lib/eventum/routed_emails/";
-         list($usec,) = explode(" ", microtime());
-         $filename = date('dmY.His.') . $usec . '.email.txt';
-         $fp = @fopen($path . $filename, 'w');
---- ../setup/index.php~	2005-07-26 18:49:37.000000000 +0300
-+++ ../setup/index.php	2005-07-26 19:12:57.000000000 +0300
-@@ -213,11 +213,11 @@
-     exit;
- }
- 
--include_once("../include/Smarty/Smarty.class.php");
-+include_once("/usr/share/pear/Smarty/Smarty.class.php");
- 
- $tpl = new Smarty();
--$tpl->template_dir = '../templates/en';
--$tpl->compile_dir = "../templates_c";
-+$tpl->template_dir = '/usr/share/eventum/templates/en';
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';
- 
- function replace_table_prefix($str)
-@@ -417,7 +417,7 @@
-         $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false", $config_contents);
-     }
- 
--    $fp = @fopen('../config.inc.php', 'w');
-+    $fp = @fopen('/etc/eventum/config.php', 'w');
-     if ($fp === FALSE) {
-         return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
-     }
---- eventum-1.5.5/setup/index.php~	2005-07-26 20:22:06.000000000 +0300
-+++ eventum-1.5.5/setup/index.php	2005-07-26 20:35:31.000000000 +0300
-@@ -198,13 +198,7 @@
-     return $html;
- }
- 
--if (stristr(PHP_OS, 'darwin')) {
--    ini_set("include_path", ".:./../include/pear/");
--} elseif (stristr(PHP_OS, 'win')) {
--    ini_set("include_path", ".;./../include/pear/");
--} else {
--    ini_set("include_path", ".:./../include/pear/");
--}
-+ini_set("include_path", ".:../../include/pear/");
- include_once("File/Util.php");
- 
- $html = checkRequirements();
---- eventum-20051130/include/class.template.php~	2005-11-30 17:51:55.000000000 +0200
-+++ eventum-20051130/include/class.template.php	2005-11-30 17:53:15.000000000 +0200
-@@ -61,6 +61,7 @@
-         $this->smarty = new Smarty;
-         $this->smarty->template_dir = APP_TPL_PATH . APP_CURRENT_LANG;
-         $this->smarty->compile_dir = "/var/cache/eventum";
-+        $this->smarty->plugins_dir  = array('/usr/share/eventum/include/smarty', 'plugins');
-         $this->smarty->config_dir = '';
-         $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
-         $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
---- ./include/class.misc.php	2005-10-26 17:17:17.000000000 +0300
-+++ /tmp/class.misc.php	2005-10-26 17:30:12.000000000 +0300
-@@ -607,7 +607,7 @@
+--- 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
       */
-     function highlightQuotedReply($text)
-     {
--        include_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
-+        include_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
-         return smarty_modifier_highlight_quoted($text);
-     }
+-    private const STORAGE_PATH = Paths::APP_PATH . '/var/storage/';
++    private const STORAGE_PATH = '/var/lib/eventum/storage/';
  
+     /**
+      * @var MountManager