- undos the patches

Changed files:
    eventum-clock-status.patch -> 1.4
    eventum-cvs-config.patch -> 1.2
    eventum-irc-config.patch -> 1.2
    eventum-mail-queue.tpl.patch -> 1.2
    eventum-paths.patch -> 1.9
    eventum-scm-encode.patch -> 1.2
    eventum-scm_checkin_associated.patch -> 1.2

diff --git a/eventum-clock-status.patch b/eventum-clock-status.patch
index 65346aa1c0c8b4a7adcef5cc67b4deac4a4023d2..08e15628b600df1b0c226a89d3b505025ba7b12e 100644 (file)
--- a/eventum-clock-status.patch
+++ b/eventum-clock-status.patch
@@ -1,14 +1,14 @@
 --- eventum-1.4/templates/en/navigation.tpl.html~      2005-01-05 01:06:03.000000000 +0200
 +++ eventum-1.4/templates/en/navigation.tpl.html       2005-01-17 15:52:27.000000000 +0200
 @@ -66,8 +66,10 @@
-           }\r
-           function changeClockStatus()\r
-           {\r
-+          {/literal}\r
-               var features = 'width=420,height=200,top=30,left=30,resizable=yes,scrollbars=yes,toolbar=no,location=no,menubar=no,status=no';\r
--              var clockWin = window.open('clock_status.php', '_clock_status', features);\r
-+              var clockWin = window.open('{$rel_url}clock_status.php', '_clock_status', features);\r
-+          {literal}\r
-               clockWin.focus();\r
-           }\r
-           //-->\r
+           }
+           function changeClockStatus()
+           {
++          {/literal}
+               var features = 'width=420,height=200,top=30,left=30,resizable=yes,scrollbars=yes,toolbar=no,location=no,menubar=no,status=no';
+-              var clockWin = window.open('clock_status.php', '_clock_status', features);
++              var clockWin = window.open('{$rel_url}clock_status.php', '_clock_status', features);
++          {literal}
+               clockWin.focus();
+           }
+           //-->

diff --git a/eventum-cvs-config.patch b/eventum-cvs-config.patch
index ed3510d52f1650cfdc3adbd66bcc90169ed078b4..253174d810664ed7bd1b4b82e99b4998c9a3d251 100644 (file)
--- a/eventum-cvs-config.patch
+++ b/eventum-cvs-config.patch
@@ -1,14 +1,14 @@
 --- /tmp/process_cvs_commits.php       2005-01-17 20:51:29.343450373 +0200
 +++ ./misc/scm/process_cvs_commits.php 2005-01-17 21:40:37.000947744 +0200
 @@ -28,10 +28,8 @@
- // @(#) $Id$\r
- //\r
- \r
--$eventum_domain = 'rabbit.impleo.net';\r
--$eventum_relative_url = '/';\r
--$eventum_port = 80;\r
- \r
-+include '/etc/eventum/cvs.php';\r
- \r
- //\r
- // DO NOT CHANGE ANYTHING AFTER THIS LINE\r
+ // @(#) $Id$
+ //
+ 
+-$eventum_domain = 'rabbit.impleo.net';
+-$eventum_relative_url = '/';
+-$eventum_port = 80;
+ 
++include '/etc/eventum/cvs.php';
+ 
+ //
+ // DO NOT CHANGE ANYTHING AFTER THIS LINE

diff --git a/eventum-irc-config.patch b/eventum-irc-config.patch
index ee52331c2e68be90e0061e1a897bdd8464dd9bb8..a36e3a72806d589c7382f96223646ef3a636c976 100644 (file)
--- a/eventum-irc-config.patch
+++ b/eventum-irc-config.patch
@@ -1,35 +1,35 @@
 --- ../BUILD/eventum-1.4/misc/irc/bot.php      2005-01-05 01:06:16.000000000 +0200
 +++ a/misc/irc/bot.php 2005-01-18 16:09:13.000000000 +0200
 @@ -52,10 +52,12 @@
