Author: glen Date: Mon Jul 17 22:47:02 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from localization branch
---- Files affected:
SOURCES:
eventum-config-setup.php (1.7 -> 1.8) , eventum-lf.patch (1.3 -> 1.4) ,
eventum-paths.patch (1.29 -> 1.30) , eventum-httpclient-clientside.patch (1.2
-> 1.3) , eventum-combined.patch (1.2 -> 1.3) ,
eventum-timetracking-advanced-logic.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/eventum-config-setup.php
diff -u SOURCES/eventum-config-setup.php:1.7
SOURCES/eventum-config-setup.php:1.8
--- SOURCES/eventum-config-setup.php:1.7 Tue Mar 28 20:51:42 2006
+++ SOURCES/eventum-config-setup.php Tue Jul 18 00:46:56 2006
@@ -61,6 +61,7 @@
define("APP_DEFAULT_NEW_EMAILS", 0); // if the user will recieve an email when
ANY issue is created
define("APP_CHARSET", "ISO-8859-1");
+define("APP_DEFAULT_LOCALE", "en_US");
// define colors used by eventum
define("APP_CELL_COLOR", "#255282");
================================================================
Index: SOURCES/eventum-lf.patch
diff -u SOURCES/eventum-lf.patch:1.3 SOURCES/eventum-lf.patch:1.4
--- SOURCES/eventum-lf.patch:1.3 Wed Nov 30 17:02:46 2005
+++ SOURCES/eventum-lf.patch Tue Jul 18 00:46:56 2006
@@ -1,18 +1,18 @@
minor look & feel fixes
---- ./templates/en/faq.tpl.html~ 2005-02-27 17:59:14.000000000 +0200
-+++ ./templates/en/faq.tpl.html 2005-03-17 12:25:38.000000000 +0200
+--- eventum-localization-dev2/templates/faq.tpl.html~ 2006-06-02
00:55:02.347271167 +0300
++++ eventum-localization-dev2/templates/faq.tpl.html 2006-06-02
00:55:31.437924456 +0300
@@ -13,7 +13,7 @@
<td class="default_white"
bgcolor="{$cell_color}"><b>{$faq.faq_title|escape:"html"}</b></td>
</tr>
<tr>
- <td class="default" bgcolor="{$dark_color}">
+ <td class="default" bgcolor="{$dark_color}" height="260"
valign="top">
- <p><i>Last updated: {$faq.faq_updated_date}</i></p>
+ <p><i>{t}Last updated{/t}: {$faq.faq_updated_date}</i></p>
{$faq.message}
</td>
---- ./templates/en/view_form.tpl.html~ 2005-02-27 17:59:14.000000000 +0200
-+++ ./templates/en/view_form.tpl.html 2005-03-17 12:38:03.000000000 +0200
+--- ./templates/view_form.tpl.html~ 2005-02-27 17:59:14.000000000 +0200
++++ ./templates/view_form.tpl.html 2005-03-17 12:38:03.000000000 +0200
@@ -5,13 +5,13 @@
{literal}
function openHistory(issue_id)
@@ -29,8 +29,8 @@
var popupWin = window.open('notification.php?iss_id=' + issue_id,
'_notification', features);
popupWin.focus();
}
---- ./templates/en/update_form.tpl.html~ 2005-03-16 19:03:57.000000000
+0200
-+++ ./templates/en/update_form.tpl.html 2005-03-17 12:59:17.000000000
+0200
+--- ./templates/update_form.tpl.html~ 2005-03-16 19:03:57.000000000 +0200
++++ ./templates/update_form.tpl.html 2005-03-17 12:59:17.000000000 +0200
@@ -31,13 +31,13 @@
<!--
function openHistory(issue_id)
@@ -47,8 +47,8 @@
var popupWin = window.open('notification.php?iss_id=' + issue_id,
'_notification', features);
popupWin.focus();
}
---- eventum-20051130/templates/en/file_upload.tpl.html~ 2005-11-30
17:54:07.000000000 +0200
-+++ eventum-20051130/templates/en/file_upload.tpl.html 2005-11-30
17:55:45.000000000 +0200
+--- eventum-20051130/templates/file_upload.tpl.html~ 2005-11-30
17:54:07.000000000 +0200
++++ eventum-20051130/templates/file_upload.tpl.html 2005-11-30
17:55:45.000000000 +0200
@@ -79,13 +79,13 @@
<td bgcolor="{$light_color}">
<table width="100%" cellpadding="2" cellspacing="0"
id="file_table">
================================================================
Index: SOURCES/eventum-paths.patch
diff -u SOURCES/eventum-paths.patch:1.29 SOURCES/eventum-paths.patch:1.30
--- SOURCES/eventum-paths.patch:1.29 Sat Jan 7 01:16:01 2006
+++ SOURCES/eventum-paths.patch Tue Jul 18 00:46:56 2006
@@ -78,17 +78,17 @@
$_displayed_confirmation = false;
---- ./include/class.template.php~ 2005-02-27 17:49:54.000000000 +0200
-+++ ./include/class.template.php 2005-02-27 17:51:00.000000000 +0200
+--- eventum-localization-dev/include/class.template.php~ 2006-04-10
23:48:12.740151749 +0300
++++ eventum-localization-dev/include/class.template.php 2006-04-10
23:48:16.310231300 +0300
@@ -60,7 +60,7 @@
{
$this->smarty = new Smarty;
- $this->smarty->template_dir = APP_TPL_PATH . APP_CURRENT_LANG;
+ $this->smarty->template_dir = APP_TPL_PATH;
- $this->smarty->compile_dir = APP_PATH . "templates_c";
-+ $this->smarty->compile_dir = "/var/cache/eventum";
++ $this->smarty->compile_dir = '/var/cache/eventum';
$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
@@ -157,6 +165,7 @@
@@ -99,9 +99,9 @@
foreach ($required_directories as $dir_path => $options) {
// check if directory exists
if (!file_exists($dir_path)) {
---- ./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
-@@ -118,31 +118,31 @@
+--- eventum-20060717/setup/index.php~ 2006-07-18 00:20:57.530267420 +0300
++++ eventum-20060717/setup/index.php 2006-07-18 00:22:06.301805247 +0300
+@@ -121,31 +121,31 @@
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.";
}
@@ -140,6 +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
@@ -276,8 +276,8 @@
clearstatcache();
@@ -173,11 +175,10 @@
}
fclose($fp);
// check if we can connect
-@@ -425,23 +425,8 @@
- $tpl->assign('is_imap_enabled', function_exists('imap_open'));
+@@ -442,22 +442,8 @@
}
--
+
-$full_url = dirname($HTTP_SERVER_VARS['PHP_SELF']);
-$pieces = explode("/", $full_url);
-$relative_url = array();
@@ -190,10 +191,10 @@
-$relative_url[] = '';
-$relative_url = implode("/", $relative_url);
-
--if (substr($HTTP_SERVER_VARS['DOCUMENT_ROOT'], -1) == '/') {
+-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 = @$HTTP_SERVER_VARS['DOCUMENT_ROOT'] . $relative_url;
+$installation_path = "/usr/share/eventum";
+$relative_url = "/eventum/";
@@ -247,7 +248,18 @@
$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 @@
+@@ -417,7 +417,7 @@
+ $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false",
$config_contents);
+ }
+
+- $fp = @fopen('../config.inc.php', 'w');
++ $fp = @fopen('/etc/webapps/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-localization-dev2/setup/index.php~ 2006-06-02 00:58:11.321514674
+0300
++++ eventum-localization-dev2/setup/index.php 2006-06-02 00:58:46.032294537
+0300
+@@ -208,11 +208,11 @@
exit;
}
@@ -255,22 +267,13 @@
+include_once("/usr/share/pear/Smarty/Smarty.class.php");
$tpl = new Smarty();
--$tpl->template_dir = '../templates/en';
+-$tpl->template_dir = '../templates/';
-$tpl->compile_dir = "../templates_c";
-+$tpl->template_dir = '/usr/share/eventum/templates/en';
++$tpl->template_dir = '/usr/share/eventum/templates';
+$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/webapps/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 @@
@@ -288,12 +291,12 @@
include_once("File/Util.php");
$html = checkRequirements();
---- eventum-20051130/include/class.template.php~ 2005-11-30
17:51:55.000000000 +0200
-+++ eventum-20051130/include/class.template.php 2005-11-30
17:53:15.000000000 +0200
+--- eventum-localization-dev/include/class.template.php~ 2006-04-11
00:16:59.258616656 +0300
++++ eventum-localization-dev/include/class.template.php 2006-04-11
00:17:23.649160189 +0300
@@ -61,6 +61,7 @@
$this->smarty = new Smarty;
- $this->smarty->template_dir = APP_TPL_PATH . APP_CURRENT_LANG;
- $this->smarty->compile_dir = "/var/cache/eventum";
+ $this->smarty->template_dir = APP_TPL_PATH;
+ $this->smarty->compile_dir = '/var/cache/eventum';
+ $this->smarty->plugins_dir =
array('/usr/share/eventum/include/smarty', 'plugins');
$this->smarty->config_dir = '';
$this->smarty->register_modifier("activateLinks",
array('Link_Filter', 'activateLinks'));
================================================================
Index: SOURCES/eventum-httpclient-clientside.patch
diff -u SOURCES/eventum-httpclient-clientside.patch:1.2
SOURCES/eventum-httpclient-clientside.patch:1.3
--- SOURCES/eventum-httpclient-clientside.patch:1.2 Wed Dec 21 00:24:28 2005
+++ SOURCES/eventum-httpclient-clientside.patch Tue Jul 18 00:46:56 2006
@@ -33,7 +33,7 @@
}
-{/literal}
\ No newline at end of file
---- ./templates/en/view.tpl.html 2005-07-30 17:47:13.000000000 +0300
+--- ./templates/view.tpl.html 2005-07-30 17:47:13.000000000 +0300
+++ /tmp/view.tpl.html 2005-07-30 20:18:01.000000000 +0300
@@ -1,9 +1,7 @@
{include file="header.tpl.html" extra_title=$extra_title}
@@ -47,7 +47,7 @@
{if $issue == ""}
<table width="400" align="center">
<tr>
---- ./templates/en/mail_queue.tpl.html 2005-07-30 17:47:13.000000000 +0300
+--- ./templates/mail_queue.tpl.html 2005-07-30 17:47:13.000000000 +0300
+++ /tmp/mail_queue.tpl.html 2005-07-30 20:21:46.000000000 +0300
@@ -3,10 +3,8 @@
{if $denied == 1}
@@ -62,10 +62,11 @@
<form>
<table bgcolor="#FFFFFF" width="100%" cellspacing="1" cellpadding="2"
border="0">
<tr>
---- eventum-20051130/templates/en/reports/recent_activity.tpl.html~
2005-11-30 18:24:19.000000000 +0200
-+++ eventum-20051130/templates/en/reports/recent_activity.tpl.html
2005-11-30 18:25:09.000000000 +0200
-@@ -1,8 +1,6 @@
- {include file="header.tpl.html" extra_title="Recent Activity"}
+--- eventum-localization-dev2/templates/reports/recent_activity.tpl.html~
2006-06-02 01:01:26.205901620 +0300
++++ eventum-localization-dev2/templates/reports/recent_activity.tpl.html
2006-06-02 01:02:30.727354382 +0300
+@@ -1,9 +1,7 @@
+ {capture assign="extra_title"}{t}Recent Activity{/t}{/capture}
+ {include file="header.tpl.html" extra_title=$extra_title}
-<script language="javascript">
-{include file="../js/httpclient.js"}
-{include file="../js/expandable_cell.js"}
================================================================
Index: SOURCES/eventum-combined.patch
diff -u SOURCES/eventum-combined.patch:1.2 SOURCES/eventum-combined.patch:1.3
--- SOURCES/eventum-combined.patch:1.2 Mon Jul 17 23:09:07 2006
+++ SOURCES/eventum-combined.patch Tue Jul 18 00:46:56 2006
@@ -1,27 +1,17 @@
Catch error from address parsing.
-Fix typo in Mail_API::getAddressInfo().
---- eventum-1.7.1/include/class.mail.php 2006-04-12 00:48:18.349874724
+0300
-+++ /home/glen/class.mail.php 2006-04-12 00:52:33.195568053 +0300
-@@ -245,12 +245,16 @@
+--- eventum-20060717/include/class.mail.php~ 2006-07-18 01:21:08.631017731
+0300
++++ eventum-20060717/include/class.mail.php 2006-07-18 01:22:01.102190536
+0300
+@@ -244,6 +244,9 @@
$address = Mime_Helper::encodeValue($address);
include_once(APP_PEAR_PATH . "Mail/RFC822.php");
$t = Mail_RFC822::parseAddressList($address, null, null, false);
+ if (PEAR::isError($t)) {
+ Error_Handler::logError(array($t->getMessage(),
$t->getDebugInfo()), __FILE__, __LINE__);
+ }
-+
if ($multiple) {
$returns = array();
for ($i = 0; $i < count($t); $i++) {
- $returns[] = array(
- 'sender_name' => $t[$i]->personal,
-- 'email' => $t[$i]->mailbox . '@' . $t[0]->host,
-+ 'email' => $t[$i]->mailbox . '@' . $t[$i]->host,
- 'username' => $t[$i]->mailbox,
- 'host' => $t[$i]->host
- );
-
-------------------------------------------------------------------------------------------------------
Detect and log possibly corrupted MIME emails.
@@ -279,7 +269,7 @@
+ foreach ($email->cc as $address) {
+ $addresses[] = $address->mailbox . '@' .
$address->host;
}
-- if (preg_match("/$prefix(\d*)@$mail_domain/i",
$email->toaddress, $matches)) {
+- if ((isset($email->toaddress)) &&
(preg_match("/$prefix(\d*)@$mail_domain/i", $email->toaddress, $matches))) {
+ }
+
+ if (@$setup['email_routing']['status'] == 'enabled') {
================================================================
Index: SOURCES/eventum-timetracking-advanced-logic.patch
diff -u SOURCES/eventum-timetracking-advanced-logic.patch:1.1
SOURCES/eventum-timetracking-advanced-logic.patch:1.2
--- SOURCES/eventum-timetracking-advanced-logic.patch:1.1 Mon May 8
23:52:00 2006
+++ SOURCES/eventum-timetracking-advanced-logic.patch Tue Jul 18 00:46:56 2006
@@ -27,8 +27,8 @@
}
function padDateValue(str)
---- eventum-1.7.1/templates/en/add_time_tracking.tpl.html 2006-05-09
00:45:21.270477456 +0300
-+++ /home/glen/add_time_tracking.tpl.html 2006-05-09 00:49:05.375471751
+0300
+--- eventum-20060717/templates/add_time_tracking.tpl.html~ 2006-07-18
01:36:29.901601912 +0300
++++ eventum-20060717/templates/add_time_tracking.tpl.html 2006-07-18
01:37:24.232815764 +0300
@@ -51,6 +51,65 @@
}
return true;
@@ -102,13 +102,13 @@
- <tr>
+
+ <tr>
- <td bgcolor="{$internal_color}" class="default_white"
width="190" nowrap><b>Time Spent:</b></td>
-- <td bgcolor="{$light_color}" width="100%"><input
class="default" type="text" size="5" name="time_spent" class="default"> <span
class="default">(in minutes)</span>{include file="error_icon.tpl.html"
field="time_spent"}</td>
-+ <td bgcolor="{$light_color}" width="100%"><input
class="default" type="text" size="5" name="time_spent" class="default"
onChange="calcDateDiff(this.form, 0)"> <span class="default">(in
minutes)</span>{include file="error_icon.tpl.html" field="time_spent"}</td>
+ <td bgcolor="{$internal_color}" class="default_white"
width="190" nowrap><b>{t}Time Spent{/t}:</b></td>
+- <td bgcolor="{$light_color}" width="100%"><input
class="default" type="text" size="5" name="time_spent" class="default"> <span
class="default">({t}in minutes{/t})</span>{include file="error_icon.tpl.html"
field="time_spent"}</td>
++ <td bgcolor="{$light_color}" width="100%"><input
class="default" type="text" size="5" name="time_spent" class="default"
onChange="calcDateDiff(this.form, 0)"> <span class="default">({t}in
minutes{/t})</span>{include file="error_icon.tpl.html" field="time_spent"}</td>
+ </tr>
+
+ <tr>
-+ <td bgcolor="{$internal_color}" class="default_white"
width="190" nowrap><b>Work started:</b></td>
++ <td bgcolor="{$internal_color}" class="default_white"
width="190" nowrap><b>{t}Work started{/t}:</b></td>
+ <td bgcolor="{$light_color}" width="100%">
+ {html_select_date start_year='-1' day_value_format='%02d'
field_array='date' prefix='' all_extra=' class="default"
onChange="calcDateDiff(this.form, 1)"'}
+ {html_select_time minute_interval=5 field_array='date'
prefix='' all_extra=' class="default" onChange="calcDateDiff(this.form, 1)"'
display_seconds=false}
@@ -116,7 +116,7 @@
+ </td>
</tr>
- <tr>
-- <td bgcolor="{$internal_color}" class="default_white"
width="190" nowrap><b>Date of Work:</b></td>
+- <td bgcolor="{$internal_color}" class="default_white"
width="190" nowrap><b>{t}Date of Work{/t}:</b></td>
+
+ <tr>
+ <td bgcolor="{$internal_color}" class="default_white"
width="190" nowrap><b>Work ended:</b></td>
@@ -135,7 +135,7 @@
<td colspan="2" bgcolor="{$internal_color}" align="center"
width="100%" nowrap>
<input type="submit" value="Add Time Entry" class="button">
</td>
-@@ -111,8 +182,9 @@
+@@ -182,6 +182,7 @@
<script language="JavaScript">
<!--
updateTimeFields('add_time_form', 'date[Year]', 'date[Month]', 'date[Day]',
'date[Hour]', 'date[Minute]');
@@ -143,7 +143,3 @@
//-->
</script>
{include file="app_info.tpl.html"}
- {/if}
--{include file="footer.tpl.html"}
-\ No newline at end of file
-+{include file="footer.tpl.html"}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/eventum-config-setup.php?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SOURCES/eventum-lf.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/eventum-paths.patch?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/SOURCES/eventum-httpclient-clientside.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/eventum-combined.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/eventum-timetracking-advanced-logic.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
