packages: eventum/eventum-bot-reconnect.patch, eventum/eventum-cvs-config.p...

glen glen at pld-linux.org
Sat Jun 27 17:22:42 CEST 2009


Author: glen                         Date: Sat Jun 27 15:22:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to r3862, files have been reorganized

---- Files affected:
packages/eventum:
   eventum-bot-reconnect.patch (1.1 -> 1.2) , eventum-cvs-config.patch (1.8 -> 1.9) , eventum-gettext.patch (1.2 -> 1.3) , eventum-irc.init (1.10 -> 1.11) , eventum-mem-limits.patch (1.12 -> 1.13) , eventum-order.patch (1.17 -> 1.18) , eventum-paths.patch (1.42 -> 1.43) , eventum.spec (1.300 -> 1.301) , eventum-irc-config.patch (1.21 -> NONE)  (REMOVED), eventum-router-qmail.sh (1.5 -> NONE)  (REMOVED), eventum-upgrade.sh (1.5 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/eventum/eventum-bot-reconnect.patch
diff -u packages/eventum/eventum-bot-reconnect.patch:1.1 packages/eventum/eventum-bot-reconnect.patch:1.2
--- packages/eventum/eventum-bot-reconnect.patch:1.1	Wed May 25 12:53:18 2005
+++ packages/eventum/eventum-bot-reconnect.patch	Sat Jun 27 17:22:36 2009
@@ -1,5 +1,5 @@
 --- /usr/share/eventum/irc/bot.php	2005-05-17 23:03:42.000000000 +0300
-+++ ./misc/irc/bot.php	2005-05-24 14:30:35.000000000 +0300
++++ ./irc/eventum-irc-bot	2005-05-24 14:30:35.000000000 +0300
 @@ -367,7 +367,7 @@
  $irc->setLogdestination(SMARTIRC_FILE);
  $irc->setLogfile(APP_IRC_LOG);

================================================================
Index: packages/eventum/eventum-cvs-config.patch
diff -u packages/eventum/eventum-cvs-config.patch:1.8 packages/eventum/eventum-cvs-config.patch:1.9
--- packages/eventum/eventum-cvs-config.patch:1.8	Wed Jan 14 21:07:21 2009
+++ packages/eventum/eventum-cvs-config.patch	Sat Jun 27 17:22:36 2009
@@ -1,5 +1,5 @@
---- eventum-r3797/misc/scm/process_cvs_commits.php~	2009-01-13 14:21:31.000000000 +0200
-+++ eventum-r3797/misc/scm/process_cvs_commits.php	2009-01-13 14:22:25.200134375 +0200
+--- eventum-r3797/scm/eventum-cvs-hook~	2009-01-13 14:21:31.000000000 +0200
++++ eventum-r3797/scm/eventum-cvs-hook	2009-01-13 14:22:25.200134375 +0200
 @@ -27,14 +27,7 @@
  // | Authors: João Prado Maia <jpm at mysql.com>                             |
  // +----------------------------------------------------------------------+
@@ -16,8 +16,8 @@
  
  if (isset($eventum_url)) {
      $data = parse_url($eventum_url);
---- eventum/misc/scm/process_svn_commits.php~	2007-02-17 20:45:06.580266717 +0200
-+++ eventum/misc/scm/process_svn_commits.php	2007-02-17 20:48:25.014819809 +0200
+--- eventum/scm/eventum-svn-hook~	2007-02-17 20:45:06.580266717 +0200
++++ eventum/scm/eventum-svn-hook	2007-02-17 20:48:25.014819809 +0200
 @@ -33,13 +33,8 @@
  
  // See http://eventum.mysql.org/wiki/index.php/Subversion_integration about SVN integration.

================================================================
Index: packages/eventum/eventum-gettext.patch
diff -u packages/eventum/eventum-gettext.patch:1.2 packages/eventum/eventum-gettext.patch:1.3
--- packages/eventum/eventum-gettext.patch:1.2	Tue Nov 20 18:21:50 2007
+++ packages/eventum/eventum-gettext.patch	Sat Jun 27 17:22:36 2009
@@ -1,5 +1,5 @@
---- eventum-r3475/include/class.language.php~	2007-11-20 19:11:35.000000000 +0200
-+++ eventum-r3475/include/class.language.php	2007-11-20 19:12:05.696195147 +0200
+--- eventum-r3475/lib/eventum/class.language.php~	2007-11-20 19:11:35.000000000 +0200
++++ eventum-r3475/lib/eventum/class.language.php	2007-11-20 19:12:05.696195147 +0200
 @@ -237,7 +237,6 @@
  }
  

================================================================
Index: packages/eventum/eventum-irc.init
diff -u packages/eventum/eventum-irc.init:1.10 packages/eventum/eventum-irc.init:1.11
--- packages/eventum/eventum-irc.init:1.10	Fri Feb  9 00:38:30 2007
+++ packages/eventum/eventum-irc.init	Sat Jun 27 17:22:36 2009
@@ -28,7 +28,7 @@
 	if [ ! -f /var/lock/subsys/eventum-irc ]; then
 		msg_starting "Eventum IRC Bot"
 		start-stop-daemon --start \
-			--exec /usr/sbin/eventum-bot \
+			--exec /usr/sbin/eventum-irc-bot \
 			--pidfile $PIDFILE \
 			--chuid eventum \
 			--background
@@ -73,7 +73,7 @@
 	start
 ;;
 status)