-     exit;\r
- }\r
- \r
-+include '/etc/eventum/irc.php';\r
-+\r
- // SETUP: need to change the project name in here\r
- $channels = array(\r
-     Project::getID('Default Project') => array(\r
--        '#issues',\r
-+        $irc_default_channel,\r
-     )\r
- );\r
- \r
+     exit;
+ }
+ 
++include '/etc/eventum/irc.php';
++
+ // SETUP: need to change the project name in here
+ $channels = array(
+     Project::getID('Default Project') => array(
+-        '#issues',
++        $irc_default_channel,
+     )
+ );
+ 
 @@ -355,9 +357,8 @@
- $irc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!?list-clocked-in', $bot, 'listClockedInUsers');\r
- $irc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!?list-quarantined', $bot, 'listQuarantinedIssues');\r
- \r
--\r
--$irc->connect('localhost', 6667);\r
--$irc->login('EventumBOT', 'EventumBOT', 0, 'EventumBOT');\r
-+$irc->connect($irc_host, $irc_port);\r
-+$irc->login($irc_nick, $irc_realname, 0, $irc_username);\r
- foreach ($channels as $prj_id => $channel_list) {\r
-     $irc->join($channel_list);\r
- }\r
+ $irc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!?list-clocked-in', $bot, 'listClockedInUsers');
+ $irc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!?list-quarantined', $bot, 'listQuarantinedIssues');
+ 
+-
+-$irc->connect('localhost', 6667);
+-$irc->login('EventumBOT', 'EventumBOT', 0, 'EventumBOT');
++$irc->connect($irc_host, $irc_port);
++$irc->login($irc_nick, $irc_realname, 0, $irc_username);
+ foreach ($channels as $prj_id => $channel_list) {
+     $irc->join($channel_list);
+ }
 @@ -366,4 +367,4 @@
- \r
- // release the lock\r
- Lock::release('irc_bot');\r
+ 
+ // release the lock
+ Lock::release('irc_bot');
 -?>
 \ No newline at end of file
-+?>\r
++?>

diff --git a/eventum-mail-queue.tpl.patch b/eventum-mail-queue.tpl.patch
index 2dec033fb642b4fd8006fe97d4371585072e1b2c..fef6315775486f173bd966c37d7fae217e4ed004 100644 (file)
--- a/eventum-mail-queue.tpl.patch
+++ b/eventum-mail-queue.tpl.patch
@@ -1,11 +1,11 @@
 --- ../eventum-1.4.b/templates/en/mail_queue.tpl.html  2005-01-05 01:05:59.000000000 +0200
 +++ ./templates/en/mail_queue.tpl.html 2005-01-24 01:45:05.000000000 +0200
 @@ -42,7 +42,7 @@
-           {/section}\r
-           <tr>\r
-             <td colspan="5" bgcolor="{$cell_color}">\r
--              <input class="button" type="button" value="&lt;&lt; Back" onClick="javascript:location.href='/view.php?id={$issue_id}';">\r
-+              <input class="button" type="button" value="&lt;&lt; Back" onClick="javascript:location.href='{$app_base_url}view.php?id={$issue_id}';">\r
-             </td>\r
-           </tr>\r
-         </table>\r
+           {/section}
+           <tr>
+             <td colspan="5" bgcolor="{$cell_color}">
+-              <input class="button" type="button" value="&lt;&lt; Back" onClick="javascript:location.href='/view.php?id={$issue_id}';">
++              <input class="button" type="button" value="&lt;&lt; Back" onClick="javascript:location.href='{$app_base_url}view.php?id={$issue_id}';">
+             </td>
+           </tr>
+         </table>

diff --git a/eventum-paths.patch b/eventum-paths.patch
index fd212e0c50f485dc1f9a16d0b4c94dbf6944c14a..2a01acca7eaae2912f5a6ad92d21218dd70e1e14 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,188 +1,188 @@
 --- eventum-1.4.d/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200
 +++ eventum-1.4/setup/config.inc.php   2005-01-25 17:09:33.000000000 +0200
 @@ -54,12 +54,12 @@
