Removing some unuseful warns.

Adding an error management for memberentry : Branch.

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 367b0a6..77536b2 100644 (file)
--- 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 654fd66..fe2dd71 100644 (file)
--- 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">