-	status eventum-bot php
+	status eventum-irc-bot php
 	exit $?
 ;;
 *)

================================================================
Index: packages/eventum/eventum-mem-limits.patch
diff -u packages/eventum/eventum-mem-limits.patch:1.12 packages/eventum/eventum-mem-limits.patch:1.13
--- packages/eventum/eventum-mem-limits.patch:1.12	Thu Feb 15 00:42:10 2007
+++ packages/eventum/eventum-mem-limits.patch	Sat Jun 27 17:22:36 2009
@@ -1,35 +1,35 @@
---- eventum/misc/route_drafts.php~	2007-02-15 01:39:42.575673579 +0200
-+++ eventum/misc/route_drafts.php	2007-02-15 01:40:02.046113147 +0200
-@@ -27,6 +27,7 @@
+--- trunk/route_drafts.php~	2009-06-27 17:36:08.000000000 +0300
++++ trunk/route_drafts.php	2009-06-27 17:36:29.036049928 +0300
+@@ -29,6 +29,7 @@
  //
  // @(#) $Id$
  
 +ini_set('memory_limit', '1024M');
- require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
---- eventum/misc/route_emails.php~	2007-02-15 01:39:42.575673579 +0200
-+++ eventum/misc/route_emails.php	2007-02-15 01:40:42.017015531 +0200
-@@ -27,6 +27,7 @@
+ require_once 'init.php';
+ 
+ $full_message = Misc::getInput();
+--- trunk/route_emails.php~	2009-06-27 17:36:08.000000000 +0300
++++ trunk/route_emails.php	2009-06-27 17:36:57.725685544 +0300
+@@ -29,6 +29,7 @@
  //
  // @(#) $Id$
  
 +ini_set('memory_limit', '1024M');
- require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
---- eventum/misc/route_notes.php~	2007-02-15 01:39:42.575673579 +0200
-+++ eventum/misc/route_notes.php	2007-02-15 01:41:13.727731426 +0200
-@@ -27,6 +27,7 @@
+ require_once 'init.php';
+ 
+ $full_message = Misc::getInput();
+--- trunk/route_notes.php~	2009-06-27 17:36:08.000000000 +0300
++++ trunk/route_notes.php	2009-06-27 17:37:14.485553825 +0300
+@@ -29,6 +29,7 @@
  //
  // @(#) $Id$
  
 +ini_set('memory_limit', '1024M');
