Skip to content

O
Openfire
Commit 4e9a9445 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

Updated Clearspace integration pieces to ask for URI instead of separate... 

Updated Clearspace integration pieces to ask for URI instead of separate pieces.  Also added admin list page.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9916 b35dd754-fafc-0310-a699-88a17e54d16e
parent 37a85925
Hide whitespace changes
Inline Side-by-side
Showing with 410 additions and 326 deletions
src/i18n/openfire_i18n_cs_CZ.properties
View file @ 4e9a9445
......@@ -1159,6 +1159,8 @@ setup.admin.settings.info=N\u00ed\u017ee zadejte nastaven\u00ed pro \u00fa\u010d
krok m\u016f\u017eete p\u0159esko\u010dit pokud jste ji\u017e nastavili v\u00e1\u0161 administr\u00e1torsk\u00fd \u00fa\u010det (net\u00fdk\u00e1 se poprv\u00e9 vstupuj\u00edc\u00edch u\u017eivatel\u016f).
setup.admin.settings.ldap.info=Zvolte jednoho nebo v\u00edce u\u017eivatel\u016f z Va\u0161eho LDAP adres\u00e1\u0159e za administr\u00e1tora \
zad\u00e1n\u00edm jejich u\u017eivatelsk\u00fdch jmen.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.error=P\u0159i aktualizaci administr\u00e1torsk\u00e9ho \u00fa\u010dtu do\u0161lo k chyb\u00e1m. Viz. n\u00ed\u017ee.
setup.admin.settings.username-error=Nebylo zad\u00e1no u\u017eivatelsk\u00e9 jm\u00e9no nebo zadan\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no neexistuje.
setup.admin.settings.current_password=Sou\u010dasn\u00e9 heslo:
......@@ -2239,7 +2241,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -2256,7 +2261,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_de.properties
View file @ 4e9a9445
......@@ -2135,6 +2135,8 @@ setup.admin.settings.add.administrator=Add Administrator
setup.admin.settings.administrator=Administrator
setup.admin.settings.ldap.info=Choose one or more users from your LDAP directory to be administrators by \
entering their usernames.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.remove=Remove
setup.admin.settings.test.error-password=Password is incorrect.
setup.admin.settings.test.error-user=Username not found.
......@@ -2225,7 +2227,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -2242,7 +2247,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_en.properties
View file @ 4e9a9445
......@@ -297,12 +297,9 @@
## Added key: 'setup.clearspace.service.integration'
## Added key: 'setup.clearspace.service'
## Added key: 'setup.clearspace.service.description'
## Added key: 'setup.clearspace.service.host'
## Added key: 'setup.clearspace.service.host_help'
## Added key: 'setup.clearspace.service.host_error'
## Added key: 'setup.clearspace.service.port'
## Added key: 'setup.clearspace.service.port_help'
## Added key: 'setup.clearspace.service.port_error'
## Added key: 'setup.clearspace.service.uri'
## Added key: 'setup.clearspace.service.uri_help'
## Added key: 'setup.clearspace.service.uri_error'
## Added key: 'setup.clearspace.service.secret'
## Added key: 'setup.clearspace.service.secret_help'
## Added key: 'setup.clearspace.service.secret_error'
......@@ -334,13 +331,8 @@
## Added key: 'sidebar.user-lockout'
## Added key: 'sidebar.user-lockout.descr'
## Updated key: 'profile-settings.info'
## Added key: 'setup.clearspace.service.path'
## Added key: 'setup.clearspace.service.path_help'
## Added key: 'setup.clearspace.service.path_error'
## Added key: 'setup.clearspace.service.secure'
## Added key: 'setup.clearspace.service.secure_help'
## Added key: 'setup.clearspace.advanced'
## Added key: 'setup.clearspace.service.connectionURI'
## Added key: 'setup.clearspace.service.password'
## Added key: 'setup.admin.settings.clearspace.info'
# Openfire
......@@ -1529,6 +1521,8 @@ setup.admin.settings.info=Enter settings for the system administrator account (u
can skip this step if you have already setup your admin account (not for first time users).
setup.admin.settings.ldap.info=Choose one or more users from your LDAP directory to be administrators by \
entering their usernames.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.error=There were errors when updating the admin account. Please see below.
setup.admin.settings.username-error=No username was provided or the specified username was not found.
setup.admin.settings.current_password=Current Password:
......@@ -1799,30 +1793,25 @@ setup.ldap.group.test.group-not-found=No groups were found using the specified c
setup.clearspace.continue=Save & Continue
setup.clearspace.test=Test Settings
setup.clearspace.advanced=Advanced Settings
setup.clearspace.title=Profile Settings - Clearspace Integration
setup.clearspace.profile=Profile Settings
setup.clearspace.service.integration=Clearspace Integration
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.connectionURI=Connection URI:
setup.clearspace.service=Clearspace Service
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.port=Port
setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
setup.clearspace.service.path=URI Path
setup.clearspace.service.path_help=Clearspace URI path, without the / in front. e.g. clearspace instead of /clearspace.
setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.uri=URI
setup.clearspace.service.uri_help=Clearspace service URI; e.g. https://cs.example.com:80/clearspace, etc.
setup.clearspace.service.uri_error=Enter a valid Clearspace service URI.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.title=Test
setup.clearspace.service.test.title-desc=Connection Settings
......
src/i18n/openfire_i18n_es.properties
View file @ 4e9a9445
......@@ -1153,6 +1153,8 @@ setup.admin.settings.info=Ingrese la configuraci\u00f3n para la cuenta del admin
configurado su cuenta de administrador (no recomendado para usuarios inexpertos).
setup.admin.settings.ldap.info=Seleccione uno o más usuarios de su directorio LDAP para ser administradores \
de Openfire ingresando sus nombres de usuarios.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.error=Se encontraron errores al actualizar la cuenta del administrador. Vea m\u00e1s abajo.
setup.admin.settings.username-error=No se ha especificado un nombre de usuario o no se ha encontrado un usuario con ese nombre.
setup.admin.settings.current_password=Contrase\u00f1a Actual:
......@@ -2281,6 +2283,7 @@ setup.clearspace.continue=Salvar & Continuar
setup.clearspace.profile=Seteos de Perfil
setup.clearspace.service=Servicio de Clearspace
setup.clearspace.service.connection_settings=Seteos de Conexi\u00f3n
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure los seteos de conexi\u00f3n a su Clearspace. Todos los campos son requeridos y el secreto compartido debe ser tambi\u00e9n configurado desde la consola de Clearspace.
setup.clearspace.service.host=Servidor
setup.clearspace.service.host_error=Ingrese un nombre de servicio v\u00e1lido para Clearspace.
......
src/i18n/openfire_i18n_fr.properties
View file @ 4e9a9445
......@@ -953,6 +953,8 @@ setup.env.check.doc = Veuillez lire la documentation d'installation et essayez d
setup.admin.settings.account = Compte Administrateur
setup.admin.settings.info = Saisissez les param\u00E8tres pour le compte de l'administrateur syst\u00E8me (pseudo \: "admin") ci-dessous. Il est important de choisir un mot de passe pour le compte qui ne puisse \u00EAtre devin\u00E9 -- par exemple, au moins six caract\u00E8res de long et contenant un m\u00E9lange de lettres et de chiffres. Vous pouvez passer cette \u00E9tape si vous avez d\u00E9j\u00E0 configur\u00E9 votre compte administrateur (pas pour la premi\u00E8re installation).
setup.admin.settings.ldap.info = Choisissez un ou plusieurs administrateurs parmi vos utilisateurs LDAP en entrant leur nom d'utilisateur.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.error = Il y a eu des erreurs lors de la mise \u00E0 jour du compte admin. Veuillez regarder ci-dessous.
setup.admin.settings.username-error = Aucun nom d'utilisateur ou ce nom d'utilisateur est introuvable.
setup.admin.settings.current_password = Mot de Passe Actuel \:
......@@ -1845,7 +1847,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -1862,7 +1867,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_ja_JP.properties
View file @ 4e9a9445
......@@ -1338,6 +1338,8 @@ setup.admin.settings.info=\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u7528\u30a2
\u3082\u3057\u3059\u3067\u306b\u7ba1\u7406\u8005\u30a2\u30ab\u30a6\u30f3\u30c8(\u521d\u56de\u306e\u30e6\u30fc\u30b6\u30fc\u3067\u306f\u306a\u3044)\u3092\u8a2d\u5b9a\u3057\u3066\u3044\u308b\u5834\u5408\u306b\u306f\u3001\u3053\u306e\u30b9\u30c6\u30c3\u30d7\u3092\u30b9\u30ad\u30c3\u30d7\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
setup.admin.settings.ldap.info=\u30e6\u30fc\u30b6\u30fc\u540d\u3092\u5165\u529b\u3057\u30011\u4eba\u304b\u305d\u308c\u4ee5\u4e0a\u306e\u3001\u7ba1\u7406\u8005\u3068\u306a\u308b\u30e6\u30fc\u30b6\u30fc\u3092LDAP\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304b\u3089\
\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.error=\u7ba1\u7406\u8005\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u66f4\u65b0\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u6b21\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
setup.admin.settings.username-error=\u30e6\u30fc\u30b6\u30fc\u540d\u304c\u5165\u529b\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3001\u5165\u529b\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fc\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
setup.admin.settings.current_password=\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9:
......@@ -2372,7 +2374,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -2389,7 +2394,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_nl.properties
View file @ 4e9a9445
......@@ -2149,6 +2149,8 @@ setup.admin.settings.add.administrator=Add Administrator
setup.admin.settings.administrator=Administrator
setup.admin.settings.ldap.info=Choose one or more users from your LDAP directory to be administrators by \
entering their usernames.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.remove=Remove
setup.admin.settings.test.error-password=Password is incorrect.
setup.admin.settings.test.error-user=Username not found.
......@@ -2236,7 +2238,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -2253,7 +2258,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_pl_PL.properties
View file @ 4e9a9445
......@@ -2119,6 +2119,8 @@ setup.admin.settings.add.administrator=Add Administrator
setup.admin.settings.administrator=Administrator
setup.admin.settings.ldap.info=Choose one or more users from your LDAP directory to be administrators by \
entering their usernames.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.remove=Remove
setup.admin.settings.test.error-password=Password is incorrect.
setup.admin.settings.test.error-user=Username not found.
......@@ -2205,7 +2207,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -2222,7 +2227,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_pt_BR.properties
View file @ 4e9a9445
......@@ -1160,6 +1160,8 @@ setup.admin.settings.info=Digite as configura\u00e7\u00f5es para a conta do admi
pode pular este passo se voc\u00ea j\u00e1 definiu uma conta de administrador (n\u00e3o recomendado para usu\u00e1rios iniciantes).
setup.admin.settings.ldap.info=Escolha um ou mais usu\u00e1rios de seu diret\u00f3rio LDAP para ser(em) administrador(es) \
digitando seus nomes de usu\u00e1rio.
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.error=Houveram erros quando da atualiza\u00e7\u00e3o da conta admin. Por favor veja abaixo.
setup.admin.settings.current_password=Senha atual:
setup.admin.settings.current_password_description=Se esta \u00e9 uma nova instala\u00e7\u00e3o, a senha \
......@@ -2239,7 +2241,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -2256,7 +2261,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_zh_CN.properties
View file @ 4e9a9445
......@@ -1072,6 +1072,8 @@ setup.env.check.doc=\u8bf7\u9605\u8bfb\u5b89\u88c5\u6587\u6863\u5e76\u518d\u6b21
setup.admin.settings.account=\u7ba1\u7406\u5458\u5e10\u6237
setup.admin.settings.info=\u8bf7\u5728\u4e0b\u9762\u8f93\u5165\u7cfb\u7edf\u7ba1\u7406\u5458\u5e10\u6237\uff08\u201cadmin\u201d\u7684\u7528\u6237\u540d\uff09\u7684\u8bbe\u7f6e\u3002\u4e3a\u8be5\u5e10\u6237\u9009\u62e9\u4e00\u4e2a\u4e0d\u6613\u731c\u4e2d\u7684\u5bc6\u7801\u975e\u5e38\u91cd\u8981 \uff0d \u4f8b\u5982\uff0c\u81f3\u5c11\u6709 6 \u4e2a\u5b57\u7b26\u957f\u5e76\u4e14\u540c\u65f6\u5305\u542b\u5b57\u6bcd\u548c\u6570\u5b57\u3002\u5982\u679c\u60a8\u5df2\u7ecf\u8bbe\u7f6e\u4e86\u60a8\u7684 admin \u5e10\u6237\uff08\u4e0d\u662f\u65b0\u7528\u6237\uff09\uff0c\u5219\u53ef\u4ee5\u8df3\u8fc7\u672c\u6b65\u9aa4\u3002
setup.admin.settings.ldap.info=\u4ece\u60a8\u7684LDAP\u76ee\u5f55\u4e2d\u9009\u62e9\u4e00\u4e2a\u6216\u66f4\u591a\u7684\u7528\u6237\u6210\u4e3a\u7ba1\u7406\u5458\uff0c\u8f93\u5165\u4ed6\u4eec\u7684\u7528\u6237\u540d\u3002
setup.admin.settings.clearspace.info=Choose one or more users from your Clearspace service to be \
administrators by entering their usernames.
setup.admin.settings.error=\u66f4\u65b0 admin \u5e10\u6237\u65f6\u51fa\u9519\u3002\u9519\u8bef\u5982\u4e0b\u3002
setup.admin.settings.username-error=\u6ca1\u6709\u63d0\u4f9b\u7528\u6237\u540d\u8d44\u6599\u6216\u6307\u5b9a\u7684\u7528\u6237\u540d\u4e0d\u5b58\u5728
setup.admin.settings.current_password=\u5f53\u524d\u5bc6\u7801\uff1a
......@@ -2016,7 +2018,10 @@ setup.clearspace.continue=Save & Continue
setup.clearspace.profile=Profile Settings
setup.clearspace.service=Clearspace Service
setup.clearspace.service.connection_settings=Connection Settings
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. All fields are required, and the shared secret is configured from the Clearspace admin console. Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.password=Password
setup.clearspace.service.description=Configure connection settings for your Clearspace service below. \
All fields are required and configured from the Clearspace admin console under the Real-Time tab. \
Please be aware that Clearspace 2.0 or higher is required.
setup.clearspace.service.host=Host
setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
......@@ -2033,7 +2038,9 @@ setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. This is a stub error and you should never see this in production. Please report immediately if you do.
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/java/org/jivesoftware/openfire/clearspace/ClearspaceManager.java
View file @ 4e9a9445
......@@ -20,8 +20,7 @@ import java.util.*;
* should be used to get an instace. The following properties configure this manager:
*
* <ul>
* <li>clearspace.host</li>
* <li>clearspace.port</li>
* <li>clearspace.uri</li>
* <li>clearspace.sharedSecret</li>
* </ul>
*
......@@ -90,12 +89,8 @@ public class ClearspaceManager {
instance = new ClearspaceManager(properties);
}
private String host;
private int port = 80;
private String path = "clearspace";
private String uri;
private String sharedSecret;
private boolean secure = true;
private Map<String, String> properties;
......@@ -119,36 +114,16 @@ public class ClearspaceManager {
public ClearspaceManager(Map<String, String> properties) {
this.properties = properties;
String secureStr = properties.get("clearspace.secure");
if (secureStr != null && (secureStr.equalsIgnoreCase("false") || secureStr.equals("0"))) {
secure = false;
}
String host = properties.get("clearspace.host");
if (host != null) {
this.host = host;
}
String portStr = properties.get("clearspace.port");
if (portStr != null) {
try {
this.port = Integer.parseInt(portStr);
}
catch (NumberFormatException nfe) {
Log.error(nfe);
}
}
String path = properties.get("clearspace.path");
if (path != null) {
this.path = path;
String uri = properties.get("clearspace.uri");
if (uri != null) {
this.uri = uri;
}
sharedSecret = properties.get("clearspace.sharedSecret");
StringBuilder buf = new StringBuilder();
buf.append("Created new ClearspaceManager() instance, fields:\n");
buf.append("\t host: ").append(host).append("\n");
buf.append("\t port: ").append(port).append("\n");
buf.append("\t path: ").append(path).append("\n");
buf.append("\t URI: ").append(uri).append("\n");
buf.append("\t sharedSecret: ").append(sharedSecret).append("\n");
buf.append("\t secure: ").append(secure ? "yes" : "no").append("\n");
if (Log.isDebugEnabled()) {
Log.debug("ClearspaceManager: "+buf.toString());
......@@ -156,97 +131,54 @@ public class ClearspaceManager {
}
/**
* Temporary connection tester.
* Check a username/password pair for valid authentication.
*
* TODO: This is a temporary stub until the real interface is worked out.
*
* @return True if connection test was successful.
* @param username Username to authenticate against.
* @param password Password to use for authentication.
* @return True or false of the authentication succeeded.
*/
public Boolean testConnection() {
if (host.equals("notlocalhost")) {
public Boolean checkAuthentication(String username, String password) {
if (username.equals("daniel")) {
return false;
}
return true;
}
/**
* Returns whether we will be making a secure connection or not. (http vs https)
*
* @return True or false if we are using a secure connection to Clearspace.
*/
public boolean isSecure() {
return secure;
}
/**
* Sets whether we will be using a secure (https) connection to Clearspace.
*
* @param secure True or false, whether secure connections will be enabled.
*/
public void setSecure(boolean secure) {
this.secure = secure;
}
/**
* Returns the Clearspace service host; e.g. <tt>cs.example.org</tt>.
* This value is stored as the Jive Property <tt>clearspace.host</tt>.
*
* @return the Clearspace service host name.
*/
public String getHost() {
return host;
}
/**
* Sets the hostname of the Clearspace service; e.g., <tt>cs.example.org</tt>.
* This value is stored as the Jive Property <tt>clearspace.host</tt>.
* Tests the web services connection with Clearspace given the manager's current configuration.
*
* @param host the Clearspace service host name.
*/
public void setHost(String host) {
this.host = host;
properties.put("clearspace.host", host);
}
/**
* Returns the Clearspace service port number. The default is 80. This value is
* stored as the Jive Property <tt>clearspace.port</tt>.
*
* @return the Clearspace service port number.
*/
public int getPort() {
return port;
}
/**
* Sets the Clearspace service port number. The default is 80. This value is
* stored as the Jive property <tt>clearspace.port</tt>.
* TODO: This is a temporary stub until the real interface is worked out.
*
* @param port the Clearspace service port number.
* @return True if connection test was successful.
*/
public void setPort(int port) {
this.port = port;
properties.put("clearspace.port", Integer.toString(port));
public Boolean testConnection() {
if (uri.equals("http://localhost:80/fail")) {
return false;
}
return true;
}
/**
* Returns the path component of the Clearspace connection URI, without the prefix /.
* Typically clearspace for https://hostname:port/clearspace.
* Returns the Clearspace service URI; e.g. <tt>https://localhost:80/clearspace</tt>.
* This value is stored as the Jive Property <tt>clearspace.uri</tt>.
*
* @return The path component of the URI.
* @return the Clearspace service URI.
*/
public String getPath() {
return path;
public String getConnectionURI() {
return uri;
}
/**
* Sets the path component of the Clearspace connection URI, without the prefix /.
* Typically clearspace for https://hostname:port/clearspace.
* Sets the URI of the Clearspace service; e.g., <tt>https://localhost:80/clearspace</tt>.
* This value is stored as the Jive Property <tt>clearspace.uri</tt>.
*
* @param path the path component of the URI.
* @param uri the Clearspace service URI.
*/
public void setPath(String path) {
this.path = path;
public void setConnectionURI(String uri) {
this.uri = uri;
properties.put("clearspace.uri", uri);
}
/**
......@@ -269,17 +201,4 @@ public class ClearspaceManager {
properties.put("clearspace.sharedSecret", sharedSecret);
}
/**
* Returns the connection URI constructed from various settings from this manager.
*
* @return the URI that should be used to connect to Clearspace.
*/
public String getConnectionURI() {
StringBuffer buf = new StringBuffer();
buf.append(secure ? "https" : "http").append("://");
buf.append(host).append(":").append(port);
buf.append("/").append(path);
return buf.toString();
}
}
\ No newline at end of file
src/web/profile-settings.jsp
View file @ 4e9a9445
......@@ -148,8 +148,7 @@
</tr>
<% if (isCLEARSPACE) { %>
<%
String host = ClearspaceManager.getInstance().getHost();
int port = ClearspaceManager.getInstance().getPort();
String uri = ClearspaceManager.getInstance().getConnectionURI();
%>
<tr>
<td width="1%" nowrap>
......@@ -165,18 +164,10 @@
<tbody>
<tr>
<td class="c1">
<fmt:message key="setup.clearspace.service.host" />:
<fmt:message key="setup.clearspace.service.uri" />:
</td>
<td class="c2">
<%= host %>
</td>
</tr>
<tr>
<td class="c1">
<fmt:message key="setup.clearspace.service.port" />:
</td>
<td class="c2">
<%= port %>
<%= uri %>
</td>
</tr>
</tbody>
......
src/web/setup/clearspace-integration.jspf
View file @ 4e9a9445
......@@ -7,10 +7,7 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<%
boolean secure;
String host;
int port = 80;
String path;
String uri;
String sharedSecret;
// Get parameters
......@@ -21,16 +18,10 @@
Map<String, String> errors = new HashMap<String, String>();
if (save || test) {
secure = ParamUtils.getBooleanParameter(request, "secure", true);
host = ParamUtils.getParameter(request, "host");
if (host == null) {
errors.put("host", LocaleUtils.getLocalizedString("setup.clearspace.service.host_error"));
uri = ParamUtils.getParameter(request, "uri");
if (uri == null) {
errors.put("uri", LocaleUtils.getLocalizedString("setup.clearspace.service.uri_error"));
}
port = ParamUtils.getIntParameter(request, "port", port);
if (port <= 0) {
errors.put("port", LocaleUtils.getLocalizedString("setup.clearspace.service.port_error"));
}
path = ParamUtils.getParameter(request, "path", true);
sharedSecret = ParamUtils.getParameter(request, "sharedSecret");
if (sharedSecret == null || sharedSecret.length() == 0) {
errors.put("secret", LocaleUtils.getLocalizedString("setup.clearspace.service.secret_error"));
......@@ -39,19 +30,13 @@
if (errors.isEmpty()) {
// Store settings in a map and keep it in the session
Map<String, String> settings = new HashMap<String, String>();
settings.put("clearspace.secure", secure ? "true" : "false");
settings.put("clearspace.host", host);
settings.put("clearspace.port", Integer.toString(port));
settings.put("clearspace.path", path);
settings.put("clearspace.uri", uri);
settings.put("clearspace.sharedSecret", sharedSecret);
session.setAttribute("clearspaceSettings", settings);
if (save) {
// Save settings and redirect
manager.setSecure(secure);
manager.setHost(host);
manager.setPort(port);
manager.setPath(path);
manager.setConnectionURI(uri);
manager.setSharedSecret(sharedSecret);
// Enable the Clearspace user, auth, group, and vcard providers.
......@@ -71,10 +56,7 @@
}
} else {
// See if there are already values for the variables defined.
secure = manager.isSecure();
host = manager.getHost();
port = manager.getPort();
path = manager.getPath();
uri = manager.getConnectionURI();
sharedSecret = manager.getSharedSecret();
}
%>
......@@ -112,8 +94,6 @@
<p><fmt:message key="setup.clearspace.service.description" /></p>
<p><strong><fmt:message key="setup.clearspace.service.connectionURI" /></strong> <span id="connectionUri">https://[hostname]:[port]/[path]</span> <img align="top" height="16" width="16" id="connectionUriStatus" src="" alt="" /></p>
<% if (errors.size() > 0) { %>
<div class="error">
......@@ -132,28 +112,15 @@
<td colspan="4"><strong><fmt:message key="setup.clearspace.service" /></strong></td>
</tr>
<tr>
<td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.clearspace.service.host" />:</td>
<td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.clearspace.service.uri" />:</td>
<td width="1%">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td width="1%" nowrap="nowrap">
<input type="text" name="host" id="jiveCLEARSPACEhost" size="22" maxlength="50" value="<%= host!=null?host:"" %>" onKeyUp="updateURI()">
<input type="text" name="uri" id="jiveCLEARSPACEuri" size="40" maxlength="255" value="<%= uri!=null?uri:"" %>">
</td>
<td width="99%">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.host_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
</td>
</tr>
</table>
</td>
<td align="right" width="1%" nowrap="nowrap">&nbsp;&nbsp; <fmt:message key="setup.clearspace.service.port" />:</td>
<td>
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td width="1%" nowrap="nowrap">
<input type="text" name="port" id="jiveCLEARSPACEport" size="5" maxlength="5" value="<%= port %>" onKeyUp="updateURI()">
</td>
<td width="99%">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.port_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.uri_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
</td>
</tr>
</table>
......@@ -175,32 +142,6 @@
</td>
</tr>
</table>
<!-- BEGIN jiveAdvancedButton -->
<div class="jiveAdvancedButton jiveAdvancedButtonTopPad">
<a href="#" onclick="togglePanel(jiveAdvanced); return false;" id="jiveAdvancedLink"><fmt:message key="setup.clearspace.advanced" /></a>
</div>
<!-- END jiveAdvancedButton -->
<!-- BEGIN jiveAdvancedPanelu (advanced clearspace connection settings) -->
<div class="jiveadvancedPanelu" id="jiveAdvanced" style="display: none;">
<div>
<table border="0" cellpadding="0" cellspacing="2">
<tr>
<td align="right"><fmt:message key="setup.clearspace.service.path" />:</td>
<td><input type="text" name="path" value="<%= path %>" id="jiveCLEARSPACEpath" size="22" maxlength="250" onKeyUp="updateURI()"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.path_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"/></td>
</tr>
<tr>
<td align="right"><fmt:message key="setup.clearspace.service.secure" />:</td>
<td><select name="secure" id="jiveCLEARSPACEsecure" onChange="updateURI()">
<option value="true"<%= secure ? " selected='selected'" : "" %>><fmt:message key="global.yes"/></option>
<option value="false"<%= !secure ? " selected='selected'" : "" %>><fmt:message key="global.no"/></option>
</select><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.secure_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"/></td>
</tr>
</table>
</div>
</div>
<!-- END jiveAdvancedPanelu (advanced clearspace connection settings) -->
</div>
<!-- END jive-contentBox_bluebox -->
......@@ -223,48 +164,5 @@
</div>
<!-- END jive-contentBox -->
<script type="text/javascript">
function updateURI() {
var uri = "";
var valid = true;
if (document.getElementById("jiveCLEARSPACEsecure").options[document.getElementById("jiveCLEARSPACEsecure").selectedIndex].value == "false") {
uri = uri + "http";
}
else {
uri = uri + "https";
}
uri = uri + "://";
if (document.getElementById("jiveCLEARSPACEhost").value != "") {
uri = uri + document.getElementById("jiveCLEARSPACEhost").value;
}
else {
uri = uri + "[hostname]";
valid = false;
}
uri = uri + ":";
if (document.getElementById("jiveCLEARSPACEport").value != "") {
uri = uri + document.getElementById("jiveCLEARSPACEport").value;
}
else {
uri = uri + "[port]";
valid = false;
}
uri = uri + "/";
if (document.getElementById("jiveCLEARSPACEpath").value != "") {
uri = uri + document.getElementById("jiveCLEARSPACEpath").value;
}
document.getElementById("connectionUri").innerHTML = uri;
if (valid) {
document.getElementById("connectionUriStatus").src = "/images/check-16x16.gif";
}
else {
document.getElementById("connectionUriStatus").src = "/images/error-16x16.gif"
}
}
// Initialize URI
updateURI();
</script>
</body>
</html>
src/web/setup/setup-admin-settings.jsp
View file @ 4e9a9445
......@@ -52,6 +52,7 @@
boolean addAdmin = request.getParameter("addAdministrator") != null;
boolean deleteAdmins = request.getParameter("deleteAdmins") != null;
boolean ldapFinished = request.getParameter("ldapFinished") != null;
boolean clearspaceFinished = request.getParameter("clearspaceFinished") != null;
// Handle a skip request
if (doSkip) {
......@@ -62,15 +63,6 @@
return;
}
// Handle clearspace completion
if (clearspace) {
// admin accounts are pulled from Clearspace, so we're done:
setSetupFinished(session);
// redirect
response.sendRedirect("setup-finished.jsp");
return;
}
// Error checks
Map<String, String> errors = new HashMap<String, String>();
if (doContinue) {
......@@ -118,14 +110,14 @@
}
}
if (ldapFinished) {
if (ldapFinished || clearspaceFinished) {
setSetupFinished(session);
// All good so redirect
response.sendRedirect("setup-finished.jsp");
return;
}
if (addAdmin) {
if (addAdmin && !doTest) {
final String admin = request.getParameter("administrator");
if (admin != null) {
if (ldap) {
......@@ -145,6 +137,23 @@
}
}
}
if (clearspace) {
// Try to verify that the username exists in LDAP
Map<String, String> settings = (Map<String, String>) session.getAttribute("ldapSettings");
Map<String, String> userSettings = (Map<String, String>) session.getAttribute("ldapUserSettings");
if (settings != null) {
LdapManager manager = new LdapManager(settings);
manager.setUsernameField(userSettings.get("ldap.usernameField"));
manager.setSearchFilter(userSettings.get("ldap.searchFilter"));
try {
manager.findUserDN(JID.unescapeNode(admin));
}
catch (Exception e) {
e.printStackTrace();
errors.put("administrator", "");
}
}
}
if (errors.isEmpty()) {
String currentList = JiveGlobals.getXMLProperty("admin.authorizedUsernames");
final List users = new ArrayList(StringUtils.stringToCollection(currentList));
......@@ -176,10 +185,10 @@
}
}
// This handles the case of reverting back to default settings from LDAP. Will
// This handles the case of reverting back to default settings from LDAP/Clearspace. Will
// add admin to the authorizedUsername list if the authorizedUsername list contains
// entries.
if (!ldap && !doTest) {
if (!ldap && !clearspace && !doTest) {
String currentAdminList = JiveGlobals.getXMLProperty("admin.authorizedUsernames");
List<String> adminCollection = new ArrayList<String>(StringUtils.stringToCollection(currentAdminList));
if ((!adminCollection.isEmpty() && !adminCollection.contains("admin")) ||
......@@ -202,7 +211,7 @@
<fmt:message key="setup.admin.settings.account" />
</h1>
<% if(!ldap){ %>
<% if(!ldap && !clearspace){ %>
<p>
<fmt:message key="setup.admin.settings.info" />
</p>
......@@ -374,7 +383,138 @@ document.acctform.newPassword.focus();
<% } else {
<% } else if (ldap) {
if (errors.size() > 0) { %>
<div class="error">
<% if (errors.get("general") != null) { %>
<%= errors.get("general") %>
<% } else if (errors.get("administrator") != null) { %>
<fmt:message key="setup.admin.settings.username-error" />
<% } else { %>
<fmt:message key="setup.admin.settings.error" />
<% } %>
</div>
<% }
if (doTest) {
StringBuffer testLink = new StringBuffer();
testLink.append("setup-admin-settings_test.jsp?username=");
testLink.append(URLEncoder.encode(username, "UTF-8"));
if (password != null) {
testLink.append("&password=").append(URLEncoder.encode(password, "UTF-8"));
}
testLink.append("&ldap=true");
%>
<a href="<%= testLink %>" id="lbmessage" title="<fmt:message key="global.test" />" style="display:none;"></a>
<script type="text/javascript">
function loadMsg() {
var lb = new lightbox(document.getElementById('lbmessage'));
lb.activate();
}
setTimeout('loadMsg()', 250);
</script>
<% } %>
<p>
<fmt:message key="setup.admin.settings.ldap.info" />
</p>
<div class="jive-contentBox">
<form action="setup-admin-settings.jsp" name="acctform" method="post">
<!-- Admin Table -->
<table cellpadding="3" cellspacing="2" border="0">
<tr valign="top">
<td class="jive-label">
<fmt:message key="setup.admin.settings.add.administrator" />:
</td>
<td>
<input type="text" name="administrator" size="20" maxlength="50"/>
</td>
<td>
<input type="submit" name="addAdministrator" value="<fmt:message key="global.add" />"/>
</td>
</tr>
</table>
<%
String authorizedUsernames = JiveGlobals.getXMLProperty("admin.authorizedUsernames");
boolean hasAuthorizedName = authorizedUsernames != null && authorizedUsernames.length() > 0;
%>
<% if(hasAuthorizedName) { %>
<!-- List of admins -->
<table class="jive-vcardTable" cellpadding="3" cellspacing="0" border="0">
<tr>
<th nowrap><fmt:message key="setup.admin.settings.administrator" /></th>
<th width="1%" nowrap><fmt:message key="global.test" /></th>
<th width="1%" nowrap><fmt:message key="setup.admin.settings.remove" /></th>
</tr>
<%
for (String authUsername : StringUtils.stringToCollection(authorizedUsernames)) {
%>
<tr valign="top">
<td>
<%= authUsername%>
</td>
<td width="1%" align="center">
<a href="setup-admin-settings.jsp?ldap=true&test=true&username=<%= URLEncoder.encode(authUsername, "UTF-8") %>"
title="<fmt:message key="global.click_test" />"
><img src="../images/setup_btn_gearplay.gif" width="14" height="14" border="0" alt="<fmt:message key="global.click_test" />"></a>
</td>
<td>
<input type="checkbox" name="remove" value="<%=authUsername%>"/>
</td>
</tr>
<%
}
if (authorizedUsernames != null) {
%>
<tr valign="top">
<td>
&nbsp;
</td>
<td>
&nbsp;
</td>
<td>
<input type="submit" name="deleteAdmins" value="Remove"/>
</td>
</tr>
<%
}
%>
</table>
<% } %>
<input type="hidden" name="ldap" value="true"/>
<div align="right">
<br/>
<input type="submit" name="ldapFinished" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0" style="display:none;">
</div>
</form>
</div>
<%
if(hasAuthorizedName) {%>
<script type="text/javascript">
document.getElementById("jive-setup-save").style.display = "";
</script>
<% } %>
<% } else if (clearspace) {
if (errors.size() > 0) { %>
<div class="error">
......@@ -401,6 +541,7 @@ document.acctform.newPassword.focus();
if (password != null) {
testLink.append("&password=").append(URLEncoder.encode(password, "UTF-8"));
}
testLink.append("&clearspace=true");
%>
<a href="<%= testLink %>" id="lbmessage" title="<fmt:message key="global.test" />" style="display:none;"></a>
......@@ -414,7 +555,7 @@ document.acctform.newPassword.focus();
<% } %>
<p>
<fmt:message key="setup.admin.settings.ldap.info" />
<fmt:message key="setup.admin.settings.clearspace.info" />
</p>
<div class="jive-contentBox">
......@@ -455,7 +596,7 @@ document.acctform.newPassword.focus();
<%= authUsername%>
</td>
<td width="1%" align="center">
<a href="setup-admin-settings.jsp?ldap=true&test=true&username=<%= URLEncoder.encode(authUsername, "UTF-8") %>"
<a href="setup-admin-settings.jsp?clearspace=true&test=true&username=<%= URLEncoder.encode(authUsername, "UTF-8") %>"
title="<fmt:message key="global.click_test" />"
><img src="../images/setup_btn_gearplay.gif" width="14" height="14" border="0" alt="<fmt:message key="global.click_test" />"></a>
</td>
......@@ -488,11 +629,11 @@ document.acctform.newPassword.focus();
<% } %>
<input type="hidden" name="ldap" value="true"/>
<input type="hidden" name="clearspace" value="true"/>
<div align="right">
<br/>
<input type="submit" name="ldapFinished" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0" style="display:none;">
<input type="submit" name="clearspaceFinished" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0" style="display:none;">
</div>
</form>
......@@ -506,5 +647,6 @@ document.acctform.newPassword.focus();
<% } %>
<% } %>
</body>
</html>
src/web/setup/setup-admin-settings_test.jsp
View file @ 4e9a9445
......@@ -2,6 +2,7 @@
<%@ page import="org.jivesoftware.util.ParamUtils, org.jivesoftware.openfire.ldap.LdapManager, org.jivesoftware.openfire.user.UserNotFoundException, org.xmpp.packet.JID" %>
<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.Map" %>
<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
......@@ -9,36 +10,39 @@
<%
String username = ParamUtils.getParameter(request, "username");
String password = ParamUtils.getParameter(request, "password");
boolean ldap = "true".equals(request.getParameter("ldap"));
boolean clearspace = "true".equals(request.getParameter("clearspace"));
boolean success = false;
String errorDetail = "";
Map<String, String> settings = (Map<String, String>) session.getAttribute("ldapSettings");
Map<String, String> userSettings =
(Map<String, String>) session.getAttribute("ldapUserSettings");
// Run the test if password was provided and we have the ldap information
if (settings != null && password != null) {
LdapManager manager = new LdapManager(settings);
manager.setUsernameField(userSettings.get("ldap.usernameField"));
manager.setSearchFilter(userSettings.get("ldap.searchFilter"));
try {
String userDN = manager.findUserDN(JID.unescapeNode(username));
// See if the user authenticates.
if (manager.checkAuthentication(userDN, password)) {
// User was able to authenticate with provided password
success = true;
if (ldap) {
boolean success = false;
String errorDetail = "";
Map<String, String> settings = (Map<String, String>) session.getAttribute("ldapSettings");
Map<String, String> userSettings =
(Map<String, String>) session.getAttribute("ldapUserSettings");
// Run the test if password was provided and we have the ldap information
if (settings != null && password != null) {
LdapManager manager = new LdapManager(settings);
manager.setUsernameField(userSettings.get("ldap.usernameField"));
manager.setSearchFilter(userSettings.get("ldap.searchFilter"));
try {
String userDN = manager.findUserDN(JID.unescapeNode(username));
// See if the user authenticates.
if (manager.checkAuthentication(userDN, password)) {
// User was able to authenticate with provided password
success = true;
}
else {
errorDetail = LocaleUtils.getLocalizedString("setup.admin.settings.test.error-password");
}
}
else {
errorDetail = LocaleUtils.getLocalizedString("setup.admin.settings.test.error-password");
catch (UserNotFoundException e) {
errorDetail = LocaleUtils.getLocalizedString("setup.admin.settings.test.error-user");
}
catch (Exception e) {
errorDetail = e.getMessage();
e.printStackTrace();
}
}
catch (UserNotFoundException e) {
errorDetail = LocaleUtils.getLocalizedString("setup.admin.settings.test.error-user");
}
catch (Exception e) {
errorDetail = e.getMessage();
e.printStackTrace();
}
}
%>
<!-- BEGIN connection settings test panel -->
<div class="jive-testPanel">
......@@ -93,4 +97,86 @@
<% } %>
</div>
</div>
<!-- END connection settings test panel -->
\ No newline at end of file
<!-- END connection settings test panel -->
<% } else if (clearspace) {
boolean success = false;
String errorDetail = "";
Map<String, String> settings = (Map<String, String>) session.getAttribute("clearspaceSettings");
// Run the test if password was provided and we have the clearspace information
if (settings != null && password != null) {
ClearspaceManager manager = new ClearspaceManager(settings);
try {
// TODO: We need to check if the user really exists somehow, handle this later.
// See if the user authenticates.
if (manager.checkAuthentication(username, password)) {
// User was able to authenticate with provided password
success = true;
}
else {
errorDetail = LocaleUtils.getLocalizedString("setup.admin.settings.test.error-password");
}
}
// catch (UserNotFoundException e) {
// errorDetail = LocaleUtils.getLocalizedString("setup.admin.settings.test.error-user");
// }
catch (Exception e) {
errorDetail = e.getMessage();
e.printStackTrace();
}
}
%>
<!-- BEGIN connection settings test panel -->
<div class="jive-testPanel">
<div class="jive-testPanel-content">
<div align="right" class="jive-testPanel-close">
<a href="#" class="lbAction" rel="deactivate"><fmt:message key="setup.clearspace.service.test.close" /></a>
</div>
<h2><fmt:message key="global.test" />: <span><fmt:message key="setup.admin.settings.test.title-desc" /></span></h2>
<% if (password != null) { %>
<% if (success) { %>
<h4 class="jive-testSuccess"><fmt:message key="setup.admin.settings.test.status-success" /></h4>
<p><fmt:message key="setup.admin.settings.test.status-success.detail" /></p>
<% } else { %>
<h4 class="jive-testError"><fmt:message key="setup.admin.settings.test.status-error" /></h4>
<p><%= errorDetail %></p>
<% }
}
if (!success) {
%>
<form action="setup-admin-settings.jsp" name="testform" method="post">
<input type="hidden" name="clearspace" value="true">
<input type="hidden" name="test" value="true">
<input type="hidden" name="username" value="<%= URLEncoder.encode(username, "UTF-8")%>">
<table cellpadding="3" cellspacing="2" border="0">
<tr valign="top">
<td class="jive-label">
<fmt:message key="setup.admin.settings.administrator" />:
</td>
<td>
<%= JID.unescapeNode(username) %>
</td>
<td>
&nbsp;
</td>
</tr>
<tr valign="top">
<td class="jive-label">
<fmt:message key="setup.clearspace.service.password" />:
</td>
<td>
<input type="password" name="password" size="20" maxlength="50"/>
</td>
<td>
<input type="submit" name="addAdministrator" value="<fmt:message key="global.test" />"/>
</td>
</tr>
</table>
</form>
<% } %>
</div>
</div>
<!-- END connection settings test panel -->
<% } %>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023