eventum-paths.patch

   1 --- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200
   2 +++ ./misc/cli/eventum  2005-01-19 03:02:40.119100405 +0200
   3 @@ -11,7 +11,7 @@
   4  //
   5  // @(#) $Id$
   6  //
   7 -include_once("config.inc.php");
   8 +include_once("/etc/eventum/cli.php");
   9  include_once(APP_INC_PATH . "class.command_line.php");
  10  include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  11
  12 --- eventum-1.4.orig/misc/cli/config.inc.php    2005-01-26 00:00:58.000000000 +0200
  13 +++ eventum-1.4/misc/cli/config.inc.php 2005-01-25 23:57:39.000000000 +0200
  14 @@ -45,16 +45,10 @@
  15  }
  16
  17  // definitions of path related variables
  18 -@define("APP_PATH", dirname(__FILE__) . '/');
  19 +@define("APP_PATH", '/usr/share/eventum/cli/');
  20  @define("APP_INC_PATH", APP_PATH . "include/");
  21  @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
  22 -if (stristr(PHP_OS, 'darwin')) {
  23 -    ini_set("include_path", ".:" . APP_PEAR_PATH);
  24 -} elseif (stristr(PHP_OS, 'win')) {
  25 -    ini_set("include_path", ".;" . APP_PEAR_PATH);
  26 -} else {
  27 -    ini_set("include_path", ".:" . APP_PEAR_PATH);
  28 -}
  29 +ini_set("include_path", ".:" . APP_PEAR_PATH);
  30
  31  @define("APP_BENCHMARK", false);
  32  ?>
  33 --- eventum-1.4/misc/cli/config.inc.php~        2005-02-22 21:35:52.000000000 +0200
  34 +++ eventum-1.4/misc/cli/config.inc.php 2005-02-22 21:44:10.000000000 +0200
  35 @@ -46,9 +46,9 @@
  36
  37  // definitions of path related variables
  38  @define("APP_PATH", '/usr/share/eventum/cli/');
  39 -@define("APP_INC_PATH", APP_PATH . "include/");
  40 +@define("APP_INC_PATH", APP_PATH);
  41  @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
  42  ini_set("include_path", ".:" . APP_PEAR_PATH);
  43
  44  @define("APP_BENCHMARK", false);
  45 -?>
  46 \ No newline at end of file
  47 +?>
  48 --- ./misc/cli/config.inc.php~  2005-02-22 21:49:37.000000000 +0200
  49 +++ ./misc/cli/config.inc.php   2005-02-22 21:50:01.000000000 +0200
  50 @@ -47,7 +47,7 @@
  51  // definitions of path related variables
  52  @define("APP_PATH", '/usr/share/eventum/cli/');
  53  @define("APP_INC_PATH", APP_PATH);
  54 -@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
  55 +@define("APP_PEAR_PATH", "/usr/share/pear/");
  56  ini_set("include_path", ".:" . APP_PEAR_PATH);
  57
  58  @define("APP_BENCHMARK", false);
  59 --- ./misc/cli/eventum~ 2005-01-24 17:49:25.000000000 +0200
  60 +++ ./misc/cli/eventum  2005-01-25 15:48:56.000000000 +0200
  61 @@ -13,7 +13,7 @@
  62  //
  63  include_once("/etc/webapps/eventum/cli.php");
  64  include_once(APP_INC_PATH . "class.command_line.php");
  65 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  66 +include_once(APP_PEAR_PATH . "XML/RPC.php");
  67
  68  list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
  69  if (empty($port)) {
  70 --- ./misc/cli/include/class.command_line.php   2005-01-05 01:06:03.000000000 +0200
  71 +++ ./misc/cli/include/class.command_line.php   2005-01-25 15:48:56.000000000 +0200
  72 @@ -29,7 +29,7 @@
  73  //
  74
  75  include_once(APP_INC_PATH . "class.misc.php");
  76 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  77 +include_once(APP_PEAR_PATH . "XML/RPC.php");
  78
  79  $_displayed_confirmation = false;
  80
  81 --- eventum-localization-dev/include/class.template.php~        2006-04-10 23:48:12.740151749 +0300
  82 +++ eventum-localization-dev/include/class.template.php 2006-04-10 23:48:16.310231300 +0300
  83 @@ -60,7 +60,7 @@
  84      {
  85          $this->smarty = new Smarty;
  86          $this->smarty->template_dir = APP_TPL_PATH;
  87 -        $this->smarty->compile_dir = APP_PATH . "templates_c";
  88 +        $this->smarty->compile_dir = '/var/cache/eventum';
  89          $this->smarty->config_dir = '';
  90          $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
  91          $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
  92 --- ./include/class.monitor.php~        2005-02-22 21:50:49.000000000 +0200
  93 +++ ./include/class.monitor.php 2005-02-22 23:04:50.000000000 +0200
  94 @@ -157,6 +165,7 @@
  95                  'permission'       => 100,
  96              ),
  97          );
  98 +        $required_directories = array();
  99          foreach ($required_directories as $dir_path => $options) {
 100              // check if directory exists
 101              if (!file_exists($dir_path)) {
 102 --- eventum-20060717/setup/index.php~   2006-07-18 00:20:57.530267420 +0300
 103 +++ eventum-20060717/setup/index.php    2006-07-18 00:22:06.301805247 +0300
 104 @@ -121,31 +121,31 @@
 105      if (ini_get('allow_call_time_pass_reference') != "1") {
 106          $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
 107      }
 108 -    $error = checkPermissions('../locks', "Directory 'locks'", TRUE);
 109 +    $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
 110      if (!empty($error)) {
 111          $errors[] = $error;
 112      }
 113 -    $error = checkPermissions('../logs', "Directory 'logs'", TRUE);
 114 +    $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
 115      if (!empty($error)) {
 116          $errors[] = $error;
 117      }
 118 -    $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);
 119 +    $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE);
 120      if (!empty($error)) {
 121          $errors[] = $error;
 122      }
 123 -    $error = checkPermissions('../config.inc.php', "File 'config.inc.php'");
 124 +    $error = checkPermissions('/etc/webapps/eventum/config.php', "File '/etc/webapps/eventum/config.php'");
 125      if (!empty($error)) {
 126          $errors[] = $error;
 127      }
 128 -    $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");
 129 +    $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
 130      if (!empty($error)) {
 131          $errors[] = $error;
 132      }
 133 -    $error = checkPermissions('../setup.conf.php', "File 'setup.conf.php'");
 134 +    $error = checkPermissions('/etc/webapps/eventum/setup.php', "File '/etc/webapps/eventum/setup.php'");
 135      if (!empty($error)) {
 136          $errors[] = $error;
 137      }
 138 -    $error = checkPermissions('../include/private_key.php', "File 'include/private_key.php'");
 139 +    $error = checkPermissions('/etc/webapps/eventum/private_key.php', "File '/etc/webapps/eventum/private_key.php'");
 140      if (!empty($error)) {
 141          $errors[] = $error;
 142      }
 143 --- ./setup/index.php   2005-04-16 05:53:27.000000000 +0300
 144 +++ eventum-1.5.2.patched/setup/index.php       2005-04-16 05:53:05.000000000 +0300
 145 @@ -276,8 +276,8 @@
 146
 147      clearstatcache();
 148      // check if config.inc.php in the root directory is writable
 149 -    if (!is_writable('../config.inc.php')) {
 150 -        return "The file 'config.inc.php' in Eventum's root directory needs to be writable by the web server user. Please correct this problem and try again.";
 151 +    if (!is_writable('/etc/webapps/eventum/config.php')) {
 152 +        return "The file '/etc/webapps/eventum/config.php' needs to be writable by the web server user. Please correct this problem and try again.";
 153      }
 154      // gotta check and see if the provided installation path really exists...
 155      if (!file_exists($HTTP_POST_VARS['path'])) {
 156 @@ -287,16 +287,16 @@
 157      $private_key = '<?php
 158  $private_key = "' . md5(microtime()) . '";
 159  ?>';
 160 -    if (!is_writable('../include/private_key.php')) {
 161 -        return "The file 'include/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
 162 +    if (!is_writable('/etc/webapps/eventum/private_key.php')) {
 163 +        return "The file '/etc/webapps/eventum/private_key.php' needs to be writable by the web server user. Please correct this problem and try again.";
 164      }
 165 -    $fp = @fopen('../include/private_key.php', 'w');
 166 +    $fp = @fopen('/etc/webapps/eventum/private_key.php', 'w');
 167      if ($fp === FALSE) {
 168 -        return "Could not open the file 'include/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
 169 +        return "Could not open the file '/etc/webapps/eventum/private_key.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
 170      }
 171      $res = fwrite($fp, $private_key);
 172      if ($fp === FALSE) {
 173 -        return "Could not write the configuration information to 'include/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
 174 +        return "Could not write the configuration information to '/etc/webapps/eventum/private_key.php'. The file should be writable by the user that the web server runs as. Please correct this problem and try again.";
 175      }
 176      fclose($fp);
 177      // check if we can connect
 178 @@ -442,22 +442,8 @@
 179  }
 180
 181
 182 -$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);
 183 -$pieces = explode("/", $full_url);
 184 -$relative_url = array();
 185 -$relative_url[] = '';
 186 -foreach ($pieces as $piece) {
 187 -    if ((!empty($piece)) && ($piece != 'setup')) {
 188 -        $relative_url[] = $piece;
 189 -    }
 190 -}
 191 -$relative_url[] = '';
 192 -$relative_url = implode("/", $relative_url);
 193 -
 194 -if (substr(@$HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {
 195 -    $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);
 196 -}
 197 -$installation_path = @$HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;
 198 +$installation_path = "/usr/share/eventum";
 199 +$relative_url = "/eventum/";
 200
 201  $tpl->assign("phpversion", phpversion());
 202  $tpl->assign("rel_url", $relative_url);
 203 --- ./index.php~        2005-04-22 18:33:06.556398818 +0300
 204 +++ ./index.php 2005-04-22 18:33:07.885180913 +0300
 205 @@ -33,8 +33,8 @@
 206  include_once(APP_INC_PATH . "db_access.php");
 207
 208  // check if templates_c is writable by the web server user
 209 -if (!Misc::isWritableDirectory(APP_PATH . 'templates_c')) {
 210 -    $errors = array("Directory 'templates_c' is not writable.");
 211 +if (!Misc::isWritableDirectory('/var/cache/eventum')) {
 212 +    $errors = array("Directory '/var/cache/eventum' is not writable.");
 213      Misc::displayRequirementErrors($errors);
 214      exit;
 215  }
 216 --- ../include/class.support.php~       2005-07-10 15:40:57.000000000 +0300
 217 +++ ../include/class.support.php        2005-07-14 22:47:58.665843734 +0300
 218 @@ -259,7 +259,7 @@
 219       */
 220      function saveRoutedEmail($message)
 221      {
 222 -        $path = APP_PATH . "misc/routed_emails/";
 223 +        $path = "/var/lib/eventum/routed_emails/";
 224          list($usec,) = explode(" ", microtime());
 225          $filename = date('dmY.His.') . $usec . '.email.txt';
 226          $fp = @fopen($path . $filename, 'w');
 227 --- eventum-20051221/include/class.draft.php~   2005-12-21 17:56:27.000000000 +0200
 228 +++ eventum-20051221/include/class.draft.php    2005-12-21 17:59:26.000000000 +0200
 229 @@ -40,7 +40,7 @@
 230       */
 231      function saveRoutedMessage($message)
 232      {
 233 -        $path = APP_PATH . "misc/routed_drafts/";
 234 +        $path = "/var/lib/eventum/routed_drafts/";
 235          list($usec,) = explode(" ", microtime());
 236          $filename = date('dmY.His.') . $usec . '.draft.txt';
 237          $fp = @fopen($path . $filename, 'w');
 238 --- eventum-20051221/include/class.note.php~    2005-12-21 17:56:27.000000000 +0200
 239 +++ eventum-20051221/include/class.note.php     2005-12-21 17:59:57.000000000 +0200
 240 @@ -255,7 +255,7 @@
 241       */
 242      function saveRoutedNote($message)
 243      {
 244 -        $path = APP_PATH . "misc/routed_notes/";
 245 +        $path = "/var/lib/eventum/routed_notes/";
 246          list($usec,) = explode(" ", microtime());
 247          $filename = date('dmY.His.') . $usec . '.note.txt';
 248          $fp = @fopen($path . $filename, 'w');
 249 --- ../setup/index.php~ 2005-07-26 18:49:37.000000000 +0300
 250 +++ ../setup/index.php  2005-07-26 19:12:57.000000000 +0300
 251 @@ -417,7 +417,7 @@
 252          $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false", $config_contents);
 253      }
 254
 255 -    $fp = @fopen('../config.inc.php', 'w');
 256 +    $fp = @fopen('/etc/webapps/eventum/config.php', 'w');
 257      if ($fp === FALSE) {
 258          return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
 259      }
 260 --- eventum-localization-dev2/setup/index.php~  2006-06-02 00:58:11.321514674 +0300
 261 +++ eventum-localization-dev2/setup/index.php   2006-06-02 00:58:46.032294537 +0300
 262 @@ -208,11 +208,11 @@
 263      exit;
 264  }
 265
 266 -include_once("../include/Smarty/Smarty.class.php");
 267 +include_once("/usr/share/pear/Smarty/Smarty.class.php");
 268
 269  $tpl = new Smarty();
 270 -$tpl->template_dir = '../templates/';
 271 -$tpl->compile_dir = "../templates_c";
 272 +$tpl->template_dir = '/usr/share/eventum/templates';
 273 +$tpl->compile_dir = "/var/cache/eventum";
 274  $tpl->config_dir = '';
 275
 276  function replace_table_prefix($str)
 277 --- eventum-1.5.5/setup/index.php~      2005-07-26 20:22:06.000000000 +0300
 278 +++ eventum-1.5.5/setup/index.php       2005-07-26 20:35:31.000000000 +0300
 279 @@ -198,13 +198,7 @@
 280      return $html;
 281  }
 282
 283 -if (stristr(PHP_OS, 'darwin')) {
 284 -    ini_set("include_path", ".:./../include/pear/");
 285 -} elseif (stristr(PHP_OS, 'win')) {
 286 -    ini_set("include_path", ".;./../include/pear/");
 287 -} else {
 288 -    ini_set("include_path", ".:./../include/pear/");
 289 -}
 290 +ini_set("include_path", ".:../../include/pear/");
 291  include_once("File/Util.php");
 292
 293  $html = checkRequirements();
 294 --- eventum-localization-dev/include/class.template.php~        2006-04-11 00:16:59.258616656 +0300
 295 +++ eventum-localization-dev/include/class.template.php 2006-04-11 00:17:23.649160189 +0300
 296 @@ -61,6 +61,7 @@
 297          $this->smarty = new Smarty;
 298          $this->smarty->template_dir = APP_TPL_PATH;
 299          $this->smarty->compile_dir = '/var/cache/eventum';
 300 +        $this->smarty->plugins_dir  = array('/usr/share/eventum/include/smarty', 'plugins');
 301          $this->smarty->config_dir = '';
 302          $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
 303          $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
 304 --- ./include/class.misc.php    2005-10-26 17:17:17.000000000 +0300
 305 +++ /tmp/class.misc.php 2005-10-26 17:30:12.000000000 +0300
 306 @@ -607,7 +607,7 @@
 307       */
 308      function highlightQuotedReply($text)
 309      {
 310 -        include_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
 311 +        include_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
 312          return smarty_modifier_highlight_quoted($text);
 313      }
 314