- require_once(dirname(__FILE__) . "/htdocs/init.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
+ require_once 'init.php';
+ 
+ $full_message = Misc::getInput();
+--- eventum-20060830/download_emails.php	2006-09-05 00:11:48.396726556 +0300
++++ eventum-20060830.mem/download_emails.php	2006-09-05 00:12:09.647203129 +0300
 @@ -28,7 +28,7 @@
  //
  // @(#) $Id$
@@ -39,8 +39,8 @@
  
  require_once("/etc/webapps/eventum/core.php");
  require_once(APP_INC_PATH . "class.support.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
+--- eventum-20060830/process_mail_queue.php	2006-09-05 00:11:48.396726556 +0300
++++ eventum-20060830.mem/process_mail_queue.php	2006-09-05 00:12:09.647203129 +0300
 @@ -28,7 +28,7 @@
  //
  // @(#) $Id$
@@ -50,8 +50,8 @@
  
  require_once("/etc/webapps/eventum/core.php");
  require_once(APP_INC_PATH . "db_access.php");
---- eventum/misc/irc/bot.php~	2007-01-16 21:24:17.009987152 +0200
-+++ eventum/misc/irc/bot.php	2007-01-16 21:24:57.050882112 +0200
+--- eventum/irc/eventum-irc-bot~	2007-01-16 21:24:17.009987152 +0200
++++ eventum/irc/eventum-irc-bot	2007-01-16 21:24:57.050882112 +0200
 @@ -26,6 +26,6 @@
  //
  

================================================================
Index: packages/eventum/eventum-order.patch
diff -u packages/eventum/eventum-order.patch:1.17 packages/eventum/eventum-order.patch:1.18
--- packages/eventum/eventum-order.patch:1.17	Tue Feb 10 08:41:59 2009
+++ packages/eventum/eventum-order.patch	Sat Jun 27 17:22:36 2009
@@ -1,5 +1,5 @@
---- eventum-new/ajax/order.php	2008-10-15 02:02:25.000000000 +0300
-+++ eventum-new/ajax/order.php	2008-10-15 02:02:25.000000000 +0300
+--- eventum-new/htdocs/ajax/order.php	2008-10-15 02:02:25.000000000 +0300
++++ eventum-new/htdocs/ajax/order.php	2008-10-15 02:02:25.000000000 +0300
 @@ -0,0 +1,72 @@
 +<?
 +require_once(dirname(__FILE__) . '/../init.php');
@@ -73,8 +73,8 @@
 +        }
 +    }
 +}
---- eventum/ajax/update.php	2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/ajax/update.php	2008-10-15 02:02:25.000000000 +0300
+--- eventum/htdocs/ajax/update.php	2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/htdocs/ajax/update.php	2008-10-15 02:02:25.000000000 +0300
 @@ -0,0 +1,30 @@
 +<?
 +require_once(dirname(__FILE__) . '/../init.php');
@@ -106,8 +106,8 @@
 +      die('object type not supported');
 +  break;
 +}
---- eventum/include/class.display_column.php	2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/include/class.display_column.php	2008-10-15 02:02:25.000000000 +0300
+--- eventum/lib/eventum/class.display_column.php	2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/lib/eventum/class.display_column.php	2008-10-15 02:02:25.000000000 +0300
 @@ -229,7 +229,10 @@
                  ),
                  "iss_expected_resolution_date"  =>  array(
@@ -120,8 +120,8 @@
              )
          );
          return $columns[$page];
---- eventum/include/class.issue.php	2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/include/class.issue.php	2008-10-15 02:02:25.000000000 +0300
+--- eventum/lib/eventum/class.issue.php	2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/lib/eventum/class.issue.php	2008-10-15 02:02:25.000000000 +0300
 @@ -1356,6 +1356,7 @@
              Error_Handler::logError(array($res->getMessage(), $res->getDebugInfo()), __FILE__, __LINE__);
              return -1;
