- merged from localization branch

Changed files:
    eventum-close-signature.patch -> 1.2
    eventum-combined.patch -> 1.3
    eventum-compact-issue-display.patch -> 1.2
    eventum-config-setup.php -> 1.8
    eventum-httpclient-clientside.patch -> 1.3
    eventum-lf.patch -> 1.4
    eventum-paths.patch -> 1.30
    eventum-timetracking-advanced-logic.patch -> 1.2
    eventum.spec -> 1.189

diff --git a/eventum-close-signature.patch b/eventum-close-signature.patch
index e76d233ee807dc28be17c80fa36d16af0a4445f3..5233a56469bd4909f1ee135e6b01b96959514cea 100644 (file)
--- a/eventum-close-signature.patch
+++ b/eventum-close-signature.patch
@@ -16,7 +16,7 @@ signature appended. feature request by slay.
 -?>
 \ No newline at end of file
 +?>
---- eventum-1.7.1/templates/en/close.tpl.html  2006-03-31 12:03:17.310786621 +0300
+--- eventum-1.7.1/templates/close.tpl.html     2006-03-31 12:03:17.310786621 +0300
 +++ /home/glen/close.tpl.html  2006-03-31 12:04:47.462798592 +0300
 @@ -90,6 +90,22 @@
          cell.style.background = "{/literal}{$internal_color}{literal}";
@@ -53,11 +53,13 @@ signature appended. feature request by slay.
              {include file="error_icon.tpl.html" field="reason"}
            </td>
          </tr>
-@@ -205,6 +224,16 @@
+--- eventum-localization-dev2/templates/close.tpl.html~        2006-06-02 00:56:06.638714939 +0300
++++ eventum-localization-dev2/templates/close.tpl.html 2006-06-02 00:57:12.060184006 +0300
+@@ -222,7 +222,16 @@
                <tr>
-                 <td><input class="button" type="button" value="&lt;&lt; Back" onClick="javascript:history.go(-1);"></td>
-                 <td width="100%" align="center"><input class="button" type="submit" value="Close Issue"></td>
-+
+                 <td><input class="button" type="button" value="&lt;&lt; {t}Back{/t}" onClick="javascript:history.go(-1);"></td>
+                 <td width="100%" align="center"><input class="button" type="submit" value="{t}Close Issue{/t}"></td>
+-              </tr>
 +                {if $current_user_prefs.email_signature != "" and $current_user_prefs.auto_append_sig != 'yes'}
 +                <td class="default_white" align="right" width="150">
 +                  <nobr>
@@ -67,6 +69,7 @@ signature appended. feature request by slay.
 +                  </nobr>
 +                </td>
 +                {/if}
-               </tr>
++            </tr>
              </table>
            </td>
+         </tr>

diff --git a/eventum-combined.patch b/eventum-combined.patch
index 3f2cc81bf643c97f81e21a28f7a67c30f180de90..144194053c20fdc9bb51935aafc6aecd73d95e3c 100644 (file)
--- a/eventum-combined.patch
+++ b/eventum-combined.patch
@@ -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 @@ Add new method Routing::getMatchingIssueIDs().
 +                    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') {

diff --git a/eventum-compact-issue-display.patch b/eventum-compact-issue-display.patch
index 9fd7ba8ca2a59a25a597512b011a472fc58896e7..64a859c3121a54f636c2cacf25d81155306e942f 100644 (file)
--- a/eventum-compact-issue-display.patch
+++ b/eventum-compact-issue-display.patch
@@ -1,5 +1,5 @@
---- eventum-1.7.0/templates/en/attachments.tpl.html     2005-12-30 08:27:24.000000000 +1300
-+++ eventum/templates/en/attachments.tpl.html   2006-02-22 16:28:47.000000000 +1300
+--- eventum-1.7.0/templates/attachments.tpl.html     2005-12-30 08:27:24.000000000 +1300
++++ eventum/templates/attachments.tpl.html   2006-02-22 16:28:47.000000000 +1300
 @@ -31,7 +31,6 @@
  //-->
  </script>
