X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-paths.patch;h=76bf178ae2d2687521b10d0bba16a88e2c962ba6;hb=23ad14972a620d07a6b930a51f99d7b3e03a565d;hp=1690469c11ed282bdf85a43553061ff5c9825999;hpb=e1f8c51da53049267b87eba94fd3cb9947f948f6;p=packages%2Feventum.git diff --git a/eventum-paths.patch b/eventum-paths.patch index 1690469..76bf178 100644 --- a/eventum-paths.patch +++ b/eventum-paths.patch @@ -1,91 +1,78 @@ ---- 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')); - } - -- --$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); ---- 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/"); - @define("APP_PEAR_PATH", APP_INC_PATH . "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')) { -@@ -153,4 +153,4 @@ - - // set charset - header("content-type: text/html;charset=" . APP_CHARSET); --?> -\ No newline at end of file -+?> ---- ./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/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 @@ - } - - // 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 @@ - } - - @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')); - } +--- eventum-3.0.3-118-g751b8cc/init.php~ 2015-10-19 22:56:35.000000000 +0300 ++++ eventum-3.0.3-118-g751b8cc/init.php 2015-10-19 23:00:17.390607216 +0300 +@@ -72,10 +72,10 @@ + // define other paths + $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_TPL_COMPILE_PATH', '/var/cache/eventum'); + $define('APP_INC_PATH', APP_PATH . '/lib/eventum'); +-$define('APP_LOCKS_PATH', APP_PATH . '/locks'); +-$define('APP_LOG_PATH', APP_PATH . '/logs'); ++$define('APP_LOCKS_PATH', '/var/run/eventum'); ++$define('APP_LOG_PATH', '/var/log/eventum'); + $define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); + $define('APP_CLI_LOG', APP_LOG_PATH . '/cli.log'); + $define('APP_IRC_LOG', APP_LOG_PATH . '/irc_bot.log'); +--- eventum-3.0.0/htdocs/setup/index.php~ 2015-02-02 20:03:49.507010317 +0200 ++++ eventum-3.0.0/htdocs/setup/index.php 2015-02-02 20:05:00.139257552 +0200 +@@ -44,10 +44,10 @@ + define('APP_CONFIG_PATH', APP_PATH . '/config'); + 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'); + define('APP_LOCAL_PATH', APP_CONFIG_PATH); + + header('Content-Type: text/html; charset=' . APP_CHARSET); +@@ -254,10 +254,6 @@ + $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_SETUP_FILE, "File '" . APP_SETUP_FILE. "'"); + if (!empty($error)) { + $errors[] = $error; +--- eventum/bin/monitor.php 2010-11-24 17:24:23.000000000 +0200 ++++ eventum/bin/monitor.php 2010-11-24 18:23:09.664934996 +0200 +@@ -37,17 +37,17 @@ + $required_files = array( + APP_CONFIG_PATH . '/config.php' => array( + 'check_owner' => true, +- 'owner' => 'apache', ++ 'owner' => 'root', + 'check_group' => true, +- 'group' => 'apache', ++ 'group' => 'http', + 'check_permission' => true, + 'permission' => 640, + ), + APP_CONFIG_PATH . '/setup.php' => array( + 'check_owner' => true, +- 'owner' => 'apache', ++ 'owner' => 'root', + 'check_group' => true, +- 'group' => 'apache', ++ 'group' => 'http', + 'check_permission' => true, + 'permission' => 660, + 'check_filesize' => true, +--- eventum-3.0.3-13-gfefa325/config/sphinx.conf.php~ 2015-10-13 20:00:48.000000000 +0300 ++++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php 2015-10-13 23:34:19.668134549 +0300 +@@ -26,7 +26,7 @@ + // | Authors: Bryan Alsdorf | + // | Authors: Elan Ruusamäe | + // +----------------------------------------------------------------------+ +-require_once __DIR__ . "/../init.php"; ++require_once '/usr/share/eventum/init.php'; + + if (!defined('SPHINX_LOG_PATH')) { + define('SPHINX_LOG_PATH', '/var/log/sphinx/');