SOURCES: eventum-config-setup.php, eventum-irc-config.patch, event...

glen glen at pld-linux.org
Wed Jul 27 09:43:38 CEST 2005 

Author: glen                         Date: Wed Jul 27 07:43:38 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.5.5

---- Files affected:
SOURCES:
   eventum-config-setup.php (1.3 -> 1.4) , eventum-irc-config.patch (1.4 -> 1.5) , eventum-paths.patch (1.22 -> 1.23) , eventum-bug-10263.patch (1.1 -> NONE)  (REMOVED), eventum-bug-10464.patch (1.1 -> NONE)  (REMOVED), eventum-ft-enable.patch (1.2 -> NONE)  (REMOVED), eventum-upgrade-exit.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/eventum-config-setup.php
diff -u SOURCES/eventum-config-setup.php:1.3 SOURCES/eventum-config-setup.php:1.4
--- SOURCES/eventum-config-setup.php:1.3	Mon Jun 13 11:10:54 2005
+++ SOURCES/eventum-config-setup.php	Wed Jul 27 09:43:32 2005
@@ -66,6 +66,6 @@
 
 define("APP_BENCHMARK", false);
 // if full text searching is enabled
-define("APP_ENABLE_FULLTEXT", false);
+define("APP_ENABLE_FULLTEXT", %{APP_ENABLE_FULLTEXT}%);
 
 ?>

================================================================
Index: SOURCES/eventum-irc-config.patch
diff -u SOURCES/eventum-irc-config.patch:1.4 SOURCES/eventum-irc-config.patch:1.5
--- SOURCES/eventum-irc-config.patch:1.4	Wed Mar 30 11:04:00 2005
+++ SOURCES/eventum-irc-config.patch	Wed Jul 27 09:43:33 2005
@@ -14,18 +14,6 @@
      )
  );
  
-@@ -355,9 +357,8 @@
- $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, $irc_password);
- foreach ($channels as $prj_id => $channel_list) {
-     $irc->join($channel_list);
- }
 --- ./misc/irc/bot.php~	2005-03-14 14:47:40.000000000 +0200
 +++ ./misc/irc/bot.php	2005-03-28 20:58:31.000000000 +0300
 @@ -56,7 +56,7 @@
@@ -37,3 +25,21 @@
          $irc_default_channel,
      )
  );
+--- ./misc/irc/bot.php~	2005-07-26 19:15:02.000000000 +0300
++++ ./misc/irc/bot.php	2005-07-26 19:15:45.000000000 +0300
+@@ -395,11 +395,11 @@
+ $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, $irc_password);
+ $irc->listen();
+ $irc->disconnect();
+ 
+ // release the lock
+ Lock::release('irc_bot');
+-?>
+\ No newline at end of file
++?>

================================================================
Index: SOURCES/eventum-paths.patch
diff -u SOURCES/eventum-paths.patch:1.22 SOURCES/eventum-paths.patch:1.23
--- SOURCES/eventum-paths.patch:1.22	Fri Apr 22 17:34:01 2005
+++ SOURCES/eventum-paths.patch	Wed Jul 27 09:43:33 2005
@@ -140,21 +140,6 @@
      if (!empty($error)) {
          $errors[] = $error;
      }
-@@ -203,11 +203,11 @@
- }
- 
- ini_set("include_path", '.');
--include_once("../include/Smarty/Smarty.class.php");
-+include_once("/usr/share/pear/Smarty/Smarty.class.php");
- 
- $tpl = new Smarty();
--$tpl->template_dir = '../templates/en';
--$tpl->compile_dir = "../templates_c";
-+$tpl->template_dir = '/usr/share/eventum/templates/en';
-+$tpl->compile_dir = "/var/cache/eventum";
- $tpl->config_dir = '';
- 
- function replace_table_prefix($str)
 @@ -276,8 +276,8 @@
  
      clearstatcache();
@@ -188,15 +173,6 @@
      }
      fclose($fp);
      // check if we can connect
-@@ -396,7 +396,7 @@
-         $protocol_type = 'http://';
-     }
-     $config_contents = str_replace("%{PROTOCOL_TYPE}%", $protocol_type, $config_contents);
--    $fp = @fopen('../config.inc.php', 'w');
-+    $fp = @fopen('/etc/eventum/config.php', 'w');
-     if ($fp === FALSE) {
-         return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
-     }
 @@ -425,23 +425,8 @@
      $tpl->assign('is_imap_enabled', function_exists('imap_open'));
  }
@@ -236,3 +212,57 @@
      Misc::displayRequirementErrors($errors);
      exit;
  }
+--- ../include/class.support.php~	2005-07-10 15:40:57.000000000 +0300
++++ ../include/class.support.php	2005-07-14 22:47:58.665843734 +0300
+@@ -259,7 +259,7 @@
+      */
+     function saveRoutedEmail($message)
+     {
+-        $path = APP_PATH . "misc/routed_emails/";
++        $path = "/var/lib/eventum/routed_emails/";
+         list($usec,) = explode(" ", microtime());
+         $filename = date('dmY.His.') . $usec . '.email.txt';
+         $fp = @fopen($path . $filename, 'w');
+--- ../setup/index.php~	2005-07-26 18:49:37.000000000 +0300
++++ ../setup/index.php	2005-07-26 19:12:57.000000000 +0300
+@@ -213,11 +213,11 @@
+     exit;
+ }
+ 
+-include_once("../include/Smarty/Smarty.class.php");
++include_once("/usr/share/pear/Smarty/Smarty.class.php");
+ 
+ $tpl = new Smarty();
+-$tpl->template_dir = '../templates/en';
+-$tpl->compile_dir = "../templates_c";
++$tpl->template_dir = '/usr/share/eventum/templates/en';
++$tpl->compile_dir = "/var/cache/eventum";
+ $tpl->config_dir = '';
+ 
+ function replace_table_prefix($str)
+@@ -417,7 +417,7 @@
+         $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false", $config_contents);
+     }
+ 
+-    $fp = @fopen('../config.inc.php', 'w');
++    $fp = @fopen('/etc/eventum/config.php', 'w');
+     if ($fp === FALSE) {
+         return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again.";
+     }
+--- eventum-1.5.5/setup/index.php~	2005-07-26 20:22:06.000000000 +0300
++++ eventum-1.5.5/setup/index.php	2005-07-26 20:35:31.000000000 +0300
+@@ -198,13 +198,7 @@
+     return $html;
+ }
+ 
+-if (stristr(PHP_OS, 'darwin')) {
+-    ini_set("include_path", ".:./../include/pear/");
+-} elseif (stristr(PHP_OS, 'win')) {
+-    ini_set("include_path", ".;./../include/pear/");
+-} else {
+-    ini_set("include_path", ".:./../include/pear/");
+-}
++ini_set("include_path", ".:../../include/pear/");
+ include_once("File/Util.php");
+ 
+ $html = checkRequirements();
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/eventum-config-setup.php?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/eventum-irc-config.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/eventum-paths.patch?r1=1.22&r2=1.23&f=u

More information about the pld-cvs-commit mailing list