From 905cc5f2e222f601e23cc416bde30230e36e75fa Mon Sep 17 00:00:00 2001
From: Mercier Pierre-Olivier <nemunaire@acu.epita.fr>
Date: Sat, 14 Sep 2013 18:54:01 +0200
Subject: [PATCH] Fix token generation

---
 ACU/Log.pm        |  2 ++
 hooks/subjects.pl | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ACU/Log.pm b/ACU/Log.pm
index 0a522c2..a7b2ebf 100644
--- a/ACU/Log.pm
+++ b/ACU/Log.pm
@@ -34,6 +34,8 @@ sub log($@)
 {
     my $level = shift;
 
+    if ($#_ < 0) { return; }
+
     if (!$log_fd && $log_file) {
 	open ($log_fd, ">>", $log_file) or die("Unable to open log ($log_file) file for writing");
 	say $log_fd strftime("%a %b %e %H:%M:%S %Y", localtime), " START new logging session ";
diff --git a/hooks/subjects.pl b/hooks/subjects.pl
index 265aa0a..eae20dc 100755
--- a/hooks/subjects.pl
+++ b/hooks/subjects.pl
@@ -152,7 +152,7 @@ sub tag_project
 		do {
 		    $token = sha1_base64(rand);
 		    $token =~ s/[^a-zA-Z0-9]//g;
-		} while (length $token >= 12);
+		} while (length $token < 12);
 		$vcs->setAttribute("token", $token);
 		$mod = 1;
 	    }
@@ -178,11 +178,12 @@ sub tag_project
 	};
 	if ($@)
 	{
-	    if ($@ =~ /apP]roject [aA]ll?ready [eE]xists/) {
-		log WARN, $@;
+	    my $err = $@;
+	    if ($err =~ /[pP]roject [aA]ll?ready [eE]xists/) {
+		log WARN, $err;
 	    }
 	    else {
-		log ERROR, $@;
+		log ERROR, $err;
 	    }
 	}
 
@@ -190,7 +191,9 @@ sub tag_project
 	eval {
 	    API::Projects::gen_groups($project_id, $year);
 	};
-	log ERROR, $_ if($@);
+	if($@) {
+	    log ERROR, $_;
+	}
     }
     else
     {