- Ajout du suffixe en query lorsque nécessaire

- Meilleure gestion des commandes, notamment enable/disable

Core/CommandProcess.pm

@@ -202,7 +202,7 @@ sub reload_command
 	my $line = <FILE>;
 	chomp $line;
 	
-	$package = $1 if($line =~ /^\s*package\s+([^ ]+)\s*;/i);
+	$package = $1 if($line =~ /^\s*package\s+([A-Za-z:_-]+)\s*;/i);
 	$command = $1 if($line =~ /#.*?commands?\s*=\s*([^ ]+)/i);
 	$perm = $1 if($line =~ /#.*?rights?\s*=\s*([^ ]+)/i);
 	
@@ -223,7 +223,7 @@ sub reload_command
 		}
 		
 		$::logger->debug("$file: package=$package; perms=$perm") if(defined($::logger));
-		$package = defined($package) ? $package : ucfirst substr $file, 0, -3;
+# 		$package = defined($package) ? $package : ucfirst substr $file, 0, -3;
 		
 		my $main = "";
 		my $save = "";
@@ -241,7 +241,7 @@ sub reload_command
 			$help = $symbol if($symbol =~ /_help$/);
 			$dbg  = $symbol if($symbol =~ /^print_debug$/);
 		}
-		strict;
+		use strict;
 		
 		foreach $command (@commands)
 		{
@@ -294,7 +294,9 @@ sub enable
 {
 	my ($self, $chan, $ref_command) = @_;
 	
-	my @ret = ();
+	my %ret = ();
+	if($chan && @{$ref_command})
+	{
 		foreach my $commande (@{$ref_command})
 		{
 			# On autorise les * comme méta-caractère
@@ -310,7 +312,7 @@ sub enable
 					if($command =~ $regex)
 					{
 						$self->{'_loaded_commands'}->{$command}->{"enable"}->{$chan} = "enable";
-					push @ret, $command;
+						$ret{$command} = '';
 					}
 				}
 			}
@@ -319,12 +321,44 @@ sub enable
 				if(defined($self->{'_loaded_commands'}->{$commande}))
 				{
 					$self->{'_loaded_commands'}->{$commande}->{"enable"}->{$chan} = "enable";
-				push @ret, $commande;
+					$ret{$commande} = '';
+				}
+			}
+		}
+	}
+	else
+	{
+		foreach my $commande (keys %{$self->{'_loaded_commands'}})
+		{
+			foreach my $chan (keys %{$self->{'_loaded_commands'}->{$commande}->{"enable"}})
+			{
+				if($self->{'_loaded_commands'}->{$commande}->{"enable"}->{$chan} eq "disable")
+				{
+					if(defined($ret{$chan}))
+					{
+						push @{$ret{$chan}}, $commande;
+					}
+					else
+					{
+						$ret{$chan} = [$commande];
+					}
 				}
 			}
 		}
 		
-	return @ret;
+		# TODO optimiser en fournissant un if($::logger->isDebug, isInfo, ...)
+		$::logger->debug("Reporting disabled commands per chan:");
+		foreach my $chan (keys %ret)
+		{
+			$::logger->debug("  $chan:");
+			foreach my $command (@{$ret{$chan}})
+			{
+				$::logger->debug("    - $command");
+			}
+		}
+	}
+	
+	return %ret;
 } # Fin enable
 
 
@@ -336,7 +370,9 @@ sub disable
 {
 	my ($self, $chan, $ref_command) = @_;
 	
-	my @ret = ();
+	my %ret = ();
+	if($chan && @{$ref_command})
+	{
 		foreach my $commande (@{$ref_command})
 		{
 			# On autorise les * comme méta-caractère
@@ -356,7 +392,7 @@ sub disable
 					if($command =~ $regex)
 					{
 						$self->{'_loaded_commands'}->{$command}->{"enable"}->{$chan} = "disable";
-					push @ret, $command;
+						$ret{$command} = '';
 					}
 					
 				}
@@ -368,12 +404,44 @@ sub disable
 				if(defined($self->{'_loaded_commands'}->{$commande}))
 				{
 					$self->{'_loaded_commands'}->{$commande}->{"enable"}->{$chan} = "disable";
-				push @ret, $commande;
+					$ret{$commande} = '';
+				}
+			}
+		}
+	}
+	else
+	{
+		foreach my $commande (keys %{$self->{'_loaded_commands'}})
+		{
+			foreach my $chan (keys %{$self->{'_loaded_commands'}->{$commande}->{"enable"}})
+			{
+				if($self->{'_loaded_commands'}->{$commande}->{"enable"}->{$chan} eq "disable")
+				{
+					if(defined($ret{$chan}))
+					{
+						push @{$ret{$chan}}, $commande;
+					}
+					else
+					{
+						$ret{$chan} = [$commande];
+					}
+				}
+			}
+		}
+		
+		# TODO optimiser en fournissant un if($::logger->isDebug, isInfo, ...)
+		$::logger->debug("Reporting disabled commands per chan:");
+		foreach my $chan (keys %ret)
+		{
+			$::logger->debug("  $chan:");
+			foreach my $command (@{$ret{$chan}})
+			{
+				$::logger->debug("    - $command");
 			}
 		}
 	}
 	
-	return @ret;
+	return %ret;
 } # Fin disable
 
 
@@ -623,7 +691,6 @@ sub print_debug
 	if(defined($ref_params->[0]))
 	{
 		@commands = @{$ref_params};
-	
 	}
 	else
 	{

Core/Hook.pm

@@ -240,6 +240,15 @@ sub on_private
 		$self->privmsg($Config::owner, "There's ".$event->{'nick'}." who is telling me: ".$event->{'args'}[0]);
 	}
 	
+	# On ajoute ${Config::suffixe} s'il n'est pas déjà présent
+	my $text = $event->{'args'}[0];
+	my $cs = $Config::command_sign;
+	if(substr($text, 0, length($cs)) ne $cs)
+	{
+		$event->{'args'}[0] = $cs.$text;
+	}
+	
+	# Received query but transmitting to public event
 	on_public($self, $event);
 } # Fin on_private