eventum-paths.patch

   1 --- eventum-1.4.orig/setup/config.inc.php       2005-01-25 23:42:55.000000000 +0200
   2 +++ eventum-1.4/setup/config.inc.php    2005-01-25 23:57:55.000000000 +0200
   3 @@ -58,15 +58,9 @@
   4  @define("APP_TPL_PATH", APP_PATH . "templates/");
   5  @define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");
   6  @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");
   7 -@define("APP_LOG_PATH", APP_PATH . "logs/");
   8 -@define("APP_LOCKS_PATH", APP_PATH . "locks/");
   9 -if (stristr(PHP_OS, 'darwin')) {
  10 -    ini_set("include_path", ".:" . APP_PEAR_PATH);
  11 -} elseif (stristr(PHP_OS, 'win')) {
  12 -    ini_set("include_path", ".;" . APP_PEAR_PATH);
  13 -} else {
  14 -    ini_set("include_path", ".:" . APP_PEAR_PATH);
  15 -}
  16 +@define("APP_LOG_PATH", "/var/log/eventum/");
  17 +@define("APP_LOCKS_PATH", "/var/run/eventum/");
  18 +ini_set("include_path", ".:" . APP_PEAR_PATH);
  19
  20  @define("APP_SETUP_PATH", APP_PATH);
  21  @define("APP_SETUP_FILE", APP_SETUP_PATH . "setup.conf.php");
  22 --- ./misc/cli/eventum~ 2005-01-19 02:47:20.000000000 +0200
  23 +++ ./misc/cli/eventum  2005-01-19 03:02:40.119100405 +0200
  24 @@ -11,7 +11,7 @@
  25  //
  26  // @(#) $Id$
  27  //
  28 -include_once("config.inc.php");
  29 +include_once("/etc/eventum/cli.php");
  30  include_once(APP_INC_PATH . "class.command_line.php");
  31  include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  32
  33 --- eventum-1.4.orig/misc/cli/config.inc.php    2005-01-26 00:00:58.000000000 +0200
  34 +++ eventum-1.4/misc/cli/config.inc.php 2005-01-25 23:57:39.000000000 +0200
  35 @@ -45,16 +45,10 @@
  36  }
  37
  38  // definitions of path related variables
  39 -@define("APP_PATH", dirname(__FILE__) . '/');
  40 +@define("APP_PATH", '/usr/share/eventum/misc/cli/');
  41  @define("APP_INC_PATH", APP_PATH . "include/");
  42  @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
  43 -if (stristr(PHP_OS, 'darwin')) {
  44 -    ini_set("include_path", ".:" . APP_PEAR_PATH);
  45 -} elseif (stristr(PHP_OS, 'win')) {
  46 -    ini_set("include_path", ".;" . APP_PEAR_PATH);
  47 -} else {
  48 -    ini_set("include_path", ".:" . APP_PEAR_PATH);
  49 -}
  50 +ini_set("include_path", ".:" . APP_PEAR_PATH);
  51
  52  @define("APP_BENCHMARK", false);
  53  ?>
  54 --- eventum-1.4.c/include/class.template.php    2005-01-05 01:05:59.000000000 +0200
  55 +++ eventum-1.4/include/class.template.php      2005-01-24 17:22:35.000000000 +0200
  56 @@ -60,7 +60,7 @@
  57      {
  58          $this->smarty = new Smarty;
  59          $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;
  60 -        $this->smarty->compile_dir = APP_PATH . "templates_c";
  61 +        $this->smarty->compile_dir = "/var/cache/eventum";
  62          $this->smarty->config_dir = '';
  63          $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));
  64      }
  65 --- eventum-1.4.orig/setup/index.php    2005-01-25 23:42:55.000000000 +0200
  66 +++ eventum-1.4/setup/index.php 2005-01-25 23:46:14.000000000 +0200
  67 @@ -114,15 +114,15 @@
  68      if (ini_get('allow_call_time_pass_reference') != "1") {
  69          $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
  70      }
  71 -    $error = checkPermissions('../locks', "Directory 'locks'", TRUE);
  72 +    $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
  73      if (!empty($error)) {
  74          $errors[] = $error;
  75      }
  76 -    $error = checkPermissions('../logs', "Directory 'logs'", TRUE);
  77 +    $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
  78      if (!empty($error)) {
  79          $errors[] = $error;
  80      }
  81 -    $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);
  82 +    $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE);
  83      if (!empty($error)) {
  84          $errors[] = $error;
  85      }
  86 @@ -130,7 +130,7 @@
  87      if (!empty($error)) {
  88          $errors[] = $error;
  89      }
  90 -    $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");
  91 +    $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
  92      if (!empty($error)) {
  93          $errors[] = $error;
  94      }
  95 @@ -203,7 +203,7 @@
  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);