Author: varkoly Date: Sun Sep 28 10:27:20 2008 New Revision: 51613 URL: http://svn.opensuse.org/viewcvs/yast?rev=51613&view=rev Log: Fixing bnc#422022 - HTML markup shows in YAST dialogue Fixing some typos Modified: trunk/mail/src/YaPI/MailServer.pm trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail.ycp Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=51613&r1=51612&r2=51613&view=diff ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Sun Sep 28 10:27:20 2008 @@ -1161,12 +1161,16 @@ } # Now we looking for if vscan (virusscanning) is started. - my $smtp = SCR->Execute('.mail.postfix.mastercf.findService', - { 'service' => 'smtp', - 'command' => 'smtpd'}); my $vscan = SCR->Execute('.mail.postfix.mastercf.findService', { 'service' => 'localhost:10025', 'command' => 'smtpd'} ); + my $smtp = SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'smtp', + 'command' => 'smtpd'}); +print "SMTP"; +print Dumper ($smtp); +print "VSCAN"; +print Dumper ($vscan); if( defined $smtp->[0] && defined $smtp->[0]->{'options'} ) { if( $smtp->[0]->{'options'}->{'content_filter'} eq 'smtp:[localhost]:10024' && $vscan ) @@ -1186,6 +1190,7 @@ { $MailPrevention{'VSCount'} = $1; } + $ismax = 1; } if( !$ismax ) { @@ -1200,7 +1205,7 @@ { $ret = $imap->login($imapadm, $AdminPassword); if($$ret{Status} eq "ok") { - $ret = $imap->select('NEWSPAM'); + $ret = $imap->select('NewSpam'); if( $ret->{Status} eq 'ok' ) { $MailPrevention{'SpamLearning'} = YaST::YCP::Boolean(1); @@ -1358,6 +1363,7 @@ SCR->Read('.mail.postfix.mastercf'); if( $MailPrevention->{'VirusScanning'} ) { + $MailPrevention->{'VSCount'}) = 5 if( ! defined $MailPrevention->{'VSCount'}); my $err = activate_virus_scanner($MailPrevention->{'VSCount'}); if( $err ne "" ) { @@ -1450,8 +1456,51 @@ $ret = $imap->setacl('NoSpam', $imapadm, "lrswipkxtea"); $ret = $imap->setacl('NewSpam', 'anyone', "lrswi"); $ret = $imap->setacl('NoSpam', 'anyone', "lsi"); + my $lernspam = '#!/bin/bash +LOG=/var/log/lern-spam +/usr/share/oss/tools/oss_date.sh >> $LOG +if [ ! -d /var/spool/imap/NewSpam ] +then + exit +fi + +setfacl -m u:vscan:rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam} +setfacl -m m::rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam} + +su - vscan -c "/usr/bin/sa-learn --sync" +( +for i in `ls /var/spool/imap/NewSpam/[0-9]* 2> /dev/null` +do + setfacl -m user:vscan:r-x $i + echo $i + su - vscan -c "/usr/bin/sa-learn --spam $i" + rm $i +done +) >> $LOG 2>&1 +su - cyrus -c "reconstruct NewSpam" &>/dev/null + +( +for i in `ls /var/spool/imap/NoSpam/[0-9]* 2> /dev/null` +do + setfacl -m user:vscan:r-x $i + echo $i + su - vscan -c "/usr/bin/sa-learn --ham $i" + rm $i +done +) >> $LOG 2>&1 +su - cyrus -c "reconstruct NoSpam" &>/dev/null + +setfacl -b /var/spool/imap /var/spool/imap/{NoSpam,NewSpam} +'; + SCR->Write(.target.string,"/etc/cron.hourly/lern-spam",$lernspam); + SCR->Write(.target.bash,"chmod 755 /etc/cron.hourly/lern-spam"); } } + else + { + SCR->Write(.target.bash,"test -e /etc/cron.hourly/lern-spam && rm /etc/cron.hourly/lern-spam"); + $ret = $imap->delete('NewSpam'); + } } return 1; } Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=51613&r1=51612&r2=51613&view=diff ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Sun Sep 28 10:27:20 2008 @@ -43,12 +43,17 @@ Ldap::LDAPInit(); map<string, any> LDAPSettings = (map <string, any>) Ldap::Export(); list args = []; + integer size1 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/servercert.pem"); + integer size2 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/serverkey.pem"); + if( size1 <= 0 || size2 <= 0) + { + ca_mgm = true; + } y2milestone(" LDAPSettings %1", LDAPSettings); //if( ! LDAPSettings["start_ldap"]:false ) if( LDAPSettings["bind_dn"]:"" == "" ) { //No LDAP-Client configuration setup_ldap_server = true; - ca_mgm = true; conf_ldap_client = true; ldap_server_local = true; comment = _("Your computer is not configured as an LDAP client.") + "<br>" + @@ -57,7 +62,7 @@ } else { //The computer is configured as LDAP-Client - if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" ) + if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" || LDAPSettings["ldap_server"]:"" == "localhost" ) { // The LDAP-Server is local comment = _("Your computer is configured as an LDAP client and the LDAP server is local.") + "<br>" + _("We suggest you adapt the LDAP server configuration for the mail server.") + "<br>" + @@ -661,11 +666,14 @@ list<map<string,string> > AccessList = (list<map<string,string> >) MailServer::MailPrevention["AccessList"]:[]; boolean VirusScanning = (boolean)MailServer::MailPrevention["VirusScanning"]:false; boolean SpamLearning = (boolean)MailServer::MailPrevention["SpamLearning"]:false; - integer VSCount = (integer)MailServer::MailPrevention["VSCount "]:10; + integer VSCount = (integer)MailServer::MailPrevention["VSCount"]:10; boolean BasicProtectionOff = false; boolean BasicProtectionMedium = false; boolean BasicProtectionHard = true; +y2milestone("---- MailPrevention %1",MailServer::MailPrevention); +y2milestone("---- VSCount %1",VSCount); + if(BasicProtection == "off"){ BasicProtectionOff = true; BasicProtectionHard = false; @@ -696,7 +704,7 @@ `HBox( `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), `HSpacing (1), - `Left(`TextEntry (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), sformat("%1",VSCount))) + `Left(`TextEntry (`id(`VSCount), _("Count of Virsus Scanner Process"), sformat("%1",VSCount))) ), `VSpacing (1), SpamL, @@ -1461,7 +1469,7 @@ MailServer::MailPrevention["BasicProtection"] = (string) UI::QueryWidget(`id(`BasicProtection), `CurrentButton); MailServer::MailPrevention["VirusScanning"] = (boolean)UI::QueryWidget(`id(`VirusScanning), `Value); MailServer::MailPrevention["SpamLearning"] = (boolean)UI::QueryWidget(`id(`SpamLearning), `Value); - MailServer::MailPrevention["VSCount"] = (boolean)UI::QueryWidget(`id(`VSCount), `Value); + MailServer::MailPrevention["VSCount"] = (integer)UI::QueryWidget(`id(`VSCount), `Value); title = _("Mail Server SPAM Basic Prevention Configuration"); content = MailPreventionDialog(CID,CIDRBL); helptext = HELPS["MailPrevention"]:"Bla Bla Bla"; Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=51613&r1=51612&r2=51613&view=diff ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Sun Sep 28 10:27:20 2008 @@ -9,8 +9,8 @@ * Main file * * Authors: - * Martin Vidner <mvidner@suse.cz> * Peter Varkoly <varkoly@novell.com> + * Martin Vidner <mvidner@suse.cz> * * $Id$ * @@ -81,13 +81,13 @@ { if( type == "standard" ) { - status = _("The running mail server configuration is based on the <b>Standard</b> type.")+ "\n"+ - _("It is possible to change to <b>Advanced</b> settings. This will overwrite all existing settings."); + status = _("The running mail server configuration is based on the \"Standard\" type.")+ "\n"+ + _("It is possible to change to \"Advanced\" settings. This will overwrite all existing settings."); } else if( type == "advanced" ) { - status = _("The running mail server configuration is based on the <b>Advanced</b> type.")+"\n"+ - _("It is possible to change to <b>Standard</b> settings. This will overwrite all existing settings."); + status = _("The running mail server configuration is based on the \"Advanced\" type.")+"\n"+ + _("It is possible to change to \"Standard\" settings. This will overwrite all existing settings."); } } term contents = -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org