postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!

SF.net SVN: postfixadmin: [207] trunk/VIRTUAL_VACATION/vacation.pl

[<Gin...@us...>]

Revision: 207
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=207&view=rev
Author:   GingerDog
Date:     2007-11-11 13:41:18 -0800 (Sun, 11 Nov 2007)

Log Message:
-----------
vacation.pl: updating spam check bit

Modified Paths:
--------------
    trunk/VIRTUAL_VACATION/vacation.pl

Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl	2007-11-11 19:05:42 UTC (rev 206)
+++ trunk/VIRTUAL_VACATION/vacation.pl	2007-11-11 21:41:18 UTC (rev 207)
@@ -325,7 +325,7 @@
    elsif (/^cc:\s+(.*)\n$/i) { $cc = $1; $lastheader = \$cc; }  
    elsif (/^subject:\s+(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }  
    elsif (/^message-id:\s+(.*)\n$/i) { $messageid = $1; $lastheader = \$messageid; }  
-   elsif (/^x-spam-flag:\s+yes$/i) { exit (0); }
+   elsif (/^x-spam-(flag|status):\s+yes/i) { exit (0); }  
    elsif (/^precedence:\s+(bulk|list|junk)/i) { exit (0); }  
    elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { exit (0); }  
    else {$lastheader = "" ; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [206] trunk/edit-admin.php

[<chr...@us...>]

Revision: 206
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=206&view=rev
Author:   christian_boltz
Date:     2007-11-11 11:05:42 -0800 (Sun, 11 Nov 2007)

Log Message:
-----------
- do not clear password on editing admins when no new password is entered
  Thanks for Benny Pedersen (xpunkt) to find out that this bug reappeared.
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1829564&group_id=191583

Modified Paths:
--------------
    trunk/edit-admin.php

Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php	2007-11-10 00:39:08 UTC (rev 205)
+++ trunk/edit-admin.php	2007-11-11 19:05:42 UTC (rev 206)
@@ -101,7 +101,11 @@
             $sqlActive = db_get_boolean(False);
         }
 
-        $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive',password='$fPassword' WHERE username='$username'");
+      $password_query = '';
+      if ($fPassword != '') { # do not change password to empty one
+         $password_query = ", password='$fPassword'";
+      }
+      $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive' $password_query WHERE username='$username'");
 
         if ($fSadmin == "on") $fSadmin = 'ALL';
 
@@ -150,3 +154,6 @@
 include ("templates/menu.tpl");
 include ("templates/admin_edit-admin.tpl");
 include ("templates/footer.tpl");
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [205] trunk/languages

[<chr...@us...>]

Revision: 205
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=205&view=rev
Author:   christian_boltz
Date:     2007-11-09 16:39:08 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
updated translations:
- ru.lang updated by Pavel Usischev (pusischev)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1828828&group_id=191583
- da.lang updated by Jesper R. Meyer (jespermeyer)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1828916&group_id=191583

Thanks!

Modified Paths:
--------------
    trunk/languages/da.lang
    trunk/languages/ru.lang

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2007-11-08 21:21:16 UTC (rev 204)
+++ trunk/languages/da.lang	2007-11-10 00:39:08 UTC (rev 205)
@@ -2,186 +2,192 @@
 //
 // Language file Danish
 // by Lars
+// updated by Jesper R. Meyer <jrm at upthere dot dk>
 //
 
 $PALANG['YES'] = 'JA';
 $PALANG['NO'] = 'NEJ';
-$PALANG['edit'] = 'rediger';
+$PALANG['edit'] = 'redigere';
 $PALANG['del'] = 'slet';
-$PALANG['exit'] = 'Exit'; # XXX
-$PALANG['confirm'] = 'Er du sikker p&aring; du vil slette dette?\n';
-$PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster for dette dom&aelig;ne? Dette kan ikke fortrydes!\n';
-$PALANG['check_update'] = 'Check for update';
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
-$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
+$PALANG['exit'] = 'Log af';
+$PALANG['confirm'] = 'Er du sikker på du vil slette dette?\n';
+$PALANG['confirm_domain'] = 'Vil du virkelig slette alle adresser for dette domæne? Dette kan ikke fortrydes!\n';
+$PALANG['check_update'] = 'Søg efter opdateringer';
+$PALANG['invalid_parameter'] = 'Ugyldig parameter!';
 
-$PALANG['pLogin_welcome'] = 'Postadministrator: Log ind her for at administrere dine dom&aelig;ner.';
+$PALANG['pFooter_logged_as'] = 'Indlogget som %s';
+
+$PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine domæner.';
 $PALANG['pLogin_username'] = 'Brugernavn (email)';
-$PALANG['pLogin_password'] = 'Kodeord';
+$PALANG['pLogin_password'] = 'Adgangskode';
 $PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Dit brugernavn er forkert. Verificer at du bruger din email-adresse som login!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Dit kodeord er forkert!</span>';
-$PALANG['pLogin_login_users'] = 'Bruger: Log ind p&aring; brugersektionen her.';
+$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Dit brugernavn er forkert. Kontroller at du bruger din emailadresse som brugernavn!</span>';
+$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Din adgangskode er forkert!</span>';
+$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
 
-$PALANG['pMenu_main'] = 'Main'; # XXX
+$PALANG['pMenu_main'] = 'Start';
 $PALANG['pMenu_overview'] = 'Oversigt';
-$PALANG['pMenu_create_alias'] = 'Tilf&oslash;j alias';
-$PALANG['pMenu_create_mailbox'] = 'Tilf&oslash;j postboks';
-$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
-$PALANG['pMenu_sendmail'] = 'Send Email';
-$PALANG['pMenu_password'] = 'Kodeord';
-$PALANG['pMenu_viewlog'] = 'Vis Log';
+$PALANG['pMenu_create_alias'] = 'Tilføj alias';
+$PALANG['pMenu_create_mailbox'] = 'Tilføj postboks';
+$PALANG['pMenu_fetchmail'] = 'Hent email';
+$PALANG['pMenu_sendmail'] = 'Send email';
+$PALANG['pMenu_password'] = 'Adgangskode';
+$PALANG['pMenu_viewlog'] = 'Vis log';
 $PALANG['pMenu_logout'] = 'Log ud';
 
 $PALANG['pMain_welcome'] = 'Velkommen til Postfix Admin!';
-$PALANG['pMain_overview'] = 'Vis alle aliaser og postbokse. Du kan redigere / slette dem herfra.';
-$PALANG['pMain_create_alias'] = 'Opret nyt alias til dit dom&aelig;ne.';
-$PALANG['pMain_create_mailbox'] = 'Opret nu postboks til dit dom&aelig;ne.';
+$PALANG['pMain_overview'] = 'Vis alle aliaser og postbokse. Du kan redigere/slette dem herfra.';
+$PALANG['pMain_create_alias'] = 'Opret nyt alias til dit domæne.';
+$PALANG['pMain_create_mailbox'] = 'Opret nu postboks til dit domæne.';
 $PALANG['pMain_sendmail'] = 'Send en email til en af dine nyoprettede postbokse.';
-$PALANG['pMain_password'] = 'Ret kodeordet til din administratorkonto.';
+$PALANG['pMain_password'] = 'Ændre adgangskoden til din administratorkonto.';
 $PALANG['pMain_viewlog'] = 'Vis logfiler.';
-$PALANG['pMain_logout'] = 'Log ud fra systemet';
+$PALANG['pMain_logout'] = 'Log ud fra systemet.';
 
-$PALANG['pOverview_disabled'] = 'Disabled';
-$PALANG['pOverview_unlimited'] = 'Unlimited';
-$PALANG['pOverview_title'] = ':: Defined Domains';
-$PALANG['pOverview_up_arrow'] = 'Go Top';
-$PALANG['pOverview_right_arrow'] = 'Next Page';
-$PALANG['pOverview_left_arrow'] = 'Previous Page';
+$PALANG['pOverview_disabled'] = 'Deaktiveret';
+$PALANG['pOverview_unlimited'] = 'Ubegrænset';
+$PALANG['pOverview_title'] = ':: Oprettede domæner';
+$PALANG['pOverview_up_arrow'] = 'Gå til top';
+$PALANG['pOverview_right_arrow'] = 'Næste side';
+$PALANG['pOverview_left_arrow'] = 'Foregående side';
 $PALANG['pOverview_alias_title'] = ':: Alias';
-$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
+$PALANG['pOverview_mailbox_title'] = ':: Postbokse';
 $PALANG['pOverview_button'] = 'Vis';
 $PALANG['pOverview_welcome'] = 'Oversigt for ';
 $PALANG['pOverview_alias_alias_count'] = 'Aliaser';
 $PALANG['pOverview_alias_mailbox_count'] = 'Postbokse';
 $PALANG['pOverview_alias_address'] = 'Fra';
 $PALANG['pOverview_alias_goto'] = 'Til';
-$PALANG['pOverview_alias_modified'] = 'Senest rettet';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
-$PALANG['pOverview_mailbox_username'] = 'Email';
+$PALANG['pOverview_alias_modified'] = 'Senest ændret';
+$PALANG['pOverview_alias_active'] = 'Aktiveret';
+$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['pOverview_mailbox_username'] = 'Emailadresse';
 $PALANG['pOverview_mailbox_name'] = 'Navn';
 $PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pOverview_mailbox_modified'] = 'Senest rettet';
+$PALANG['pOverview_mailbox_modified'] = 'Senest ændret';
 $PALANG['pOverview_mailbox_active'] = 'Aktiv';
-$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
-$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
+$PALANG['pOverview_vacation_edit'] = 'Autosvar er aktiveret';
+$PALANG['pOverview_vacation_option'] = 'Opret autosvar';
 
-$PALANG['pOverview_get_domain'] = 'Dom&aelig;ne';
+
+$PALANG['pOverview_get_domain'] = 'Domæne';
 $PALANG['pOverview_get_aliases'] = 'Aliaser';
 $PALANG['pOverview_get_mailboxes'] = 'Postbokse';
 $PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)';
-$PALANG['pOverview_get_modified'] = 'Senest rettet';
+$PALANG['pOverview_get_modified'] = 'Senest ændret';
 
 $PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette denne post ';
-$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
+$PALANG['pDelete_delete_success'] = '%s er slettet.';
 $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunne ikke fjerne postkassen ';
-$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette dom&aelig;ne er ikke dit ';
-$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunne ikke slette aliaset ';
 
-$PALANG['pCreate_alias_welcome'] = 'Opret nyt alias til dit dom&aelig;ne.';
+$PALANG['pCreate_alias_welcome'] = 'Opret nyt alias til dit domæne.';
 $PALANG['pCreate_alias_address'] = 'Alias';
 $PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Aliaset er ikke gyldigt!</span>';
-$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Email adressen eksisterer allerede. V&aelig;lg venligst en anden!</span>';
-$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har n&aring;et gr&aelig;nsen for antallet af aliaser til dit dom&aelig;ne!</span>';
+$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>';
+$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af aliaser til dit domæne!</span>';
 $PALANG['pCreate_alias_goto'] = 'Modtager';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
-$PALANG['pCreate_alias_button'] = 'Tilf&oslash;j Alias';
+$PALANG['pCreate_alias_active'] = 'Aktiv';
+$PALANG['pCreate_alias_button'] = 'Tilføj Alias';
 $PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
 $PALANG['pCreate_alias_goto_text_error'] = 'Hvor emailen skal videresendes til.<br /><span class="error_msg">Modtageradressen er ikke gyldig!</span>';
-$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan ikke tilf&oslash;je aliaset til alias-tabellen!</span>';
-$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilf&oslash;jet til alias-tabellen!';
-$PALANG['pCreate_alias_catchall_text'] = 'For at oprette et stjerne-alias, brug en "*" som alias.<br />For dom&aelig;ne til dom&aelig;ne-viderestilling brug "*@domain.tld" som modtager.';
+$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan ikke tilføje aliaset til alias-tabellen!</span>';
+$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet til alias-tabellen!';
+$PALANG['pCreate_alias_catchall_text'] = 'For at oprette et stjerne-alias, brug en "*" som alias.<br />For domæne til domæne-videresending brug "*@domain.tld" som modtager.';
 
