SF.net SVN: postfixadmin:[1519] trunk

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

Revision: 1519
          http://sourceforge.net/p/postfixadmin/code/1519
Author:   christian_boltz
Date:     2013-08-18 18:40:57 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
fetchmail: add sslcertck, sslcertpath, sslfingerprint


ADDITIONS/fetchmail.pl
- add sslcertck, sslcertpath and sslfingerprint to fetchmail config
- some whitespace fixes

fetchmail.php
- add sslcertck, sslcertpath, sslfingerprint fields
  (sslcertpath and sslfingerprint require $CONF[fetchmail_extra_options]
  because they don't have input validation)

languages/*.lang
- add new texts needed for the added fields

templates/fetchmail.tpl:
- add the new fields
- also add extra_options and mda fields - they were not displayed yet

upgrade.php
- fix _db_add_field() to call _db_field_exists() with correct table name
- upgrade_1519(): add sslcertck, sslcertpath, sslfingerprint fields to the
  fetchmail table


Most parts of this commit are based on the work of Lars Engelhard
(modified files sent on the mailinglist 2013-07-30)

Modified Paths:
--------------
    trunk/ADDITIONS/fetchmail.pl
    trunk/fetchmail.php
    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/ja.lang
    trunk/languages/lt.lang
    trunk/languages/mk.lang
    trunk/languages/nb.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
    trunk/templates/fetchmail.tpl
    trunk/upgrade.php

Modified: trunk/ADDITIONS/fetchmail.pl
===================================================================
--- trunk/ADDITIONS/fetchmail.pl	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/ADDITIONS/fetchmail.pl	2013-08-18 18:40:57 UTC (rev 1519)
@@ -87,7 +87,7 @@
 }
 
 $sql = "
-	SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,usessl 
+	SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,usessl, sslcertck, sslcertpath, sslfingerprint
 	FROM fetchmail
 	WHERE $sql_cond  > poll_time*60
 	";
@@ -97,19 +97,22 @@
 	my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl)=@$_;
 
 	syslog("info","fetch ${src_user}@${src_server} for ${mailbox}");
-	
+
 	$cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
 	$cmd.=" folder '${src_folder}'" if ($src_folder);
 	$cmd.=" mda ".$mda if ($mda);
 
 #	$cmd.=" mda \"/usr/local/libexec/dovecot/deliver -m ${mailbox}\"";
 	$cmd.=" is '${mailbox}' here";
-	
+
 	$cmd.=" keep" if ($keep);
 	$cmd.=" fetchall" if ($fetchall);
 	$cmd.=" ssl" if ($usessl);
+	$cmd.=" sslcertck" if($sslcertck);
+	$cmd.=" sslcertpath $sslcertpath" if ($sslcertck && $sslcertpath);
+	$cmd.=" sslfingerprint \"$sslfingerprint\"" if ($sslfingerprint);
 	$cmd.=" ".$extra_options if ($extra_options);
-	
+
 	$text=<<TXT;
 set postmaster "postmaster"
 set nobouncemail
@@ -119,7 +122,7 @@
 
 poll ${src_server} with proto ${protocol}
 	$cmd
-	
+
 TXT
 
   ($file_handler, $filename) = mkstemp( "/tmp/fetchmail-all-XXXXX" ) or log_and_die "cannot open/create fetchmail temp file";

Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/fetchmail.php	2013-08-18 18:40:57 UTC (rev 1519)
@@ -65,6 +65,9 @@
    "keep"            => array(1,                1,                'bool'      ),
    "protocol"        => array(1,                1,                'enum'      ),
    "usessl"          => array(1,                1,                'bool'      ),
+   "sslcertck"       => array(1,                1,                'bool'      ),
+   "sslcertpath"     => array($extra_options,   $extra_options,   'text'      ), # TODO: input validation
+   "sslfingerprint"  => array($extra_options,   $extra_options,   'text'      ), # TODO: input validation
    "extra_options"   => array($extra_options,   $extra_options,   'longtext'  ),
    "mda"             => array($extra_options,   $extra_options,   'longtext'  ),
    "date"            => array(0,                $display_status,  'text'      ),
@@ -215,6 +218,7 @@
       $formvars['fetchall']=('t'==$formvars['fetchall']) ? 1 : 0;
       $formvars['keep']=('t'==$formvars['keep']) ? 1 : 0;
       $formvars['usessl']=('t'==$formvars['usessl']) ? 1 : 0;
+      $formvars['sslcertck']=('t'==$formvars['sslcertck']) ? 1: 0;
    }
 } elseif ($new) { # create entry form
    foreach (array_keys($fm_struct) as $value) {
@@ -240,6 +244,7 @@
             $row['fetchall']=('t'==$row['fetchall']) ? 1 : 0;
             $row['keep']=('t'==$row['keep']) ? 1 : 0;
             $row['usessl']=('t'==$row['usessl']) ? 1 : 0;
+            $row['sslcertck']=('t'==$row['sslcertck']) ? 1: 0;
          }
          $tFmail[] = $row;
       }
@@ -391,6 +396,7 @@
 $smarty->assign ('headers', $headers);
 $smarty->assign ('user_domains', $user_domains);
 $smarty->assign ('tFmail', $tFmail);
+$smarty->assign ('extra_options', $extra_options);
 
 $smarty->assign ('smarty_template', 'fetchmail');
 $smarty->display ('index.tpl');

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/bg.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/ca.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/cn.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/cs.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -320,6 +320,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Nemazat';
 $PALANG['pFetchmail_field_protocol']        = 'Protokol';
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Parametry';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Datum';

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/da.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -322,6 +322,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Behold';
 $PALANG['pFetchmail_field_protocol']        = 'Protokol';
 $PALANG['pFetchmail_field_usessl']          = 'SSL aktiv';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Ekstra tilvalg';
 $PALANG['pFetchmail_field_mda']             = 'MDA (Mail Delivery Agent)';
 $PALANG['pFetchmail_field_date']            = 'Dato';

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/de.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -320,6 +320,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Behalten';
 $PALANG['pFetchmail_field_protocol']        = 'Protokoll';
 $PALANG['pFetchmail_field_usessl']          = 'SSL aktiv';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL Zertifikatsprüfung';
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL Pfad der Zertifikate';
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)';
 $PALANG['pFetchmail_field_extra_options']   = 'Zusätzliche Optionen';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Datum';

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/en.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -323,6 +323,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep';
 $PALANG['pFetchmail_field_protocol']        = 'Protocol';
 $PALANG['pFetchmail_field_usessl']          = 'SSL active';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check';
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates';
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)';
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Date';

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/es.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -310,6 +310,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Conservar'; 
 $PALANG['pFetchmail_field_protocol']        = 'Protocolo'; 
 $PALANG['pFetchmail_field_usessl']          = 'SSL activado'; 
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Opciones extras'; 
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Fecha'; 

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/et.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -312,6 +312,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/eu.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -307,6 +307,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/fi.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Pidä';
 $PALANG['pFetchmail_field_protocol']        = 'Protokolla';
 $PALANG['pFetchmail_field_usessl']          = 'SSL aktiivinen';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Lisämääritteet';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Päivämäärä';

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/fo.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -313,6 +313,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/fr.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -310,6 +310,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Conserver';
 $PALANG['pFetchmail_field_protocol']        = 'Protocole';
 $PALANG['pFetchmail_field_usessl']          = 'SSL activé';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Options supplémentaires';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Date';

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/hr.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -307,6 +307,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/hu.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -321,6 +321,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/is.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/it.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Conserva';
 $PALANG['pFetchmail_field_protocol']        = 'Protocollo';
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Data';

Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/ja.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -319,6 +319,9 @@
 $PALANG['pFetchmail_field_keep']            = '残す';
 $PALANG['pFetchmail_field_protocol']        = 'プロトコル';
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = '追加オプション';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = '日付';

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/lt.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -314,6 +314,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/mk.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/nb.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Behold';
 $PALANG['pFetchmail_field_protocol']        = 'Protokoll';
 $PALANG['pFetchmail_field_usessl']          = 'Bruk SSL';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Ekstra alternativer';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Dato';

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/nl.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -312,6 +312,9 @@
 $PALANG['pFetchmail_field_keep']            = 'behouden';
 $PALANG['pFetchmail_field_protocol']        = 'protocol';
 $PALANG['pFetchmail_field_usessl']          = 'SSL actief';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'extra opties';
 $PALANG['pFetchmail_field_mda']             = 'MD';
 $PALANG['pFetchmail_field_date']            = 'datum';

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/nn.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -231,6 +231,7 @@
 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke gyldig adresse!';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Klarte ikke å legge til administratoren!';
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
@@ -307,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/pl.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -314,6 +314,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Pozostaw';
 $PALANG['pFetchmail_field_protocol']        = 'Protokół';
 $PALANG['pFetchmail_field_usessl']          = 'Aktywne SSL';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Dodatkowe opcje';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Data';

Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/pt-br.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -321,6 +321,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Manter';
 $PALANG['pFetchmail_field_protocol']        = 'Protocolo';
 $PALANG['pFetchmail_field_usessl']          = 'SSL habilitado';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Opções extra';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Data';

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/ru.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -321,6 +321,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Не удалять';
 $PALANG['pFetchmail_field_protocol']        = 'Протокол';
 $PALANG['pFetchmail_field_usessl']          = 'Включить SSL';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Дополнительные параметры';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Дата';

Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/sk.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -309,6 +309,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Ponechať';
 $PALANG['pFetchmail_field_protocol']        = 'Protokol';
 $PALANG['pFetchmail_field_usessl']          = 'SSL';
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Parametre';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Dátum';

Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/sl.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/sv.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -310,6 +310,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Behåll';
 $PALANG['pFetchmail_field_protocol']        = 'Protokoll';
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra inställningsmöjligheter';
 $PALANG['pFetchmail_field_mda']             = 'MDA';
 $PALANG['pFetchmail_field_date']            = 'Datum';

Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/tr.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/languages/tw.lang	2013-08-18 18:40:57 UTC (rev 1519)
@@ -308,6 +308,9 @@
 $PALANG['pFetchmail_field_keep']            = 'Keep'; # XXX
 $PALANG['pFetchmail_field_protocol']        = 'Protocol'; # XXX
 $PALANG['pFetchmail_field_usessl']          = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_sslcertck']       = 'SSL certificate check'; # XXX
+$PALANG['pFetchmail_field_sslcertpath']     = 'SSL path to certificates'; # XXX
+$PALANG['pFetchmail_field_sslfingerprint']  = 'SSL fingerprint (md5)'; # XXX
 $PALANG['pFetchmail_field_extra_options']   = 'Extra Options'; # XXX
 $PALANG['pFetchmail_field_mda']             = 'MDA'; # XXX
 $PALANG['pFetchmail_field_date']            = 'Date'; # XXX

Modified: trunk/templates/fetchmail.tpl
===================================================================
--- trunk/templates/fetchmail.tpl	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/templates/fetchmail.tpl	2013-08-18 18:40:57 UTC (rev 1519)
@@ -29,6 +29,13 @@
 					<td nowrap="nowrap">{$row.keep}&nbsp;</td>
 					<td nowrap="nowrap">{$row.protocol}&nbsp;</td>
 					<td nowrap="nowrap">{$row.usessl}&nbsp;</td>
+					<td nowrap="nowrap">{$row.sslcertck}&nbsp;</td>
+{if $extra_options}
+					<td nowrap="nowrap">{$row.sslcertpath}&nbsp;</td>
+					<td nowrap="nowrap">{$row.sslfingerprint}&nbsp;</td>
+					<td nowrap="nowrap">{$row.extra_options}&nbsp;</td>
+					<td nowrap="nowrap">{$row.mda}&nbsp;</td>
+{/if}
 					<td nowrap="nowrap">{$row.date}&nbsp;</td>
 					<td nowrap="nowrap">{$row.returned_text}--x--&nbsp;</td> <!-- Inhalt mit if auswerten!  -->
 					<td><a href="fetchmail.php?edit={$row.id|escape:"url"}">{$PALANG.edit}</a></td>

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2013-08-07 21:46:53 UTC (rev 1518)
+++ trunk/upgrade.php	2013-08-18 18:40:57 UTC (rev 1519)
@@ -80,7 +80,7 @@
         $query .= " AFTER $after "; # PgSQL does not support to specify where to add the column, MySQL does
     }
 
-    if(! _db_field_exists($table, $field)) {
+    if(! _db_field_exists(table_by_key($table), $field)) {
         $result = db_query_parsed($query);
     } else { 
         printdebug ("field already exists: $table.$field");
@@ -1328,7 +1328,13 @@
     db_query_parsed("ALTER TABLE `$table_vacation` ADD `interval_time` INT NOT NULL DEFAULT '0' AFTER `reply_type` ");
 }
 
+function upgrade_1519() {
+    _db_add_field('fetchmail', 'sslcertck',      '{BOOLEAN}',                        'usessl'     );
+    _db_add_field('fetchmail', 'sslcertpath',    "VARCHAR(255) {UTF-8}  DEFAULT ''", 'sslcertck'  );
+    _db_add_field('fetchmail', 'sslfingerprint', "VARCHAR(255) {LATIN1} DEFAULT ''", 'sslcertpath');
+}
 
+
 # TODO MySQL:
 # - various varchar fields do not have a default value
 #   https://sourceforge.net/projects/postfixadmin/forums/forum/676076/topic/3419725

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