- merged file patches

Changed files:
    eventum-paths.patch -> 1.5

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 0b0d201e18086deaaf89916c8b0ebf46a9ce44ec..94efa258204d7d973a3eb7e2fc8a100251cacfad 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,31 +1,3 @@
---- 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'));\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";\r
-+$relative_url = "/eventum/";\r
- \r
- $tpl->assign("phpversion", phpversion());\r
- $tpl->assign("rel_url", $relative_url);\r
 --- 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 @@
@@ -89,9 +61,14 @@
          $this->smarty->config_dir = '';\r
          $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));\r
      }\r
---- index.php  2005-01-24 17:39:51.000000000 +0200
-+++ eventum-1.4/setup/index.php        2005-01-24 17:42:33.000000000 +0200
-@@ -118,7 +118,7 @@
+--- 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
@@ -100,6 +77,11 @@
      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
@@ -123,3 +105,29 @@
  $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