Indefero Commit Details

Date:

2011-03-03 14:03:26 (14 years 2 months ago)

Author:

Patrick Georgi

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.1, release-1.2, release-1.3

Commit:

04069871bb3f308d6dfefdb4a50df0f21f1b0bd7

Parents:

31469204e022091a6d1cfa9e84c8b39a43dfe204

Message:

Fixes to bugs introduced by the multiple mail feature

Changes:

File differences

-86
87 87
88 88
89 
89
90 90
91 91
92 92
+                $return_url = Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryInputCode');␊
                $tmpl = new Pluf_Template('idf/user/passrecovery-email.txt');␊
                $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));␊
                $code = trim($cr->encrypt($user->email.':'.$user->id.':'.time()), ␊
                $code = trim($cr->encrypt($user->email.':'.$user->id.':'.time().':primary'), ␊
                             '~');␊
                $code = substr(md5(Pluf::f('secret_key').$code), 0, 2).$code;␊
                $url = Pluf::f('url_base').Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecovery', array($code), array(), false);␊
                 $return_url = Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryInputCode');␊
                 $tmpl = new Pluf_Template('idf/user/passrecovery-email.txt');␊
                 $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));␊
-                $code = trim($cr->encrypt($user->email.':'.$user->id.':'.time()), ␊
+                $code = trim($cr->encrypt($user->email.':'.$user->id.':'.time().':primary'), ␊
                              '~');␊
                 $code = substr(md5(Pluf::f('secret_key').$code), 0, 2).$code;␊
                 $url = Pluf::f('url_base').Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecovery', array($code), array(), false);␊

-63
64 64
65 65
66 
66
67 67
68 68
69 69
+            throw new Pluf_Form_Invalid(__('The validation key is not valid. Please copy/paste it from your confirmation email.'));␊
        }␊
        $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));␊
        return explode(':', $cr->decrypt($encrypted), 3);␊
        return explode(':', $cr->decrypt($encrypted), 4);␊
        ␊
    }␊
␊
             throw new Pluf_Form_Invalid(__('The validation key is not valid. Please copy/paste it from your confirmation email.'));␊
         }␊
         $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));␊
-        return explode(':', $cr->decrypt($encrypted), 3);␊
+        return explode(':', $cr->decrypt($encrypted), 4);␊
         ␊
     }␊
 ␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags