Author: varkoly Date: Wed Nov 7 15:21:37 2007 New Revision: 41854 URL: http://svn.opensuse.org/viewcvs/yast?rev=41854&view=rev Log: #337398 - Long time bug in yast mail transfer agent module regarding relayhost port setting Modified: trunk/mail/src/widgets.ycp Modified: trunk/mail/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/widgets.ycp?rev=41854&r1=41853&r2=41854&view=diff ============================================================================== --- trunk/mail/src/widgets.ycp (original) +++ trunk/mail/src/widgets.ycp Wed Nov 7 15:21:37 2007 @@ -221,8 +221,16 @@ // when validating: may be enclosed in brackets (prevents mx lookups) string oms = (string) UI::QueryWidget (`id (id), `Value); // watch this: "[", no brackets, "]" - string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? - regexpsub (oms, ".(.*).", "\\1") : oms; + string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".(.*).:.*", "\\1") : oms; + + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? regexpsub (oms, ".(.*).", "\\1") : oms; + } + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, ".*:.*") ? regexpsub (oms, "(.*):.*", "\\1") : oms; + } if (oms_no_brackets != "" && ! Address::Check (oms_no_brackets) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org