- }\r
- @define("APP_PATH", $app_path);\r
- @define("APP_INC_PATH", APP_PATH . "include/");\r
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
-+@define("APP_PEAR_PATH", "/usr/share/pear/");\r
- @define("APP_TPL_PATH", APP_PATH . "templates/");\r
--@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");\r
-+@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");\r
- @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");\r
--@define("APP_LOG_PATH", APP_PATH . "logs/");\r
--@define("APP_LOCKS_PATH", APP_PATH . "locks/");\r
-+@define("APP_LOG_PATH", "/var/log/eventum/");\r
-+@define("APP_LOCKS_PATH", "/var/run/eventum/");\r
- if (stristr(PHP_OS, 'darwin')) {\r
-     ini_set("include_path", ".:" . APP_PEAR_PATH);\r
- } elseif (stristr(PHP_OS, 'win')) {\r
+ }
+ @define("APP_PATH", $app_path);
+ @define("APP_INC_PATH", APP_PATH . "include/");
+-@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
++@define("APP_PEAR_PATH", "/usr/share/pear/");
+ @define("APP_TPL_PATH", APP_PATH . "templates/");
+-@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");
++@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");
+ @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");
+-@define("APP_LOG_PATH", APP_PATH . "logs/");
+-@define("APP_LOCKS_PATH", APP_PATH . "locks/");
++@define("APP_LOG_PATH", "/var/log/eventum/");
++@define("APP_LOCKS_PATH", "/var/run/eventum/");
+ if (stristr(PHP_OS, 'darwin')) {
+     ini_set("include_path", ".:" . APP_PEAR_PATH);
+ } elseif (stristr(PHP_OS, 'win')) {
 --- ./misc/cli/eventum~        2005-01-19 02:47:20.000000000 +0200
 +++ ./misc/cli/eventum 2005-01-19 03:02:40.119100405 +0200
 @@ -11,7 +11,7 @@
- //\r
- // @(#) $Id$\r
- //\r
--include_once("config.inc.php");\r
-+include_once("/etc/eventum/cli.php");\r
- include_once(APP_INC_PATH . "class.command_line.php");\r
- include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
- \r
+ //
+ // @(#) $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");
+ 
 --- eventum-1.4/misc/cli/config.inc.php~       2005-01-05 01:06:01.000000000 +0200
 +++ eventum-1.4/misc/cli/config.inc.php        2005-01-19 03:25:10.000000000 +0200
 @@ -45,7 +45,7 @@
- }\r
- \r
- // definitions of path related variables\r
--@define("APP_PATH", dirname(__FILE__) . '/');\r
-+@define("APP_PATH", '/usr/share/eventum/misc/cli/');\r
- @define("APP_INC_PATH", APP_PATH . "include/");\r
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
- if (stristr(PHP_OS, 'darwin')) {\r
+ }
+ 
+ // definitions of path related variables
+-@define("APP_PATH", dirname(__FILE__) . '/');
++@define("APP_PATH", '/usr/share/eventum/misc/cli/');
+ @define("APP_INC_PATH", APP_PATH . "include/");
+ @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
+ if (stristr(PHP_OS, 'darwin')) {
 @@ -57,4 +57,4 @@
- }\r
- \r
- @define("APP_BENCHMARK", false);\r
+ }
+ 
+ @define("APP_BENCHMARK", false);
 -?>
 \ No newline at end of file
-+?>\r
++?>
 --- eventum-1.4.c/include/class.template.php   2005-01-05 01:05:59.000000000 +0200
 +++ eventum-1.4/include/class.template.php     2005-01-24 17:22:35.000000000 +0200
 @@ -60,7 +60,7 @@
-     {\r
-         $this->smarty = new Smarty;\r
-         $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;\r
--        $this->smarty->compile_dir = APP_PATH . "templates_c";\r
-+        $this->smarty->compile_dir = "/var/cache/eventum";\r
-         $this->smarty->config_dir = '';\r
-         $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));\r
-     }\r
+     {
+         $this->smarty = new Smarty;
+         $this->smarty->template_dir = APP_PATH . "templates/" . APP_CURRENT_LANG;
+-        $this->smarty->compile_dir = APP_PATH . "templates_c";
++        $this->smarty->compile_dir = "/var/cache/eventum";
+         $this->smarty->config_dir = '';
+         $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'processText'));
+     }
 --- index.php  2005-01-05 01:05:52.000000000 +0200
 +++ eventum-1.4/setup/index.php        2005-01-24 17:47:16.000000000 +0200
 @@ -114,15 +114,15 @@