@@ -16,8 +16,8 @@
              {if $browser.ie5up or $browser.ns6up or $browser.gecko or $browser.safari}
              [ <a id="attachments_link" class="link" href="javascript:void(null);" onClick="javascript:toggleVisibility('attachments');">{get_innerhtml element_name="attachments"}</a> ]
              {/if}
---- eventum-1.7.0/templates/en/checkins.tpl.html        2005-12-30 08:27:25.000000000 +1300
-+++ eventum/templates/en/checkins.tpl.html      2006-02-22 16:29:26.000000000 +1300
+--- eventum-1.7.0/templates/checkins.tpl.html        2005-12-30 08:27:25.000000000 +1300
++++ eventum/templates/checkins.tpl.html      2006-02-22 16:29:26.000000000 +1300
 @@ -20,7 +20,6 @@
  //-->
  </script>
@@ -34,8 +34,8 @@
              {if $browser.ie5up or $browser.ns6up or $browser.gecko or $browser.safari or $browser.opera5up}
              [ <a id="checkins_link" class="link" href="javascript:void(null);" onClick="javascript:toggleVisibility('checkins');">{get_innerhtml element_name="checkins" total=$checkins|@count}</a> ]
              {/if} Common subdirectories: eventum-1.7.0/templates/en/customer and eventum/templates/en/customer
---- eventum-1.7.0/templates/en/custom_fields.tpl.html   2005-12-30 08:27:24.000000000 +1300
-+++ eventum/templates/en/custom_fields.tpl.html 2006-02-22 16:27:56.000000000 +1300
+--- eventum-1.7.0/templates/custom_fields.tpl.html   2005-12-30 08:27:24.000000000 +1300
++++ eventum/templates/custom_fields.tpl.html 2006-02-22 16:27:56.000000000 +1300
 @@ -11,7 +11,6 @@
  //-->
  </script>
@@ -54,8 +54,8 @@
              {if $browser.ie5up or $browser.ns6up or $browser.gecko or $browser.safari or $browser.opera5up}
              [ <a id="custom_fields_link" class="link" href="javascript:void(null);" onClick="javascript:toggleVisibility('custom_fields');">{get_innerhtml element_name="custom_fields" total=$custom_fields|@count}</a> ]
              {/if}
---- eventum-1.7.0/templates/en/email_drafts.tpl.html    2005-12-30 08:27:25.000000000 +1300
-+++ eventum/templates/en/email_drafts.tpl.html  2006-02-22 16:31:17.000000000 +1300
+--- eventum-1.7.0/templates/email_drafts.tpl.html    2005-12-30 08:27:25.000000000 +1300
++++ eventum/templates/email_drafts.tpl.html  2006-02-22 16:31:17.000000000 +1300
 @@ -33,7 +33,6 @@
  {else}
    {assign var="draft_col_count" value="6"}
@@ -74,8 +74,8 @@
              [ <a id="drafts_link" class="link" href="javascript:void(null);" onClick="javascript:toggleVisibility('drafts');">{get_innerhtml element_name="drafts" total=$drafts|@count}</a> ]
              {/if}
            </td> Common subdirectories: eventum-1.7.0/templates/en/expandable_cell and eventum/templates/en/expandable_cell
---- eventum-1.7.0/templates/en/notes.tpl.html   2005-12-30 08:27:24.000000000 +1300
-+++ eventum/templates/en/notes.tpl.html 2006-02-22 16:30:29.000000000 +1300
+--- eventum-1.7.0/templates/notes.tpl.html   2005-12-30 08:27:24.000000000 +1300
++++ eventum/templates/notes.tpl.html 2006-02-22 16:30:29.000000000 +1300
 @@ -43,7 +43,6 @@
  //-->
  </script>
@@ -92,8 +92,8 @@
              {if $browser.ie5up or $browser.ns6up or $browser.gecko or $browser.safari or $browser.opera5up or $browser.safari or $browser.opera5up}
              [ <a id="notes_link" class="link" href="javascript:void(null);" onClick="javascript:toggleVisibility('notes');">{get_innerhtml element_name="notes" total=$notes|@count}</a> ]
              {/if} Common subdirectories: eventum-1.7.0/templates/en/notifications and eventum/templates/en/notifications
