Added support for ssh port specification in gitServer. Also clarity f…

…ix for access box.

README.mkd

@@ -110,8 +110,8 @@ The *httpServer* variable should be set to the hostname which will be used to ac
 may optionally include a port using the ':portnum' syntax, i.e. www.my-own-person-git-host-server.com:8000.  Unlike earlier versions of this plugin, this variable should
 *not* include the path to your Redmine root.
 
-The *gitServer* variable should be set to the hostname which will be used to access the gitolite repositories via ssh.  In most configurations, this 
-variable will be identical to the *httpServer*, except for the fact that *gitServer* will never include an optional port number.
+The *gitServer* variable should be set to the hostname which will be used to access the gitolite repositories via ssh.  Like *httpServer*, this variable may optionally include a port using the ':portnum' syntax, i.e. www.my-own-person-git-host-server.com:444.  In most configurations, the *gitServer* 
+variable will be identical to the *httpServer*, except when ports are involved.
 
 The *gitUser* is the user under which gitolite is installed.
 

app/models/git_hosting_settings_observer.rb

@@ -26,20 +26,20 @@ def before_save(object)
                   		valuehash['gitoliteIdentityPublicKeyFile'] = @@old_valuehash['gitoliteIdentityPublicKeyFile']
                 	end
 
-                  	# Server should not include any path components
+                  	# Server should not include any path components.  Also, ports should be numeric.
                   	if valuehash['gitServer']
                         	normalizedServer = valuehash['gitServer'].lstrip.rstrip.split('/').first
-                        	if (normalizedServer == '')
+                        	if (!normalizedServer.match(/^[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(:\d+)?$/))
                                 	valuehash['gitServer'] = @@old_valuehash['gitServer']
                                 else
                                 	valuehash['gitServer'] = normalizedServer
                                 end
                         end
 
-                  	# Server should not include any path components
+                  	# Server should not include any path components.  Also, ports should be numeric.
                   	if valuehash['httpServer']
                         	normalizedServer = valuehash['httpServer'].lstrip.rstrip.split('/').first
-                        	if (normalizedServer == '')
+                        	if (!normalizedServer.match(/^[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*(:\d+)?$/))
                                 	valuehash['httpServer'] = @@old_valuehash['httpServer']
                                 else
                                 	valuehash['httpServer'] = normalizedServer

app/views/repositories/git_instructions.html.erb

@@ -1,7 +1,10 @@
+
 <%# This is used to display basic git setup instructions, like on github... %>
 <% flash.now[:warning] = "Repository is empty. Get started by following the instructions below." %>
-<% git_ssh_url = Setting.plugin_redmine_git_hosting['gitUser'] + "@" + Setting.plugin_redmine_git_hosting['gitServer'] + ":" + GitHosting.repository_name(@project) + '.git'  %>
-
+<% gitSHP = Setting.plugin_redmine_git_hosting['gitServer'].match(/:\d+$/) %>
+<% git_ssh_url =
+   "#{gitSHP ? 'ssh://' : ''}#{Setting.plugin_redmine_git_hosting['gitUser']}@#{Setting.plugin_redmine_git_hosting['gitServer']}#{gitSHP ? '/' : ':'}#{GitHosting.repository_name(@project)}.git" %>
+
 <div class="box">
 
 <h2>Git Setup:</h2>

app/views/settings/_display_access.html.erb

@@ -7,7 +7,8 @@
 		%>
 		<br/>
 		<label><%= l(:label_ssh_access)%>:</label>
-		<%= "ssh://#{@settings['gitUser']}@#{@settings['gitServer']}:#{@settings['gitRedmineSubdir']}<em>#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git</em>"
+		<% gitSHP = Setting.plugin_redmine_git_hosting['gitServer'].match(/:\d+$/) %>
+		<%= "#{gitSHP ? 'ssh://' : ''}#{@settings['gitUser']}@#{@settings['gitServer']}#{gitSHP	? '/' : ':'}#{@settings['gitRedmineSubdir']}<em>#{(GitHosting.repository_hierarchy)?'project1/project2/':''}project3.git</em>"
 		%>
 		<br/>
 		<label><%= l(:label_http_access)%>:</label>

assets/javascripts/git_url_display.js

@@ -4,7 +4,8 @@ function updateGitUrl(el)
 	guHttpBase = guHttpBase.replace(/\/$/, "")
 
 	var urls=[]
-	urls["git_url_ssh"]  = [guGitUser + "@" + guGitServer + ":" + guSshURL, guUserIsCommitter]
+	var gitSHP = /:\d+$/.test(guGitServer)
+	urls["git_url_ssh"]  = [(gitSHP ? "ssh://" : "") + guGitUser + "@" + guGitServer + (gitSHP ? "/" : ":") + guSshURL, guUserIsCommitter]
 	urls["git_url_http"] = [guHttpProto + "://" + ( (!guProjectIsPublic) || guUserIsCommitter ? guUser + "@" : "") + guHttpBase + "/" + guHttpURL, guUserIsCommitter]
 	urls["git_url_git"]  = ["git://" + guGitServer + "/" + guSshURL, false]
 	var allGitUrlIds = ["git_url_ssh", "git_url_http", "git_url_git"]

config/locales/bg.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/bs.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/ca.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/cs.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/da.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/de.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/el.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/en.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/es.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/fi.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/fr.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/gl.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/he.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/hu.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/id.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/it.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.

config/locales/ja.yml

@@ -100,7 +100,7 @@
   mirror_push_sucess: Success.
   mirror_push_fail: Failed!
 
-  display_access_setup: Assuming that project1 is a parent of project2, and project2 is a parent of project3. Given the current configuration, project3's repository has the following properties
+  display_access_setup: Assume that <em>project1</em> is a parent of <em>project2</em>, and <em>project2</em> is a parent of <em>project3</em>. Given the current configuration, <em>project3</em>'s repository has the following properties
   display_access_emphasis: In the above patterns, <em>emphasized</em> components represent context-dependent elements. 
   display_access_hierarchical: Parent projects are included in the URLs, since the repository is in <em>Hierarchical</em> mode.
   display_access_flat: Parent projects are not included in the URLs, since the repository is in <em>Flat</em> mode.