-$PALANG['pEdit_alias_welcome'] = 'Rediger et alias for dit dom&aelig;ne.<br />En modtager pr. linie.';
+$PALANG['pEdit_alias_welcome'] = 'Rediger et alias for dit domæne.<br />En modtager pr. linje.';
 $PALANG['pEdit_alias_address'] = 'Alias';
 $PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Kan ikke finde aliaset!</span>';
 $PALANG['pEdit_alias_goto'] = 'Modtager(e)';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
+$PALANG['pEdit_alias_active'] = 'Aktiv';
 $PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du udfyldte ikke noget i Modtager(e)</span>';
-$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilf&oslash;jede emailadresse er ikke gyldig: ';
-$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette dom&aelig;ne tilh&oslash;rer ikke dig: ';
-$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
-$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
+$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilføjede emailadresse er ikke gyldig: ';
+$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: ';
+$PALANG['pEdit_alias_forward_and_store'] = 'Lever email til den lokale postboks.';
+$PALANG['pEdit_alias_forward_only'] = 'Videresend til angiven emailadresse uden lokal kopi.';
 $PALANG['pEdit_alias_button'] = 'Ret Alias';
 $PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan ikke redigere aliaset!</span>';
 
-$PALANG['pCreate_mailbox_welcome'] = 'Opret en ny lokal postboks til dit dom&aelig;ne.';
+$PALANG['pCreate_mailbox_welcome'] = 'Opret en ny lokal postboks til dit domæne.';
 $PALANG['pCreate_mailbox_username'] = 'Brugernavn';
-$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Email adressen er ikke gyldig!</span>';
-$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Email adressen eksisterer allerede. V&aelig;lg venligst en anden!</span>';
-$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har n&aring;et gr&aelig;nsen for antallet af postbokse til dit dom&aelig;ne!</span>';
-$PALANG['pCreate_mailbox_password'] = 'Kodeord';
-$PALANG['pCreate_mailbox_password2'] = 'Kodeord (igen)';
-$PALANG['pCreate_mailbox_password_text'] = 'Kodeord til POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Kodeord til POP3/IMAP<br /><span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Emailadressen er ikke gyldig!</span>';
+$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>';
+$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af postbokse til dit domæne!</span>';
+$PALANG['pCreate_mailbox_password'] = 'Adgangskode';
+$PALANG['pCreate_mailbox_password2'] = 'Adgangskode (igen)';
+$PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP';
+$PALANG['pCreate_mailbox_password_text_error'] = 'Adgangskode til POP3/IMAP<br /><span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
 $PALANG['pCreate_mailbox_name'] = 'Navn';
 $PALANG['pCreate_mailbox_name_text'] = 'Fulde navn';
 $PALANG['pCreate_mailbox_quota'] = 'Kvota';
 $PALANG['pCreate_mailbox_quota_text'] = 'MB';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den &oslash;nskede kvota er for h&oslash;j!</span>';
+$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>';
 $PALANG['pCreate_mailbox_active'] = 'Aktiv';
 $PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen';
-$PALANG['pCreate_mailbox_button'] = 'Tilf&oslash;j postboks';
-$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ikke tilf&oslash;je postboksen til postboks-tabellen!</span>';
-$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilf&oslash;jet til postboks-tabellen!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilf&oslash;jet, men ingen (eller kun dele) af de foruddefinerede underfoldere kunne oprettes.';
+$PALANG['pCreate_mailbox_button'] = 'Tilføj postboks';
+$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ikke tilføje postboksen til postboks-tabellen!</span>';
+$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede underfoldere kunne oprettes.';
 
-$PALANG['pEdit_mailbox_welcome'] = 'Rediger en postboks til dit dom&aelig;ne.';
+$PALANG['pEdit_mailbox_welcome'] = 'Rediger en postboks til dit domæne.';
 $PALANG['pEdit_mailbox_username'] = 'Brugernavn';
 $PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Kan ikke finde postboksen!</span>';
-$PALANG['pEdit_mailbox_password'] = 'Nyt kodeord';
-$PALANG['pEdit_mailbox_password2'] = 'Nyt kodeord (igen)';
-$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!</span>';
+$PALANG['pEdit_mailbox_password'] = 'Ny adgangskode';
+$PALANG['pEdit_mailbox_password2'] = 'Ny adgangskode (igen)';
+$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!</span>';
 $PALANG['pEdit_mailbox_name'] = 'Navn';
-$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
+$PALANG['pEdit_mailbox_name_text'] = 'Fulde navn';
 $PALANG['pEdit_mailbox_quota'] = 'Kvota';
 $PALANG['pEdit_mailbox_quota_text'] = 'MB';
-$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den &oslash;nskede kvota er for h&oslash;j!</span>';
-$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Dette dom&aelig;ne er ikke dit: ';
+$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>';
+$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit: ';
 $PALANG['pEdit_mailbox_button'] = 'Ret postboks';
-$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kan ikke skifte kodeord!</span>';
+$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden!</span>';
 
-$PALANG['pPassword_welcome'] = 'Ret dit kodeord.';
-$PALANG['pPassword_admin'] = 'Kodeord';
+$PALANG['pPassword_welcome'] = 'Ændre din adgangskode.';
+$PALANG['pPassword_admin'] = 'Adgangskode';
 $PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Brugernavnet kunne ikke findes!</span>';
-$PALANG['pPassword_password_current'] = 'Nuv&aelig;rende kodeord';
-$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Du glemte at skrive dit nuv&aelig;rende kodeord!</span>';
-$PALANG['pPassword_password'] = 'Nyt kodeord';
-$PALANG['pPassword_password2'] = 'Nyt kodeord (igen)';
-$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
-$PALANG['pPassword_button'] = 'Skift kodeord';
-$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke skifte kodeord!</span>';
-$PALANG['pPassword_result_success'] = 'Dit kodeord er skiftet!';
-$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
-$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
-$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX
-$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
-$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
+$PALANG['pPassword_password_current'] = 'Nuværende adgangskode';
+$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Du glemte at skrive din nuværende adgangskode!</span>';
+$PALANG['pPassword_password'] = 'Ny adgangskode';
+$PALANG['pPassword_password2'] = 'Ny adgangskode (igen)';
+$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pPassword_button'] = 'Ændre adgangskode';
+$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden!</span>';
+$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!';
 
+$PALANG['pEdit_vacation_set'] = 'Ændre / Opret autosvar';
+$PALANG['pEdit_vacation_remove'] = 'Fjern autosvar';
+
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Autosvarindstillinger kunne ikke opdateres!</span>';
+$PALANG['pVacation_result_removed'] = 'Autosvar er fjernet!';
+$PALANG['pVacation_result_added'] = 'Autosvar er aktiveret!';
+
 $PALANG['pViewlog_welcome'] = 'Vis de sidste 10 poster for ';
 $PALANG['pViewlog_timestamp'] = 'Tidsstempel';
 $PALANG['pViewlog_username'] = 'Administrator';
-$PALANG['pViewlog_domain'] = 'Dom&aelig;ne';
+$PALANG['pViewlog_domain'] = 'Domæne';
 $PALANG['pViewlog_action'] = 'Handling';
 $PALANG['pViewlog_data'] = 'Data';
-$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
-$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
-$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
-$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
-$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
-$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
-$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
-$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
+$PALANG['pViewlog_action_create_mailbox'] = 'opret postboks';
+$PALANG['pViewlog_action_delete_mailbox'] = 'slet postboks';
+$PALANG['pViewlog_action_edit_mailbox'] = 'rediger postboks';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'ændre postboks aktiv';
+$PALANG['pViewlog_action_create_alias'] = 'opret alias';
+$PALANG['pViewlog_action_delete_alias'] = 'slet alias';
+$PALANG['pViewlog_action_edit_alias'] = 'rediger alias';
+$PALANG['pViewlog_action_edit_alias_active'] = 'ændre alias aktiv';
+$PALANG['pViewlog_action_edit_password'] = 'ændre adgangskode';
+
 $PALANG['pViewlog_button'] = 'Vis';
 $PALANG['pViewlog_result_error'] = '<span class="error_msg">Kan ikke finde loggen!</span>';
 
 $PALANG['pSendmail_welcome'] = 'Send en email.';
 $PALANG['pSendmail_admin'] = 'Afsender';
 $PALANG['pSendmail_to'] = 'Modtager';
-$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Modtager er tom eller en ugyldig email adresse!</span>';
+$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Modtager er tom eller en ugyldig emailadresse!</span>';
 $PALANG['pSendmail_subject'] = 'Emne';
 $PALANG['pSendmail_subject_text'] = 'Velkommen';
 $PALANG['pSendmail_body'] = 'Meddelelse';
@@ -190,30 +196,30 @@
 $PALANG['pSendmail_result_success'] = 'Postboksen er oprettet!';
 
 $PALANG['pAdminMenu_list_admin'] = 'Administratorliste';
-$PALANG['pAdminMenu_list_domain'] = 'Dom&aelig;neliste';
+$PALANG['pAdminMenu_list_domain'] = 'Domæneliste';
 $PALANG['pAdminMenu_list_virtual'] = 'Virtuel Liste';
 $PALANG['pAdminMenu_viewlog'] = 'Vis Log';
 $PALANG['pAdminMenu_backup'] = 'Backup';
-$PALANG['pAdminMenu_create_domain_admins'] = 'Dom&aelig;neadministrator';
+$PALANG['pAdminMenu_create_domain_admins'] = 'Domæneadministrator';
 $PALANG['pAdminMenu_create_admin'] = 'Ny administrator';
-$PALANG['pAdminMenu_create_domain'] = 'Nyt dom&aelig;ne';
-$PALANG['pAdminMenu_create_alias'] = 'Tilf&oslash;j alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Tilf&oslash;j postboks';
+$PALANG['pAdminMenu_create_domain'] = 'Nyt domæne';
+$PALANG['pAdminMenu_create_alias'] = 'Tilføj alias';
+$PALANG['pAdminMenu_create_mailbox'] = 'Tilføj postboks';
 
-$PALANG['pAdminList_admin_domain'] = 'Dom&aelig;ne';
+$PALANG['pAdminList_admin_domain'] = 'Domæne';
 $PALANG['pAdminList_admin_username'] = 'Administrator';
-$PALANG['pAdminList_admin_count'] = 'Dom&aelig;ner';
-$PALANG['pAdminList_admin_modified'] = 'Senest rettet';
+$PALANG['pAdminList_admin_count'] = 'Domæner';
+$PALANG['pAdminList_admin_modified'] = 'Senest ændret';
 $PALANG['pAdminList_admin_active'] = 'Aktiv';
 
-$PALANG['pAdminList_domain_domain'] = 'Dom&aelig;ne';
+$PALANG['pAdminList_domain_domain'] = 'Domæne';
 $PALANG['pAdminList_domain_description'] = 'Beskrivelse';
 $PALANG['pAdminList_domain_aliases'] = 'Aliaser';
 $PALANG['pAdminList_domain_mailboxes'] = 'Postbokse';
 $PALANG['pAdminList_domain_maxquota'] = 'Maks. kvota (MB)';
 $PALANG['pAdminList_domain_transport'] = 'Transport';
 $PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
-$PALANG['pAdminList_domain_modified'] = 'Senest rettet';
+$PALANG['pAdminList_domain_modified'] = 'Senest ændret';
 $PALANG['pAdminList_domain_active'] = 'Aktiv';
 
 $PALANG['pAdminList_virtual_button'] = 'Vis';
@@ -222,17 +228,17 @@
 $PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postbokse';
 $PALANG['pAdminList_virtual_alias_address'] = 'Fra';
 $PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_alias_modified'] = 'Senest rettet';
+$PALANG['pAdminList_virtual_alias_modified'] = 'Senest ændret';
 $PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
 $PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
 $PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pAdminList_virtual_mailbox_modified'] = 'Senest rettet';
