- use system PEAR for -cli

[packages/eventum.git] / eventum-paths.patch

--- 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-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/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('/usr/share/pear/XML/RPC.php');
 \r
 list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();\r
 if (empty($port)) {\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/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('/usr/share/pear/XML/RPC.php');
 \r
 $_displayed_confirmation = false;\r
 \r