Indefero Commit Details

Date:

2008-12-19 04:46:46 (16 years 3 days ago)

Author:

Loic d'Anterroches

Branch:

dev, 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, master, release-1.1, release-1.2, release-1.3

Commit:

d29267875974c1e7dac2ba88e78a626e7cba2348

Parents:

f6fb6c5ccc6252c9a20a73169698755e70cec726

Message:

Added the initialisation of the user language at registration time.

When the user register, we grab the language from the browser and use it
as first value for the corresponding user object. The user can then
later on modify it from his account area.

Changes:

File differences

-27
28 28
29 29
30
31
30 32
31 33
34
32 35
33 36
34 37
... ...
115 118
116 119
117 120
121
118 122
119 123
120 124
+ */␊
class IDF_Form_Register extends Pluf_Form␊
{␊
    protected $request;␊
␊
    public function initFields($extra=array())␊
    {␊
        $this->request = $extra['request'];␊
        $login = '';␊
        if (isset($extra['initial']['login'])) {␊
            $login = $extra['initial']['login'];␊

        $user->last_name = $this->cleaned_data['login'];␊
        $user->login = $this->cleaned_data['login'];␊
        $user->email = $this->cleaned_data['email'];␊
        $user->language = $this->request->language_code;␊
        $user->active = false;␊
        $user->create();␊
        $from_email = Pluf::f('from_email');␊
 ...
  */␊
 class IDF_Form_Register extends Pluf_Form␊
 {␊
+    protected $request;␊
+␊
     public function initFields($extra=array())␊
     {␊
+        $this->request = $extra['request'];␊
         $login = '';␊
         if (isset($extra['initial']['login'])) {␊
             $login = $extra['initial']['login'];␊
         $user->last_name = $this->cleaned_data['login'];␊
         $user->login = $this->cleaned_data['login'];␊
         $user->email = $this->cleaned_data['email'];␊
+        $user->language = $this->request->language_code;␊
         $user->active = false;␊
         $user->create();␊
         $from_email = Pluf::f('from_email');␊

-63
64 64
65 65
66
66 67
67 68
68 69
+                                                       'size' => 15,␊
                                                                    ),␊
                                            ));␊
␊
        $this->fields['password'] = new Pluf_Form_Field_Varchar(␊
                                      array('required' => true,␊
                                            'label' => __('Your password'),␊
                                                        'size' => 15,␊
                                                                     ),␊
                                             ));␊
+␊
         $this->fields['password'] = new Pluf_Form_Field_Varchar(␊
                                       array('required' => true,␊
                                             'label' => __('Your password'),␊

-84
85 85
86 86
87
87 88
88 
89
89 90
90 91
91 92
92 93
93 94
94 95
95 
96 
96
97
98
99
97 100
98 101
99 102
+    function register($request, $match)␊
    {␊
        $title = __('Create Your Account');␊
        $params = array('request'=>$request);␊
        if ($request->method == 'POST') {␊
            $form = new IDF_Form_Register($request->POST);␊
            $form = new IDF_Form_Register($request->POST, $params);␊
            if ($form->isValid()) {␊
                $user = $form->save(); // It is sending the confirmation email␊
                $url = Pluf_HTTP_URL_urlForView('IDF_Views::registerInputKey');␊
                return new Pluf_HTTP_Response_Redirect($url);␊
            }␊
        } else {␊
            $init = (isset($request->GET['login'])) ? array('initial' => array('login' => $request->GET['login'])) : array();␊
            $form = new IDF_Form_Register(null, $init);␊
            if (isset($request->GET['login'])) {␊
                $params['initial'] = array('login' => $request->GET['login']);␊
            }␊
            $form = new IDF_Form_Register(null, $params);␊
        }␊
        $context = new Pluf_Template_Context(array());␊
        $tmpl = new Pluf_Template('idf/terms.html');␊
     function register($request, $match)␊
     {␊
         $title = __('Create Your Account');␊
+        $params = array('request'=>$request);␊
         if ($request->method == 'POST') {␊
-            $form = new IDF_Form_Register($request->POST);␊
+            $form = new IDF_Form_Register($request->POST, $params);␊
             if ($form->isValid()) {␊
                 $user = $form->save(); // It is sending the confirmation email␊
                 $url = Pluf_HTTP_URL_urlForView('IDF_Views::registerInputKey');␊
                 return new Pluf_HTTP_Response_Redirect($url);␊
             }␊
         } else {␊
-            $init = (isset($request->GET['login'])) ? array('initial' => array('login' => $request->GET['login'])) : array();␊
-            $form = new IDF_Form_Register(null, $init);␊
+            if (isset($request->GET['login'])) {␊
+                $params['initial'] = array('login' => $request->GET['login']);␊
+            }␊
+            $form = new IDF_Form_Register(null, $params);␊
         }␊
         $context = new Pluf_Template_Context(array());␊
         $tmpl = new Pluf_Template('idf/terms.html');␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags