eventum-paths.patch

   1 --- eventum-1.4.d/setup/config.inc.php  2005-01-05 01:05:58.000000000 +0200
   2 +++ eventum-1.4/setup/config.inc.php    2005-01-25 17:09:33.000000000 +0200
   3 @@ -54,12 +54,12 @@
   4  }
   5  @define("APP_PATH", $app_path);
   6  @define("APP_INC_PATH", APP_PATH . "include/");
   7 -@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
   8 +@define("APP_PEAR_PATH", "/usr/share/pear/");
   9  @define("APP_TPL_PATH", APP_PATH . "templates/");
  10 -@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");
  11 +@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");
  12  @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");
  13 -@define("APP_LOG_PATH", APP_PATH . "logs/");
  14 -@define("APP_LOCKS_PATH", APP_PATH . "locks/");
  15 +@define("APP_LOG_PATH", "/var/log/eventum/");
  16 +@define("APP_LOCKS_PATH", "/var/run/eventum/");
  17  if (stristr(PHP_OS, 'darwin')) {
  18      ini_set("include_path", ".:" . APP_PEAR_PATH);
  19  } elseif (stristr(PHP_OS, 'win')) {
  20 --- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200
  21 +++ ./misc/cli/eventum  2005-01-19 03:02:40.119100405 +0200
  22 @@ -11,7 +11,7 @@
  23  //
  24  // @(#) $Id$
  25  //
  26 -include_once("config.inc.php");
  27 +include_once("/etc/eventum/cli.php");
  28  include_once(APP_INC_PATH . "class.command_line.php");
  29  include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  30
  31 --- eventum-1.4/misc/cli/config.inc.php~        2005-01-05 01:06:01.000000000 +0200
  32 +++ eventum-1.4/misc/cli/config.inc.php 2005-01-19 03:25:10.000000000 +0200
  33 @@ -45,7 +45,7 @@
  34  }
  35
  36  // definitions of path related variables
  37 -@define("APP_PATH", dirname(__FILE__) . '/');
  38 +@define("APP_PATH", '/usr/share/eventum/misc/cli/');
  39  @define("APP_INC_PATH", APP_PATH . "include/");
  40  @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
  41  if (stristr(PHP_OS, 'darwin')) {
  42 @@ -57,4 +57,4 @@
  43  }
  44
  45  @define("APP_BENCHMARK", false);
  46 -?>
  47 \ No newline at end of file
  48 +?>
  49 --- eventum-1.4.c/include/class.template.php    2005-01-05 01:05:59.000000000 +0200
  50 +++ eventum-1.4/include/class.template.php      2005-01-24 17:22:35.000000000 +0200
  51 @@ -60,7 +60,7 @@
  52      {
  53          $this->smarty = new Smarty;
  54          $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;
  55 -        $this->smarty->compile_dir = APP_PATH . "templates_c";
  56 +        $this->smarty->compile_dir = "/var/cache/eventum";
  57          $this->smarty->config_dir = '';
  58          $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));
  59      }
  60 --- index.php   2005-01-05 01:05:52.000000000 +0200
  61 +++ eventum-1.4/setup/index.php 2005-01-24 17:47:16.000000000 +0200
  62 @@ -114,15 +114,15 @@
  63      if (ini_get('allow_call_time_pass_reference') != "1") {
  64          $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
  65      }
  66 -    $error = checkPermissions('../locks', "Directory 'locks'", TRUE);
  67 +    $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
  68      if (!empty($error)) {
  69          $errors[] = $error;
  70      }
  71 -    $error = checkPermissions('../logs', "Directory 'logs'", TRUE);
  72 +    $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
  73      if (!empty($error)) {
  74          $errors[] = $error;
  75      }
  76 -    $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);
  77 +    $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE);
  78      if (!empty($error)) {
  79          $errors[] = $error;
  80      }
  81 @@ -130,7 +130,7 @@
  82      if (!empty($error)) {
  83          $errors[] = $error;
  84      }
  85 -    $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");
  86 +    $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
  87      if (!empty($error)) {
  88          $errors[] = $error;
  89      }
  90 @@ -199,11 +199,11 @@
  91  }
  92
  93  ini_set("include_path", '.');
  94 -include_once("../include/Smarty/Smarty.class.php");
  95 +include_once('/usr/share/pear/Smarty/Smarty.class.php');
  96
  97  $tpl = new Smarty();
  98  $tpl->template_dir = '../templates/en';
  99 -$tpl->compile_dir = "../templates_c";
 100 +$tpl->compile_dir = "/var/cache/eventum";
 101  $tpl->config_dir = '';
 102
 103  function replace_table_prefix($str)
 104 @@ -417,23 +417,8 @@
 105      $tpl->assign('is_imap_enabled', function_exists('imap_open'));
 106  }
 107
 108 -
 109 -$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);
 110 -$pieces = explode("/", $full_url);
 111 -$relative_url = array();
 112 -$relative_url[] = '';
 113 -foreach ($pieces as $piece) {
 114 -    if ((!empty($piece)) && ($piece != 'setup')) {
 115 -        $relative_url[] = $piece;
 116 -    }
 117 -}
 118 -$relative_url[] = '';
 119 -$relative_url = implode("/", $relative_url);
 120 -
 121 -if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {
 122 -    $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);
 123 -}
 124 -$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;
 125 +$installation_path = "/usr/share/eventum";
 126 +$relative_url = "/eventum/";
 127
 128  $tpl->assign("phpversion", phpversion());
 129  $tpl->assign("rel_url", $relative_url);
 130 --- ./misc/cli/config.inc.php~  2005-01-24 17:49:25.000000000 +0200
 131 +++ ./misc/cli/config.inc.php   2005-01-25 15:52:07.000000000 +0200
 132 @@ -47,7 +47,7 @@
 133  // definitions of path related variables
 134  @define("APP_PATH", '/usr/share/eventum/misc/cli/');
 135  @define("APP_INC_PATH", APP_PATH . "include/");
 136 -@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
 137 +@define("APP_PEAR_PATH", "/usr/share/pear/");
 138  if (stristr(PHP_OS, 'darwin')) {
 139      ini_set("include_path", ".:" . APP_PEAR_PATH);
 140  } elseif (stristr(PHP_OS, 'win')) {
 141 --- ./misc/cli/eventum~ 2005-01-24 17:49:25.000000000 +0200
 142 +++ ./misc/cli/eventum  2005-01-25 15:48:56.000000000 +0200
 143 @@ -13,7 +13,7 @@
 144  //
 145  include_once("/etc/eventum/cli.php");
 146  include_once(APP_INC_PATH . "class.command_line.php");
 147 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
 148 +include_once(APP_PEAR_PATH . "XML/RPC.php");
 149
 150  list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
 151  if (empty($port)) {
 152 --- ./misc/cli/include/class.command_line.php   2005-01-05 01:06:03.000000000 +0200
 153 +++ ./misc/cli/include/class.command_line.php   2005-01-25 15:48:56.000000000 +0200
 154 @@ -29,7 +29,7 @@
 155  //
 156
 157  include_once(APP_INC_PATH . "class.misc.php");
 158 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
 159 +include_once(APP_PEAR_PATH . "XML/RPC.php");
 160
 161  $_displayed_confirmation = false;
 162
 163 --- ./rpc/xmlrpc.php~   2005-01-05 01:06:19.000000000 +0200
 164 +++ ./rpc/xmlrpc.php    2005-01-25 16:35:14.000000000 +0200
 165 @@ -41,7 +41,7 @@
 166  include_once(APP_INC_PATH . "class.template.php");
 167  include_once(APP_INC_PATH . "class.customer.php");
 168  error_reporting(0);
 169 -include_once(APP_PEAR_PATH . "XML_RPC/Server.php");
 170 +include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
 171
 172  function authenticate($email, $password)
 173  {
 174 --- ./include/class.notification.php~   2005-01-05 01:06:19.000000000 +0200
 175 +++ ./include/class.notification.php    2005-01-25 16:41:23.000000000 +0200
 176 @@ -613,9 +613,9 @@
 177          }
 178          if ($old["iss_description"] != $new["description"]) {
 179              // need real diff engine here
 180 -            include_once 'Text_Diff/Diff.php';
 181 -            include_once 'Text_Diff/Diff/Renderer.php';
 182 -            include_once 'Text_Diff/Diff/Renderer/unified.php';
 183 +            include_once 'Text/Diff.php';
 184 +            include_once 'Text/Diff/Renderer.php';
 185 +            include_once 'Text/Diff/Renderer/unified.php';
 186              $old['iss_description'] = explode("\n", $old['iss_description']);
 187              $new['description'] = explode("\n", $new['description']);
 188              $diff = &new Text_Diff($old["iss_description"], $new["description"]);