Merge branch 'master' of github.com:RocketChat/Rocket.Chat

Author: marceloschmidt

i18n/en.i18n.json

@@ -304,7 +304,9 @@
   "Showing_results" : "<p>Showing <b>%s</b> results</p>",
   "Silence" : "Silence",
   "since_creation" : "since %s",
-  "Site_Name" : "Site Name:",
+  "Site_Name" : "Site Name",
+  "Site_Url" : "Site URL",
+  "Site_Url_Description" : "Example: https://chat.domain.com/",
   "SAML" : "SAML",
   "SMTP" : "SMTP",
   "SMTP_Host" : "SMTP Host",

i18n/pt.i18n.json

@@ -291,7 +291,9 @@
   "Showing_results" : "<p>Exibindo <b>%s</b> resultados</p>",
   "Silence" : "Silenciar",
   "since_creation" : "desde %s",
-  "Site_Name" : "Nome do Site:",
+  "Site_Name" : "Nome do Site",
+  "Site_Url" : "URL do Site",
+  "Site_Url_Description" : "Exemplo: https://chat.dominio.com.br/",
   "SAML" : "SAML",
   "SMTP" : "SMTP",
   "SMTP_Host" : "Host SMTP",

packages/rocketchat-lib/package.js

@@ -34,6 +34,7 @@ Package.onUse(function(api) {
 
 	// Settings
 	api.addFiles('settings/lib/rocketchat.coffee');
+	api.addFiles('settings/lib/onLoadSettings.coffee');
 
 	api.addFiles('settings/server/models/Settings.coffee', 'server');
 	api.addFiles('settings/server/methods.coffee', 'server');

packages/rocketchat-lib/settings/client/rocketchat.coffee

@@ -8,5 +8,5 @@ settingsDict = new ReactiveDict('settings')
 RocketChat.settings.get = (_id) ->
 	return settingsDict.get(_id)
 
-RocketChat.settings.load = (key, value) ->
-	return settingsDict.set key, value
+RocketChat.settings.onload '*', (key, value) ->
+	return settingsDict.set key, value

packages/rocketchat-lib/settings/lib/onLoadSettings.coffee

@@ -0,0 +1,5 @@
+RocketChat.settings.onload 'Site_Url', (key, value, initialLoad) ->
+	if value?.trim() isnt ''
+		__meteor_runtime_config__.ROOT_URL = value
+		if Meteor.absoluteUrl.defaultOptions?.rootUrl?
+			Meteor.absoluteUrl.defaultOptions.rootUrl = value

packages/rocketchat-lib/settings/lib/rocketchat.coffee

@@ -2,24 +2,38 @@
 # RocketChat.settings holds all packages settings
 # @namespace RocketChat.settings
 ###
-RocketChat.settings = {}
+RocketChat.settings =
+	callbacks: {}
+	ts: new Date
 
-RocketChat.settings.ts = new Date
+	get: (_id) ->
+		return Meteor.settings?[_id]
 
-RocketChat.settings.get = (_id) ->
-	return Meteor.settings?[_id]
+	set: (_id, value, callback) ->
+		Meteor.call 'saveSetting', _id, value, callback
 
-RocketChat.settings.set = (_id, value, callback) ->
-	Meteor.call 'saveSetting', _id, value, callback
+	batchSet: (settings, callback) ->
 
-RocketChat.settings.batchSet = (settings, callback) ->
+		# async -> sync
+		# http://daemon.co.za/2012/04/simple-async-with-only-underscore/
 
-	# async -> sync
-	# http://daemon.co.za/2012/04/simple-async-with-only-underscore/
+		save = (setting) ->
+			return (callback) ->
+				Meteor.call 'saveSetting', setting._id, setting.value, callback
 
-	save = (setting) ->
-		return (callback) ->
-			Meteor.call 'saveSetting', setting._id, setting.value, callback
+		actions = _.map settings, (setting) -> save(setting)
+		_(actions).reduceRight(_.wrap, (err, success) -> return callback err, success)()
 
-	actions = _.map settings, (setting) -> save(setting)
-	_(actions).reduceRight(_.wrap, (err, success) -> return callback err, success)()
+	load: (key, value, initialLoad) ->
+		if RocketChat.settings.callbacks[key]?
+			for callback in RocketChat.settings.callbacks[key]
+				callback key, value, initialLoad
+
+		if RocketChat.settings.callbacks['*']?
+			for callback in RocketChat.settings.callbacks['*']
+				callback key, value, initialLoad
+
+
+	onload: (key, callback) ->
+		RocketChat.settings.callbacks[key] ?= []
+		RocketChat.settings.callbacks[key].push callback

packages/rocketchat-lib/settings/server/methods.coffee

@@ -1,5 +1,3 @@
-RocketChat.settings.callbacks = {}
-
 ###
 # Add a setting
 # @param {String} _id
@@ -60,20 +58,6 @@ RocketChat.settings.addGroup = (_id, options = {}) ->
 	return RocketChat.models.Settings.upsert { _id: _id }, upsertChanges
 
 
-RocketChat.settings.load = (key, value, initialLoad) ->
-	if RocketChat.settings.callbacks[key]?
-		for callback in RocketChat.settings.callbacks[key]
-			callback key, value, initialLoad
-
-	if RocketChat.settings.callbacks['*']?
-		for callback in RocketChat.settings.callbacks['*']
-			callback key, value, initialLoad
-
-
-RocketChat.settings.onload = (key, callback) ->
-	RocketChat.settings.callbacks[key] ?= []
-	RocketChat.settings.callbacks[key].push callback
-
 ###
 # Remove a setting by id
 # @param {String} _id

packages/rocketchat-lib/settings/server/startup.coffee

@@ -35,6 +35,7 @@ RocketChat.settings.add 'Accounts_OAuth_Twitter_id', '', { type: 'string', group
 RocketChat.settings.add 'Accounts_OAuth_Twitter_secret', '', { type: 'string', group: 'Accounts', section: 'Twitter' }
 
 RocketChat.settings.addGroup 'General'
+RocketChat.settings.add 'Site_Url', __meteor_runtime_config__?.ROOT_URL, { type: 'string', group: 'General', i18nDescription: 'Site_Url_Description', public: true }
 RocketChat.settings.add 'Site_Name', 'Rocket.Chat', { type: 'string', group: 'General', public: true }
 RocketChat.settings.add 'Allow_Invalid_SelfSigned_Certs', false, { type: 'boolean', group: 'General' }
 RocketChat.settings.add 'Disable_Favorite_Rooms', false, { type: 'boolean', group: 'General' }