@@ -640,8 +640,8 @@
 +    
  }
  
---- eventum-r3749/js/global.js~	2008-10-15 02:03:48.000000000 +0300
-+++ eventum-r3749/js/global.js	2008-10-15 02:06:00.000000000 +0300
+--- eventum-r3749/htdocs/js/global.js~	2008-10-15 02:03:48.000000000 +0300
++++ eventum-r3749/htdocs/js/global.js	2008-10-15 02:06:00.000000000 +0300
 @@ -799,4 +799,39 @@
  		});
      });
@@ -682,8 +682,8 @@
 +});
 +
  //-->
---- eventum/list.php	2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/list.php	2008-10-15 02:02:25.000000000 +0300
+--- eventum/htdocs/list.php	2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/htdocs/list.php	2008-10-15 02:02:25.000000000 +0300
 @@ -67,6 +67,11 @@
              $profile['sort_by'] . "&sort_order=" . $profile['sort_order']);
  }
@@ -898,8 +898,8 @@
 -{include file="footer.tpl.html"}
 +{include file="footer.tpl.html"}
 \ No newline at end of file
---- ./js/jquery/jquery.tablednd.js	(revision 0)
-+++ ./js/jquery/jquery.tablednd.js	(revision 0)
+--- ./htdocs/js/jquery/jquery.tablednd.js	(revision 0)
++++ ./htdocs/js/jquery/jquery.tablednd.js	(revision 0)
 @@ -0,0 +1,382 @@
 +/**
 + * TableDnD plug-in for JQuery, allows you to drag and drop table rows
@@ -1284,18 +1284,18 @@
 +	}
 +);
 \ No newline at end of file
---- eventum-r3765/templates/header.tpl.html~	2008-10-28 20:23:04.000000000 +0200
-+++ eventum-r3765/templates/header.tpl.html	2008-10-28 22:39:10.604728264 +0200
+--- trunk/templates/header.tpl.html~	2009-06-27 16:15:57.000000000 +0300
++++ trunk/templates/header.tpl.html	2009-06-27 16:16:44.992783169 +0300
 @@ -8,6 +8,7 @@
- <script language="JavaScript" src="{$rel_url}js/jquery/jquery.js"></script>
- <script language="JavaScript" src="{$rel_url}js/jquery/form.js"></script>
- <script language="JavaScript" src="{$rel_url}js/jquery/ui.datepicker.js"></script>
-+<script language="JavaScript" src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
+ <script type="text/javascript" src="{$rel_url}js/jquery/form.js"></script>
+ <script type="text/javascript" src="{$rel_url}js/jquery/blockui.js"></script>
+ <script type="text/javascript" src="{$rel_url}js/jquery/ui.datepicker.js"></script>
++<script type="text/javascript" src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
  <link rel="stylesheet" href="{$rel_url}js/jquery/ui.datepicker.css">
- <script language="JavaScript">
+ <script type="text/javascript">
  <!--
---- eventum-r3765/css/style.css~	2008-06-19 08:30:31.000000000 +0300
-+++ eventum-r3765/css/style.css	2008-10-29 17:28:49.393768970 +0200
+--- eventum-r3765/htdocs/css/style.css~	2008-06-19 08:30:31.000000000 +0300
++++ eventum-r3765/htdocs/css/style.css	2008-10-29 17:28:49.393768970 +0200
 @@ -172,4 +172,9 @@
      font-size: 70%;
      font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -1308,8 +1308,8 @@
 +	background-color: #ffffdd;
 +	border: 1px solid red;
 +}
---- eventum~/css/style.css	2008-11-06 16:54:30.000000000 +0200
-+++ eventum/css/style.css	2008-11-06 16:20:50.038350957 +0200
+--- eventum~/htdocs/css/style.css	2008-11-06 16:54:30.000000000 +0200
++++ eventum/htdocs/css/style.css	2008-11-06 16:20:50.038350957 +0200
 @@ -173,8 +173,21 @@
      font-family: Verdana, Arial, Helvetica, sans-serif;
      padding: 10px;
@@ -1396,8 +1396,8 @@
 -{include file="footer.tpl.html"}
 \ No newline at end of file
 +{include file="footer.tpl.html"}
---- eventum-r3776/misc/upgrade/update-database.php	2008-11-18 01:10:18.806283202 +0200
-+++ eventum/misc/upgrade/update-database.php	2008-11-18 01:15:20.703082655 +0200
+--- eventum-r3776/upgrade/update-database.php	2008-11-18 01:10:18.806283202 +0200
++++ eventum/upgrade/update-database.php	2008-11-18 01:15:20.703082655 +0200
 @@ -83,6 +83,7 @@
  		1 => '01_notes.php',
  		2 => '02_usr_alias.php',
@@ -1407,7 +1407,7 @@
  
  	// sanity check. check that the version table exists.
 --- /dev/null	2008-11-04 20:33:38.146691408 +0200
-+++ eventum/misc/upgrade/patches/04_isu_order.php	2008-11-18 01:14:02.972104347 +0200
++++ eventum/upgrade/patches/04_isu_order.php	2008-11-18 01:14:02.972104347 +0200
 @@ -0,0 +1,15 @@
 +<?php
 +
@@ -1424,8 +1424,8 @@
 +
 +	return $stmts;
 +}
---- ../eventum-old2/ajax/update.php	2008-10-13 11:14:23.673428821 +0300
-+++ ./ajax/update.php	2008-11-19 15:05:54.490054961 +0200
+--- ../eventum-old2/htdocs/ajax/update.php	2008-10-13 11:14:23.673428821 +0300
++++ ./htdocs/ajax/update.php	2008-11-19 15:05:54.490054961 +0200
 @@ -16,9 +16,17 @@
    case 'expected_resolution_date':
      $day = (int)$_POST['day'];
@@ -1447,8 +1447,8 @@
      } else {
          echo 'update failed';
      }
---- eventum_tar/js/global.js	2008-11-06 16:54:30.000000000 +0200
-+++ ./js/global.js	2008-11-19 15:06:21.820071605 +0200
+--- eventum_tar/htdocs/js/global.js	2008-11-06 16:54:30.000000000 +0200
++++ ./htdocs/js/global.js	2008-11-19 15:06:21.820071605 +0200
 @@ -817,10 +817,15 @@
              function (date, dteObj) {
                  fieldName = masterObj.id.substr(0,masterObj.id.indexOf('|'));
@@ -1468,8 +1468,8 @@
                  }, "text");
              },
              // config
---- eventum-old2/include/class.issue.php	2008-10-15 18:30:31.590172372 +0300
-+++ ./include/class.issue.php	2008-11-19 15:04:43.710659328 +0200
+--- eventum-old2/lib/eventum/class.issue.php	2008-10-15 18:30:31.590172372 +0300
++++ ./lib/eventum/class.issue.php	2008-11-19 15:04:43.710659328 +0200
 @@ -1694,7 +1694,11 @@
                  $stmt .= ", iss_pre_id = " . Misc::escapeInteger($filed_value);
              break;
@@ -1483,8 +1483,8 @@
              break;
              case 'release':
                  $stmt .= ", iss_pre_id = " . Misc::escapeInteger($filed_value);
---- eventum/include/class.issue.php	2008-10-15 01:46:20.000000000 +0300
-+++ eventum-new/include/class.issue.php	2008-10-15 02:02:25.000000000 +0300
+--- eventum/lib/eventum/class.issue.php	2008-10-15 01:46:20.000000000 +0300
++++ eventum-new/lib/eventum/class.issue.php	2008-10-15 02:02:25.000000000 +0300
 @@ -2050,7 +2050,7 @@
                      " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
                   WHERE

================================================================
Index: packages/eventum/eventum-paths.patch
diff -u packages/eventum/eventum-paths.patch:1.42 packages/eventum/eventum-paths.patch:1.43
--- packages/eventum/eventum-paths.patch:1.42	Tue Feb 10 08:42:00 2009
+++ packages/eventum/eventum-paths.patch	Sat Jun 27 17:22:36 2009
@@ -1,28 +1,5 @@
---- eventum-r3833/misc/cli/config.inc.php~	2009-02-10 09:30:34.000000000 +0200
-+++ eventum-r3833/misc/cli/config.inc.php	2009-02-10 09:31:11.928169361 +0200
-@@ -33,8 +33,7 @@
- set_time_limit(0);
- 
- // definitions of path related variables
--define('APP_PATH', dirname(__FILE__) . '/');
--define('APP_INC_PATH', APP_PATH . 'include/');
--define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
-+define('APP_INC_PATH', '/usr/share/eventum/cli/');
-+define('APP_PEAR_PATH', '/usr/share/pear/');
- 
- set_include_path(get_include_path() . PATH_SEPARATOR . APP_PEAR_PATH);
---- eventum/include/class.template_helper.php~	2007-01-30 18:52:59.020179406 +0200
-+++ eventum/include/class.template_helper.php	2007-01-30 18:53:24.620759076 +0200
-@@ -61,6 +61,7 @@
-         $this->smarty = new Smarty;
-         $this->smarty->template_dir = APP_TPL_PATH;
-         $this->smarty->compile_dir = APP_TPL_COMPILE_PATH;
-+        $this->smarty->plugins_dir  = array('/usr/share/eventum/include/smarty', 'plugins');
-         $this->smarty->config_dir = '';
-         $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks'));
-         $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue'));
---- ./include/class.monitor.php~	2005-02-22 21:50:49.000000000 +0200
-+++ ./include/class.monitor.php	2005-02-22 23:04:50.000000000 +0200
+--- ./lib/eventum/class.monitor.php~	2005-02-22 21:50:49.000000000 +0200
++++ ./lib/eventum/class.monitor.php	2005-02-22 23:04:50.000000000 +0200
 @@ -157,6 +165,7 @@
                  'permission'       => 100,
              ),
@@ -31,19 +8,8 @@
          foreach ($required_directories as $dir_path => $options) {
              // check if directory exists
              if (!file_exists($dir_path)) {
---- ./include/class.misc.php	2005-10-26 17:17:17.000000000 +0300
-+++ /tmp/class.misc.php	2005-10-26 17:30:12.000000000 +0300
-@@ -607,7 +607,7 @@
-      */
-     function highlightQuotedReply($text)
-     {
--        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);
-     }
- 
---- eventum-r3615/init.php~	2008-06-05 00:02:42.833798000 +0300
-+++ eventum-r3615/init.php	2008-06-05 00:02:58.229406819 +0300
+--- trunk/init.php~	2009-06-27 17:31:32.000000000 +0300
++++ trunk/init.php	2009-06-27 17:33:35.745565456 +0300
 @@ -26,7 +26,7 @@
  // | Authors: Elan Ruusamäe <glen at delfi.ee>                               |
  // +----------------------------------------------------------------------+