---- eventum-1.7.0/templates/en/phone_support.tpl.html   2005-12-30 08:27:24.000000000 +1300
-+++ eventum/templates/en/phone_support.tpl.html 2006-02-22 16:31:01.000000000 +1300
+--- eventum-1.7.0/templates/phone_support.tpl.html   2005-12-30 08:27:24.000000000 +1300
++++ eventum/templates/phone_support.tpl.html 2006-02-22 16:31:01.000000000 +1300
 @@ -24,7 +24,6 @@
  //-->
  </script>
@@ -112,8 +112,8 @@
              [ <a id="phone_support_link" class="link" href="javascript:void(null);" onClick="javascript:toggleVisibility('phone_support');">{get_innerhtml element_name="phone_support" total=$phone_entries|@count}</a> ]
              {/if}
          </td> Common subdirectories: eventum-1.7.0/templates/en/reminders and eventum/templates/en/reminders
---- eventum-1.7.0/templates/en/support_emails.tpl.html  2005-12-30 08:27:24.000000000 +1300
-+++ eventum/templates/en/support_emails.tpl.html        2006-02-22 16:31:39.000000000 +1300
+--- eventum-20060717/templates/support_emails.tpl.html~        2006-07-18 01:39:25.025514665 +0300
++++ eventum-20060717/templates/support_emails.tpl.html 2006-07-18 01:41:22.838147227 +0300
 @@ -40,7 +40,6 @@
  //-->
  </script>
@@ -122,18 +122,16 @@
  {if $current_role > $roles.viewer}
      {assign var="email_col_count" value="8"}
  {else}
-@@ -57,7 +56,8 @@
-             <b>Associated Emails ({if $emails|@is_array}{$emails|@count}{else}0{/if})</b>
+@@ -56,6 +56,7 @@
+             <b>{t}Associated Emails{/t} ({if $emails|@is_array}{$emails|@count}{else}0{/if})</b>
            </td>
            <td align="right" class="default">
--            {if $current_role >= $roles.standard_user}
-+            [ <a class="link" href="#top">Back to Top</a><a id="link" class="link" href="#top"></a> ]
-+          {if $current_role >= $roles.standard_user}
-             [ <a href="mail_queue.php?iss_id={$smarty.get.id}" class="link" title="view the history of sent emails">Mail Queue Log</a> ]
++            [ <a class="link" href="#top">{t}Back to Top{/t}</a><a id="link" class="link" href="#top"></a> ]
+             {if $current_role >= $roles.standard_user}
+             [ <a href="mail_queue.php?iss_id={$smarty.get.id}" class="link" title="{t}view the history of sent emails{/t}">{t}Mail Queue Log{/t}</a> ]
              {/if}
-             {if $browser.ie5up or $browser.ns6up or $browser.gecko or $browser.safari or $browser.opera5up or $browser.safari or $browser.opera5up}
---- eventum-1.7.0/templates/en/time_tracking.tpl.html   2005-12-30 08:27:24.000000000 +1300
-+++ eventum/templates/en/time_tracking.tpl.html 2006-02-22 16:29:50.000000000 +1300
+--- eventum-1.7.0/templates/time_tracking.tpl.html   2005-12-30 08:27:24.000000000 +1300
++++ eventum/templates/time_tracking.tpl.html 2006-02-22 16:29:50.000000000 +1300
 @@ -24,7 +24,6 @@
  //-->
  </script>
@@ -150,8 +148,8 @@
              {if $browser.ie5up or $browser.ns6up or $browser.gecko or $browser.safari or $browser.opera5up or $browser.safari or $browser.opera5up}
              [ <a id="time_tracker_link" class="link" href="javascript:void(null);" onClick="javascript:toggleVisibility('time_tracker');">{get_innerhtml element_name="time_tracker" total=$time_entries|@count}</a> ]
              {/if} Common subdirectories: eventum-1.7.0/templates/en/tips and eventum/templates/en/tips
---- eventum-1.7.0/templates/en/view.tpl.html    2005-12-30 08:27:24.000000000 +1300
-+++ eventum/templates/en/view.tpl.html  2006-02-22 16:26:14.000000000 +1300
+--- eventum-1.7.0/templates/view.tpl.html    2005-12-30 08:27:24.000000000 +1300
++++ eventum/templates/view.tpl.html  2006-02-22 16:26:14.000000000 +1300
 @@ -27,36 +27,27 @@
  {else}
    {include file="view_form.tpl.html"}

