jro_apps/redmine Commit - r2586:31cf9be7abac

0

app/models/user.rb +11 -2

               validates_length_of :firstname, :lastname, :maximum => 30
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
               validates_length_of :mail, :maximum => 60, :allow_nil => true
-              validates_length_of :password, :minimum => 4, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               def before_create
                 anonymous_user
               end
-            private
+              protected
+              def validate
+                # Password length validation based on setting
+                if !password.nil? && password.size < Setting.password_min_length.to_i
+                  errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)
+                end
+              end
+              private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")

0

app/views/account/register.rhtml +1 -1

             <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
             <%= password_field_tag 'password', nil, :size => 25  %><br />
-            <em><%= l(:text_caracters_minimum, 4) %></em></p>
+            <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
             <p><label for="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>

0

app/views/my/password.rhtml +1 -1

             <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
             <%= password_field_tag 'new_password', nil, :size => 25 %><br />
-            <em><%= l(:text_caracters_minimum, 4) %></em></p>
+            <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
             <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
             <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>

0

app/views/settings/_authentication.rhtml +3 0

                                        [l(:label_registration_automatic_activation), "3"]
                                       ], Setting.self_registration ) %></p>
+            <p><label><%= l(:setting_password_min_length) %></label>
+            <%= text_field_tag 'settings[password_min_length]', Setting.password_min_length, :size => 6 %></p>
             <p><label><%= l(:label_password_lost) %></label>
             <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>

0

app/views/users/_form.rhtml +1 -1

             <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
             <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
             <%= password_field_tag 'password', nil, :size => 25  %><br />
-            <em><%= l(:text_caracters_minimum, 4) %></em></p>
+            <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
             <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
             </div>

0

config/locales/bg.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/bs.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/ca.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/cs.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/da.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/de.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/en.yml +1 0

               setting_file_max_size_displayed: Max size of text files displayed inline
               setting_repository_log_display_limit: Maximum number of revisions displayed on file log
               setting_openid: Allow OpenID login and registration
+              setting_password_min_length: Minimum password length
               permission_edit_project: Edit project
               permission_select_project_modules: Select project modules

0

config/locales/es.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/fi.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/fr.yml +1 0

               setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne
               setting_repository_log_display_limit: "Nombre maximum de revisions affichées sur l'historique d'un fichier"
               setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
+              setting_password_min_length: Longueur minimum des mots de passe
               permission_edit_project: Modifier le projet
               permission_select_project_modules: Choisir les modules

0

config/locales/gl.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/he.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/hu.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/it.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/ja.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/ko.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/lt.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/nl.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/no.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/pl.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/pt-BR.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/pt.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/ro.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/ru.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/sk.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/sl.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/sr.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/sv.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/th.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/tr.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/uk.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/vi.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/zh-TW.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/locales/zh.yml +1 0

               text_wiki_page_reassign_children: Reassign child pages to this parent page
               text_wiki_page_nullify_children: Keep child pages as root pages
               text_wiki_page_destroy_children: Delete child pages and all their descendants
+              setting_password_min_length: Minimum password length

0

config/settings.yml +3 0

               default: '2'
             lost_password:
               default: 1
+            password_min_length:
+              format: int
+              default: 4
             attachment_max_size:
               format: int
               default: 5120

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages