]> git.pld-linux.org Git - packages/eventum.git/blobdiff - eventum-paths.patch
up to 3.1.6
[packages/eventum.git] / eventum-paths.patch
index fd212e0c50f485dc1f9a16d0b4c94dbf6944c14a..05fa573e55cd4e415b654030ece5e2bd21606e57 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 @@
- }\r
- @define("APP_PATH", $app_path);\r
- @define("APP_INC_PATH", APP_PATH . "include/");\r
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
-+@define("APP_PEAR_PATH", "/usr/share/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
---- ./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-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") {\r
-         $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";\r
-     }\r
--    $error = checkPermissions('../locks', "Directory 'locks'", TRUE);\r
-+    $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
-     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
--    $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);\r
-+    $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/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
-@@ -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";
-+$relative_url = "/eventum/";
\r
- $tpl->assign("phpversion", phpversion());\r
- $tpl->assign("rel_url", $relative_url);\r
---- ./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\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
-+@define("APP_PEAR_PATH", "/usr/share/pear/");
- if (stristr(PHP_OS, 'darwin')) {\r
-     ini_set("include_path", ".:" . APP_PEAR_PATH);\r
- } elseif (stristr(PHP_OS, 'win')) {\r
---- ./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 @@
- //\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
-+include_once(APP_PEAR_PATH . "XML/RPC.php");\r
\r
- list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();\r
- if (empty($port)) {\r
---- ./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 @@
- //\r
\r
- include_once(APP_INC_PATH . "class.misc.php");\r
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
-+include_once(APP_PEAR_PATH . "XML/RPC.php");\r
\r
- $_displayed_confirmation = false;\r
\r
---- ./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");\r
- include_once(APP_INC_PATH . "class.customer.php");\r
- error_reporting(0);\r
--include_once(APP_PEAR_PATH . "XML_RPC/Server.php");\r
-+include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
\r
- function authenticate($email, $password)\r
- {\r
---- ./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 @@
-         }\r
-         if ($old["iss_description"] != $new["description"]) {\r
-             // need real diff engine here\r
--            include_once 'Text_Diff/Diff.php';\r
--            include_once 'Text_Diff/Diff/Renderer.php';\r
--            include_once 'Text_Diff/Diff/Renderer/unified.php';\r
-+            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']);\r
-             $new['description'] = explode("\n", $new['description']);\r
-             $diff = &new Text_Diff($old["iss_description"], $new["description"]);\r
+--- eventum-3.0.3-287-ge48a790/init.php~       2015-10-26 21:42:14.000000000 +0200
++++ eventum-3.0.3-287-ge48a790/init.php        2015-10-26 21:46:47.983157509 +0200
+@@ -76,9 +76,9 @@
+ $define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
+ $define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+ $define('APP_TPL_PATH', APP_PATH . '/templates');
+-$define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache');
+-$define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock');
+-$define('APP_LOG_PATH', APP_VAR_PATH . '/log');
++$define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
++$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.3-287-ge48a790/htdocs/setup/index.php~ 2015-10-26 21:45:35.367554219 +0200
++++ eventum-3.0.3-287-ge48a790/htdocs/setup/index.php  2015-10-26 21:47:31.775849576 +0200
+@@ -47,10 +47,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_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');
+ 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-3.0.8-100-g3543f89/src/Command/MonitorCommand.php~ 2016-01-31 18:24:19.000000000 +0200
++++ eventum-3.0.8-100-g3543f89/src/Command/MonitorCommand.php  2016-02-01 00:16:28.751423105 +0200
+@@ -31,17 +31,17 @@
+         $required_files = array(
+             APP_CONFIG_PATH . '/config.php' => [
+                 'check_owner' => true,
+-                'owner' => 'apache',
++                'owner' => 'root',
+                 'check_group' => true,
+-                'group' => 'apache',
++                'group' => 'http',
+                 'check_permission' => true,
+                 'permission' => 640,
+             ],
+             APP_CONFIG_PATH . '/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/');
This page took 0.078368 seconds and 4 git commands to generate.