-     if (ini_get('allow_call_time_pass_reference') != "1") {\r
-         $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";\r
-     }\r
--    $error = checkPermissions('../locks', "Directory 'locks'", TRUE);\r
+     if (ini_get('allow_call_time_pass_reference') != "1") {
+         $errors[] = "The 'allow_call_time_pass_reference' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly.";
+     }
+-    $error = checkPermissions('../locks', "Directory 'locks'", TRUE);
 +    $error = checkPermissions('/var/run/eventum', "Directory '/var/run/eventum'", TRUE);
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
--    $error = checkPermissions('../logs', "Directory 'logs'", TRUE);\r
+     if (!empty($error)) {
+         $errors[] = $error;
+     }
+-    $error = checkPermissions('../logs', "Directory 'logs'", TRUE);
 +    $error = checkPermissions('/var/log/eventum', "Directory '/var/log/eventum'", TRUE);
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
--    $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);\r
+     if (!empty($error)) {
+         $errors[] = $error;
+     }
+-    $error = checkPermissions('../templates_c', "Directory 'templates_c'", TRUE);
 +    $error = checkPermissions('/var/cache/eventum', "Directory '/var/cache/eventum'", TRUE);
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
+     if (!empty($error)) {
+         $errors[] = $error;
+     }
 @@ -130,7 +130,7 @@
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
--    $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");\r
+     if (!empty($error)) {
+         $errors[] = $error;
+     }
+-    $error = checkPermissions('../logs/errors.log', "File 'logs/errors.log'");
 +    $error = checkPermissions('/var/log/eventum/errors.log', "File '/var/log/eventum/errors.log'");
-     if (!empty($error)) {\r
-         $errors[] = $error;\r
-     }\r
+     if (!empty($error)) {
+         $errors[] = $error;
+     }
 @@ -199,11 +199,11 @@
- }\r
- \r
- ini_set("include_path", '.');\r
--include_once("../include/Smarty/Smarty.class.php");\r
+ }
+ 
+ ini_set("include_path", '.');
+-include_once("../include/Smarty/Smarty.class.php");
 +include_once('/usr/share/pear/Smarty/Smarty.class.php');
- \r
- $tpl = new Smarty();\r
- $tpl->template_dir = '../templates/en';\r
--$tpl->compile_dir = "../templates_c";\r
+ 
+ $tpl = new Smarty();
+ $tpl->template_dir = '../templates/en';
+-$tpl->compile_dir = "../templates_c";
 +$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';\r
- \r
- function replace_table_prefix($str)\r
+ $tpl->config_dir = '';
+ 
+ function replace_table_prefix($str)
 @@ -417,23 +417,8 @@
-     $tpl->assign('is_imap_enabled', function_exists('imap_open'));\r
- }\r
- \r
--\r
--$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);\r
--$pieces = explode("/", $full_url);\r
--$relative_url = array();\r
--$relative_url[] = '';\r
--foreach ($pieces as $piece) {\r
--    if ((!empty($piece)) && ($piece != 'setup')) {\r
--        $relative_url[] = $piece;\r
--    }\r
--}\r
--$relative_url[] = '';\r
--$relative_url = implode("/", $relative_url);\r
--\r
--if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {\r
--    $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);\r
--}\r
--$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;\r
+     $tpl->assign('is_imap_enabled', function_exists('imap_open'));
+ }
+ 
+-
+-$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);
+-$pieces = explode("/", $full_url);
+-$relative_url = array();
+-$relative_url[] = '';
+-foreach ($pieces as $piece) {
+-    if ((!empty($piece)) && ($piece != 'setup')) {
+-        $relative_url[] = $piece;
+-    }
+-}
+-$relative_url[] = '';
+-$relative_url = implode("/", $relative_url);
+-
+-if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {
+-    $HTTP_SERVER_VARS['DOCUMENT_ROOT'] = substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], 0, -1);
+-}
+-$installation_path = $HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;
 +$installation_path = "/usr/share/eventum";
 +$relative_url = "/eventum/";
