]> git.pld-linux.org Git - packages/eventum.git/blobdiff - eventum-paths.patch
package new files
[packages/eventum.git] / eventum-paths.patch
index 0b0d201e18086deaaf89916c8b0ebf46a9ce44ec..8384539acd786ec1e444ad97423ae677cc9eaf58 100644 (file)
---- 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.c/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php   2005-01-24 17:21:52.000000000 +0200
-@@ -56,10 +56,10 @@
- @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_LOCKS_PATH", APP_PATH . "locks/");\r
-+@define("APP_LOG_PATH", "/var/log/eventum/");\r
-+@define("APP_LOCKS_PATH", "/var/run/eventum/");\r
- if (stristr(PHP_OS, 'darwin')) {\r
-     ini_set("include_path", ".:" . APP_PEAR_PATH);\r
- } elseif (stristr(PHP_OS, 'win')) {\r
-@@ -153,4 +153,4 @@
\r
- // set charset\r
- header("content-type: text/html;charset=" . APP_CHARSET);\r
--?>
-\ No newline at end of file
-+?>\r
---- ./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 @@
- //\r
- // @(#) $Id$\r
- //\r
--include_once("config.inc.php");\r
-+include_once("/etc/eventum/cli.php");\r
- include_once(APP_INC_PATH . "class.command_line.php");\r
- include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
\r
---- eventum-1.4/misc/cli/config.inc.php~       2005-01-05 01:06:01.000000000 +0200
-+++ eventum-1.4/misc/cli/config.inc.php        2005-01-19 03:25:10.000000000 +0200
-@@ -45,7 +45,7 @@
- }\r
\r
- // definitions of path related variables\r
--@define("APP_PATH", dirname(__FILE__) . '/');\r
-+@define("APP_PATH", '/usr/share/eventum/misc/cli/');\r
- @define("APP_INC_PATH", APP_PATH . "include/");\r
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
- if (stristr(PHP_OS, 'darwin')) {\r
-@@ -57,4 +57,4 @@
- }\r
\r
- @define("APP_BENCHMARK", false);\r
--?>
-\ No newline at end of file
-+?>\r
---- eventum-1.4.c/include/class.template.php   2005-01-05 01:05:59.000000000 +0200
-+++ eventum-1.4/include/class.template.php     2005-01-24 17:22:35.000000000 +0200
-@@ -60,7 +60,7 @@
-     {\r
-         $this->smarty = new Smarty;\r
-         $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;\r
--        $this->smarty->compile_dir = APP_PATH . "templates_c";\r
-+        $this->smarty->compile_dir = "/var/cache/eventum";\r
-         $this->smarty->config_dir = '';\r
-         $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));\r
-     }\r
---- index.php  2005-01-24 17:39:51.000000000 +0200
-+++ eventum-1.4/setup/index.php        2005-01-24 17:42:33.000000000 +0200
-@@ -118,7 +118,7 @@
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
--    $error = checkPermissions('../logs', "Directory 'logs'", TRUE);\r
-+    $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
-@@ -130,7 +130,7 @@
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
--    $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");\r
-+    $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
-@@ -199,11 +199,11 @@
- }\r
\r
- ini_set("include_path", '.');\r
--include_once("../include/Smarty/Smarty.class.php");\r
-+include_once('/usr/share/pear/Smarty/Smarty.class.php');
\r
- $tpl = new Smarty();\r
- $tpl->template_dir = '../templates/en';\r
--$tpl->compile_dir = "../templates_c";\r
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';\r
\r
- function replace_table_prefix($str)\r
+--- eventum-3.6.7-73-ga12094613/globals.php    2019-05-17 00:29:37.284776088 +0300
++++ eventum-3.6.7-73-ga12094613/globals.php    2019-05-17 00:30:55.133655597 +0300
+@@ -22,10 +22,8 @@
+-// /var path for writable data
+-define('APP_VAR_PATH', APP_PATH . '/var');
+-define('APP_CACHE_PATH', APP_VAR_PATH . '/cache');
++define('APP_CACHE_PATH', '/var/cache/eventum');
+ // define other paths
+ define('APP_TPL_PATH', APP_PATH . '/templates');
+ define('APP_TPL_COMPILE_PATH', APP_CACHE_PATH . '/smarty');
+-define('APP_LOG_PATH', APP_VAR_PATH . '/log');
++define('APP_LOG_PATH', '/var/log/eventum');
+ define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
+-define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock');
++define('APP_LOCKS_PATH', '/var/run/eventum');
+--- eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php~     2019-01-23 01:50:42.000000000 +0200
++++ eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php      2019-01-24 22:18:56.047816296 +0200
+@@ -64,10 +64,6 @@
+         $configPath = Setup::getConfigPath();
+         $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.5.0/src/Console/Command/MonitorCommand.php~      2018-05-20 17:33:34.000000000 +0300
++++ eventum-3.5.0/src/Console/Command/MonitorCommand.php       2018-05-21 01:42:21.463354763 +0300
+@@ -47,17 +47,17 @@
+         $required_files = [
+             $configPath . '/config.php' => [
+                 'check_owner' => true,
+-                'owner' => 'apache',
++                'owner' => 'root',
+                 'check_group' => true,
+-                'group' => 'apache',
++                'group' => 'http',
+                 'check_permission' => true,
+                 'permission' => 640,
+             ],
+             $configPath . '/setup.php' => [
+                 'check_owner' => true,
+-                'owner' => 'apache',
++                'owner' => 'root',
+                 'check_group' => true,
+-                'group' => 'apache',
++                'group' => 'http',
+                 'check_permission' => true,
+                 'permission' => 660,
+                 'check_filesize' => true,
+--- eventum-3.1.5/config/sphinx.conf.php~      2016-11-13 12:05:37.000000000 +0200
++++ eventum-3.1.5/config/sphinx.conf.php       2016-11-23 03:10:05.855040510 +0200
+@@ -1,7 +1,7 @@
+ #!/usr/bin/php
+ <?php
+-require_once __DIR__ . '/../init.php';
++require_once '/usr/share/eventum/init.php';
+ if (!defined('SPHINX_LOG_PATH')) {
+     define('SPHINX_LOG_PATH', '/var/log/sphinx/');
+--- eventum-3.3.1/src/Attachment/StorageManager.php~   2017-10-08 15:53:56.000000000 +0300
++++ eventum-3.3.1/src/Attachment/StorageManager.php    2017-10-09 23:22:00.162142738 +0300
+@@ -32,7 +32,7 @@
+      *
+      * @var string
+      */
+-    const STORAGE_PATH = APP_PATH . '/var/storage/';
++    const STORAGE_PATH = '/var/lib/eventum/storage/';
+     /**
+      * @var MountManager
+--- eventum-3.7.1/src/Kernel.php~      2019-04-06 17:42:28.000000000 +0300
++++ eventum-3.7.1/src/Kernel.php       2019-06-02 23:02:32.198743341 +0300
+@@ -87,11 +87,11 @@
+     public function getCacheDir(): string
+     {
+-        return "{$this->rootDir}/var/cache/{$this->environment}";
++        return APP_CACHE_PATH . '/' . $this->environment;
+     }
+     public function getLogDir(): string
+     {
+-        return "{$this->rootDir}/var/log";
++        return APP_LOG_PATH;
+     }
+ }
This page took 0.035735 seconds and 4 git commands to generate.