[dev] commit please

[Anton Nekhoroshikh]

Hello, dev.

This patch fix and enable now select charset in messages at russian
language.

================================================
*** imp/templates/message/navbar.inc.orig     Sat Mar  1 11:22:10 2003
--- imp/templates/message/navbar.inc  Sat Mar  1 11:21:03 2003
***************
*** 55,65 ****
  <td align="right" colspan="2">
  <?php echo _("Select charset:") ?>
   <?php echo Horde::link($self_link, _('Automatic charset'), 'widget') . 'Automatic</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'win'), _('WIN charset'), 'widget') . 'WIN</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'koi'), _('KOI charset'), 'widget') . 'KOI</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'dos'), _('DOS charset'), 'widget') . 'DOS</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'iso'), _('ISO charset'), 'widget') . 'ISO</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'mac'), _('MAC charset'), 'widget') . 'MAC</a>' ?>
  </td>
  </tr>
  <?php endif; ?>
--- 55,65 ----
  <td align="right" colspan="2">
  <?php echo _("Select charset:") ?>
   <?php echo Horde::link($self_link, _('Automatic charset'), 'widget') . 'Automatic</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'windows-1251'), _('WIN charset'), 'widget') . 'WIN</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'koi8-r'), _('KOI charset'), 'widget') . 'KOI</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'cp866'), _('DOS charset'), 'widget') . 'DOS</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'iso-8859-5'), _('ISO charset'), 'widget') . 'ISO</a>' ?>
!  | <?php echo Horde::link(Horde::addParameter($self_link, 'charset', 'mac-cyrillic'), _('MAC charset'), 'widget') . 'MAC</a>' ?>
  </td>
  </tr>
  <?php endif; ?>
================================================


================================================
*** horde/lib/MIME/Part.php.orig       Sat Mar  1 11:26:27 2003
--- horde/lib/MIME/Part.php    Sat Mar  1 11:25:02 2003
***************
*** 1188,1194 ****

          /* Do character set conversions now. */
          if (($msg_charset = $this->getCharset(true))) {
!             $message = String::convertCharset($message, $msg_charset, $charset);
          }

          return $message;
--- 1188,1194 ----

          /* Do character set conversions now. */
          if (($msg_charset = $this->getCharset(true))) {
!             $message = String::convertCharset($message, $msg_charset, Horde::getFormData('charset') ? Horde::getFormData('charset'):$charset);
          }

          return $message;
================================================

-- 
Technical director,
Anton Nekhoroshikh                          mailto:anton at valuehost.ru