Author: glen Date: Mon Sep 18 21:18:27 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 20060918 snap
---- Files affected:
SOURCES:
eventum-paths.patch (1.30 -> 1.31) , eventum-combined.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/eventum-paths.patch
diff -u SOURCES/eventum-paths.patch:1.30 SOURCES/eventum-paths.patch:1.31
--- SOURCES/eventum-paths.patch:1.30 Tue Jul 18 00:46:56 2006
+++ SOURCES/eventum-paths.patch Mon Sep 18 23:18:22 2006
@@ -140,8 +140,8 @@
if (!empty($error)) {
$errors[] = $error;
}
---- ./setup/index.php 2005-04-16 05:53:27.000000000 +0300
-+++ eventum-1.5.2.patched/setup/index.php 2005-04-16 05:53:05.000000000
+0300
+--- eventum-20060918/setup/index.php~ 2006-09-19 00:15:15.216195060 +0300
++++ eventum-20060918/setup/index.php 2006-09-19 00:15:18.346265301 +0300
@@ -276,8 +276,8 @@
clearstatcache();
@@ -175,10 +175,11 @@
}
fclose($fp);
// check if we can connect
-@@ -442,22 +442,8 @@
+@@ -429,18 +429,7 @@
+ $tpl->assign('is_imap_enabled', function_exists('imap_open'));
}
-
+-
-$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);
-$pieces = explode("/", $full_url);
-$relative_url = array();
@@ -190,13 +191,7 @@
-}
-$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/";
++$relative_url = '/eventum/';
$tpl->assign("phpversion", phpversion());
$tpl->assign("rel_url", $relative_url);
================================================================
Index: SOURCES/eventum-combined.patch
diff -u SOURCES/eventum-combined.patch:1.3 SOURCES/eventum-combined.patch:1.4
--- SOURCES/eventum-combined.patch:1.3 Tue Jul 18 00:46:56 2006
+++ SOURCES/eventum-combined.patch Mon Sep 18 23:18:22 2006
@@ -56,11 +56,11 @@
- }
- if (empty($prefix)) {
+ if (empty($setup['email_routing']['address_prefix'])) {
- return array(78, "Error: Please configure the email address
prefix.\n");
+ return array(78, gettext("Error: Please configure the email
address prefix.") . "\n");
}
- if (empty($mail_domain)) {
+ if (empty($setup['email_routing']['address_host'])) {
- return array(78, "Error: Please configure the email address
domain.\n");
+ return array(78, gettext("Error: Please configure the email
address domain.") . "\n");
}
+
$structure = Mime_Helper::decode($full_message, true, true);
@@ -79,13 +79,13 @@
- if (!empty($matches[1])) {
- $issue_id = $matches[1];
- } else {
-- return array(65, "Error: The routed email had no associated
Eventum issue ID or had an invalid recipient address.\n");
+- return array(65, gettext("Error: The routed email had no
associated Eventum issue ID or had an invalid recipient address.") . "\n");
- }
+ $issue_id =
Routing::getMatchingIssueIDs($structure->headers['cc'], 'email');
+ }
+
+ if (empty($issue_id)) {
-+ return array(65, "Error: The routed email had no associated
Eventum issue ID or had an invalid recipient address.\n");
++ return array(65, gettext("Error: The routed email had no
associated Eventum issue ID or had an invalid recipient address.") . "\n");
}
+
if (empty($email_account_id)) {
@@ -93,7 +93,7 @@
if (empty($issue_prj_id)) {
@@ -305,30 +299,26 @@
if (@$setup['note_routing']['status'] != 'enabled') {
- return array(78, "Error: The internal note routing interface is
disabled.\n");
+ return array(78, gettext("Error: The internal note routing
interface is disabled.") . "\n");
}
- $prefix = $setup['note_routing']['address_prefix'];
- // escape plus signs so '[EMAIL PROTECTED]' becomes a valid routing
address
@@ -101,11 +101,11 @@
- $mail_domain = quotemeta($setup['note_routing']['address_host']);
- if (empty($prefix)) {
+ if (empty($setup['note_routing']['address_prefix'])) {
- return array(78, "Error: Please configure the email address
prefix.\n");
+ return array(78, gettext("Error: Please configure the email
address prefix.") . "\n");
}
- if (empty($mail_domain)) {
+ if (empty($setup['note_routing']['address_host'])) {
- return array(78, "Error: Please configure the email address
domain.\n");
+ return array(78, gettext("Error: Please configure the email
address domain.") . "\n");
}
$structure = Mime_Helper::decode($full_message, true, true);
@@ -123,27 +123,27 @@
- if (!empty($matches[1])) {
- $issue_id = $matches[1];
- } else {
-- return array(65, "Error: The routed note had no associated
Eventum issue ID or had an invalid recipient address.\n");
+- return array(65, gettext("Error: The routed note had no
associated Eventum issue ID or had an invalid recipient address.") . "\n");
- }
+ $issue_id =
Routing::getMatchingIssueIDs($structure->headers['cc'], 'note');
+ }
+
+ if (empty($issue_id)) {
-+ return array(65, "Error: The routed note had no associated
Eventum issue ID or had an invalid recipient address.\n");
++ return array(65, gettext("Error: The routed note had no
associated Eventum issue ID or had an invalid recipient address.")" . "\n");
}
$prj_id = Issue::getProjectID($issue_id);
-@@ -389,6 +379,7 @@
+@@ -377,6 +377,7 @@
if ($res != -1) {
Support::extractAttachments($issue_id, $full_message, true, $res);
}
+ // FIXME! $res == -2 is not handled
- History::add($issue_id, Auth::getUserID(),
History::getTypeID('note_routed'), "Note routed from " .
$structure->headers['from']);
+ History::add($issue_id, Auth::getUserID(),
History::getTypeID('note_routed'), ev_gettext('Note routed from %1$s',
$structure->headers['from']));
return true;
@@ -433,30 +424,27 @@
if (@$setup['draft_routing']['status'] != 'enabled') {
- return array(78, "Error: The email draft interface is
disabled.\n");
+ return array(78, gettext("Error: The email draft interface is
disabled.") . "\n");
}
- $prefix = $setup['draft_routing']['address_prefix'];
- // escape plus signs so '[EMAIL PROTECTED]' becomes a valid address
@@ -151,11 +151,11 @@
- $mail_domain = quotemeta($setup['draft_routing']['address_host']);
- if (empty($prefix)) {
+ if (empty($setup['draft_routing']['address_prefix'])) {
- return array(78, "Error: Please configure the email address
prefix.\n");
+ return array(78, gettext("Error: Please configure the email
address prefix.") . "\n");
}
- if (empty($mail_domain)) {
+ if (empty($setup['draft_routing']['address_host'])) {
- return array(78, "Error: Please configure the email address
domain.\n");
+ return array(78, gettext("Error: Please configure the email
address domain.") . "\n");
}
+
$structure = Mime_Helper::decode($full_message, true, false);
@@ -174,13 +174,13 @@
- if (!empty($matches[1])) {
- $issue_id = $matches[1];
- } else {
-- return array(65, "Error: The routed draft had no associated
Eventum issue ID or had an invalid recipient address.\n");
+- return array(65, gettext("Error: The routed draft had no
associated Eventum issue ID or had an invalid recipient address.") . "\n");
- }
+ $issue_id =
Routing::getMatchingIssueIDs($structure->headers['cc'], 'draft');
+ }
+
+ if (empty($issue_id)) {
-+ return array(65, "Error: The routed email had no associated
Eventum issue ID or had an invalid recipient address.\n");
++ return array(65, gettext("Error: The routed email had no
associated Eventum issue ID or had an invalid recipient address.") . "\n");
}
$prj_id = Issue::getProjectID($issue_id);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/eventum-paths.patch?r1=1.30&r2=1.31&f=u
http://cvs.pld-linux.org/SOURCES/eventum-combined.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
