X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-paths.patch;h=447d913885f1eb78c6edfff8ff8990b5e1bd132d;hb=f56655e1e63580a9b514b743552ebedff919fc8c;hp=ecd7446a95c1ed086814e56622b99950efec1576;hpb=643718e71a59ab8fb51b4dbb6c037b8715de3745;p=packages%2Feventum.git diff --git a/eventum-paths.patch b/eventum-paths.patch index ecd7446..447d913 100644 --- a/eventum-paths.patch +++ b/eventum-paths.patch @@ -1,149 +1,156 @@ ---- eventum-1.4.orig/setup/config.inc.php 2005-01-25 23:42:55.000000000 +0200 -+++ eventum-1.4/setup/config.inc.php 2005-01-25 23:57:55.000000000 +0200 -@@ -58,15 +58,9 @@ - @define("APP_TPL_PATH", APP_PATH . "templates/"); - @define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/"); - @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/"); --@define("APP_LOG_PATH", APP_PATH . "logs/"); --@define("APP_LOCKS_PATH", APP_PATH . "locks/"); --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); --} -+@define("APP_LOG_PATH", "/var/log/eventum/"); -+@define("APP_LOCKS_PATH", "/var/run/eventum/"); -+ini_set("include_path", ".:" . APP_PEAR_PATH); - - @define("APP_SETUP_PATH", APP_PATH); - @define("APP_SETUP_FILE", APP_SETUP_PATH . "setup.conf.php"); ---- ./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.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 ++++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 +@@ -27,7 +27,7 @@ + // | Authors: Elan Ruusamäe | + // +----------------------------------------------------------------------+ + +-if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) { ++if (!file_exists('/etc/webapps/eventum/config.php') || !filesize('/etc/webapps/eventum/config.php')) { + Header('Location: setup/'); + exit(0); + } +@@ -47,7 +47,7 @@ + // define base path + define('APP_PATH', realpath(dirname(__FILE__))); + if (!defined('APP_CONFIG_PATH')) { +- define('APP_CONFIG_PATH', APP_PATH . '/config'); ++ define('APP_CONFIG_PATH', '/etc/webapps/eventum'); } - // 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')) { -- 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.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-1.4.orig/setup/index.php 2005-01-25 23:42:55.000000000 +0200 -+++ eventum-1.4/setup/index.php 2005-01-25 23:46:14.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; + // include local site config. may override any default +--- eventum-3.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 ++++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 +@@ -78,7 +78,7 @@ + } + + if (!defined('APP_TPL_COMPILE_PATH')) { +- define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); ++ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); + } + + if (!defined('APP_INC_PATH')) { +@@ -81,7 +77,7 @@ + } + + if (!defined('APP_LOCKS_PATH')) { +- define('APP_LOCKS_PATH', APP_PATH . '/locks'); ++ define('APP_LOCKS_PATH', '/var/run/eventum/'); + } + + if (!defined('APP_SQL_PATCHES_PATH')) { +@@ -89,7 +85,7 @@ + } + + if (!defined('APP_LOG_PATH')) { +- define('APP_LOG_PATH', APP_PATH . '/logs'); ++ define('APP_LOG_PATH', '/var/log/eventum'); + } + + if (!defined('APP_ROUTED_MAILS_SAVEDIR')) { +--- 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('../logs/errors.log', "File 'logs/errors.log'"); -+ $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'"); + +- $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; - } -@@ -203,7 +203,7 @@ +--- eventum-2.2/irc/eventum-irc-bot.php~ 2009-07-23 14:03:41.422211655 +0300 ++++ eventum-2.2/irc/eventum-irc-bot.php 2009-07-23 13:54:22.000000000 +0300 +@@ -32,7 +32,7 @@ + + ini_set('memory_limit', '1024M'); + +-require_once dirname(__FILE__) . '/../init.php'; ++require_once '/usr/share/eventum/init.php'; + + if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) { + fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n"); +--- 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-2.3.3/config/sphinx.conf.php~ 2012-06-27 14:59:39.000000000 +0300 ++++ eventum-2.3.3/config/sphinx.conf.php 2012-06-27 15:04:52.928810689 +0300 +@@ -26,7 +26,7 @@ + // | Authors: Bryan Alsdorf | + // | Authors: Elan Ruusamäe | + // +----------------------------------------------------------------------+ +-require_once dirname(__FILE__) . "/../init.php"; ++require_once '/usr/share/eventum/init.php'; - $tpl = new Smarty(); - $tpl->template_dir = '../templates/en'; --$tpl->compile_dir = "../templates_c"; -+$tpl->compile_dir = "/var/cache/eventum"; - $tpl->config_dir = ''; + if (!defined('SPHINX_LOG_PATH')) { + define('SPHINX_LOG_PATH', '/var/log/sphinx/'); +--- eventum-3.0.0-285-g72865b8/autoload.php~ 2015-04-20 23:14:34.904789824 +0300 ++++ eventum-3.0.0-285-g72865b8/autoload.php 2015-04-20 23:22:44.240566443 +0300 +@@ -54,11 +54,11 @@ + */ - function replace_table_prefix($str) -@@ -417,23 +417,8 @@ - $tpl->assign('is_imap_enabled', function_exists('imap_open')); + if (!defined('APP_PEAR_PATH')) { +- define('APP_PEAR_PATH', ''); ++ define('APP_PEAR_PATH', '/usr/share/pear'); } -- --$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.orig/setup/config.inc.php 2005-01-25 23:42:55.000000000 +0200 -+++ eventum-1.4/setup/config.inc.php 2005-01-25 23:57:55.000000000 +0200 -@@ -58,15 +58,9 @@ - @define("APP_TPL_PATH", APP_PATH . "templates/"); - @define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/"); - @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/"); --@define("APP_LOG_PATH", APP_PATH . "logs/"); --@define("APP_LOCKS_PATH", APP_PATH . "locks/"); --if (stristr(PHP_OS, 'darwin')) { -+@define("APP_LOG_PATH", "/var/log/eventum/"); -+@define("APP_LOCKS_PATH", "/var/run/eventum/"); - 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); --} - - @define("APP_SETUP_PATH", APP_PATH); - @define("APP_SETUP_FILE", APP_SETUP_PATH . "setup.conf.php"); + if (!defined('APP_PHP_PATH')) { +- define('APP_PHP_PATH', ''); ++ define('APP_PHP_PATH', '/usr/share/php'); + } + + if (!defined('APP_FONTS_PATH')) { +@@ -66,7 +66,7 @@ + } + + if (!defined('APP_SPHINXAPI_PATH')) { +- define('APP_SPHINXAPI_PATH', ''); ++ define('APP_SPHINXAPI_PATH', APP_PHP_PATH); + } + + if (!defined('APP_PHP_GETTEXT_PATH')) { +@@ -74,7 +74,7 @@ + } + + if (!defined('APP_SMARTY_PATH')) { +- define('APP_SMARTY_PATH', ''); ++ define('APP_SMARTY_PATH', APP_PHP_PATH . '/Smarty3'); + } + + // add PEAR to the include path, required by PEAR classes