fixex index.cgi

git-svn-id: http://biopieces.googlecode.com/svn/trunk@813 74ccb610-7750-0410-82ae-013aeee3265d

diff --git a/www/index.cgi b/www/index.cgi
index ef3f4885b49be33560bb03bdf66bb7b4d34c056e..4d833cc8005b76570bf35b3089f02983f0aa60b6 100755 (executable)
--- a/www/index.cgi
+++ b/www/index.cgi
@@ -245,25 +245,15 @@ sub cookie_login
 
     my ( $session );
 
-<<<<<<< .mine
-=======
-    $session = Maasha::BGB::Session::session_restore( "$cookie->{ 'SESSION_DIR' }/sessions.txt" );
-    
->>>>>>> .r811
     if ( $cookie->{ 'USER' } and $cookie->{ 'PASSWORD' } )
     {
-        $session = Maasha::BBrowser::Session::session_restore( "$cookie->{ 'SESSION_DIR' }/sessions.txt" );
+        $session = Maasha::BGB::Session::session_restore( "$cookie->{ 'SESSION_DIR' }/sessions.txt" );
     
         if ( exists $session->{ $cookie->{ 'USER' } } and
              $session->{ $cookie->{ 'USER' } }->{ 'PASSWORD' } eq Digest::MD5::md5_hex( $cookie->{ 'PASSWORD' } ) )
         {
-<<<<<<< .mine
-            $session->{ $cookie->{ 'USER' } }->{ 'SESSION_ID' } ||= Maasha::BBrowser::Session::session_new();
+            $session->{ $cookie->{ 'USER' } }->{ 'SESSION_ID' } ||= Maasha::BGB::Session::session_new();
             # $session->{ $cookie->{ 'USER' } }->{ 'SESSION_ID' }   = $ENV{ 'SSL_SESSION_ID' };
-=======
-            # $session->{ $cookie->{ 'USER' } }->{ 'SESSION_ID' } ||= Maasha::BGB::Session::session_new();
-            $session->{ $cookie->{ 'USER' } }->{ 'SESSION_ID' }   = $ENV{ 'SSL_SESSION_ID' };
->>>>>>> .r811
             $session->{ $cookie->{ 'USER' } }->{ 'TIME' }         = Maasha::Common::time_stamp();
 
             $cookie->{ 'SESSION_ID' } = $session->{ $cookie->{ 'USER' } }->{ 'SESSION_ID' };