[dev] Was the Fetchmail Commit complete

Nuno Loureiro nuno@co.eth.pt
28 May 2002 12:57:34 +0100
Previous message: [dev] Was the Fetchmail Commit complete
Next message: [dev] Was the Fetchmail Commit complete
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Tue, 2002-05-28 at 00:55, Edwin Culp wrote:
> P.S. Nuno, I'm attaching my diff file from cvs after applying the patches
>      manually.  May help find the bug and it is easy for me to do.

You mean, a "cvs diff" after apply the patches? 
Why don't you cvs update then? I think I miss something here, sorry.

If that is cvs diff after apply the patches, then is normal it's not
working...
 
> Quoting Edwin Culp <eculp@encontacto.net>:
> 
> > I can fetch my mail with yesterday's version, no problem.  With today's
> > version I get a no messages to fetch with or without the new messages b=
ox
> > checked.  It logs in and logs out, nothing else.  If I have new mail in=
 
> > my Maildir/new it is moved to Maildir/cur and that is it.  
> > 
> > I could be at fault here.  Does anyone have the current head version wo=
rking
> > with the check box for "Get only new messages"?  If not I will try to a=
pply
> > Nuno's  patch manually on yesterday's version and test it.  When I saw =
that
> > it didn't apply cleanly and that Jan had committed it, I just did a cvs
> > update.
> > 
> > Thanks,
> > 
> > ed
> > 
> > -- 
> > 
> > 
> > -------------------------------------------------------------
> >  http://insourcery.com - Mergence of Business and Technology  
> >           a "Griffin Plaza Partners, LLC" Company
> > 
> > -- 
> > Horde developers mailing list
> > Frequently Asked Questions: http://horde.org/faq/
> > To unsubscribe, mail: dev-unsubscribe@lists.horde.org
> 
> 
> -- 
> 
> 
> -------------------------------------------------------------
>  http://insourcery.com - Mergence of Business and Technology  
>           a "Griffin Plaza Partners, LLC" Company
> ----
> 

> Index: imp/templates/fetchmail/fetchmail.inc
> =========================
===========================================
> RCS file: /repository/imp/templates/fetchmail/fetchmail.inc,v
> retrieving revision 1.6
> diff -u -r1.6 fetchmail.inc
> --- imp/templates/fetchmail/fetchmail.inc	25 May 2002 17:15:47 -0000	1.6
> +++ imp/templates/fetchmail/fetchmail.inc	27 May 2002 23:35:59 -0000
> @@ -45,10 +45,12 @@
>  
>      <?= _("Local Mailbox:") ?><br />
>      <select name="lmailbox">
> -        <?= IMP::flistSelect('', false, false, isset($to_edit) ? $acco=
unt->getValue('lmailbox', $to_edit) : '') ?>
> +        <?= IMP::flistSelect('', false, '', isset($to_edit) ? $account=
->getValue('lmailbox', $to_edit) : '') ?>
>      </select>
> -<?php } ?>
> +<?php } ?><br />
>  
> +<input type="checkbox" name="onlynew" value="1" <?= isset($to_ed=
it) && $account->getValue('onlynew', $to_edit) ? 'checked="checked" ' : '' ?>/>
> +<?= _("Get only new messages") ?><br />
>  
>  </td></tr></table></td></tr>
>  <tr>
> @@ -67,15 +69,18 @@
>  </tr>
>  </table>
>  
> +</td></tr>
>  <tr><td>
>  </td></tr>
>  <tr>
>     <td class="item">
>     <b><?=_("Status")?>:</b>
> -<? if ($num_msgs) { ?>
> +<? if ($num_msgs > 0) { ?>
>              <span id="stat"><?= sprintf(_("%s messages were fetched.=
.."), $num_msgs) ?></span>
>  <? } elseif (isset($error) && $error != 'ok') { ?>
>              <span id="stat"><?=$error?></span>
> +<? } elseif ($num_msgs == 0) { ?>
> +            <span id="stat"><?=_("No messages to fetch...") ?></span=
>
>  <? } else { ?>
>              <span id="stat">&nbsp;</span>
>  <? } ?>
> Index: imp/templates/fetchmail/fetchmail_js.inc
> =========================
===========================================
> RCS file: /repository/imp/templates/fetchmail/fetchmail_js.inc,v
> retrieving revision 1.1
> diff -u -r1.1 fetchmail_js.inc
> --- imp/templates/fetchmail/fetchmail_js.inc	25 May 2002 17:15:48 -0000	1=
.1
> +++ imp/templates/fetchmail/fetchmail_js.inc	27 May 2002 23:35:59 -0000
> @@ -12,7 +12,8 @@
>          "<?= addslashes($account->getValue('username', $i)) ?>",
>          "<?= addslashes($account->getValue('password', $i)) ?>",
>          "<?= addslashes($account->getValue('rmailbox', $i)) ?>",
> -        "<?= addslashes($account->getValue('lmailbox', $i)) ?>"
> +        "<?= addslashes($account->getValue('lmailbox', $i)) ?>",
> +        "<?= addslashes($account->getValue('onlynew', $i)) ?>"
>      )<?php if ($i + 1 < count($accounts)) echo ','; ?>
>  
>  <?php endfor; ?>
> @@ -35,13 +36,11 @@
>  
>  function updateForm(account)
>  {
> -    document.accounts.edit_account.value = account;
>      document.accounts.id.value =            fields[account][0];
>      document.accounts.server.value =     fields[account][2];
>      document.accounts.username.value =  fields[account][3];
>      document.accounts.password.value =     fields[account][4];
>      document.accounts.rmailbox.value =     fields[account][5];
> -    document.accounts.lmailbox.value =     fields[account][6];
>      document.accounts.protocol.selectedIndex = 0;
>      for (var i = 0; i < document.accounts.protocol.length; i++) {
>          if (document.accounts.protocol[i].value == fields[account][1=
]) {
> @@ -49,19 +48,28 @@
>              break;
>          }
>      }
> +    document.accounts.lmailbox.selectedIndex = 0;
> +    for (var i = 0; i < document.accounts.lmailbox.length; i++) {
> +        if (document.accounts.lmailbox[i].value == fields[account][6=
]) {
> +            document.accounts.lmailbox.selectedIndex = i;
> +            break;
> +        }
> +    }
> +    if (fields[account][7] == "1") document.accounts.onlynew.checked=
 = true;
> +    else document.accounts.onlynew.checked = false;
>  }
>  
>  function clearForm()
>  {
> -    document.accounts.edit_account.value = '';
>      document.accounts.id.value = '';
>      document.accounts.server.value = '';
>      document.accounts.username.value = '';
>      document.accounts.password.value = '';
>      document.accounts.rmailbox.value = '';
> -    document.accounts.lmailbox.checked = false;
> +    document.accounts.lmailbox.selectedIndex = 0;
>      document.accounts.protocol.selectedIndex = 0;
>      document.accounts.account.selectedIndex = 0;
> +    document.accounts.onlynew.checked  = false;
>      cancelSubmit = true;
>  }
>  
> Index: imp/templates/fetchmail/javascript.inc
> =========================
===========================================
> RCS file: /repository/imp/templates/fetchmail/javascript.inc,v
> retrieving revision 1.1
> diff -u -r1.1 javascript.inc
> --- imp/templates/fetchmail/javascript.inc	25 May 2002 17:15:48 -0000	1.1
> +++ imp/templates/fetchmail/javascript.inc	27 May 2002 23:35:59 -0000
> @@ -12,7 +12,8 @@
>          "<?= addslashes($account->getValue('username', $i)) ?>",
>          "<?= addslashes($account->getValue('password', $i)) ?>",
>          "<?= addslashes($account->getValue('rmailbox', $i)) ?>",
> -        "<?= addslashes($account->getValue('lmailbox', $i)) ?>"
> +        "<?= addslashes($account->getValue('lmailbox', $i)) ?>",
> +        "<?= addslashes($account->getValue('onlynew', $i)) ?>"
>      )<?php if ($i + 1 < count($accounts)) echo ','; ?>
>  
>  <?php endfor; ?>
> @@ -39,7 +40,6 @@
>      document.accounts.username.value =  fields[account][3];
>      document.accounts.password.value =     fields[account][4];
>      document.accounts.rmailbox.value =     fields[account][5];
> -    document.accounts.lmailbox.value =     fields[account][6];
>      document.accounts.protocol.selectedIndex = 0;
>      for (var i = 0; i < document.accounts.protocol.length; i++) {
>          if (document.accounts.protocol[i].value == fields[account][1=
]) {
> @@ -47,9 +47,16 @@
>              break;
>          }
>      }
> -}
> -
> -function clearForm()
> +    document.accounts.lmailbox.selectedIndex = 0;
> +    for (var i = 0; i < document.accounts.lmailbox.length; i++) {
> +        if (document.accounts.lmailbox[i].value == fields[account][6=
]) {
> +            document.accounts.lmailbox.selectedIndex = i;
> +            break;
> +        }
> +    }
> +    if (fields[account][7] == "1") document.accounts.onlynew.checked=
 = true;
