]> git.pld-linux.org Git - packages/eventum.git/blobdiff - eventum-paths.patch
up to 3.6.0-26-g1819e751e
[packages/eventum.git] / eventum-paths.patch
index 2a01acca7eaae2912f5a6ad92d21218dd70e1e14..c563eafbf187d4481e3bdd16e47804ef9c5c44b0 100644 (file)
---- eventum-1.4.d/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php   2005-01-25 17:09:33.000000000 +0200
-@@ -54,12 +54,12 @@
- }
- @define("APP_PATH", $app_path);
- @define("APP_INC_PATH", APP_PATH . "include/");
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
-+@define("APP_PEAR_PATH", "/usr/share/pear/");
- @define("APP_TPL_PATH", APP_PATH . "templates/");
--@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");
-+@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");
- @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");
--@define("APP_LOG_PATH", APP_PATH . "logs/");
--@define("APP_LOCKS_PATH", APP_PATH . "locks/");
-+@define("APP_LOG_PATH", "/var/log/eventum/");
-+@define("APP_LOCKS_PATH", "/var/run/eventum/");
- if (stristr(PHP_OS, 'darwin')) {
-     ini_set("include_path", ".:" . APP_PEAR_PATH);
- } elseif (stristr(PHP_OS, 'win')) {
---- ./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-3.3.4-365-g65c5538f/globals.php~   2018-03-13 10:49:12.000000000 +0200
++++ eventum-3.3.4-365-g65c5538f/globals.php    2018-03-13 23:22:58.153814696 +0200
+@@ -22,7 +22,7 @@
  
---- 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 @@
- }
+ // define other paths
+ define('APP_TPL_PATH', APP_PATH . '/templates');
+-define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache');
+-define('APP_LOG_PATH', APP_VAR_PATH . '/log');
++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_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();
  
- // definitions of path related variables
--@define("APP_PATH", dirname(__FILE__) . '/');
-+@define("APP_PATH", '/usr/share/eventum/misc/cli/');
- @define("APP_INC_PATH", APP_PATH . "include/");
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
- if (stristr(PHP_OS, 'darwin')) {
-@@ -57,4 +57,4 @@
- }
+-        $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
  
- @define("APP_BENCHMARK", false);
--?>
-\ No newline at end of file
-+?>
---- 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 @@
-     {
-         $this->smarty = new Smarty;
-         $this->smarty->template_dir = APP_PATH . "templates/" . 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', 'processText'));
-     }
---- index.php  2005-01-05 01:05:52.000000000 +0200
-+++ eventum-1.4/setup/index.php        2005-01-24 17:47:16.000000000 +0200
-@@ -114,15 +114,15 @@
-     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;
-     }
-@@ -130,7 +130,7 @@
-     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;
-     }
-@@ -199,11 +199,11 @@
- }
+-require_once __DIR__ . '/../init.php';
++require_once '/usr/share/eventum/init.php';
  
- ini_set("include_path", '.');
--include_once("../include/Smarty/Smarty.class.php");
-+include_once('/usr/share/pear/Smarty/Smarty.class.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/';
  
- $tpl = new Smarty();
- $tpl->template_dir = '../templates/en';
--$tpl->compile_dir = "../templates_c";
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';
- function replace_table_prefix($str)
-@@ -417,23 +417,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);
---- ./misc/cli/config.inc.php~ 2005-01-24 17:49:25.000000000 +0200
-+++ ./misc/cli/config.inc.php  2005-01-25 15:52:07.000000000 +0200
-@@ -47,7 +47,7 @@
- // definitions of path related variables
- @define("APP_PATH", '/usr/share/eventum/misc/cli/');
- @define("APP_INC_PATH", APP_PATH . "include/");
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
-+@define("APP_PEAR_PATH", "/usr/share/pear/");
- if (stristr(PHP_OS, 'darwin')) {
-     ini_set("include_path", ".:" . APP_PEAR_PATH);
- } elseif (stristr(PHP_OS, 'win')) {
---- ./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;
---- ./rpc/xmlrpc.php~  2005-01-05 01:06:19.000000000 +0200
-+++ ./rpc/xmlrpc.php   2005-01-25 16:35:14.000000000 +0200
-@@ -41,7 +41,7 @@
- include_once(APP_INC_PATH . "class.template.php");
- include_once(APP_INC_PATH . "class.customer.php");
- error_reporting(0);
--include_once(APP_PEAR_PATH . "XML_RPC/Server.php");
-+include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
- function authenticate($email, $password)
- {
---- ./include/class.notification.php~  2005-01-05 01:06:19.000000000 +0200
-+++ ./include/class.notification.php   2005-01-25 16:41:23.000000000 +0200
-@@ -613,9 +613,9 @@
-         }
-         if ($old["iss_description"] != $new["description"]) {
-             // need real diff engine here
--            include_once 'Text_Diff/Diff.php';
--            include_once 'Text_Diff/Diff/Renderer.php';
--            include_once 'Text_Diff/Diff/Renderer/unified.php';
-+            include_once 'Text/Diff.php';
-+            include_once 'Text/Diff/Renderer.php';
-+            include_once 'Text/Diff/Renderer/unified.php';
-             $old['iss_description'] = explode("\n", $old['iss_description']);
-             $new['description'] = explode("\n", $new['description']);
-             $diff = &new Text_Diff($old["iss_description"], $new["description"]);
+     /**
+      * @var MountManager
This page took 0.151567 seconds and 4 git commands to generate.