- \r
- $tpl->assign("phpversion", phpversion());\r
- $tpl->assign("rel_url", $relative_url);\r
+ 
+ $tpl->assign("phpversion", phpversion());
+ $tpl->assign("rel_url", $relative_url);
 --- ./misc/cli/config.inc.php~ 2005-01-24 17:49:25.000000000 +0200
 +++ ./misc/cli/config.inc.php  2005-01-25 15:52:07.000000000 +0200
 @@ -47,7 +47,7 @@
- // definitions of path related variables\r
- @define("APP_PATH", '/usr/share/eventum/misc/cli/');\r
- @define("APP_INC_PATH", APP_PATH . "include/");\r
--@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
+ // definitions of path related variables
+ @define("APP_PATH", '/usr/share/eventum/misc/cli/');
+ @define("APP_INC_PATH", APP_PATH . "include/");
+-@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");
 +@define("APP_PEAR_PATH", "/usr/share/pear/");
- if (stristr(PHP_OS, 'darwin')) {\r
-     ini_set("include_path", ".:" . APP_PEAR_PATH);\r
- } elseif (stristr(PHP_OS, 'win')) {\r
+ if (stristr(PHP_OS, 'darwin')) {
+     ini_set("include_path", ".:" . APP_PEAR_PATH);
+ } elseif (stristr(PHP_OS, 'win')) {
 --- ./misc/cli/eventum~        2005-01-24 17:49:25.000000000 +0200
 +++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200
 @@ -13,7 +13,7 @@
- //\r
- include_once("/etc/eventum/cli.php");\r
- include_once(APP_INC_PATH . "class.command_line.php");\r
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
-+include_once(APP_PEAR_PATH . "XML/RPC.php");\r
- \r
- list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();\r
- if (empty($port)) {\r
+ //
+ include_once("/etc/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");
+ 
+ list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();
+ if (empty($port)) {
 --- ./misc/cli/include/class.command_line.php  2005-01-05 01:06:03.000000000 +0200
 +++ ./misc/cli/include/class.command_line.php  2005-01-25 15:48:56.000000000 +0200
 @@ -29,7 +29,7 @@
- //\r
- \r
- include_once(APP_INC_PATH . "class.misc.php");\r
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
-+include_once(APP_PEAR_PATH . "XML/RPC.php");\r
- \r
- $_displayed_confirmation = false;\r
- \r
+ //
+ 
+ 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");
+ 
+ $_displayed_confirmation = false;
+ 
 --- ./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");\r
- include_once(APP_INC_PATH . "class.customer.php");\r
- error_reporting(0);\r
--include_once(APP_PEAR_PATH . "XML_RPC/Server.php");\r
+ include_once(APP_INC_PATH . "class.template.php");
+ include_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");
- \r
- function authenticate($email, $password)\r
- {\r
+ 
+ function authenticate($email, $password)
+ {
 --- ./include/class.notification.php~  2005-01-05 01:06:19.000000000 +0200
 +++ ./include/class.notification.php   2005-01-25 16:41:23.000000000 +0200
 @@ -613,9 +613,9 @@
-         }\r
-         if ($old["iss_description"] != $new["description"]) {\r
-             // need real diff engine here\r
--            include_once 'Text_Diff/Diff.php';\r
--            include_once 'Text_Diff/Diff/Renderer.php';\r
--            include_once 'Text_Diff/Diff/Renderer/unified.php';\r
+         }
+         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';
-             $old['iss_description'] = explode("\n", $old['iss_description']);\r
-             $new['description'] = explode("\n", $new['description']);\r
-             $diff = &new Text_Diff($old["iss_description"], $new["description"]);\r
+             $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-scm-encode.patch b/eventum-scm-encode.patch
index d1544c41d1f07924cf5c0f9f5766ff7d54b3cc10..2072f524ac2512ee5bd91840892f88cfb085ef34 100644 (file)
--- a/eventum-scm-encode.patch
+++ b/eventum-scm-encode.patch
@@ -1,23 +1,23 @@
 --- /tmp/process_cvs_commits.php       2005-01-17 20:51:29.343450373 +0200
 +++ ./misc/scm/process_cvs_commits.php 2005-01-17 20:51:10.639892676 +0200
 @@ -74,13 +78,17 @@
- if (count($matches) > 1) {\r
-     $issue_id = $matches[1];\r
-     $commit_msg = base64_encode($commit_msg);\r
-+    $cvs_module = base64_encode($cvs_module);\r
-+    $username = base64_encode($username);\r
-+    $issue_id = base64_encode($issue_id);\r
-+\r
-     // build the GET url to use\r
-     $ping_url = $eventum_relative_url . "scm_ping.php?module=$cvs_module&username=$username&commit_msg=$commit_msg";\r
-     $ping_url .= "&issue[]=$issue_id";\r
-     for ($i = 0; $i < count($modified_files); $i++) {\r
--        $ping_url .= "&files[$i]=" . $modified_files[$i]['filename'];\r
--        $ping_url .= "&old_versions[$i]=" . $modified_files[$i]['old_revision'];\r
--        $ping_url .= "&new_versions[$i]=" . $modified_files[$i]['new_revision'];\r
-+        $ping_url .= "&files[$i]=" . base64_encode($modified_files[$i]['filename']);\r
-+        $ping_url .= "&old_versions[$i]=" . base64_encode($modified_files[$i]['old_revision']);\r
-+        $ping_url .= "&new_versions[$i]=" . base64_encode($modified_files[$i]['new_revision']);\r
-     }\r
- \r
-     $fp = fsockopen($eventum_domain, $eventum_port, $errno, $errstr, 30);\r
+ if (count($matches) > 1) {
+     $issue_id = $matches[1];
+     $commit_msg = base64_encode($commit_msg);
++    $cvs_module = base64_encode($cvs_module);
++    $username = base64_encode($username);
++    $issue_id = base64_encode($issue_id);
++
+     // build the GET url to use
+     $ping_url = $eventum_relative_url . "scm_ping.php?module=$cvs_module&username=$username&commit_msg=$commit_msg";
+     $ping_url .= "&issue[]=$issue_id";
+     for ($i = 0; $i < count($modified_files); $i++) {
+-        $ping_url .= "&files[$i]=" . $modified_files[$i]['filename'];
+-        $ping_url .= "&old_versions[$i]=" . $modified_files[$i]['old_revision'];
+-        $ping_url .= "&new_versions[$i]=" . $modified_files[$i]['new_revision'];
++        $ping_url .= "&files[$i]=" . base64_encode($modified_files[$i]['filename']);
++        $ping_url .= "&old_versions[$i]=" . base64_encode($modified_files[$i]['old_revision']);
++        $ping_url .= "&new_versions[$i]=" . base64_encode($modified_files[$i]['new_revision']);
+     }
+ 
+     $fp = fsockopen($eventum_domain, $eventum_port, $errno, $errstr, 30);

diff --git a/eventum-scm_checkin_associated.patch b/eventum-scm_checkin_associated.patch
index 016ab3f337b86c0e7a1182ba4a357bdb675e30e0..3af3272e57ddee3f636015817e07bb5d5a62a4a3 100644 (file)
--- a/eventum-scm_checkin_associated.patch
+++ b/eventum-scm_checkin_associated.patch
@@ -1,10 +1,10 @@
 --- eventum-1.4/setup/schema.sql~      2005-01-05 01:06:07.000000000 +0200
 +++ eventum-1.4/setup/schema.sql       2005-01-24 13:45:36.000000000 +0200
 @@ -108,6 +108,7 @@
- INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'phone_entry_added', htt_role = 4;\r
- INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'phone_entry_removed', htt_role = 4;\r
- INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'scm_checkin_removed';\r
-+INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'scm_checkin_associated';\r
- INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'email_associated';\r
- INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'email_disassociated';\r
- INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'email_sent';\r
+ INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'phone_entry_added', htt_role = 4;
+ INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'phone_entry_removed', htt_role = 4;
+ INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'scm_checkin_removed';
++INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'scm_checkin_associated';
+ INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'email_associated';
+ INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'email_disassociated';
+ INSERT INTO %TABLE_PREFIX%history_type SET htt_name = 'email_sent';