Move git_author config to global tab, validate author email

Author: root

Diff for: app/views/settings/_gitolite_config_file.html.erb

@@ -3,8 +3,6 @@
   gitolite_config_file          = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_config_file)
   gitolite_config_has_admin_key = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_config_has_admin_key, true)
   gitolite_identifier_prefix    = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_identifier_prefix)
-  git_config_username           = RedmineGitolite::ConfigRedmine.get_setting(:git_config_username)
-  git_config_email              = RedmineGitolite::ConfigRedmine.get_setting(:git_config_email)
 
   disable_button = (gitolite_config_file == RedmineGitolite::Config::GITOLITE_DEFAULT_CONFIG_FILE ? true : false)
 %>
@@ -32,20 +30,6 @@
   <em><%= l(:label_gitolite_identifier_prefix_desc) %></em>
 </p>
 
-<p>
-  <label><%= l(:label_git_config_username) %></label>
-  <%= text_field_tag("settings[git_config_username]", "#{git_config_username}", :size => 60) %>
-  <br />
-  <em><%= l(:label_git_config_username_desc) %></em>
-</p>
-
-<p>
-  <label><%= l(:label_git_config_email) %></label>
-  <%= text_field_tag("settings[git_config_email]", "#{git_config_email}", :size => 60) %>
-  <br />
-  <em><%= l(:label_git_config_email_desc) %></em>
-</p>
-
 <br />
 
 <div class="git_hosting_access_box">

Diff for: app/views/settings/_gitolite_config_global.html.erb

@@ -6,6 +6,9 @@
   gitolite_scripts_dir = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_scripts_dir)
   gitolite_log_level   = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_log_level)
   gitolite_log_split   = RedmineGitolite::ConfigRedmine.get_setting(:gitolite_log_split, true)
+
+  git_config_username  = RedmineGitolite::ConfigRedmine.get_setting(:git_config_username)
+  git_config_email     = RedmineGitolite::ConfigRedmine.get_setting(:git_config_email)
 %>
 
 <h3><%= l(:label_gitolite_global_config) %></h3>
@@ -62,3 +65,17 @@
     <em><%= l(:label_gitolite_log_split_off) %></em>
   <% end %>
 </p>
+
+<p>
+  <label><%= l(:label_git_config_username) %></label>
+  <%= text_field_tag("settings[git_config_username]", "#{git_config_username}", :size => 60) %>
+  <br />
+  <em><%= l(:label_git_config_username_desc) %></em>
+</p>
+
+<p>
+  <label><%= l(:label_git_config_email) %></label>
+  <%= text_field_tag("settings[git_config_email]", "#{git_config_email}", :size => 60) %>
+  <br />
+  <em><%= l(:label_git_config_email_desc) %></em>
+</p>

Diff for: init.rb

@@ -33,8 +33,6 @@
       :gitolite_config_file                  => 'gitolite.conf',
       :gitolite_config_has_admin_key         => true,
       :gitolite_identifier_prefix            => 'redmine_',
-      :git_config_username                   => 'Redmine Git Hosting',
-      :git_config_email                      => '[email protected]',
 
       # Gitolite Global Config
       :gitolite_temp_dir                     => File.join(Rails.root, 'tmp', 'redmine_git_hosting').to_s,
@@ -43,6 +41,8 @@
       :gitolite_recycle_bin_expiration_time  => 24.0,
       :gitolite_log_level                    => 'info',
       :gitolite_log_split                    => false,
+      :git_config_username                   => 'Redmine Git Hosting',
+      :git_config_email                      => '[email protected]',
 
       # Gitolite Hooks Config
       :gitolite_hooks_are_asynchronous  => false,

Diff for: lib/redmine_git_hosting/patches/setting_patch.rb

@@ -249,6 +249,16 @@ def save_git_hosting_values
             end
 
 
+            # Validate git author address
+            if valuehash[:git_config_email].blank?
+              valuehash[:git_config_email] = Setting.mail_from.to_s.strip.downcase
+            else
+              if !/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i.match(valuehash[:git_config_email])
+                valuehash[:git_config_email] = @@old_valuehash[:git_config_email]
+              end
+            end
+
+
             ## This a force update
             if valuehash[:gitolite_resync_all_projects] == 'true'
               @@resync_projects = true