@@ -53,92 +19,76 @@
      Header('Location: setup/');
      exit;
  }
-@@ -45,30 +45,30 @@
+@@ -46,7 +46,7 @@
  
  // define base path
--define('APP_PATH', realpath(dirname(__FILE__)) . '/');
--define('APP_CONFIG_PATH', APP_PATH . 'config/');
-+define('APP_PATH', '/usr/share/eventum/htdocs/');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
- 
- // include local site config
- require_once APP_CONFIG_PATH . 'config.php';
- 
- // define other paths
- if (!defined('APP_INC_PATH')) {
--    define('APP_INC_PATH', APP_PATH . 'include/');
-+    define('APP_INC_PATH', '/usr/share/eventum/include/');
- }
- 
- if (!defined('APP_PEAR_PATH')) {
--    define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
-+    define('APP_PEAR_PATH', '/usr/share/pear/');
+ define('APP_PATH', realpath(dirname(__FILE__)));
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
+ 
+ // include local site config. may override any default
+ require_once APP_CONFIG_PATH . '/config.php';
+@@ -61,19 +61,15 @@
  }
  
- if (!defined('APP_TPL_PATH')) {
--    define('APP_TPL_PATH', APP_PATH . 'templates/');
-+    define('APP_TPL_PATH', '/usr/share/eventum/templates/');
+ if (!defined('APP_TPL_COMPILE_PATH')) {
+-    define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
++    define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
  }
  
- if (!defined('APP_TPL_COMPILE_PATH')) {
--    define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
-+    define('APP_TPL_COMPILE_PATH', '/var/cache/eventum/');
+ if (!defined('APP_INC_PATH')) {
+     define('APP_INC_PATH', APP_PATH . '/lib/eventum');
  }
  
+-if (!defined('APP_PEAR_PATH')) {
+-    define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
+-}
+-
  if (!defined('APP_SMARTY_PATH')) {
--    define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
-+    define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
+-    define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
++    define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
  }
  
  if (!defined('APP_JPGRAPH_PATH')) {
-@@ -76,7 +76,7 @@
+@@ -81,7 +77,7 @@
  }
  
  if (!defined('APP_LOCKS_PATH')) {
--    define('APP_LOCKS_PATH', APP_PATH . 'locks/');
+-    define('APP_LOCKS_PATH', APP_PATH . '/locks');
 +    define('APP_LOCKS_PATH', '/var/run/eventum/');
  }
  
- if (!defined('APP_SETUP_FILE')) {
-@@ -84,11 +84,11 @@
- }
- 
  if (!defined('APP_SQL_PATCHES_PATH')) {
--    define('APP_SQL_PATCHES_PATH', APP_PATH . 'misc/upgrade/patches');
-+    define('APP_SQL_PATCHES_PATH', '/usr/share/eventum/upgrade/patches');
+@@ -89,7 +85,7 @@
  }
  
  if (!defined('APP_LOG_PATH')) {
--    define('APP_LOG_PATH', APP_PATH . 'logs/');
-+    define('APP_LOG_PATH', '/var/log/eventum/');
+-    define('APP_LOG_PATH', APP_PATH . '/logs');
++    define('APP_LOG_PATH', '/var/log/eventum');
  }
  
  if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
---- eventum/setup/index.php~	2007-01-30 20:04:32.306824546 +0200
-+++ eventum/setup/index.php	2007-01-30 20:14:43.880555938 +0200
-@@ -38,17 +38,17 @@
- set_time_limit(0);
- define('APP_CHARSET', 'UTF-8');
- define('APP_DEFAULT_LOCALE', 'en_US');
--define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/');
-+define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/');
- define('APP_INC_PATH', APP_PATH . 'include/');
- define('APP_PEAR_PATH', APP_INC_PATH . 'pear/');
--define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/');
--define('APP_CONFIG_PATH', APP_PATH . 'config/');
-+define('APP_SMARTY_PATH', '/usr/share/php/Smarty/');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum/');
- define('APP_SETUP_FILE', APP_CONFIG_PATH . 'setup.php');
- define('APP_TPL_PATH', APP_PATH . 'templates/');
--define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c');
--define('APP_LOG_PATH', APP_PATH . 'logs/');
+--- trunk/htdocs/setup/index.php~	2009-06-27 17:34:22.000000000 +0300
++++ trunk/htdocs/setup/index.php	2009-06-27 17:35:07.108898271 +0300
+@@ -42,14 +42,14 @@
+ define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
+ define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+ define('APP_PEAR_PATH', APP_INC_PATH . '/lib/pear');
+-define('APP_SMARTY_PATH', APP_INC_PATH . '/lib/Smarty');
+-define('APP_CONFIG_PATH', APP_PATH . '/config');
++define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
++define('APP_CONFIG_PATH', '/etc/webapps/eventum');
+ define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
+ define('APP_TPL_PATH', APP_PATH . '/templates');
+-define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
+-define('APP_LOG_PATH', APP_PATH . '/logs');
 +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
-+define('APP_LOG_PATH', '/var/log/eventum/');
- define('APP_ERROR_LOG', APP_LOG_PATH . 'errors.log');
--define('APP_LOCKS_PATH', APP_PATH . 'locks/');
-+define('APP_LOCKS_PATH', '/var/run/eventum/');
++define('APP_LOG_PATH', '/var/log/eventum');
+ define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
+-define('APP_LOCKS_PATH', APP_PATH . '/locks');
++define('APP_LOCKS_PATH', '/var/run/eventum');
  
- define('APP_BENCHMARK', false);
+ header('Content-Type: text/html; charset=' . APP_CHARSET);
  
 @@ -192,10 +192,6 @@
      if (ini_get('file_uploads') != "1") {
@@ -162,87 +112,3 @@
      // need to create a random private key variable
      $private_key = '<?php
  $private_key = "' . md5(microtime()) . '";
---- eventum/misc/cli/eventum~	2007-01-30 20:33:31.435916994 +0200
-+++ eventum/misc/cli/eventum	2007-01-30 20:34:58.717881130 +0200
-@@ -13,3 +13,3 @@
- //
--require_once(dirname(__FILE__) . '/config.inc.php');
-+require_once('/etc/eventum/cli.php');
- require_once(APP_INC_PATH . 'class.command_line.php');
---- eventum/misc/process_mail_queue.php~	2007-02-15 00:31:11.000000000 +0200
-+++ eventum/misc/process_mail_queue.php	2007-02-15 01:02:15.704386785 +0200
-@@ -30,7 +30,7 @@
- 
- ini_set("memory_limit", "1024M");
- 
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.mail_queue.php");
- 
---- eventum/misc/download_emails.php~	2007-02-15 00:31:11.000000000 +0200
-+++ eventum/misc/download_emails.php	2007-02-15 01:02:56.183553358 +0200
-@@ -30,7 +30,7 @@
- 
- ini_set("memory_limit", "1024M");
- 
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "class.support.php");
- require_once(APP_INC_PATH . "class.lock.php");
- require_once(APP_INC_PATH . "class.project.php");
---- eventum/misc/check_reminders.php~	2007-02-15 01:04:27.107937884 +0200
-+++ eventum/misc/check_reminders.php	2007-02-15 01:10:20.645910516 +0200
-@@ -29,7 +29,7 @@
- // @(#) $Id$
- //
- 
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.lock.php");
- require_once(APP_INC_PATH . "class.reminder.php");
---- eventum/misc/monitor.php~	2007-02-15 01:27:45.089473611 +0200
-+++ eventum/misc/monitor.php	2007-02-15 01:28:05.849942411 +0200
-@@ -27,7 +27,7 @@
- //
- // @(#) $Id$
- 
--require_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "class.monitor.php");
- 
- // the disk partition in which eventum is stored in
---- eventum/misc/route_drafts.php~	2007-02-15 01:36:00.780666107 +0200
-+++ eventum/misc/route_drafts.php	2007-02-15 01:36:28.141283847 +0200
-@@ -27,7 +27,7 @@
- //
- // @(#) $Id$
- 
--include_once(dirname(__FILE__) . "/../init.php");
-+require_once(dirname(__FILE__) . "/htdocs/init.php");
- require_once(APP_INC_PATH . "db_access.php");
- require_once(APP_INC_PATH . "class.routing.php");
- 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-bot-reconnect.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-cvs-config.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-gettext.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-irc.init?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-mem-limits.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-order.patch?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-paths.patch?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.300&r2=1.301&f=u



More information about the pld-cvs-commit mailing list