diff --git a/eventum-config-setup.php b/eventum-config-setup.php
index 4747da3ff41304e1803d54031e7e3d8a2dd1d2ba..5ba4a7e0b15275b0d612c10c5c2a6f671570e214 100644 (file)
--- a/eventum-config-setup.php
+++ b/eventum-config-setup.php
@@ -61,6 +61,7 @@ define("APP_DEFAULT_ASSIGNED_EMAILS", 1); // if the user will recieve an email w
 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");

diff --git a/eventum-httpclient-clientside.patch b/eventum-httpclient-clientside.patch
index 3a7ef99a48e6325beecde22e63a0f0821a7a76a1..daa499844be7977b68d42de6c6f0241ad7993a01 100644 (file)
--- a/eventum-httpclient-clientside.patch
+++ b/eventum-httpclient-clientside.patch
@@ -33,7 +33,7 @@ glen 2005-07-30, 2005-11-30
  }
 -{/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 @@ glen 2005-07-30, 2005-11-30
  {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 @@ glen 2005-07-30, 2005-11-30
  <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"}

diff --git a/eventum-lf.patch b/eventum-lf.patch
index 642920b203a50993208969f3c745021d2c5bc309..afed08993bd51549b1cff50e2a3646d20e441a1d 100644 (file)
--- a/eventum-lf.patch
+++ b/eventum-lf.patch
@@ -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 @@ minor look & feel fixes
      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 @@ minor look & feel fixes
      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">

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 8fcb93a578cfe9d7203e01d9a32cac67757c395f..8d9f86b3879a876c898a811cca57cdb5ae1451c5 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -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'));

diff --git a/eventum-timetracking-advanced-logic.patch b/eventum-timetracking-advanced-logic.patch
index 3c6eb9d6defb58af2bcb298cf5f72ef1016257a5..580a00a875eea0d01638fd589ecba60a2750073b 100644 (file)
--- a/eventum-timetracking-advanced-logic.patch
+++ b/eventum-timetracking-advanced-logic.patch
@@ -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)"'}&nbsp;
 +                  {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"}

diff --git a/eventum.spec b/eventum.spec
index 126c6b4e74dc40c229d81a205e7881a6f83e559b..72b54dc88b3a466ff7323002e02eba4bd4f21a4c 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -11,21 +11,20 @@
 %bcond_with    qmail   # build the router-qmail subpackage
 %bcond_with    order_patch     # with custom issue order patch
 
-#define        _snap   20060330
+%define        _snap   20060717
 #define        _rc             RC3
-%define        _rel    2.37
+%define        _rel    2.45
 
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl):   Eventum - system ¶ledzenia spraw/b³êdów
 Name:          eventum
 Version:       1.7.1
-Release:       %{?_snap:0.%{_snap}.}%{?_rc:%{_rc}.}%{_rel}
+Release:       %{?_rc:%{_rc}.}%{_rel}%{?_snap:.%{_snap}}
 License:       GPL
 Group:         Applications/WWW
-#Source0:      http://downloads.mysql.com/snapshots/eventum/%{name}-nightly-%{_snap}.tar.gz
-Source0:       http://mysql.dataphone.se/Downloads/eventum/%{name}-%{version}.tar.gz
-# Source0-md5: e1845de39b4d9bd30ddec9c26031a7d5
+Source0:       http://downloads.mysql.com/snapshots/eventum/%{name}-nightly-%{_snap}.tar.gz
+# Source0-md5: 1cce0226e038632a16a951ec225f3686
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -67,6 +66,8 @@ Patch22:      %{name}-mem-limits.patch
 Patch23:       %{name}-backtraces.patch
 Patch24:       %{name}-errorhandler.patch
 Patch25:       %{name}-unbalancedquotesinemailaddress.patch
+Patch26:       http://glen.alkohol.ee/pld/eventum/upgrade-2.0.patch
+Patch27:       http://glen.alkohol.ee/pld/eventum/checkins.tpl-typo.patch
 # packaging patches that probably never go upstream
 Patch100:      %{name}-paths.patch
 Patch101:      %{name}-cvs-config.patch
@@ -106,6 +107,7 @@ Requires:   php-pear-PEAR-core
 Requires:      php-pear-Text_Diff
 Requires:      php-pear-XML_RPC
 Requires:      php-session
+Requires:      smarty-gettext
 Requires:      webapps
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -477,10 +479,13 @@ Szczeg
 # undos the source
 find . -type f -print0 | xargs -0 sed -i -e 's,\r$,,'
 
+%patch26 -p1
+
 rm -f setup.conf.php # not to be installed by *.php glob
 rm -rf misc/upgrade/*v1.[123]* # too old to support in PLD Linux
 rm -f misc/upgrade/flush_compiled_templates.php
 rm -rf misc/upgrade/*/upgrade_config.php # not needed in PLD Linux
+rm -rf misc/upgrade/*/index.html # not needed in PLD Linux
 
 # sample, not used in eventum
 rm -f rpc/xmlrpc_client.php
@@ -512,6 +517,7 @@ rm -f rpc/xmlrpc_client.php
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch27 -p1
 
 # packaging
 %patch100 -p1
@@ -529,6 +535,24 @@ cat <<'EOF'> mysql-permissions.sql
 GRANT SELECT, UPDATE, DELETE, INSERT, ALTER, DROP, CREATE, INDEX ON eventum.* TO 'eventum'@'localhost' IDENTIFIED BY 'password';
 EOF
 
+mv misc/localization/de{_DE,}
+mv misc/localization/es{_ES,}
+mv misc/localization/fi{_FI,}
+mv misc/localization/fr{_FR,}
+mv misc/localization/it{_IT,}
+mv misc/localization/nl{_NL,}
+mv misc/localization/ru{_RU,}
+
+# oops, the file got truncated - quick fix
+cp misc/localization/eventum.po misc/localization/de/LC_MESSAGES/eventum.po
+cp misc/localization/eventum.po misc/localization/es/LC_MESSAGES/eventum.po
+cp misc/localization/eventum.po misc/localization/fi/LC_MESSAGES/eventum.po
+cp misc/localization/eventum.po misc/localization/fr/LC_MESSAGES/eventum.po
+cp misc/localization/eventum.po misc/localization/it/LC_MESSAGES/eventum.po
+cp misc/localization/eventum.po misc/localization/nl/LC_MESSAGES/eventum.po
+cp misc/localization/eventum.po misc/localization/ru/LC_MESSAGES/eventum.po
+cp misc/localization/eventum.po misc/localization/en_US/LC_MESSAGES/eventum.po
+
 sed -e '1s,#!.*/bin/php -q,#!%{_bindir}/php,' misc/cli/eventum > %{name}-cli
 sed -e '1i#!%{_bindir}/php' misc/scm/process_cvs_commits.php > %{name}-scm
 sed -e '1i#!%{_bindir}/php' misc/irc/bot.php > %{name}-bot
@@ -549,6 +573,12 @@ grep -rl 'APP_INC_PATH..*"private_key.php"' . | xargs sed -i -e '
 # remove backups from patching as we use globs to package files to buildroot
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
 
+%build
+cd misc/localization
+for a in */LC_MESSAGES; do
+       msgfmt -o $a/eventum.mo $a/eventum.po
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d \
@@ -629,6 +659,15 @@ install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/router-qmail
 install %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/router-postfix
 
 install -D %{SOURCE15} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+# locale
+cd misc/localization
+for a in */LC_MESSAGES; do
+       install -d $RPM_BUILD_ROOT%{_datadir}/locale/$a
+       cp -a $a/%{name}.mo $RPM_BUILD_ROOT%{_datadir}/locale/$a
+done
+cd -
+
+#%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -803,6 +842,11 @@ EOF
 database_changes.php Perform database changes
 EOF
 
+%triggerpostun -- eventum < 1.7.1-2.43.20060717
+%{_appdir}/upgrade/upgrade.sh %{_appdir}/upgrade/v1.7.1_to_v2.0 <<EOF
+database_changes.php Perform database changes
+EOF
+
 %triggerpostun irc -- eventum-irc < 1.6.1-3.14
 sed -i -e '
 s,\$irc_host,$irc_server_hostname,