- Massive: include->require

Changed files:
    eventum-PEAR.patch -> 1.4
    eventum-irc-config.patch -> 1.13
    eventum-mem-limits.patch -> 1.7
    eventum-paths.patch -> 1.33

diff --git a/eventum-PEAR.patch b/eventum-PEAR.patch
index 5098b9b1e0798ca4920883c44e72a3e899661a78..8d6ff7ab70d15ea644a4e04a7cfc01469b880d7f 100644 (file)
--- a/eventum-PEAR.patch
+++ b/eventum-PEAR.patch
@@ -15,11 +15,11 @@
 --- ./rpc/xmlrpc.php~  2005-01-05 01:06:19.000000000 +0200
 +++ ./rpc/xmlrpc.php   2005-01-25 16:35:14.000000000 +0200
 @@ -41,7 +41,7 @@
- include_once(APP_INC_PATH . "class.template.php");
- include_once(APP_INC_PATH . "class.customer.php");
+ require_once(APP_INC_PATH . "class.template.php");
+ require_once(APP_INC_PATH . "class.customer.php");
  error_reporting(0);
--include_once(APP_PEAR_PATH . "XML_RPC/Server.php");
-+include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
+-require_once(APP_PEAR_PATH . "XML_RPC/Server.php");
++require_once(APP_PEAR_PATH . "XML/RPC/Server.php");
  
  function authenticate($email, $password)
  {
@@ -29,12 +29,12 @@
          }
          if ($old["iss_description"] != $new["description"]) {
              // need real diff engine here
--            include_once 'Text_Diff/Diff.php';
--            include_once 'Text_Diff/Diff/Renderer.php';
--            include_once 'Text_Diff/Diff/Renderer/unified.php';
-+            include_once 'Text/Diff.php';
-+            include_once 'Text/Diff/Renderer.php';
-+            include_once 'Text/Diff/Renderer/unified.php';
+-            require_once 'Text_Diff/Diff.php';
+-            require_once 'Text_Diff/Diff/Renderer.php';
+-            require_once 'Text_Diff/Diff/Renderer/unified.php';
++            require_once 'Text/Diff.php';
++            require_once 'Text/Diff/Renderer.php';
++            require_once 'Text/Diff/Renderer/unified.php';
              $old['iss_description'] = explode("\n", $old['iss_description']);
              $new['description'] = explode("\n", $new['description']);
              $diff = &new Text_Diff($old["iss_description"], $new["description"]);

diff --git a/eventum-irc-config.patch b/eventum-irc-config.patch
index d314dc8b0448b98801d09c42c28978dbf81fe67b..38293ab72163706bbe0b478253b80ef2ca5a2fd9 100644 (file)
--- a/eventum-irc-config.patch
+++ b/eventum-irc-config.patch
@@ -70,8 +70,8 @@
 @@ -31,6 +31,7 @@
  ini_set("memory_limit", "256M");
  
- include_once("../../config.inc.php");
-+include_once('/etc/eventum/irc.php');
- include_once(APP_INC_PATH . "db_access.php");
- include_once(APP_INC_PATH . "class.auth.php");
- include_once(APP_INC_PATH . "class.lock.php");
+ require_once("../../config.inc.php");
++require_once('/etc/eventum/irc.php');
+ require_once(APP_INC_PATH . "db_access.php");
+ require_once(APP_INC_PATH . "class.auth.php");
+ require_once(APP_INC_PATH . "class.lock.php");

diff --git a/eventum-mem-limits.patch b/eventum-mem-limits.patch
index 5a1130686a0d16d493490c5e8747cfa5b6fcb46e..22d509fea9caf09754839cb00b7012fb35b9ba0a 100644 (file)
--- a/eventum-mem-limits.patch
+++ b/eventum-mem-limits.patch
@@ -5,9 +5,9 @@
  // @(#) $Id$
  //
 +ini_set('memory_limit', '1024M');
- include_once("../config.inc.php");
- include_once(APP_INC_PATH . "db_access.php");
- include_once(APP_INC_PATH . "class.routing.php");
+ require_once("../config.inc.php");
+ require_once(APP_INC_PATH . "db_access.php");
+ require_once(APP_INC_PATH . "class.routing.php");
 --- eventum-20060210/misc/route_emails.php~    2006-02-11 07:27:35.000000000 +0200
 +++ eventum-20060210/misc/route_emails.php     2006-02-11 07:28:43.000000000 +0200
 @@ -27,6 +27,7 @@
@@ -15,9 +15,9 @@
  // @(#) $Id$
  //
 +ini_set('memory_limit', '1024M');
- include_once("../config.inc.php");
- include_once(APP_INC_PATH . "db_access.php");
- include_once(APP_INC_PATH . "class.routing.php");
+ require_once("../config.inc.php");
+ require_once(APP_INC_PATH . "db_access.php");
+ require_once(APP_INC_PATH . "class.routing.php");
 --- eventum-20060210/misc/route_notes.php~     2006-02-11 07:27:35.000000000 +0200
 +++ eventum-20060210/misc/route_notes.php      2006-02-11 07:28:54.000000000 +0200
 @@ -27,6 +27,7 @@
@@ -25,9 +25,9 @@
  // @(#) $Id$
  //
 +ini_set('memory_limit', '1024M');
- include_once("../config.inc.php");
- include_once(APP_INC_PATH . "db_access.php");
- include_once(APP_INC_PATH . "class.routing.php");
+ require_once("../config.inc.php");
+ require_once(APP_INC_PATH . "db_access.php");
+ require_once(APP_INC_PATH . "class.routing.php");
 --- eventum-20060830/misc/download_emails.php  2006-09-05 00:11:48.396726556 +0300
 +++ eventum-20060830.mem/misc/download_emails.php      2006-09-05 00:12:09.647203129 +0300
 @@ -28,7 +28,7 @@
@@ -37,8 +37,8 @@
 -ini_set("memory_limit", "256M");
 +ini_set("memory_limit", "1024M");
  
- include_once("/etc/webapps/eventum/core.php");
- include_once(APP_INC_PATH . "class.support.php");
+ require_once("/etc/webapps/eventum/core.php");
+ require_once(APP_INC_PATH . "class.support.php");
 --- eventum-20060830/misc/irc/bot.php  2006-09-05 00:11:48.396726556 +0300
 +++ eventum-20060830.mem/misc/irc/bot.php      2006-09-05 00:12:09.647203129 +0300
 @@ -28,7 +28,7 @@
@@ -48,8 +48,8 @@
 -ini_set("memory_limit", "256M");
 +ini_set("memory_limit", "1024M");
  
- include_once("/etc/webapps/eventum/core.php");
- include_once('/etc/eventum/irc.php');
+ require_once("/etc/webapps/eventum/core.php");
+ require_once('/etc/eventum/irc.php');
 --- eventum-20060830/misc/process_mail_queue.php       2006-09-05 00:11:48.396726556 +0300
 +++ eventum-20060830.mem/misc/process_mail_queue.php   2006-09-05 00:12:09.647203129 +0300
 @@ -28,7 +28,7 @@
@@ -59,5 +59,5 @@
 -ini_set("memory_limit", "256M");
 +ini_set("memory_limit", "1024M");
  
- include_once("/etc/webapps/eventum/core.php");
- include_once(APP_INC_PATH . "db_access.php");
+ require_once("/etc/webapps/eventum/core.php");
+ require_once(APP_INC_PATH . "db_access.php");

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);
      }