+$PALANG['pAdminList_virtual_mailbox_modified'] = 'Senest ændret';
 $PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiv';
 
-$PALANG['pAdminCreate_domain_welcome'] = 'Tilf&oslash;j et nyt dom&aelig;ne';
-$PALANG['pAdminCreate_domain_domain'] = 'Dom&aelig;ne';
-$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Dom&aelig;net eksisterer allerede!</span>';
-$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
+$PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne';
+$PALANG['pAdminCreate_domain_domain'] = 'Domæne';
+$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domænet eksisterer allerede!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Domænet er ugyldigt!</span>';
 $PALANG['pAdminCreate_domain_description'] = 'Beskrivelse';
 $PALANG['pAdminCreate_domain_aliases'] = 'Aliaser';
 $PALANG['pAdminCreate_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt';
@@ -241,17 +247,18 @@
 $PALANG['pAdminCreate_domain_maxquota'] = 'Maks. kvota';
 $PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = annuller | 0 = uendeligt';
 $PALANG['pAdminCreate_domain_transport'] = 'Transport';
-$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
-$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilf&oslash;j standard aliaser';
-$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
-$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
-$PALANG['pAdminCreate_domain_button'] = 'Tilf&oslash;j dom&aelig;ne';
-$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilf&oslash;je dom&aelig;ne!</span>';
-$PALANG['pAdminCreate_domain_result_success'] = 'Dom&aelig;net er tilf&oslash;jet!';
-$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne dom&aelig;net!</span>';
+$PALANG['pAdminCreate_domain_transport_text'] = 'Præciser transport';
+$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard aliaser';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
+$PALANG['pAdminCreate_domain_backupmx'] = 'Mailserveren er backup MX';
+$PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne';
+$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domæne!</span>';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
 
-$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et dom&aelig;ne';
-$PALANG['pAdminEdit_domain_domain'] = 'Dom&aelig;ne';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes!</span>';
+
+$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne';
+$PALANG['pAdminEdit_domain_domain'] = 'Domæne';
 $PALANG['pAdminEdit_domain_description'] = 'Beskrivelse';
 $PALANG['pAdminEdit_domain_aliases'] = 'Aliaser';
 $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt';
@@ -260,52 +267,51 @@
 $PALANG['pAdminEdit_domain_maxquota'] = 'Maks. kvota';
 $PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = annuller | 0 = uendeligt';
 $PALANG['pAdminEdit_domain_transport'] = 'Transport';
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
-$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
+$PALANG['pAdminEdit_domain_transport_text'] = 'Præciser transport';
+$PALANG['pAdminEdit_domain_backupmx'] = 'Mailserveren er backup MX';
 $PALANG['pAdminEdit_domain_active'] = 'Aktiv';
-$PALANG['pAdminEdit_domain_button'] = 'Rediger dom&aelig;ne';
-$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kan ikke rette dom&aelig;ne!</span>';
+$PALANG['pAdminEdit_domain_button'] = 'Rediger domæne';
+$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kan ikke rette domæne!</span>';
 
-$PALANG['pAdminCreate_admin_welcome'] = 'Tilf&oslash;j ny dom&aelig;neadministrator';
+$PALANG['pAdminCreate_admin_welcome'] = 'Tilføj ny domæneadministrator';
 $PALANG['pAdminCreate_admin_username'] = 'Administrator';
-$PALANG['pAdminCreate_admin_username_text'] = 'Email adresse';
-$PALANG['pAdminCreate_admin_username_text_error1'] = 'Email adresse<br /><span class="error_msg">Administrator er ikke en gyldig email adresse!</span>';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Email adresse<br /><span class="error_msg">Aministratoren findes allerede eller er ikke gyldig</span>';
-$PALANG['pAdminCreate_admin_password'] = 'Kodeord';
-$PALANG['pAdminCreate_admin_password2'] = 'Kodeord (igen)';
-$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
-$PALANG['pAdminCreate_admin_button'] = 'Tilf&oslash;j administrator';
-$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kan ikke tilf&oslash;je administrator!</span>';
-$PALANG['pAdminCreate_admin_result_success'] = 'Administrator er tilf&oslash;jet!';
-$PALANG['pAdminCreate_admin_address'] = 'Dom&aelig;ne';
+$PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse';
+$PALANG['pAdminCreate_admin_username_text_error1'] = 'Emailadresse<br /><span class="error_msg">Administrator er ikke en gyldig emailadresse!</span>';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'Emailadresse<br /><span class="error_msg">Aministratoren findes allerede eller er ikke gyldig</span>';
+$PALANG['pAdminCreate_admin_password'] = 'Adgangskode';
+$PALANG['pAdminCreate_admin_password2'] = 'Adgangskode (igen)';
+$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
+$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kan ikke tilføje administrator!</span>';
+$PALANG['pAdminCreate_admin_result_success'] = 'Administrator er tilføjet!';
+$PALANG['pAdminCreate_admin_address'] = 'Domæne';
 
-
-$PALANG['pAdminEdit_admin_welcome'] = 'Rediger en dom&aelig;neadministrator';
+$PALANG['pAdminEdit_admin_welcome'] = 'Rediger en domæneadministrator';
 $PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['pAdminEdit_admin_password'] = 'Kodeord';
-$PALANG['pAdminEdit_admin_password2'] = 'Kodeord (igen)';
-$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pAdminEdit_admin_password'] = 'Adgangskode';
+$PALANG['pAdminEdit_admin_password2'] = 'Adgangskode (igen)';
+$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
 $PALANG['pAdminEdit_admin_active'] = 'Aktiv';
-$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin';
+$PALANG['pAdminEdit_admin_super_admin'] = 'Superadministrator';
 $PALANG['pAdminEdit_admin_button'] = 'Rediger administrator';
 $PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Kan ikke rette administrator!</span>';
 $PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!';
 
-$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Login for at &aelig;ndre kodeord og viderestilling.';
+$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Login for at ændre adgangskode og videresending.';
 $PALANG['pUsersLogin_username'] = 'Brugernavn (email)';
-$PALANG['pUsersLogin_password'] = 'Kodeord';
+$PALANG['pUsersLogin_password'] = 'Adgangskode';
 $PALANG['pUsersLogin_button'] = 'Log ind';
-$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Verificer at du bruger din email adresse som brugernavn!';
-$PALANG['pUsersLogin_password_incorrect'] = 'Dit kodeord er ikke korrekt!';
+$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Tjek at du bruger din emailadresse som brugernavn!';
+$PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt!';
 
 $PALANG['pUsersMenu_vacation'] = 'Autosvar';
-$PALANG['pUsersMenu_edit_alias'] = 'Rediger dine viderestillinger';
-$PALANG['pUsersMenu_password'] = 'Skift kodeord';
+$PALANG['pUsersMenu_edit_alias'] = 'Rediger dine videresendinger';
+$PALANG['pUsersMenu_password'] = 'Ændre adgangskode';
 
-$PALANG['pUsersMain_vacation'] = 'Tilf&oslash;j en "ikke tilstede" besked eller et autosvar til din email adresse.';
-$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
-$PALANG['pUsersMain_edit_alias'] = 'Skift dine viderestillinger for email.';
-$PALANG['pUsersMain_password'] = 'Skift dit nuv&aelig;rende kodeord.';
+$PALANG['pUsersMain_vacation'] = 'Tilføj en "ikke tilstede" besked eller et autosvar til din emailadresse.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' er AKTIVERET, klik \'' . $PALANG['pUsersMenu_vacation'] . '\' for at ' . $PALANG['edit'] . '/fjerne';
+$PALANG['pUsersMain_edit_alias'] = 'Ændre dine videresendinger for email.';
+$PALANG['pUsersMain_password'] = 'Ændre din nuværende adgangskode.';
 
 $PALANG['pUsersVacation_welcome'] = 'Autosvar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar indstillet!';
@@ -314,48 +320,53 @@
 $PALANG['pUsersVacation_body'] = 'Meddelelse';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
 Jeg er ikke tilstede i perioden <dato> til <dato>.
-I n&oslash;dstilf&aelig;lde kan <kontaktperson> kontaktes.
+I nødstilfælde kan <kontaktperson> kontaktes.
 EOM;
 $PALANG['pUsersVacation_button_away'] = 'Tager afsted';
-$PALANG['pUsersVacation_button_back'] = 'Er kommet tilbage';
-$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere dine autosvar indstillinger!</span>';
+$PALANG['pUsersVacation_button_back'] = 'Kommer tilbage';
+$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere indstillinger for dit autosvar!</span>';
 $PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!';
 
-$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
-$PALANG['pCreate_dbLog_createalias'] = 'create alias';
-$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
-$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
+$PALANG['pCreate_dbLog_createmailbox'] = 'opret postboks';
+$PALANG['pCreate_dbLog_createalias'] = 'opret alias';
+$PALANG['pDelete_dbLog_deletealias'] = 'slet alias';
+$PALANG['pDelete_dbLog_deletemailbox'] = 'slet postboks';
 
-$PALANG['pEdit_dbLog_editactive'] = 'change active state';
-$PALANG['pEdit_dbLog_editalias'] = 'edit alias';
-$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox';
+$PALANG['pEdit_dbLog_editactive'] = 'ændre aktivtilstand';
+$PALANG['pEdit_dbLog_editalias'] = 'rediger alias';
+$PALANG['pEdit_dbLog_editmailbox'] = 'rediger postboks';
 
-$PALANG['pSearch'] = 'search'; # XXX
-$PALANG['pSearch_welcome'] = 'Searching for: ';
-$PALANG['pReturn_to'] = 'Return to'; # XXX
-$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
-$PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
-$PALANG['pBroadcast_message'] = 'Message'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
-$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
-$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
-$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
-$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
-$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
-$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
-$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
+$PALANG['pSearch'] = 'søg';
+$PALANG['pSearch_welcome'] = 'Søg efter: ';
 
+$PALANG['pReturn_to'] = 'Tilbage til';
+
+$PALANG['pBroadcast_title'] = 'Rundsend meddelelse';
+$PALANG['pBroadcast_from'] = 'Afsender';
+$PALANG['pBroadcast_name'] = 'Dit navn';
+$PALANG['pBroadcast_subject'] = 'Emne';
+$PALANG['pBroadcast_message'] = 'Meddelelse';
+$PALANG['pBroadcast_send'] = 'Send meddelelse';
+$PALANG['pBroadcast_success'] = 'Din meddelelse er rundsendt.';
+$PALANG['pAdminMenu_broadcast_message'] = 'Rundsend meddelse';
+$PALANG['pBroadcast_error_empty'] = 'Felterne Dit navn, Emne og Meddelelse skal udfyldes!';
+
+$PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres ';
+$PALANG['pStatus_custom'] = 'Leveres til ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+
+$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves";
+
+$PALANG['pFetchmail_welcome'] = 'Hent post for:';
+$PALANG['pFetchmail_new_entry'] = 'Ny regel';
+$PALANG['pFetchmail_database_save_error'] = 'Reglen kunne ikke gemmes in databasen!';
+$PALANG['pFetchmail_database_save_success'] = 'Reglen er gemt i databasen.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Reglen med ID %s eksisterer ikke!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Ugyldig postboks!';
+$PALANG['pFetchmail_server_missing'] = 'Angiv navnet på fjernserveren!';
+$PALANG['pFetchmail_user_missing'] = 'Angiv brugernavnet til fjernserveren!';
+$PALANG['pFetchmail_password_missing'] = 'Angiv adgangskoden til fjernserveren!';
+
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2007-11-08 21:21:16 UTC (rev 204)
+++ trunk/languages/ru.lang	2007-11-10 00:39:08 UTC (rev 205)
@@ -13,7 +13,7 @@
 $PALANG['confirm'] = 'Вы уверены, что хотите удалить это?\n';
 $PALANG['confirm_domain'] = 'Вы действительно хотите удалить все настройки для домена? Это действие нельзя будет отменить!\n';
 $PALANG['check_update'] = 'Проверить обновление';
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
+$PALANG['invalid_parameter'] = 'Некорректный параметр!';
 
 $PALANG['pFooter_logged_as'] = 'Вошли как %s';
 
@@ -77,7 +77,7 @@
 $PALANG['pOverview_get_modified'] = 'Последнее изменение';
 
 $PALANG['pDelete_delete_error'] = '<span class="error_msg">Невозможно удалить запись ';
-$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
+$PALANG['pDelete_delete_success'] = '%s удален.';
 $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Невозможно удалить ящик ';
 $PALANG['pDelete_domain_error'] = '<span class="error_msg">Этот домен не принадлежит вам ';
 $PALANG['pDelete_alias_error'] = '<span class="error_msg">Невозможно удалить алиас ';
@@ -359,13 +359,13 @@
 
 $PALANG['pFetchmail_welcome'] = 'Собирать почту для:';
 $PALANG['pFetchmail_new_entry'] = 'Новая запись';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Не удалось сохранить эту запись в базе данных!';
+$PALANG['pFetchmail_database_save_success'] = 'Запись сохранена в базе данных.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Не найдена запись с номером %s!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Некорректный почтовый ящик!';
+$PALANG['pFetchmail_server_missing'] = 'Пожалуйста введите имя удаленного сервера!';
+$PALANG['pFetchmail_user_missing'] = 'Пожалуйста введите имя удаленного пользователя!';
+$PALANG['pFetchmail_password_missing'] = 'Пожалуйста введите пароль удаленного пользователя!';
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [204] trunk/debian

[<Gin...@us...>]

Revision: 204
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=204&view=rev
Author:   GingerDog
Date:     2007-11-08 13:21:16 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
update debian stuff so i can sign the package

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/control

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-08 18:21:23 UTC (rev 203)
+++ trunk/debian/changelog	2007-11-08 21:21:16 UTC (rev 204)
@@ -2,5 +2,5 @@
 
   * Initial Release (via dpkg)
 
- -- David Goodwin <da...@co...>  Sun, 04 Nov 2007 15:36:00 +0000
+ -- David Goodwin <dav...@pa...>  Sun, 04 Nov 2007 15:36:00 +0000
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-11-08 18:21:23 UTC (rev 203)
+++ trunk/debian/control	2007-11-08 21:21:16 UTC (rev 204)
@@ -1,7 +1,7 @@
 Source: postfixadmin
 Section: web
 Priority: optional
-Maintainer: David Goodwin <da...@co...>
+Maintainer: David Goodwin <dav...@pa...>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [203] trunk/VIRTUAL_VACATION/vacation.pl

[<Gin...@us...>]

Revision: 203
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=203&view=rev
Author:   GingerDog
Date:     2007-11-08 10:21:23 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
vacation.pl: do not send a vacation response if the mail has been previously classes as spam - assumes /^x-spam-flag:\s+yes$/i matches in the message

Modified Paths:
--------------
    trunk/VIRTUAL_VACATION/vacation.pl

Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl	2007-11-05 23:23:19 UTC (rev 202)
+++ trunk/VIRTUAL_VACATION/vacation.pl	2007-11-08 18:21:23 UTC (rev 203)
@@ -325,6 +325,7 @@
    elsif (/^cc:\s+(.*)\n$/i) { $cc = $1; $lastheader = \$cc; }  
    elsif (/^subject:\s+(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }  
    elsif (/^message-id:\s+(.*)\n$/i) { $messageid = $1; $lastheader = \$messageid; }  
+   elsif (/^x-spam-flag:\s+yes$/i) { exit (0); }
    elsif (/^precedence:\s+(bulk|list|junk)/i) { exit (0); }  
    elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { exit (0); }  
    else {$lastheader = "" ; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [202] trunk/upgrade.php

[<chr...@us...>]

Revision: 202
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=202&view=rev
Author:   christian_boltz
Date:     2007-11-05 15:23:19 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
- rename placeholder {UTF_8} to the more obvious {UTF-8}
  This also fixes my last commit ;-)

Modified Paths:
--------------
    trunk/upgrade.php

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2007-11-05 22:07:02 UTC (rev 201)
+++ trunk/upgrade.php	2007-11-05 23:23:19 UTC (rev 202)
@@ -93,7 +93,7 @@
             '{UNSIGNED}'        => 'unsigned'  , 
             '{FULLTEXT}'        => 'FULLTEXT', 
             '{BOOLEAN}'         => 'tinyint(1) NOT NULL',
-            '{UTF_8}'           => '/*!40100 CHARACTER SET utf8 COLLATE utf8_unicode_ci */',
+            '{UTF-8}'           => '/*!40100 CHARACTER SET utf8 COLLATE utf8_unicode_ci */',
             '{LATIN1}'          => '/*!40100 CHARACTER SET latin1 COLLATE latin1_swedish_ci */',
             '{IF_NOT_EXISTS}'   => 'IF NOT EXISTS',
             '{RENAME_COLUMN}'   => 'CHANGE COLUMN',
@@ -107,7 +107,7 @@
             '{UNSIGNED}'        => '', 
             '{FULLTEXT}'        => '', 
             '{BOOLEAN}'         => 'BOOLEAN NOT NULL', 
-            '{UTF_8}'           => '', # TODO: UTF_8 is simply ignored.
+            '{UTF-8}'           => '', # TODO: UTF-8 is simply ignored.
             '{LATIN1}'          => '', # TODO: same for latin1
             '{IF_NOT_EXISTS}'   => 'IF NOT EXISTS', # TODO: does this work with PgSQL?
             '{RENAME_COLUMN}'   => 'CHANGE COLUMN', # TODO: probably wrong


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [201] trunk/upgrade.php

[<chr...@us...>]

Revision: 201
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=201&view=rev
Author:   christian_boltz
Date:     2007-11-05 14:07:02 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
- completed upgrade_81_mysql() (several changes in vacation table)

Modified Paths:
--------------
    trunk/upgrade.php

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2007-11-05 21:23:37 UTC (rev 200)
+++ trunk/upgrade.php	2007-11-05 22:07:02 UTC (rev 201)
@@ -294,31 +294,26 @@
 }
 
 function upgrade_81_mysql() { # MySQL only
-/* TODO
+    $table_vacation = table_by_key ('vacation');
+    $table_vacation_notification = table_by_key('vacation_notification');
 
-table vacation -
-- all varchar + text fields changed to utf8
-- active was tinyint (1), now (4)
-- ENGINE changed
-- DEFAULT CHARSET changed
-- COLLATE changed
+    $all_sql = split("\n", trim("
+        ALTER TABLE `$table_vacation` CHANGE `email`    `email`   VARCHAR( 255 ) {LATIN1} NOT NULL
+        ALTER TABLE `$table_vacation` CHANGE `subject`  `subject` VARCHAR( 255 ) {UTF-8}  NOT NULL
+        ALTER TABLE `$table_vacation` CHANGE `body`     `body`    TEXT           {UTF-8}  NOT NULL
+        ALTER TABLE `$table_vacation` CHANGE `cache`    `cache`   TEXT           {LATIN1} NOT NULL
+        ALTER TABLE `$table_vacation` CHANGE `domain`   `domain`  VARCHAR( 255 ) {LATIN1} NOT NULL
+        ALTER TABLE `$table_vacation` CHANGE `active`   `active`  TINYINT( 1 )            NOT NULL DEFAULT '1'
+        ALTER TABLE `$table_vacation` DEFAULT                                    {LATIN1}
+        ALTER TABLE `$table_vacation` ENGINE = INNODB
+    "));
 
-diff:
-   -  `body` text NOT NULL default '',
-   -  `cache` text NOT NULL default '',
-   +    body text NOT NULL,
-   +    cache text NOT NULL,
-   -  `active` tinyint(1) NOT NULL default '1',
-   +    active tinyint(4) NOT NULL default '1',  -> boolean are usually tinyint(1)
-   -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation';
-   +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci TYPE=InnoDB COMMENT='Postfix Admin - Virtual Vacation' ;
+    foreach ($all_sql as $sql) {
+        $result = db_query_parsed($sql, TRUE);
+    }
 
- 
- 
- */
-
     db_query_parsed(
-        "   CREATE TABLE {IF_NOT_EXISTS} vacation_notification (
+        "   CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
                 on_vacation varchar(255) NOT NULL,
                 notified varchar(255) NOT NULL,
                 notified_at timestamp NOT NULL default now(),
@@ -358,11 +353,12 @@
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 MySQL:
-* vacation: DROP INDEX email
+* vacation: 
+  - DROP INDEX email
+  - 'cache' field might be obsolete with vacation_notification - needs to be checked!
 * vacation_notification:
   - DEFAULT CHARSET and COLLATE should be changed
   - change all varchar fields to latin1 (email addresses don't contain utf8 characters)
-* remove all DROP TABLE statements from DATABASE_*
 
 */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [200] trunk

[<chr...@us...>]

Revision: 200
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=200&view=rev
Author:   christian_boltz
Date:     2007-11-05 13:23:37 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
edit-vacation.php
- fix double-encoded special characters if language file contains
  entity-encoded strings by html_entity_decode'ing the string
  (will be encoded in template file later)

edit-vacation.tpl:
- encode tSubject with htmlentities() in template

Modified Paths:
--------------
    trunk/edit-vacation.php
    trunk/templates/edit-vacation.tpl

Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php	2007-11-04 22:52:16 UTC (rev 199)
+++ trunk/edit-vacation.php	2007-11-05 21:23:37 UTC (rev 200)
@@ -76,8 +76,8 @@
 
    $tUseremail = $fUsername;
    $tDomain = $fDomain;
-   if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
-   if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+   if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+   if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
 
 }
 
@@ -103,8 +103,8 @@
    }
 
    $tUseremail = $fUsername;
-   if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
-   if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+   if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+   if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
 
    //if change, remove old one, then perhaps set new one
    if (!empty ($fBack) || !empty ($fChange))

Modified: trunk/templates/edit-vacation.tpl
===================================================================
--- trunk/templates/edit-vacation.tpl	2007-11-04 22:52:16 UTC (rev 199)
+++ trunk/templates/edit-vacation.tpl	2007-11-05 21:23:37 UTC (rev 200)
@@ -19,7 +19,7 @@
    </tr>
    <tr>
       <td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
-      <td><textarea class="flat" cols="60" name="fSubject" ><?php print $tSubject; ?></textarea></td>
+      <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities($tSubject, ENT_QUOTES, 'UTF-8'); ?></textarea></td>
       <td>&nbsp;</td>
    </tr>
    <tr>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [199] trunk

[<chr...@us...>]

Revision: 199
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=199&view=rev
Author:   christian_boltz
Date:     2007-11-04 14:52:16 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
functions.inc.php
- encode_header(): made charset parameter optional, defaults to utf-8
- db_delete(): escape_string() $where and $delete

create-mailbox.php:
- always encode mail header and insert Content-Type etc. headers
  (previous code never did this, $PALANG['charset'] is not set in any
  language. so this code part was never used)

sendmail.php:
- always encode mail header and insert Content-Type etc. headers
  (had the same bug as create-mailbox.php)
- merge GET and POST

These changes fix
http://sourceforge.net/tracker/index.php?func=detail&aid=1811214&group_id=191583&atid=937964

Modified Paths:
--------------
    trunk/create-mailbox.php
    trunk/functions.inc.php
    trunk/sendmail.php

Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php	2007-11-04 21:08:42 UTC (rev 198)
+++ trunk/create-mailbox.php	2007-11-04 22:52:16 UTC (rev 199)
@@ -210,7 +210,6 @@
         Lines starting with /* were inserted to keep this section in commented mode.
 
 
-      $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir',$quota,'$fDomain',NOW(),NOW(),'$sqlActive')");
       if ($result['rows'] != 1)
       {
          $tDomain = $fDomain;
@@ -311,18 +310,11 @@
          $fHeaders = "To: " . $fTo . "\n";
          $fHeaders .= "From: " . $fFrom . "\n";
 
-         if (!empty ($PALANG['charset']))
-         {
-            $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text'], $PALANG['charset']) . "\n";
-            $fHeaders .= "MIME-Version: 1.0\n";
-            $fHeaders .= "Content-Type: text/plain; charset=" . $PALANG['charset'] . "\n";
-            $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
-         }
-         else
-         {
-            $fHeaders .= "Subject: " . $PALANG['pSendmail_subject_text'] . "\n\n";
-         }
-
+         $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n";
+         $fHeaders .= "MIME-Version: 1.0\n";
+         $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
+         $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
+         
          $fHeaders .= $CONF['welcome_text'];
 
          if (!smtp_mail ($fTo, $fFrom, $fHeaders))

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2007-11-04 21:08:42 UTC (rev 198)
+++ trunk/functions.inc.php	2007-11-04 22:52:16 UTC (rev 199)
@@ -900,7 +900,7 @@
 // Action: Encode a string according to RFC 1522 for use in headers if it contains 8-bit characters.
 // Call: encode_header (string header, string charset)
 //
-function encode_header ($string, $default_charset)
+function encode_header ($string, $default_charset = "utf-8")
 {
    if (strtolower ($default_charset) == 'iso-8859-1')
    {
@@ -1514,7 +1514,7 @@
 //
 function db_delete ($table,$where,$delete)
 {
-   $result = db_query ("DELETE FROM $table WHERE $where='$delete'");
+   $result = db_query ("DELETE FROM $table WHERE " . escape_string($where) . "='" . escape_string($delete) . "'");
    if ($result['rows'] >= 1)
    {
       return $result['rows'];

Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php	2007-11-04 21:08:42 UTC (rev 198)
+++ trunk/sendmail.php	2007-11-04 22:52:16 UTC (rev 199)
@@ -37,43 +37,29 @@
 (($CONF['sendmail'] == 'NO') ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
 
 $SESSID_USERNAME = authentication_get_username();
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
-   include ("./templates/header.tpl");
-   include ("./templates/menu.tpl");
-   include ("./templates/sendmail.tpl");
-   include ("./templates/footer.tpl");
-}
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
-   if (isset ($_POST['fTo'])) $fTo = escape_string ($_POST['fTo']);
+   $fTo = safepost('fTo');
    $fFrom = $SESSID_USERNAME;
-   if (isset ($_POST['fTo'])) $fHeaders = "To: " . $fTo . "\n";
-   if (isset ($_POST['fTo'])) $fHeaders .= "From: " . $fFrom . "\n";
+   $fHeaders = "To: " . $fTo . "\n";
+   $fHeaders .= "From: " . $fFrom . "\n";
 
-   if (!empty ($PALANG['charset']))
-   {
-      $fHeaders .= "Subject: " . encode_header (escape_string ($_POST['fSubject']), $PALANG['charset']) . "\n";
-      $fHeaders .= "MIME-Version: 1.0\n";
-      $fHeaders .= "Content-Type: text/plain; charset=" . $PALANG['charset'] . "\n";
-      $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
-   }
-   else
-   {
-      $fHeaders .= "Subject: " . escape_string ($_POST['fSubject']) . "\n\n";
-   }
+   $fHeaders .= "Subject: " . encode_header(safepost('fSubject')) . "\n";
+   $fHeaders .= "MIME-Version: 1.0\n";
+   $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
+   $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
 
    $fHeaders .= escape_string ($_POST['fBody']);
 
    if (empty ($fTo) or !check_email ($fTo))
-	{
+   {
       $error = 1;
       $tTo = escape_string ($_POST['fTo']);
       $tSubject = escape_string ($_POST['fSubject']);
       $tBody = escape_string ($_POST['fBody']);
       $tMessage = $PALANG['pSendmail_to_text_error'];
-	}
+   }
 
    if ($error != 1)
    {
@@ -86,10 +72,12 @@
          $tMessage .= $PALANG['pSendmail_result_success'];
       }
    }
-
-   include ("./templates/header.tpl");
-   include ("./templates/menu.tpl");
-   include ("./templates/sendmail.tpl");
-   include ("./templates/footer.tpl");
 }
+
+include ("./templates/header.tpl");
+include ("./templates/menu.tpl");
+include ("./templates/sendmail.tpl");
+include ("./templates/footer.tpl");
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [198] trunk/templates/users_menu.tpl

[<chr...@us...>]

Revision: 198
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=198&view=rev
Author:   christian_boltz
Date:     2007-11-04 13:08:42 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
- clear float (no, motd right of the menu doesn't look good ;-)

Modified Paths:
--------------
    trunk/templates/users_menu.tpl

Modified: trunk/templates/users_menu.tpl
===================================================================
--- trunk/templates/users_menu.tpl	2007-11-04 21:06:00 UTC (rev 197)
+++ trunk/templates/users_menu.tpl	2007-11-04 21:08:42 UTC (rev 198)
@@ -10,6 +10,8 @@
 </ul>
 </div>
 
+<br clear='all' /><br>
+
 <?php 
 if (file_exists (realpath ("../motd-users.txt"))) 
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [197] trunk/config.inc.php

[<chr...@us...>]

Revision: 197
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=197&view=rev
Author:   christian_boltz
Date:     2007-11-04 13:06:00 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
- also read config.local.php when in /users/

Modified Paths:
--------------
    trunk/config.inc.php

Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php	2007-11-04 21:02:26 UTC (rev 196)
+++ trunk/config.inc.php	2007-11-04 21:06:00 UTC (rev 197)
@@ -57,6 +57,7 @@
 $CONF['database_tables'] = array (
     'admin' => 'admin',
     'alias' => 'alias',
+    'config' => 'config',
     'domain' => 'domain',
     'domain_admins' => 'domain_admins',
     'log' => 'log',
@@ -313,11 +314,15 @@
 // that future updates work without problems, you can use a separate config 
 // file (config.local.php) instead of editing this file and override some
 // settings there.
-if (file_exists (realpath ("./config.local.php"))) {
+if (file_exists (realpath ("./config.local.php"))) { # for /
    include('config.local.php');
+} elseif (file_exists (realpath ("../config.local.php"))) { # for /users/
+   include('../config.local.php');
 };
 
+
 //
 // END OF CONFIG FILE
 //
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [196] trunk/DATABASE_MYSQL.TXT

[<chr...@us...>]

Revision: 196
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=196&view=rev
Author:   christian_boltz
Date:     2007-11-04 13:02:26 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
- remove DROP TABLE statements - they can do more harm than good

Modified Paths:
--------------
    trunk/DATABASE_MYSQL.TXT

Modified: trunk/DATABASE_MYSQL.TXT
===================================================================
--- trunk/DATABASE_MYSQL.TXT	2007-11-04 20:55:17 UTC (rev 195)
+++ trunk/DATABASE_MYSQL.TXT	2007-11-04 21:02:26 UTC (rev 196)
@@ -126,8 +126,6 @@
 #
 # Vacation stuff ...
 #
-DROP TABLE IF EXISTS vacation;
-DROP TABLE IF EXISTS vacation_notification;
 CREATE TABLE vacation ( 
     email varchar(255) NOT NULL default '', 
     subject varchar(255) NOT NULL default '', 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [195] trunk/languages

[<chr...@us...>]

Revision: 195
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=195&view=rev
Author:   christian_boltz
Date:     2007-11-04 12:55:17 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
- renamed -$PALANG['pViewlog_action_edit_alias_state'] to
  $PALANG['pViewlog_action_edit_alias_active'] - fixes undefined
  messages in viewlog.php
- added some new strings to the language files
- pFetchmail_* strings were at the wrong location in several languages
- enforce at least one line of matching context in language-check.sh
  This might cause rejects (especially if there are empty lines next to
  the change), but avoids that strings are inserted at the wrong position

Modified Paths:
--------------
    trunk/languages/bg.lang
    trunk/languages/ca.lang
    trunk/languages/cn.lang
    trunk/languages/cs.lang
    trunk/languages/da.lang
    trunk/languages/de.lang
    trunk/languages/en.lang
    trunk/languages/es.lang
    trunk/languages/et.lang
    trunk/languages/eu.lang
    trunk/languages/fi.lang
    trunk/languages/fo.lang
    trunk/languages/fr.lang
    trunk/languages/hr.lang
    trunk/languages/hu.lang
    trunk/languages/is.lang
    trunk/languages/it.lang
    trunk/languages/language-update.sh
    trunk/languages/lt.lang
    trunk/languages/mk.lang
    trunk/languages/nl.lang
    trunk/languages/nn.lang
    trunk/languages/pl.lang
    trunk/languages/pt-br.lang
    trunk/languages/ru.lang
    trunk/languages/sk.lang
    trunk/languages/sl.lang
    trunk/languages/sv.lang
    trunk/languages/tr.lang
    trunk/languages/tw.lang

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/bg.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Ñèãóðíè ëè ñòå, ÷å æåëàåòå äà èçòðèåòî òîâà?\n';
 $PALANG['confirm_domain'] = 'Íàèñòèíà ëè èñêàòå äà èçòðèåòå âñè÷êè çàïèñè çà òîçè äîìåéí? Òîâà äåéñòâèå å íåîáðàòèìî!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Àäìèíèñòðàòîðà ìîæå äà ñå ëîãíå îòòóê çà àäìèíèñòðèðàíå íà äîìåéí.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Íàïðåä';
@@ -320,13 +321,6 @@
 $PALANG['pUsersVacation_result_success'] = 'Âàøèÿò àâòîìàòè÷åí îòãîâîð áåøå ïðåìàõíàò!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -353,6 +347,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/ca.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = '¿Segur que vols esborrar-lo?\n';
 $PALANG['confirm_domain'] = 'Estas segur que vols borrar tots els registres d\'aquest domini? Això no podrà ser desfet!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
@@ -170,7 +171,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Ves';
@@ -319,13 +320,6 @@
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Imposible actualitzar la configuració de la seva resposta automàtica!</span>';
 $PALANG['pUsersVacation_result_success'] = 'La seva resposta automàtica ha estat esborrada!';
 
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
@@ -353,6 +347,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/cn.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = '是否确定删除?\n';
 $PALANG['confirm_domain'] = '你是否确定要删除该域中的所有记录? 删除后不可恢复!\n';
 $PALANG['check_update'] = '检查新版本';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = '执行';
@@ -320,13 +321,6 @@
 $PALANG['pUsersVacation_result_success'] = '你的自动回复已经关闭!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = '新建邮箱';     
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = '新建别名';
 $PALANG['pDelete_dbLog_deletealias'] = '删除别名';
 $PALANG['pDelete_dbLog_deletemailbox'] = '邮件邮箱';
@@ -353,6 +347,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/cs.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -14,6 +14,7 @@
 $PALANG['confirm'] = 'Jste si jistí?\n';
 $PALANG['confirm_domain'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\n';
 $PALANG['check_update'] = 'Zkontrolovat aktualizace';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 
 $PALANG['pFooter_logged_as'] = 'Přihlášen jako %s';
 
@@ -177,7 +178,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'vytvořeno přesměrování';
 $PALANG['pViewlog_action_delete_alias'] = 'smazáno přesměrování';
 $PALANG['pViewlog_action_edit_alias'] = 'úprava přesměrování';
-$PALANG['pViewlog_action_edit_alias_state'] = 'změna stavu přesměrování';
+$PALANG['pViewlog_action_edit_alias_active'] = 'změna stavu přesměrování';
 $PALANG['pViewlog_action_edit_password'] = 'změna hesla';
 
 $PALANG['pViewlog_button'] = 'Jít';
@@ -323,13 +324,6 @@
 EOM;
 $PALANG['pUsersVacation_button_away'] = 'Odjet pryč';
 $PALANG['pUsersVacation_button_back'] = 'Vrátit se';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nepodařilo se upravit nastavení!</span>';
 $PALANG['pUsersVacation_result_success'] = 'Nastavení bylo upraveno!';
 
@@ -363,6 +357,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/da.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Er du sikker p&aring; du vil slette dette?\n';
 $PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster for dette dom&aelig;ne? Dette kan ikke fortrydes!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Postadministrator: Log ind her for at administrere dine dom&aelig;ner.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Vis';
@@ -320,13 +321,6 @@
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere dine autosvar indstillinger!</span>';
 $PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!';
 
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
@@ -354,6 +348,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/de.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Sind Sie sicher dass Sie das l&ouml;schen wollen?\n';
 $PALANG['confirm_domain'] = 'Wollen Sie wirklich alle Eintr&auml;ge dieser Domain l&ouml;schen? Dies kann NICHT r&uuml;ckg&auml;ngig gemacht werden!\n';
 $PALANG['check_update'] = 'Auf Updates &uuml;berpr&uuml;fen';
+$PALANG['invalid_parameter'] = 'Ung&uuml;ltiger Parameter!';
 
 $PALANG['pFooter_logged_as'] = 'Angemeldet als %s';
 
@@ -175,7 +176,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'Alias erstellen';
 $PALANG['pViewlog_action_delete_alias'] = 'Alias l&ouml;schen';
 $PALANG['pViewlog_action_edit_alias'] = 'Alias bearbeiten';
-$PALANG['pViewlog_action_edit_alias_state'] = 'Alias Aktiv bearbeiten';
+$PALANG['pViewlog_action_edit_alias_active'] = 'Alias Aktiv bearbeiten';
 $PALANG['pViewlog_action_edit_password'] = 'Passwort &auml;ndern';
 
 $PALANG['pViewlog_button'] = 'Los';
@@ -347,7 +348,7 @@
 $PALANG['pBroadcast_send'] = 'Nachricht senden';
 $PALANG['pBroadcast_success'] = 'Ihre Rundmail wurde gesendet.';
 $PALANG['pAdminMenu_broadcast_message'] = 'Rundmail';
-$PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht d\xFCrfen nicht leer sein!';
+$PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht d&uuml;rfen nicht leer sein!';
 
 $PALANG['pStatus_undeliverable'] = 'm&ouml;glicherweise UNZUSTELLBAR ';
 $PALANG['pStatus_custom'] = 'Zustellung an ';

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/en.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -13,6 +13,7 @@
 $PALANG['confirm'] = 'Are you sure you want to delete this?\n';
 $PALANG['confirm_domain'] = 'Do you really want to delete all records for this domain? This can not be undone!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!';
 
 $PALANG['pFooter_logged_as'] = 'Logged as %s';
 
@@ -177,9 +178,9 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias';
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias';
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias';
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active';
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active';
 $PALANG['pViewlog_action_edit_password'] = 'change password';
-
+ 
 $PALANG['pViewlog_button'] = 'Go';
 $PALANG['pViewlog_result_error'] = '<span class="error_msg">Unable to find the logs!</span>';
 

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/es.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = '¿Está seguro de que desea borrarlo?\n';
 $PALANG['confirm_domain'] = '¿Está seguro de que desea borrar todos los registros de este dominio? ¡Esto no puede ser deshecho!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Ir';
@@ -319,13 +320,6 @@
 $PALANG['pUsersVacation_button_back'] = 'De vuelta';
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuración de su respuesta automática!</span>';
 $PALANG['pUsersVacation_result_success'] = '¡Su respuesta automática ha sido borrada!';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
@@ -354,6 +348,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/et.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Oled kindel, et soovid seda kustutada?\n';
 $PALANG['confirm_domain'] = 'Oled tõesti kindel, et tahad kustutada kõik kirjed sellele domeenile? Seda tegevust ei saa tagasi võtta!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Mine';
@@ -320,13 +321,6 @@
 $PALANG['pUsersVacation_button_away'] = 'Olen eemal alates';
 $PALANG['pUsersVacation_button_back'] = 'Tulen tagasi';
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Automaatse vastuse uuendamine ebaõnnestus!</span>';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pUsersVacation_result_success'] = 'Automaatne vastus on eemaldatud!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'postkasti loomine';     
@@ -357,6 +351,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/eu.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Ziur al zaude ezabatu nahi duzula?\n';
 $PALANG['confirm_domain'] = 'Ziur al zaude domeinu honetako erregistro guztiak ezbatu nahi dituzula? Hau ezin izango da desegin!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
@@ -169,7 +170,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Joan';
@@ -319,13 +320,6 @@
 $PALANG['pUsersVacation_result_success'] = 'Zure erantzun automatikoa borratu da!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -352,6 +346,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/fi.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -4,6 +4,9 @@
 // by Palo
 //
 
+# XXX @translators: This file has several untranslated strings that are NOT marked with XXX
+# XXX               Please check the whole file and remove this comment afterwards.
+
 $PALANG['YES'] = 'Kyllä';
 $PALANG['NO'] = 'Ei';
 $PALANG['edit'] = 'muokkaa';
@@ -12,6 +15,7 @@
 $PALANG['confirm'] = 'Oletko varma että haluat poistaa tämän?\n';
 $PALANG['confirm_domain'] = 'Oletko varma että haluat poistaa kaikki tietueet tästä domainista? Tätä komentoa ei voi perua!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Kirjautuminen';
@@ -170,7 +174,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Siirry';
@@ -320,13 +324,6 @@
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
 
@@ -352,6 +349,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/fo.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Ert tú vís(ur) í at tú vilt strika hetta?\n';
 $PALANG['confirm_domain'] = 'Vilt tú veruliga strika allar upplýsingar fyri hetta navnaøki? Her kann ikki vendast aftur!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkara navnaøki.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Vel';
@@ -320,13 +321,6 @@
 Títt navn
 EOM;
 $PALANG['pUsersVacation_button_away'] = 'Burtur';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pUsersVacation_button_back'] = 'Heima';
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Fái ikki broytt tínar frítíðarboð uppsetingar!</span>';
 $PALANG['pUsersVacation_result_success'] = 'Títt frítíðarboð er strikað!';
@@ -358,6 +352,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/fr.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -14,6 +14,7 @@
 $PALANG['confirm'] = 'Etes vous sur de vouloir supprimer cet enregistrement\n';
 $PALANG['confirm_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n';
 $PALANG['check_update'] = 'Vérifiez les mises à jour';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Bonjour %s';
 
 $PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
@@ -172,7 +173,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'créer un alias';
 $PALANG['pViewlog_action_delete_alias'] = 'supprimer un alias';
 $PALANG['pViewlog_action_edit_alias'] = 'éditer un alias';
-$PALANG['pViewlog_action_edit_alias_state'] = 'activer un alias';
+$PALANG['pViewlog_action_edit_alias_active'] = 'activer un alias';
 $PALANG['pViewlog_action_edit_password'] = 'changer le mot de passe';
 
 $PALANG['pViewlog_button'] = 'Aller';
@@ -322,13 +323,6 @@
 $PALANG['pUsersVacation_result_success'] = 'Votre réponse automatique a été enlevée!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'Création de compte';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = 'Création d\'alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'Suppression d\'alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'Suppression de compte';
@@ -355,6 +349,13 @@
 $PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
 $PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
 $PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/hr.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -11,6 +11,7 @@
 $PALANG['confirm'] = 'Da li ste sigurni da želite ovo pobrisati?\n';
 $PALANG['confirm_domain'] = 'Da li ste sigurni da želite pobrisati sve zapise za tu domenu? Zapisi ce biti zauvijek pobrisani!\n';
 $PALANG['check_update'] = 'Provjeri da li postoji novija inačica';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
@@ -170,7 +171,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Idi';
@@ -319,13 +320,6 @@
 $PALANG['pUsersVacation_result_success'] = 'Obvijest o odsutnosti je uklonjena!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'stvori poštanski ormarić';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = 'stvori alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'pobriši alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'pobriši poštanski ormarić';
@@ -351,6 +345,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/hu.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -11,7 +11,8 @@
 $PALANG['exit'] = 'Kilép';
 $PALANG['confirm'] = 'Biztos vagy benne hogy törlöd ezt?\n';
 $PALANG['confirm_domain'] = 'Biztos hogy törölni akarod az összes bejegyzést ez alól a domain alól? Nem lehet visszahozni késõbb!\n';
-$PALANG['check_update'] = 'Check for update';
+$PALANG['check_update'] = 'Check for update'; # XXX
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 
 $PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve';
 
@@ -176,7 +177,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'alias létrehozása';
 $PALANG['pViewlog_action_delete_alias'] = 'alias törlése';
 $PALANG['pViewlog_action_edit_alias'] = 'alias módosítása';
-$PALANG['pViewlog_action_edit_alias_state'] = 'alias aktivitás módosítása';
+$PALANG['pViewlog_action_edit_alias_active'] = 'alias aktivitás módosítása';
 $PALANG['pViewlog_action_edit_password'] = 'jelszó módosítása';
 
 $PALANG['pViewlog_button'] = 'Gyerünk';
@@ -322,13 +323,6 @@
 
 Ez egy automatikus üzenet.
 EOM;
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pUsersVacation_button_away'] = 'Automatikus válaszadás bekapcsolása';
 $PALANG['pUsersVacation_button_back'] = 'Automatikus válaszadás kikapcsolása';
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nem sikerült megváltoztatni az automatikus válasz konfigurációdat!</span>';
@@ -366,8 +360,14 @@
 
 $PALANG['pFetchmail_welcome'] = 'Mail lehozása:';
 $PALANG['pFetchmail_new_entry'] = 'Új bejegyzés';
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
-
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/is.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Ertu viss um að þú viljir eyða þessu?\n';
 $PALANG['confirm_domain'] = 'Ertu viss um að þú viljir eyða öllu sem tengist þessu léni? Það er ekki hægt að bakka með aðgerðina!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
@@ -170,7 +171,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Áfram';
@@ -320,13 +321,6 @@
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
 
@@ -352,6 +346,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/it.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Sei sicuro di volerlo cancellare?\n';
 $PALANG['confirm_domain'] = 'Sei sicuro di voler cancellare tutti gli indirizzi di questo dominio? Questa modifica sar&agrave; permanente!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'GLi amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Vai';
@@ -320,13 +321,6 @@
 $PALANG['pUsersVacation_result_success'] = 'La tua risposta automatica &egrave; stata tolta!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -353,6 +347,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/language-update.sh	2007-11-04 20:55:17 UTC (rev 195)
@@ -79,7 +79,7 @@
 
 for file in $filelist ; do
 	test "$file" = "en.lang" && continue
-	LANG=C diff -U1 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
+	LANG=C diff -U2 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
 
 	test $notext = 1 && cat $file.diff && continue
 
@@ -118,7 +118,7 @@
 	done > $file.patch
 
 	test $patch = 0 && cat $file.patch
-	test $patch = 1 && patch $file < $file.patch
+	test $patch = 1 && patch --fuzz=1 $file < $file.patch
 done
 ###############################################################################
 

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/lt.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -11,6 +11,7 @@
 $PALANG['confirm'] = 'Tikrai norite šalinti?\n';
 $PALANG['confirm_domain'] = 'Tikrai norite šalinti visus šios srities įrašus? Operacija negrįžtama!\n';
 $PALANG['check_update'] = 'Patikrinti versiją';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Pašto srities administratorius.';
@@ -170,7 +171,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Eiti';
@@ -319,13 +320,6 @@
 $PALANG['pUsersVacation_result_success'] = 'Auto atsakovas išjungtas!';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'pašto dėžutė sukurta';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = 'sinonimas sukurtas';
 $PALANG['pDelete_dbLog_deletealias'] = 'sinonimas pašalintas';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'pašto dėžutė pašalinta';
@@ -352,6 +346,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/mk.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Дали сте сигурни дека сакате да го избришете ова?\n';
 $PALANG['confirm_domain'] = 'Дали сакате да ги избришете сите записи од овој домен? Ова не може да се поправи покасно!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Логин за администрирање на домени (Само за администратори!)';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Оди';
@@ -320,13 +321,6 @@
 $PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Не можам да ги променам сетирањата за автоматскиот одговор!</span>';
 $PALANG['pUsersVacation_result_success'] = 'Вашиот автоматски одговор е отстранет!';
 
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
@@ -354,6 +348,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/nl.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Weet u het zeker dat u wilt verwijderen?\n';
 $PALANG['confirm_domain'] = 'Weet u zeker dat u ALLE waardes van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n';
 $PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beheren.';
@@ -171,7 +172,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
 $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
 
 $PALANG['pViewlog_button'] = 'Ga';
@@ -320,13 +321,6 @@
 $PALANG['pUsersVacation_result_success'] = 'Uw automatisch beantwoorder is verwijderd.';
 
 $PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';     
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 $PALANG['pCreate_dbLog_createalias'] = 'create alias';
 $PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
 $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -353,6 +347,13 @@
 $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
 
 $PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
 /* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/nn.lang	2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
 $PALANG['confirm'] = 'Vil du slette dette?\n';
 $PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster og domenet?\n';
 $PALANG['check_update'] = 'Se etter oppdatering';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
 $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
 
 $PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere ditt domene';
@@ -169,7 +170,7 @@
 $PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
 $PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
 $PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit ali...
 
[truncated message content]

SF.net SVN: postfixadmin: [194] trunk/search.php

[<chr...@us...>]

Revision: 194
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=194&view=rev
Author:   christian_boltz
Date:     2007-11-04 11:53:45 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
- removed forgotten debugging code

Modified Paths:
--------------
    trunk/search.php

Modified: trunk/search.php
===================================================================
--- trunk/search.php	2007-11-04 19:46:37 UTC (rev 193)
+++ trunk/search.php	2007-11-04 19:53:45 UTC (rev 194)
@@ -92,7 +92,6 @@
     if ($CONF['vacation_control_admin'] == 'YES' && $CONF['vacation'] == 'YES')
     {
         $query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' OR $table_mailbox.name LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
-        echo $query;
     }
     else
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [193] trunk/search.php

[<Gin...@us...>]

Revision: 193
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=193&view=rev
Author:   GingerDog
Date:     2007-11-04 11:46:37 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
search.php: remove dead code, fix for pgsql

Modified Paths:
--------------
    trunk/search.php

Modified: trunk/search.php
===================================================================
--- trunk/search.php	2007-11-04 19:35:09 UTC (rev 192)
+++ trunk/search.php	2007-11-04 19:46:37 UTC (rev 193)
@@ -89,23 +89,14 @@
     }
 
 
-/*
-
-   */
-    if ($CONF['vacation_control_admin'] == 'YES')
+    if ($CONF['vacation_control_admin'] == 'YES' && $CONF['vacation'] == 'YES')
     {
         $query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' OR $table_mailbox.name LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
-        # TODO: special query for pgsql needed?
+        echo $query;
     }
     else
     {
         $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
-        /* TODO: special query for pgsql really needed?
-		if ('pgsql'==$CONF['database_type'])
-        {
-            $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
-        } 
-		*/
     }
 
     $result = db_query ($query);
@@ -117,15 +108,9 @@
             {
                 if ('pgsql'==$CONF['database_type'])
                 {
-                    $row['created']=gmstrftime('%c %Z',$row['created']);
-                    $row['modified']=gmstrftime('%c %Z',$row['modified']);
-                    # TODO: code from admin/search.php
-                    # $row['created']=gmstrftime('%c %Z',$row['uts_created']);
-                    # $row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
+                    $row['created']=gmstrftime('%c %Z',strtotime($row['created']));
+                    $row['modified']=gmstrftime('%c %Z',strtotime($row['modified']));
                     $row['active']=('t'==$row['active']) ? 1 : 0;
-                    # TODO: code from admin/search.php
-                    # unset($row['uts_created']);
-                    # unset($row['uts_modified']);
 				}         	
                 $tMailbox[] = $row;
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [192] trunk/templates/list-virtual.tpl

[<Gin...@us...>]

Revision: 192
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=192&view=rev
Author:   GingerDog
Date:     2007-11-04 11:35:09 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
list-virtual.tpl: only display vacation stuff if vacation support is enabled

Modified Paths:
--------------
    trunk/templates/list-virtual.tpl

Modified: trunk/templates/list-virtual.tpl
===================================================================
--- trunk/templates/list-virtual.tpl	2007-11-04 19:34:45 UTC (rev 191)
+++ trunk/templates/list-virtual.tpl	2007-11-04 19:35:09 UTC (rev 192)
@@ -236,7 +236,7 @@
          $active = ($tMailbox[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
          print "      <td><a href=\"edit-active.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=$fDomain" . "\">" . $active . "</a></td>\n";
 
-         if ($CONF['vacation_control_admin'] == 'YES')
+         if ($CONF['vacation_control_admin'] == 'YES' && $CONF['vacation'] == 'YES')
          {
             $v_active_int = $tMailbox[$i]['v_active'];
             if($v_active_int !== -1) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [191] trunk/list-virtual.php

[<Gin...@us...>]

Revision: 191
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=191&view=rev
Author:   GingerDog
Date:     2007-11-04 11:34:45 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
list-virtual.php: fix logic for display of vacation stuff

Modified Paths:
--------------
    trunk/list-virtual.php

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2007-11-04 19:22:58 UTC (rev 190)
+++ trunk/list-virtual.php	2007-11-04 19:34:45 UTC (rev 191)
@@ -110,13 +110,14 @@
    {
       if ('pgsql'==$CONF['database_type'])
       {
+         //var_dump($row);
          $row['created']=gmstrftime('%c %Z',strtotime($row['created']));
          $row['modified']=gmstrftime('%c %Z',strtotime($row['modified']));
          $row['active']=('t'==$row['active']) ? 1 : 0;
-         $row['v_active'] = 1;  // default to off... TODO: 1 is NOT off
-         if(isset($row['v_active'])) { /* key may not be present in results due to query from above */
-            $row['v_active']=('t'==$row['v_active']) ? 1 : 0; 
+         if($row['v_active'] == NULL) { 
+            $row['v_active'] = 'f';
          }
+         $row['v_active']=('t'==$row['v_active']) ? 1 : 0; 
       }
       $tMailbox[] = $row;
    }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [190] trunk/list-virtual.php

[<Gin...@us...>]

Revision: 190
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=190&view=rev
Author:   GingerDog
Date:     2007-11-04 11:22:58 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
list-virtual.php: remove unnecessary todo

Modified Paths:
--------------
    trunk/list-virtual.php

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2007-11-04 19:13:42 UTC (rev 189)
+++ trunk/list-virtual.php	2007-11-04 19:22:58 UTC (rev 190)
@@ -64,9 +64,6 @@
 
 if ((is_array ($list_domains) and sizeof ($list_domains) > 0)) if (empty ($fDomain)) $fDomain = $list_domains[0];
 
-
-if ((is_array ($list_domains) and sizeof ($list_domains) > 0)) if (empty ($fDomain)) $fDomain = $list_domains[1]; # TODO: should never happen?!? ($fDomain should already be filled by the line above)
-
 if (!check_owner(authentication_get_username(), $fDomain)) {
 #   die($PALANG['invalid_parameter']);
    header("Location: list-domain.php"); # domain not owned by this admin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [189] trunk/list-virtual.php

[<Gin...@us...>]

Revision: 189
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=189&view=rev
Author:   GingerDog
Date:     2007-11-04 11:13:42 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
list-virtual.php: fix unnecessary clause for psql query, that is not needed

Modified Paths:
--------------
    trunk/list-virtual.php

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2007-11-04 16:46:43 UTC (rev 188)
+++ trunk/list-virtual.php	2007-11-04 19:13:42 UTC (rev 189)
@@ -94,12 +94,7 @@
 
 if ($CONF['vacation_control_admin'] == 'YES')
 {
-   $query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $fDisplay, $page_size");
-   if ('pgsql'==$CONF['database_type'])
-   {
-      //TODO/FIXME: postgres query needs to be rewrited
-      $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE domain='$fDomain' ORDER BY username LIMIT $page_size OFFSET $fDisplay";
-   }
+   $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay";
 }
 else
 {
@@ -118,10 +113,10 @@
    {
       if ('pgsql'==$CONF['database_type'])
       {
-         $row['created']=gmstrftime('%c %Z',$row['uts_created']);
-         $row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
+         $row['created']=gmstrftime('%c %Z',strtotime($row['created']));
+         $row['modified']=gmstrftime('%c %Z',strtotime($row['modified']));
          $row['active']=('t'==$row['active']) ? 1 : 0;
-         $row['v_active'] = 1; // default to off... TODO: 1 is NOT off
+         $row['v_active'] = 1;  // default to off... TODO: 1 is NOT off
          if(isset($row['v_active'])) { /* key may not be present in results due to query from above */
             $row['v_active']=('t'==$row['v_active']) ? 1 : 0; 
          }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [188] trunk

[<Gin...@us...>]

Revision: 188
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=188&view=rev
Author:   GingerDog
Date:     2007-11-04 08:46:43 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
debian: adding - initial support for creating .debs; run dpkg-buildpakcage -rfakeroot within the trunk dir

Added Paths:
-----------
    trunk/debian/
    trunk/debian/README.Debian
    trunk/debian/apache-conf
    trunk/debian/changelog
    trunk/debian/compat
    trunk/debian/conffiles
    trunk/debian/control
    trunk/debian/copyright
    trunk/debian/docs
    trunk/debian/files
    trunk/debian/postfixadmin.dirs
    trunk/debian/rules

Added: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	                        (rev 0)
+++ trunk/debian/README.Debian	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,30 @@
+PostfixAdmin for Debian
+=======================
+
+After installing the package, you should find that :
+
+http://youserver/postfixadmin/setup.php works. This should 
+guide you through the appropriate process.
+
+You will need to create a database (either MySQL or PostgreSQL) 
+and know the username and password for it. The Database does not need
+to be on the same server as the Postfixadmin install.
+
+
+
+Recommended and Suggested Packages
+==================================
+
+ - Postfix
+ - MySQL or PostgreSQL
+ - Courier or Dovecot
+ 
+Where to get help
+=================
+
+The first stop would be the Postfixadmin Website, Forum or IRC channel. 
+
+See :
+ - http://postfixadmin.sf.net
+ - #postfixadmin on irc.freenode.net
+

Added: trunk/debian/apache-conf
===================================================================
--- trunk/debian/apache-conf	                        (rev 0)
+++ trunk/debian/apache-conf	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,6 @@
+# BEGIN FOR POSTFIXADMIN
+
+Alias /postfixadmin /usr/share/postfixadmin
+
+
+# END FOR POSTFIXADMIN

Added: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	                        (rev 0)
+++ trunk/debian/changelog	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,6 @@
+postfixadmin (2.2.0-1rc1) unstable; urgency=low
+
+  * Initial Release (via dpkg)
+
+ -- David Goodwin <da...@co...>  Sun, 04 Nov 2007 15:36:00 +0000
+

Added: trunk/debian/compat
===================================================================
--- trunk/debian/compat	                        (rev 0)
+++ trunk/debian/compat	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1 @@
+5

Added: trunk/debian/conffiles
===================================================================
--- trunk/debian/conffiles	                        (rev 0)
+++ trunk/debian/conffiles	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,2 @@
+/etc/apache2/conf.d/postfixadmin
+/etc/postfixadmin/config.inc.php

Added: trunk/debian/control
===================================================================
--- trunk/debian/control	                        (rev 0)
+++ trunk/debian/control	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,25 @@
+Source: postfixadmin
+Section: web
+Priority: optional
+Maintainer: David Goodwin <da...@co...>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: postfixadmin
+Architecture: all
+Depends: apache2 | httpd, libapache2-mod-php4 | libapache-mod-php4 | php4 | php4-cgi | libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5, ${misc:Depends}
+Recommends: squirrelmail-locales, ispell | aspell | aspell-bin, perl, postfix, postgresql-server, mysql-server
+Suggests: 
+Description: Virtual mail hosting interface for Postfix
+ Postfixadmin is a web interface to managing virtual users and domains
+ for a Postfix mailserver. The web interface is written in PHP.
+ Postfixadmin allows administrators to delegate handling a domain to domain 
+ administrators. 
+ Postfixadmin allows users to login and change their own settings (e.g. forward,
+ vacation, password etc).
+ Postfixadmin also includes support for virtual vacation support - 
+ this requires Perl and various CPAN modules to be installed. 
+ See vacation.pl for further details.
+ . 
+ Homepage: http://postfixadmin.sf.net/
+

Added: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	                        (rev 0)
+++ trunk/debian/copyright	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,30 @@
+This package was debianized by David Goodwin <da...@co...> on
+Sun, 04 Nov 2007 15:21:00 +0000. 
+
+It was downloaded from subversion, via http://postfixadmin.sf.net
+
+Upstream Authors: The PostfixAdmin Development Team <pos...@li...>
+
+Copyright:
+
+   Copyright (C) 2007 The Postfixadmin Project Team
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in the `/usr/share/common-licenses' directory.
+
+The Debian packaging of Postfixadmin is licensed under the same terms
+as Postfixadmin itself.

Added: trunk/debian/docs
===================================================================
--- trunk/debian/docs	                        (rev 0)
+++ trunk/debian/docs	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,6 @@
+VIRTUAL_VACATION 
+DOCUMENTS 
+ADDITIONS
+LICENSE.TXT
+INSTALL.TXT
+GPL-LICENSE.TXT 


Property changes on: trunk/debian/docs
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/debian/files
===================================================================
--- trunk/debian/files	                        (rev 0)
+++ trunk/debian/files	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1 @@
+postfixadmin_2.2.0-1rc1_all.deb web optional

Added: trunk/debian/postfixadmin.dirs
===================================================================
--- trunk/debian/postfixadmin.dirs	                        (rev 0)
+++ trunk/debian/postfixadmin.dirs	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,3 @@
+usr/share/postfixadmin
+usr/share/doc/postfixadmin
+etc/postfixadmin

Added: trunk/debian/rules
===================================================================
--- trunk/debian/rules	                        (rev 0)
+++ trunk/debian/rules	2007-11-04 16:46:43 UTC (rev 188)
@@ -0,0 +1,57 @@
+#!/usr/bin/make -f
+# debian/rules makefile for squirrelmail
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install
+	cp *.php debian/postfixadmin/usr/share/postfixadmin
+	mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
+	ln -s /etc/postfixadmin/config.inc.php debian/postfixadmin/usr/share/postfixadmin/config.inc.php
+	cp -a admin debian/postfixadmin/usr/share/postfixadmin
+	cp -a images debian/postfixadmin/usr/share/postfixadmin
+	cp -a languages debian/postfixadmin/usr/share/postfixadmin
+	cp -a templates debian/postfixadmin/usr/share/postfixadmin
+	cp -a users debian/postfixadmin/usr/share/postfixadmin
+	mkdir -p debian/postfixadmin/etc/apache2/conf.d
+	cp debian/apache-conf debian/postfixadmin/etc/apache2/conf.d/postfixadmin
+	find debian/postfixadmin -name .svn | xargs -r rm -r
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdebconf	
+	dh_installdocs -X.svn
+	dh_installexamples
+	dh_installman
+	dh_installcron
+	dh_link
+	dh_compress
+	dh_fixperms -X/var
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch:
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


Property changes on: trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [187] trunk/edit-vacation.php

[<chr...@us...>]

Revision: 187
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=187&view=rev
Author:   christian_boltz
Date:     2007-11-03 18:00:50 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
edit-vacation.php:
- changed redirect targets to list-virtual.php

Modified Paths:
--------------
    trunk/edit-vacation.php

Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php	2007-11-04 00:54:09 UTC (rev 186)
+++ trunk/edit-vacation.php	2007-11-04 01:00:50 UTC (rev 187)
@@ -38,7 +38,7 @@
 require_once('common.php');
 
 if($CONF['vacation'] == 'NO') { 
-   header("Location: " . $CONF['postfix_admin_url'] . "/main.php"); # TODO
+   header("Location: " . $CONF['postfix_admin_url'] . "/list-virtual.php");
    exit(0);
 }
 
@@ -60,7 +60,7 @@
 $vacation_goto = preg_replace('/@/', '#', $fUsername);
 $vacation_goto = $vacation_goto . '@' . $vacation_domain;
 
-$fCanceltarget = $CONF['postfix_admin_url'] . '/main.php'; # TODO
+$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=$fDomain";
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [186] trunk/functions.inc.php

[<chr...@us...>]

Revision: 186
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=186&view=rev
Author:   christian_boltz
Date:     2007-11-03 17:54:09 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
OOps. Removed forgotten debugging code again.

Modified Paths:
--------------
    trunk/functions.inc.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2007-11-04 00:53:13 UTC (rev 185)
+++ trunk/functions.inc.php	2007-11-04 00:54:09 UTC (rev 186)
@@ -1537,6 +1537,8 @@
  */
 function db_insert ($table, $values, $timestamp = array())
 {
+   $table = table_by_key ($table);
+
    foreach(array_keys($values) as $key) {
       $values[$key] = "'" . escape_string($values[$key]) . "'";
    }
@@ -1547,8 +1549,6 @@
  
    $sql_values = "(" . implode(",",escape_string(array_keys($values))).") VALUES (".implode(",",$values).")";
 
-   $table = table_by_key ($table);
-echo "*** $sql_values ***"; exit;
    $result = db_query ("INSERT INTO $table $sql_values");
    return $result['rows'];
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [185] trunk/edit-mailbox.php

[<chr...@us...>]

Revision: 185
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=185&view=rev
Author:   christian_boltz
Date:     2007-11-03 17:53:13 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
- fix: password was always changed when editing a mailbox.
  Thanks to Ryan Wagoner for pointing this out.
- first usage of db_update function ;-)

Modified Paths:
--------------
    trunk/edit-mailbox.php

Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php	2007-11-04 00:50:09 UTC (rev 184)
+++ trunk/edit-mailbox.php	2007-11-04 00:53:13 UTC (rev 185)
@@ -96,7 +96,9 @@
 
    if($fPassword != $user_details['password']){
       if($fPassword == $fPassword2) {
-         $fPassword = pacrypt($fPassword);
+         if ($fPassword != "") {
+            $formvars['password'] = pacrypt($fPassword);
+         }
       }
       else {
          flash_error($PALANG['pEdit_mailbox_password_text_error']);
@@ -137,8 +139,13 @@
          $fActive = 0;
       }
 
-      $result = db_query ("UPDATE $table_mailbox SET name='$fName',password='$fPassword',quota=$quota,modified=NOW(),active=$sqlActive WHERE username='$fUsername' AND domain='$fDomain'");
-      if ($result['rows'] != 1) {
+      $formvars['name'] = $fName;
+      $formvars['quota'] =$quota;
+      $formvars['active']=$sqlActive;
+
+      $result = db_update ('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified'));
+
+      if ($result != 1) {
          $tMessage = $PALANG['pEdit_mailbox_result_error'];
       }
       else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [184] trunk/functions.inc.php

[<chr...@us...>]

Revision: 184
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=184&view=rev
Author:   christian_boltz
Date:     2007-11-03 17:50:09 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
functions.php:
- new function db_update ($table, $where, $values, $timestamp = array())
  to update a database entry with the values given as array
- added optional $timestamp parameter to db_insert()

Modified Paths:
--------------
    trunk/functions.inc.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2007-11-03 23:32:36 UTC (rev 183)
+++ trunk/functions.inc.php	2007-11-04 00:50:09 UTC (rev 184)
@@ -675,7 +675,7 @@
 
 //
 // check_owner
-// Action: Checks if the admin is the owner of the domain.
+// Action: Checks if the admin is the owner of the domain (or global-admin)
 // Call: check_owner (string admin, string domain)
 //
 function check_owner ($username, $domain)
@@ -1532,21 +1532,54 @@
  * Call: db_insert (string table, array values)
  * @param String $table - table name
  * @param array - key/value map of data to insert into the table.
+ * @param array (optional) - array of fields to set to now()
+ * @return int - number of inserted rows
  */
-function db_insert ($table, $values)
+function db_insert ($table, $values, $timestamp = array())
 {
-   $sql_values = "(" . implode(",",escape_string(array_keys($values))).") VALUES ('".implode("','",escape_string($values))."')";
+   foreach(array_keys($values) as $key) {
+      $values[$key] = "'" . escape_string($values[$key]) . "'";
+   }
+
+   foreach($timestamp as $key) {
+      $values[$key] = "now()";
+   }
+ 
+   $sql_values = "(" . implode(",",escape_string(array_keys($values))).") VALUES (".implode(",",$values).")";
+
    $table = table_by_key ($table);
+echo "*** $sql_values ***"; exit;
+   $result = db_query ("INSERT INTO $table $sql_values");
+   return $result['rows'];
+}
 
-   $result = db_query ("INSERT INTO $table $sql_values");
-   if ($result['rows'] >= 1)
-   {
-      return $result['rows'];
+
+/**
+ * db_update
+ * Action: Updates a specified table
+ * Call: db_update (string table, array values, string where)
+ * @param String $table - table name
+ * @param String - WHERE condition
+ * @param array - key/value map of data to insert into the table.
+ * @param array (optional) - array of fields to set to now()
+ * @return int - number of updated rows
+ */
+function db_update ($table, $where, $values, $timestamp = array())
+{
+   $table = table_by_key ($table);
+
+   foreach(array_keys($values) as $key) {
+      $sql_values[$key] = escape_string($key) . "='" . escape_string($values[$key]) . "'";
    }
-   else
-   {
-      return true;
+
+   foreach($timestamp as $key) {
+      $sql_values[$key] = escape_string($key) . "=now()";
    }
+
+   $sql="UPDATE $table SET ".implode(",",$sql_values)." WHERE $where";
+
+   $result = db_query ($sql);
+   return $result['rows'];
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [183] trunk/list-domain.php

[<chr...@us...>]

Revision: 183
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=183&view=rev
Author:   christian_boltz
Date:     2007-11-03 16:32:36 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
- list all domains for superadmins (instead of none)

Modified Paths:
--------------
    trunk/list-domain.php

Modified: trunk/list-domain.php
===================================================================
--- trunk/list-domain.php	2007-11-03 22:46:20 UTC (rev 182)
+++ trunk/list-domain.php	2007-11-03 23:32:36 UTC (rev 183)
@@ -30,23 +30,24 @@
 authentication_require_role('admin');
 
 if (authentication_has_role('global-admin')) {
-	$list_admins = list_admins ();
-	$is_superadmin = 1;
+   $list_admins = list_admins ();
+   $is_superadmin = 1;
+   $fUsername = safepost('fUsername', safeget('username')); # prefer POST over GET variable
+   if ($fUsername != "") $admin_properties = get_admin_properties($fUsername);
 } else {
-	$list_admins = array(authentication_get_username());
-	$is_superadmin = 0;
+   $list_admins = array(authentication_get_username());
+   $is_superadmin = 0;
+   $fUsername = "";
 }
 
-if ($_SERVER['REQUEST_METHOD'] == "POST" && $is_superadmin && isset ($_POST['fUsername'])) {
-  $fUsername = escape_string ($_POST['fUsername']);
+if (isset($admin_properties) && $admin_properties['domain_count'] == 'ALL') { # list all domains for superadmins
+   $list_domains = list_domains ();
+} elseif (!empty($fUsername)) {
   $list_domains = list_domains_for_admin ($fUsername);
-} elseif ($_SERVER['REQUEST_METHOD'] == "GET" && $is_superadmin && isset ($_GET['username'])) {
-  $fUsername = escape_string ($_GET['username']);
-  $list_domains = list_domains_for_admin ($fUsername);
 } elseif ($is_superadmin) {
    $list_domains = list_domains ();
 } else {
-	$list_domains = list_domains_for_admin(authentication_get_username());
+   $list_domains = list_domains_for_admin(authentication_get_username());
 }
 
    if (!empty ($list_domains))
@@ -62,9 +63,11 @@
 include ("templates/menu.tpl");
 
 if ($is_superadmin) {
-	include ("templates/admin_list-domain.tpl");
+   include ("templates/admin_list-domain.tpl");
 } else {
-	include ("templates/overview-get.tpl");
+   include ("templates/overview-get.tpl");
 }
 include ("templates/footer.tpl");
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.