BugFixing : viewlog.pl was broken (comma missing)

[koha_fer] / C4 / Auth.pm

diff --git a/C4/Auth.pm b/C4/Auth.pm
index e11c582..6d792ea 100755 (executable)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -438,8 +438,9 @@ sub checkauth {
         if ($logout) {
 
             # voluntary logout the user
-#             $session->delete;
+
             $session->flush;      
+                       $session->delete();
             C4::Context->_unset_userenv($sessionID);
             $sessionID = undef;
             $userid    = undef;
@@ -493,12 +494,20 @@ sub checkauth {
         }
     }
     unless ($userid) {
-#         my $session = new CGI::Session("driver:MySQL", undef, {Handle=>$dbh});    
-        my $session = new CGI::Session("driver:File", undef, {Directory=>'/tmp'});    
+               my $storage_method = C4::Context->preference('SessionStorage');
+               my $session;
+               if ($storage_method eq 'mysql'){
+                   $session = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
+               }
+               else {
+                       # catch all defaults to tmp should work on all systems
+                       $session = new CGI::Session("driver:File", $sessionID, {Directory=>'/tmp'});                    
+               }
+
         my $sessionID;
-    if ($session) {
-      $sessionID = $session->id;
-      }
+               if ($session) {
+                       $sessionID = $session->id;
+               }
         $userid    = $query->param('userid');
         C4::Context->_new_userenv($sessionID);
         my $password = $query->param('password');