Edgewall Software

Ticket #5340: 5340-accountmanagerplugin-loginmodule-r3857.patch

File 5340-accountmanagerplugin-loginmodule-r3857.patch, 1.0 KB (added by Remy Blank <remy.blank@…>, 4 months ago)

Remove duplicate code and fix #3048

  • trunk/acct_mgr/web_ui.py

    diff --git a/trunk/acct_mgr/web_ui.py b/trunk/acct_mgr/web_ui.py
    a b  
    434434 
    435435    def _do_login(self, req): 
    436436        if not req.remote_user: 
    437             req.redirect(self.env.abs_href()) 
     437            req.redirect(req.abs_href()) 
    438438        return auth.LoginModule._do_login(self, req) 
    439439 
    440440    def _remote_user(self, req): 
     
    445445        if AccountManager(self.env).check_password(user, password): 
    446446            return user 
    447447        return None 
    448  
    449     def _redirect_back(self, req): 
    450         """Redirect the user back to the URL she came from.""" 
    451         referer = self._referer(req) 
    452         if referer and not referer.startswith(req.base_url): 
    453             # don't redirect to external sites 
    454             referer = None 
    455         req.redirect(referer or self.env.abs_href()) 
    456  
    457     def _referer(self, req): 
    458         return req.args.get('referer') or req.get_header('Referer') 
    459448 
    460449    def enabled(self): 
    461450        # Users should disable the built-in authentication to use this one