mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
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) git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1519 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
5f94773ae4
commit
b985816baa
@ -87,7 +87,7 @@ if($db_type eq "Pg") {
|
||||
}
|
||||
|
||||
$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
|
||||
";
|
||||
@ -108,6 +108,9 @@ map{
|
||||
$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;
|
||||
|
@ -65,6 +65,9 @@ $fm_struct=array( // list($editible,$view,$type)
|
||||
"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 @@ if ($cancel) { # cancel $new or $edit
|
||||
$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 @@ if ($edit + $new == 0) { # display list
|
||||
$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 ('fetchmail_edit_row', fetchmail_edit_row($formvars),false);
|
||||
$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');
|
||||
|
@ -309,6 +309,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -308,6 +308,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -308,6 +308,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -320,6 +320,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Stahovat vše';
|
||||
$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';
|
||||
|
@ -322,6 +322,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hent alle';
|
||||
$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';
|
||||
|
@ -320,6 +320,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Alle abholen';
|
||||
$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';
|
||||
|
@ -323,6 +323,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All';
|
||||
$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';
|
||||
|
@ -310,6 +310,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Obtener todo';
|
||||
$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';
|
||||
|
@ -312,6 +312,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -307,6 +307,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -308,6 +308,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hae kaikki';
|
||||
$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ä';
|
||||
|
@ -313,6 +313,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -310,6 +310,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Tout récupérer';
|
||||
$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';
|
||||
|
@ -307,6 +307,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -321,6 +321,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -308,6 +308,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -309,6 +309,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Ricevi tutto';
|
||||
$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';
|
||||
|
@ -319,6 +319,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'すべて取得';
|
||||
$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'] = '日付';
|
||||
|
@ -314,6 +314,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -309,6 +309,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -309,6 +309,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hent alt';
|
||||
$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';
|
||||
|
@ -312,6 +312,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen';
|
||||
$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';
|
||||
|
@ -231,6 +231,7 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Klarte ikke å oppdatere domenet!';
|
||||
$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_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -314,6 +314,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Pobierz wszystkie';
|
||||
$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';
|
||||
|
@ -321,6 +321,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Recuperar todas';
|
||||
$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';
|
||||
|
@ -321,6 +321,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Скачивать все';
|
||||
$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'] = 'Дата';
|
||||
|
@ -309,6 +309,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Staré';
|
||||
$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';
|
||||
|
@ -308,6 +308,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -310,6 +310,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hämta samtliga';
|
||||
$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';
|
||||
|
@ -308,6 +308,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -308,6 +308,9 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
|
||||
$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
|
||||
|
@ -29,6 +29,13 @@
|
||||
<td nowrap="nowrap">{$row.keep} </td>
|
||||
<td nowrap="nowrap">{$row.protocol} </td>
|
||||
<td nowrap="nowrap">{$row.usessl} </td>
|
||||
<td nowrap="nowrap">{$row.sslcertck} </td>
|
||||
{if $extra_options}
|
||||
<td nowrap="nowrap">{$row.sslcertpath} </td>
|
||||
<td nowrap="nowrap">{$row.sslfingerprint} </td>
|
||||
<td nowrap="nowrap">{$row.extra_options} </td>
|
||||
<td nowrap="nowrap">{$row.mda} </td>
|
||||
{/if}
|
||||
<td nowrap="nowrap">{$row.date} </td>
|
||||
<td nowrap="nowrap">{$row.returned_text}--x-- </td> <!-- Inhalt mit if auswerten! -->
|
||||
<td><a href="fetchmail.php?edit={$row.id|escape:"url"}">{$PALANG.edit}</a></td>
|
||||
|
@ -80,7 +80,7 @@ function _db_add_field($table, $field, $fieldtype, $after) {
|
||||
$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,6 +1328,12 @@ function upgrade_1345_mysql() {
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user