- Massive: include->require

[packages/eventum.git] / eventum-paths.patch

diff --git a/eventum-paths.patch b/eventum-paths.patch
index f95fe8cce1808230dca5f600e8a528cca55364f0..3b81f37441b7816bc7acce8d47ade735a4328772 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -4,10 +4,10 @@
  //
  // @(#) $Id$
  //
--include_once("config.inc.php");
-+include_once("/etc/eventum/cli.php");
- include_once(APP_INC_PATH . "class.command_line.php");
- include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
+-require_once("config.inc.php");
++require_once("/etc/eventum/cli.php");
+ require_once(APP_INC_PATH . "class.command_line.php");
+ require_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
  
 --- eventum-1.4.orig/misc/cli/config.inc.php   2005-01-26 00:00:58.000000000 +0200
 +++ eventum-1.4/misc/cli/config.inc.php        2005-01-25 23:57:39.000000000 +0200
@@ -60,10 +60,10 @@
 +++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200
 @@ -13,7 +13,7 @@
  //
- include_once("/etc/webapps/eventum/cli.php");
- include_once(APP_INC_PATH . "class.command_line.php");
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+include_once(APP_PEAR_PATH . "XML/RPC.php");
+ require_once("/etc/webapps/eventum/cli.php");
+ require_once(APP_INC_PATH . "class.command_line.php");
+-require_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
++require_once(APP_PEAR_PATH . "XML/RPC.php");
  
  list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
  if (empty($port)) {
@@ -72,9 +72,9 @@
 @@ -29,7 +29,7 @@
  //
  
- include_once(APP_INC_PATH . "class.misc.php");
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
-+include_once(APP_PEAR_PATH . "XML/RPC.php");
+ require_once(APP_INC_PATH . "class.misc.php");
+-require_once(APP_PEAR_PATH . "XML_RPC/RPC.php");
++require_once(APP_PEAR_PATH . "XML/RPC.php");
  
  $_displayed_confirmation = false;
  
@@ -198,7 +198,7 @@
 --- ./index.php~       2005-04-22 18:33:06.556398818 +0300
 +++ ./index.php        2005-04-22 18:33:07.885180913 +0300
 @@ -33,8 +33,8 @@
- include_once(APP_INC_PATH . "db_access.php");
+ require_once(APP_INC_PATH . "db_access.php");
  
  // check if templates_c is writable by the web server user
 -if (!Misc::isWritableDirectory(APP_PATH . 'templates_c')) {
@@ -258,8 +258,8 @@
      exit;
  }
  
--include_once("../include/Smarty/Smarty.class.php");
-+include_once("/usr/share/pear/Smarty/Smarty.class.php");
+-require_once("../include/Smarty/Smarty.class.php");
++require_once("/usr/share/pear/Smarty/Smarty.class.php");
  
  $tpl = new Smarty();
 -$tpl->template_dir = '../templates/';
@@ -283,7 +283,7 @@
 -    ini_set("include_path", ".:./../include/pear/");
 -}
 +ini_set("include_path", ".:../../include/pear/");
- include_once("File/Util.php");
+ require_once("File/Util.php");
  
  $html = checkRequirements();
 --- eventum-localization-dev/include/class.template.php~       2006-04-11 00:16:59.258616656 +0300
@@ -302,8 +302,8 @@
       */
      function highlightQuotedReply($text)
      {
--        include_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
-+        include_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
+-        require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php");
++        require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php");
          return smarty_modifier_highlight_quoted($text);
      }