From 0960f3245c6f3c13d3358f001db7db54b19ff2df Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Fri, 29 Jul 2005 16:14:37 +0000
Subject: [PATCH] Removing some unuseful warns. Adding an error management for
 memberentry : Branch.

---
 C4/Auth.pm                                                  | 4 ----
 koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 367b0a6ce6..77536b210a 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -314,7 +314,6 @@ sub checkauth {
 			# voluntary logout the user
 			$dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
 			C4::Context->_unset_userenv($sessionID);
-			warn "DEL USERENV0";
 			$sessionID = undef;
 			$userid = undef;
 			open L, ">>/tmp/sessionlog";
@@ -328,7 +327,6 @@ sub checkauth {
 				$info{'timed_out'} = 1;
 				$dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
 				C4::Context->_unset_userenv($sessionID);
-				warn "DEL USERENV1";
 				$userid = undef;
 				$sessionID = undef;
 				open L, ">>/tmp/sessionlog";
@@ -342,7 +340,6 @@ sub checkauth {
 				$info{'different_ip'} = 1;
 				$dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
 				C4::Context->_unset_userenv($sessionID);
-				warn "DEL USERENV2";
 				$sessionID = undef;
 				$userid = undef;
 				open L, ">>/tmp/sessionlog";
@@ -438,7 +435,6 @@ sub checkauth {
 					-expires => '');
 		}
 		if ($envcookie){
-			warn "envcookie set";
 			return ($userid, [$cookie,$envcookie], $sessionID, $flags)
 		} else {
 			return ($userid, $cookie, $sessionID, $flags);
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 654fd66efa..fe2dd714bd 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -36,6 +36,9 @@
 			<!-- TMPL_IF NAME="ERROR_city" -->
 				Postal city<br>
 			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_branch" -->
+				Branch : member should be of the same branch as you<br>
+			<!-- /TMPL_IF -->
 		</div>
 	<!-- /TMPL_IF -->
 	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-- 
2.11.0