eventum-PEAR.patch

   1 --- eventum-1.4/setup/config.inc.php~   2005-01-25 23:50:53.000000000 +0200
   2 +++ eventum-1.4/setup/config.inc.php    2005-01-25 23:51:23.000000000 +0200
   3 @@ -54,9 +54,9 @@
   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", APP_PEAR_PATH . "Smarty/");
  12  @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");
  13  @define("APP_LOG_PATH", "/var/log/eventum/");
  14  @define("APP_LOCKS_PATH", "/var/run/eventum/");
  15 --- eventum-1.4/setup/index.php~        2005-01-25 23:52:31.000000000 +0200
  16 +++ eventum-1.4/setup/index.php 2005-01-25 23:52:33.000000000 +0200
  17 @@ -199,7 +199,7 @@
  18  }
  19
  20  ini_set("include_path", '.');
  21 -include_once("../include/Smarty/Smarty.class.php");
  22 +include_once("/usr/share/pear/Smarty/Smarty.class.php");
  23
  24  $tpl = new Smarty();
  25  $tpl->template_dir = '../templates/en';
  26 --- eventum-1.4/misc/cli/config.inc.php~        2005-01-26 00:24:10.000000000 +0200
  27 +++ eventum-1.4/misc/cli/config.inc.php 2005-01-26 00:24:12.000000000 +0200
  28 @@ -47,7 +47,7 @@
  29  // definitions of path related variables
  30  @define("APP_PATH", '/usr/share/eventum/misc/cli/');
  31  @define("APP_INC_PATH", APP_PATH . "include/");
  32 -@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
  33 +@define("APP_PEAR_PATH", "/usr/share/pear/");
  34  ini_set("include_path", ".:" . APP_PEAR_PATH);
  35
  36  @define("APP_BENCHMARK", false);
  37 --- ./misc/cli/eventum~ 2005-01-24 17:49:25.000000000 +0200
  38 +++ ./misc/cli/eventum  2005-01-25 15:48:56.000000000 +0200
  39 @@ -13,7 +13,7 @@
  40  //
  41  include_once("/etc/eventum/cli.php");
  42  include_once(APP_INC_PATH . "class.command_line.php");
  43 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  44 +include_once(APP_PEAR_PATH . "XML/RPC.php");
  45
  46  list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
  47  if (empty($port)) {
  48 --- ./misc/cli/include/class.command_line.php   2005-01-05 01:06:03.000000000 +0200
  49 +++ ./misc/cli/include/class.command_line.php   2005-01-25 15:48:56.000000000 +0200
  50 @@ -29,7 +29,7 @@
  51  //
  52
  53  include_once(APP_INC_PATH . "class.misc.php");
  54 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  55 +include_once(APP_PEAR_PATH . "XML/RPC.php");
  56
  57  $_displayed_confirmation = false;
  58
  59 --- ./rpc/xmlrpc.php~   2005-01-05 01:06:19.000000000 +0200
  60 +++ ./rpc/xmlrpc.php    2005-01-25 16:35:14.000000000 +0200
  61 @@ -41,7 +41,7 @@
  62  include_once(APP_INC_PATH . "class.template.php");
  63  include_once(APP_INC_PATH . "class.customer.php");
  64  error_reporting(0);
  65 -include_once(APP_PEAR_PATH . "XML_RPC/Server.php");
  66 +include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
  67
  68  function authenticate($email, $password)
  69  {
  70 --- ./include/class.notification.php~   2005-01-05 01:06:19.000000000 +0200
  71 +++ ./include/class.notification.php    2005-01-25 16:41:23.000000000 +0200
  72 @@ -613,9 +613,9 @@
  73          }
  74          if ($old["iss_description"] != $new["description"]) {
  75              // need real diff engine here
  76 -            include_once 'Text_Diff/Diff.php';
  77 -            include_once 'Text_Diff/Diff/Renderer.php';
  78 -            include_once 'Text_Diff/Diff/Renderer/unified.php';
  79 +            include_once 'Text/Diff.php';
  80 +            include_once 'Text/Diff/Renderer.php';
  81 +            include_once 'Text/Diff/Renderer/unified.php';
  82              $old['iss_description'] = explode("\n", $old['iss_description']);
  83              $new['description'] = explode("\n", $new['description']);
  84              $diff = &new Text_Diff($old["iss_description"], $new["description"]);