> +    else document.accounts.onlynew.checked = false;
> + }  function clearForm()
>  {
>      document.accounts.edit_account.value = '';
>      document.accounts.id.value = '';
> @@ -57,9 +64,10 @@
>      document.accounts.username.value = '';
>      document.accounts.password.value = '';
>      document.accounts.rmailbox.value = '';
> -    document.accounts.lmailbox.checked = false;
> +    document.accounts.lmailbox.selectedIndex = 0;
>      document.accounts.protocol.selectedIndex = 0;
>      document.accounts.account.selectedIndex = 0;
> +    document.accounts.onlynew.checked  = false;
>      cancelSubmit = true;
>  }
>  
> Index: imp/templates/fetchmail/manage.inc
> =========================
===========================================
> RCS file: /repository/imp/templates/fetchmail/manage.inc,v
> retrieving revision 1.1
> diff -u -r1.1 manage.inc
> --- imp/templates/fetchmail/manage.inc	25 May 2002 17:15:48 -0000	1.1
> +++ imp/templates/fetchmail/manage.inc	27 May 2002 23:35:59 -0000
> @@ -47,7 +47,10 @@
>      <select name="lmailbox">
>          <?= IMP::flistSelect('', false, false, isset($to_edit) ? $acco=
unt->getValue('lmailbox', $to_edit) : '') ?>
>      </select>
> -<?php } ?>
> +<?php } ?><br />
> +
> +<input type="checkbox" name="onlynew" value="1" <?= isset($to_ed=
it) && $account->getValue('onlynew', $to_edit) ? 'checked="checked" ' : '' ?>/>
> +<?= _("Get only new messages") ?><br />
>  
>  </td></tr></table></td></tr>
>  <tr>
> ----
> 

> 
> -- 
> Horde developers mailing list
> Frequently Asked Questions: http://horde.org/faq/
> To unsubscribe, mail: dev-unsubscribe@lists.horde.org
-- 
Nuno Loureiro <nuno@eth.pt>
Ethernet, Soluções Informáticas, LDA
http://www.eth.pt
Previous message: [dev] Was the Fetchmail Commit complete
Next message: [dev] Was the Fetchmail Commit complete
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]