fixed ignore bug #50

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@968 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 87 insertions, 97 deletions

diff --git a/data/defscript/aliases.kvs b/data/defscript/aliases.kvs
index 7f6d8510b..7845e453d 100644
--- a/data/defscript/aliases.kvs
+++ b/data/defscript/aliases.kvs
@@ -554,30 +554,22 @@ alias(ignore)
 	if(!$0)
 	{
 		echo $tr("Usage:")
-		echo "	  /ignore [-r] <nick> [mask]"
+		echo "	  /ignore [-r] <nick>"
 		halt
 	}
 
-	# Get the mask
-
-	%mask = $1
-
-	# no mask specified ? build it
-
-	if(!%mask)%mask = $0!*@*
-
 	# Now add the user (but do not replace old entries)
 
-	reguser.add -f -q $0 %mask
+	reguser.add $0 $mask($0,15);
 
 	# And finally set the property (use -n so the notify lists will be restarted)
 	# Check if ignore or unignore the user
 
 	if(!$sw(r))
 	{
-		reguser.setIgnoreEnabled $0 true
-		reguser.setIgnoreFlags -p -c -t $0
-	} else reguser.setIgnoreEnabled $0 false
+		reguser.setproperty $0 IgnoreEnabled 1
+		reguser.setproperty $0 IgnoreAll 1
+	} else reguser.setproperty $0 IgnoreEnabled 0
 }
 
 # Dcc...people commonly use "dcc send" instead of "dcc.send"
diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs
index 0c5d3067c..d984b1883 100644
--- a/data/defscript/popups.kvs
+++ b/data/defscript/popups.kvs
@@ -79,219 +79,217 @@ defpopup(ignore)
 		if(%:regName)
 		{
 			%:inIgnoreList = $reguser.isIgnoreEnabled(%:regName);
-			if(%:inIgnoreList) {
-				%:ignLabelText << $tr("is being ignored")
-			} else {
-				%:ignLabelText << $tr("is not being ignored")
-			}
-		%:ignLabelText << "</p>"
+			if(%:inIgnoreList) %:ignLabelText << $tr("is being ignored")
+			else %:ignLabelText << $tr("is not being ignored")
+		
+			%:ignLabelText << "</p>"
 		} else {
 			%:ignLabelText << $tr("is not being ignored")"</p>"
 		}
 	}
-	
+
 	label(%:ignLabelText)
-	
+
 	item($tr("Enable Ignore"),168) (!%:inIgnoreList && %:regName)
 	{
-		reguser.setIgnoreEnabled %:regName 1
+		reguser.setproperty %:regName IgnoreEnabled 1;
 	}
-	
+
 	popup($tr("Ignore as..."),44) (!%:inIgnoreList)
 	{
 		item($tr("Ignore as") $0 "("$mask($0,0)")") ("$reguser.exactMatch($mask($0,0))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,0);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,1)")") ("$reguser.exactMatch($mask($0,1))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,1);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,2)")") ("$reguser.exactMatch($mask($0,2))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,2);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,3);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,4);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,5);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,6)")") ("$reguser.exactMatch($mask($0,6))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,6);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,7)")") ("$reguser.exactMatch($mask($0,7))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,7);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,8)")") ("$reguser.exactMatch($mask($0,8))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,8);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,9)")") ("$reguser.exactMatch($mask($0,9))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,9);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,10)")") ("$reguser.exactMatch($mask($0,10))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,10);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,11);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,12);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,13);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,14)")") ("$reguser.exactMatch($mask($0,14))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,14);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,15)")") ("$reguser.exactMatch($mask($0,15))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,15);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,16)")") ("$reguser.exactMatch($mask($0,16))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,16);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,17)")") ("$reguser.exactMatch($mask($0,17))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,17);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,18)")") ("$reguser.exactMatch($mask($0,17))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,18);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,19)")") ("$reguser.exactMatch($mask($0,19))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,19);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,20)")") ("$reguser.exactMatch($mask($0,20))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,20);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,21)")") ("$reguser.exactMatch($mask($0,21))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,21);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,22)")") ("$reguser.exactMatch($mask($0,22))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,22);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,23)")") ("$reguser.exactMatch($mask($0,23))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,23);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,24)")") ("$reguser.exactMatch($mask($0,24))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,24);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
-		
+
 		item($tr("Ignore as") $0 "("$mask($0,25)")") ("$reguser.exactMatch($mask($0,25))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,25);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 		
 		item($tr("Ignore as") $0 "("$mask($0,26)")") ("$reguser.exactMatch($mask($0,26))" == "")
 		{
 			if(!%:regName) reguser.add $0 $mask($0,26);
-			reguser.setIgnoreEnabled $0 1;
-			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
+			reguser.setproperty %:regName IgnoreEnabled 1;
+			reguser.setproperty %:regName IgnoreAll 1;
 		}
 	}
-	
+
 	item($tr("Unignore"),217) (%:inIgnoreList)
 	{
-		reguser.setIgnoreEnabled %:regName 0
+		reguser.setproperty %:regName IgnoreEnabled 0;
 	}
 }