From cacb9840fa575c159ef197bdb0ed4072f4719a60 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:16:46 +0200 Subject: [PATCH 01/28] Further work on settings panel --- controller/settingscontroller.php | 10 ++++++++-- templates/admin.php | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index 9450573..14df7fc 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -37,13 +37,17 @@ class SettingsController extends Controller { parent::__construct($appName, $request); } + + /** * @AdminRequired * * @param string $registered_user_group all newly registered user will be put in this group + * @param string $allowed_domains Registrations are only allowed for E-Mailadresses with these domains * @return DataResponse */ - public function admin($registered_user_group) { + public function admin($registered_user_group, $allowed_domains) { + $this->config->setAppValue($this->appName, 'allowed_domains', $allowed_domains); $groups = $this->groupmanager->search(''); foreach ( $groups as $group ) { $group_id_list[] = $group->getGid(); @@ -82,9 +86,11 @@ class SettingsController extends Controller { } // TODO selected $current_value = $this->config->getAppValue($this->appName, 'registered_user_group', 'none'); + $allowed_domains = $this->config->getAppValue($this->appName, 'allowed_domains', ''); return new TemplateResponse('registration', 'admin', [ 'groups' => $group_id_list, - 'current' => $current_value + 'current' => $current_value, + 'allowed' => $allowed_domains ], ''); } } diff --git a/templates/admin.php b/templates/admin.php index 6664c01..eed1fca 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -15,4 +15,9 @@ foreach ( $_['groups'] as $group ) { ?>

+

+ + t('allowed'));?> + +

From 62ca6262e8d60c7f2228d306ec82609bf12c5bab Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:26:21 +0200 Subject: [PATCH 02/28] Translation for new config panel setting --- l10n/de.js | 1 + l10n/de_DE.js | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n/de.js b/l10n/de.js index aeacd28..c8a1286 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -16,6 +16,7 @@ OC.L10N.register( "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 0e58c34..84adb33 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -16,6 +16,7 @@ OC.L10N.register( "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", From 6f1a0f1881586cfdb5da902f9a97d400036eecc2 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:31:18 +0200 Subject: [PATCH 03/28] Translation for new config panel setting --- l10n/de.json | 3 ++- l10n/de.php | 1 + l10n/de_DE.json | 3 ++- l10n/de_DE.php | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/l10n/de.json b/l10n/de.json index f4c86f1..38da4d4 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -14,6 +14,7 @@ "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", @@ -24,4 +25,4 @@ "Please re-enter a valid email address" : "Bitte nochmals eine gültige E-Mail-Adresse angeben", "You will receive an email with verification link" : "Du wirst eine E-Mail mit einem Bestätigungslink erhalten" },"pluralForm" :"nplurals=2; plural=(n != 1);" -} \ No newline at end of file +} diff --git a/l10n/de.php b/l10n/de.php index b5650ae..0b8d0f1 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", +"Allowed domains for registration" => "Für Registrierung freigeschaltete Domains" "Welcome, you can create your account below." => "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" => "Benutzername", "Password" => "Passwort", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index e6597a9..a766eab 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -14,6 +14,7 @@ "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", @@ -24,4 +25,4 @@ "Please re-enter a valid email address" : "Bitte nochmals eine gültige E-Mail-Adresse angeben", "You will receive an email with verification link" : "Sie werden eine E-Mail mit einem Bestätigungslink erhalten" },"pluralForm" :"nplurals=2; plural=(n != 1);" -} \ No newline at end of file +} diff --git a/l10n/de_DE.php b/l10n/de_DE.php index 79e3a0c..a5b12a6 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", +"Allowed domains for registration" => "Für Registrierung freigeschaltete Domains" "Welcome, you can create your account below." => "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" => "Benutzername", "Password" => "Passwort", From 257329ff80c12e4e96ef8c6a314fb0a6e41831a3 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:36:23 +0200 Subject: [PATCH 04/28] Added save button and its German translation --- l10n/de.js | 3 ++- l10n/de.json | 3 ++- l10n/de.php | 3 ++- l10n/de_DE.js | 3 ++- l10n/de_DE.json | 3 ++- l10n/de_DE.php | 3 ++- templates/admin.php | 5 +++-- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/l10n/de.js b/l10n/de.js index c8a1286..998a0d9 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -16,7 +16,8 @@ OC.L10N.register( "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", - "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", diff --git a/l10n/de.json b/l10n/de.json index 38da4d4..c1a53f1 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -14,7 +14,8 @@ "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", - "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", diff --git a/l10n/de.php b/l10n/de.php index 0b8d0f1..a635e15 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -15,7 +15,8 @@ $TRANSLATIONS = array( "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", -"Allowed domains for registration" => "Für Registrierung freigeschaltete Domains" +"Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", +"Save" => "Speichern", "Welcome, you can create your account below." => "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" => "Benutzername", "Password" => "Passwort", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 84adb33..1c4d862 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -16,7 +16,8 @@ OC.L10N.register( "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", - "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index a766eab..344e957 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -14,7 +14,8 @@ "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", - "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains" + "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", "Password" : "Passwort", diff --git a/l10n/de_DE.php b/l10n/de_DE.php index a5b12a6..434105d 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -15,7 +15,8 @@ $TRANSLATIONS = array( "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", -"Allowed domains for registration" => "Für Registrierung freigeschaltete Domains" +"Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", +"Save" => "Speichern", "Welcome, you can create your account below." => "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" => "Benutzername", "Password" => "Passwort", diff --git a/templates/admin.php b/templates/admin.php index eed1fca..1bab3a8 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,8 @@ foreach ( $_['groups'] as $group ) {

- t('allowed'));?> + t('allowed'));?>> + -

+

From b502ddea93c8356654ac15e1b95a5587a0dab559 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:39:39 +0200 Subject: [PATCH 05/28] Fixed typo in domain setting --- templates/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin.php b/templates/admin.php index 1bab3a8..4dafcd4 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -16,7 +16,7 @@ foreach ( $_['groups'] as $group ) {

- + t('allowed'));?>> From f20740de196eae85439bd4bb9469c782a1bec235 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:43:19 +0200 Subject: [PATCH 06/28] Fixed typo in domain setting --- templates/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin.php b/templates/admin.php index 4dafcd4..4563c35 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,7 @@ foreach ( $_['groups'] as $group ) {

- t('allowed'));?>> + > From bbdbe0f1873137a1a5c482acfdfd09a09f360cd8 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:43:41 +0200 Subject: [PATCH 07/28] Fixed typo in domain setting --- templates/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin.php b/templates/admin.php index 4563c35..04c758e 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,7 @@ foreach ( $_['groups'] as $group ) {

- > + > From 8e9343706b36c53fde1276a66a585e1a04549128 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:44:18 +0200 Subject: [PATCH 08/28] Fixed typo in domain setting --- templates/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin.php b/templates/admin.php index 04c758e..401b3b6 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,7 @@ foreach ( $_['groups'] as $group ) {

- > + > From cd4a61243a1152d29b13734db1777aa00e7b86e9 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:49:30 +0200 Subject: [PATCH 09/28] changed settings.js to reflect changes in template --- js/settings.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/settings.js b/js/settings.js index 44a6b37..b258394 100644 --- a/js/settings.js +++ b/js/settings.js @@ -1,9 +1,11 @@ $(document).ready(function() { function saveSettings() { - var post = $('#registered_user_group').serialize(); + var post1 = $('#registered_user_group').serialize(); + var post2 = $('#allowed_domains').serialize(); - $.post(OC.generateUrl('/apps/registration/settings'), post); + $.post(OC.generateUrl('/apps/registration/settings'), post1,post2); } $('#registered_user_group').change(saveSettings); + $('#allowed_domains').change(saveSettings); }); From b665d1c11a029c3a69064770335ffaee037e0baa Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 00:53:09 +0200 Subject: [PATCH 10/28] Added debug logs for settings.js --- js/settings.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/settings.js b/js/settings.js index b258394..6720b41 100644 --- a/js/settings.js +++ b/js/settings.js @@ -2,7 +2,9 @@ $(document).ready(function() { function saveSettings() { var post1 = $('#registered_user_group').serialize(); var post2 = $('#allowed_domains').serialize(); - + console.log(post1); + console.log(post2); + $.post(OC.generateUrl('/apps/registration/settings'), post1,post2); } From 18b4911038d01c241fdd3045cdeabc74f9bd2080 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 02:23:40 +0200 Subject: [PATCH 11/28] Settings for allowed domain are now processed and saved correct --- controller/settingscontroller.php | 1 + js/settings.js | 9 +++------ templates/admin.php | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index 14df7fc..40a50b9 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -21,6 +21,7 @@ use \OCP\IGroupManager; use \OCP\IL10N; use \OCP\IConfig; use \OCP\IUser; +use \OCP\AppFramework\Http\JSONResponse; class SettingsController extends Controller { diff --git a/js/settings.js b/js/settings.js index 6720b41..532128a 100644 --- a/js/settings.js +++ b/js/settings.js @@ -1,11 +1,8 @@ $(document).ready(function() { function saveSettings() { - var post1 = $('#registered_user_group').serialize(); - var post2 = $('#allowed_domains').serialize(); - console.log(post1); - console.log(post2); - - $.post(OC.generateUrl('/apps/registration/settings'), post1,post2); + var post = $('#registration').serialize(); + console.log(post); + $.post(OC.generateUrl('/apps/registration/settings'), post); } $('#registered_user_group').change(saveSettings); diff --git a/templates/admin.php b/templates/admin.php index 401b3b6..d4d1ce0 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,8 +17,7 @@ foreach ( $_['groups'] as $group ) {

- > - + > +

-

From de6137e7ff23539e4a471ee52a486deea8e52dc3 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 03:28:47 +0200 Subject: [PATCH 12/28] Code for handling registrations for allowed and not allowed domains --- controller/registercontroller.php | 28 ++++++++++++++++++++++++++++ controller/settingscontroller.php | 12 +++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index 43450ef..4ba8d34 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -94,7 +94,35 @@ class RegisterController extends Controller { ), 'error'); } + // FEATURE: allow only from specific email domain + $allowed_domains= $this->config->getAppValue($this->appName, 'allowed_domains',''); + if ($allowed_domains !== null || $allowed_domains !== ''){ + $allowed_domains= explode (";";$allowed_domains); + $allowed=false; + $domains=''; + foreach ($allowed_domains as $domain ) { + $domains=$domain."\n".$domains; + $maildomain=explode("@",$email)[1]; + // valid domain, everythings fine + if ($maildomain === $domain) { + $allowed_domains=true; + break; + } + + } + // $allowed still false->return error message + if ( $allowed === false ) { + return new TemplateResponse('', 'error', array( + 'errors' => array(array( + 'error' => $this->l10n->t('Only following domain names are allowed:\n'), + 'hint' => '' + )) + ), 'error'); + } + } + + $token = $this->pendingreg->save($email); //TODO: check for error diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index 40a50b9..92c6173 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -48,7 +48,17 @@ class SettingsController extends Controller { * @return DataResponse */ public function admin($registered_user_group, $allowed_domains) { - $this->config->setAppValue($this->appName, 'allowed_domains', $allowed_domains); + if ($allowed_domains===''){ + $this->config->deleteAppValue($this->appName, 'registered_user_group'); + }else{ + /* + $new_domains=''; + $domains=explode($allowed_domains,';'); + foreach ( $domains as $domain) { + if( (strlen($domain)i >= 3) && (strpos($domain,'.' + }*/ + $this->config->setAppValue($this->appName, 'allowed_domains', $allowed_domains); + } $groups = $this->groupmanager->search(''); foreach ( $groups as $group ) { $group_id_list[] = $group->getGid(); From 7afb88d4960ff548c29512c0a18b290d37df2e3b Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 03:58:25 +0200 Subject: [PATCH 13/28] Fixed bug in check for changed allowed domains --- controller/settingscontroller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index 92c6173..de8a6e0 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -48,8 +48,8 @@ class SettingsController extends Controller { * @return DataResponse */ public function admin($registered_user_group, $allowed_domains) { - if ($allowed_domains===''){ - $this->config->deleteAppValue($this->appName, 'registered_user_group'); + if ( ( $allowed_domains==='' ) || ( $allowed_domains === NULL ) ){ + $this->config->deleteAppValue($this->appName, 'allowed_domains'); }else{ /* $new_domains=''; From ce319a54aac8dd25f1024cede2e16211c8562cd3 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 04:08:52 +0200 Subject: [PATCH 14/28] Fixed typo in domain checking code --- controller/registercontroller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index 4ba8d34..a23bbe1 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -98,11 +98,11 @@ class RegisterController extends Controller { // FEATURE: allow only from specific email domain $allowed_domains= $this->config->getAppValue($this->appName, 'allowed_domains',''); if ($allowed_domains !== null || $allowed_domains !== ''){ - $allowed_domains= explode (";";$allowed_domains); + $allowed_domains= explode (";",$allowed_domains); $allowed=false; $domains=''; foreach ($allowed_domains as $domain ) { - $domains=$domain."\n".$domains; + $domains=$domain.print_unescaped("
").$domains; $maildomain=explode("@",$email)[1]; // valid domain, everythings fine if ($maildomain === $domain) { @@ -115,7 +115,7 @@ class RegisterController extends Controller { if ( $allowed === false ) { return new TemplateResponse('', 'error', array( 'errors' => array(array( - 'error' => $this->l10n->t('Only following domain names are allowed:\n'), + 'error' => $this->l10n->t('Only following domain names are allowed:'."\n".$domains), 'hint' => '' )) ), 'error'); From b5147142158cde186317435d776dc23c683a3d7d Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 05:32:44 +0200 Subject: [PATCH 15/28] Added error message when trying to register from wrong domains --- controller/registercontroller.php | 17 +++++++---------- l10n/de.js | 1 + l10n/de.json | 1 + l10n/de.php | 1 + l10n/de_DE.js | 1 + l10n/de_DE.json | 1 + l10n/de_DE.php | 1 + 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index a23bbe1..5657642 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -96,32 +96,29 @@ class RegisterController extends Controller { // FEATURE: allow only from specific email domain + $allowed_domains= $this->config->getAppValue($this->appName, 'allowed_domains',''); if ($allowed_domains !== null || $allowed_domains !== ''){ $allowed_domains= explode (";",$allowed_domains); $allowed=false; - $domains=''; + $domains=array(); foreach ($allowed_domains as $domain ) { - $domains=$domain.print_unescaped("
").$domains; + $domains[]=$domain;//=$domain.print_unescaped("
").$domains; $maildomain=explode("@",$email)[1]; // valid domain, everythings fine if ($maildomain === $domain) { - $allowed_domains=true; + $allowed=true; break; } } // $allowed still false->return error message if ( $allowed === false ) { - return new TemplateResponse('', 'error', array( - 'errors' => array(array( - 'error' => $this->l10n->t('Only following domain names are allowed:'."\n".$domains), - 'hint' => '' - )) - ), 'error'); + return new TemplateResponse('registration', 'domains', ['domains' => + $domains + ], 'guest'); } } - $token = $this->pendingreg->save($email); diff --git a/l10n/de.js b/l10n/de.js index 998a0d9..262ac6a 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -17,6 +17,7 @@ OC.L10N.register( "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de.json b/l10n/de.json index c1a53f1..db09b2d 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -15,6 +15,7 @@ "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de.php b/l10n/de.php index a635e15..bf3022a 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", +"Registriation is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" => "Speichern", "Welcome, you can create your account below." => "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" => "Benutzername", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 1c4d862..cbca9b5 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -17,6 +17,7 @@ OC.L10N.register( "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 344e957..ea0a029 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -15,6 +15,7 @@ "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", + "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de_DE.php b/l10n/de_DE.php index 434105d..8f23257 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", +"Registriation is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" => "Speichern", "Welcome, you can create your account below." => "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" => "Benutzername", From 2891795b7a4592da3d8386cf9b386322c19560f1 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 05:40:26 +0200 Subject: [PATCH 16/28] Fixed typo in error message --- l10n/de.js | 2 +- l10n/de.json | 2 +- l10n/de.php | 2 +- l10n/de_DE.js | 2 +- l10n/de_DE.json | 2 +- l10n/de_DE.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/l10n/de.js b/l10n/de.js index 262ac6a..71b3170 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -17,7 +17,7 @@ OC.L10N.register( "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", - "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", + "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de.json b/l10n/de.json index db09b2d..192b6ec 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -15,7 +15,7 @@ "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", - "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", + "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de.php b/l10n/de.php index bf3022a..6314ae0 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", -"Registriation is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", +"Registration is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" => "Speichern", "Welcome, you can create your account below." => "Willkommen, Du kannst im unteren Teil Dein Konto anlegen.", "Username" => "Benutzername", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index cbca9b5..60aac7e 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -17,7 +17,7 @@ OC.L10N.register( "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", - "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", + "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index ea0a029..e6ad56b 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -15,7 +15,7 @@ "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", - "Registriation is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", + "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" : "Speichern", "Welcome, you can create your account below." : "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" : "Benutzername", diff --git a/l10n/de_DE.php b/l10n/de_DE.php index 8f23257..8bc3df6 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", -"Registriation is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", +"Registration is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", "Save" => "Speichern", "Welcome, you can create your account below." => "Willkommen, Sie können im unteren Teil Ihr Konto anlegen.", "Username" => "Benutzername", From db941b30aa17d04386aa0fbbfc5e5e47592be37f Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 05:58:44 +0200 Subject: [PATCH 17/28] Fixed invalid mail error msg --- controller/registercontroller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index 5657642..f7b569a 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -67,7 +67,7 @@ class RegisterController extends Controller { public function validateEmail() { $email = $this->request->getParam('email'); if ( !filter_var($email, FILTER_VALIDATE_EMAIL) ) { - return new TemplateResponse('', 'error', array(array('error' => $this->l10n->t('Email address you entered is not valid'))), 'error'); + // return new TemplateResponse('', 'error', array(array('error' => $this->l10n->t('Email address you entered is not valid'))), 'error'); return new TemplateResponse('', 'error', array( 'errors' => array(array( 'error' => $this->l10n->t('Email address you entered is not valid'), From 89fb9ff1d3442863032df6a56e71c3f2a6c7ff90 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 06:02:50 +0200 Subject: [PATCH 18/28] Added domain error template --- templates/domains.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 templates/domains.php diff --git a/templates/domains.php b/templates/domains.php new file mode 100644 index 0000000..4c73dba --- /dev/null +++ b/templates/domains.php @@ -0,0 +1,15 @@ + +
    +
  • t('Registration is only allowed for following domains:')); ?> +"; + p($domain); + echo "

    "; +} + +?> +
    • +
From 9295c366ea2daaead480c41c675291bea243ee1d Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 06:40:28 +0200 Subject: [PATCH 19/28] Now registrations works again when domain is not set --- controller/registercontroller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index f7b569a..e169d36 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -98,7 +98,8 @@ class RegisterController extends Controller { // FEATURE: allow only from specific email domain $allowed_domains= $this->config->getAppValue($this->appName, 'allowed_domains',''); - if ($allowed_domains !== null || $allowed_domains !== ''){ + if ( ($allowed_domains === null) || ($allowed_domains === '') || ( strlen($allowed_domains)===0)){ +}else{ $allowed_domains= explode (";",$allowed_domains); $allowed=false; $domains=array(); @@ -118,7 +119,7 @@ class RegisterController extends Controller { $domains ], 'guest'); } - } + }//else var_dump($allowed_domains); $token = $this->pendingreg->save($email); From affbbe7566515529668b514462eec6b4f210ed6d Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 07:33:35 +0200 Subject: [PATCH 20/28] Removed debug line in js/settings.js --- js/settings.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/settings.js b/js/settings.js index 532128a..ab61c2a 100644 --- a/js/settings.js +++ b/js/settings.js @@ -1,7 +1,6 @@ $(document).ready(function() { function saveSettings() { var post = $('#registration').serialize(); - console.log(post); $.post(OC.generateUrl('/apps/registration/settings'), post); } From a0b26e0a46610ada4985b1ae2682a19b550f1244 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 07:36:36 +0200 Subject: [PATCH 21/28] Removed commented out bug in validateMail --- controller/registercontroller.php | 1 - 1 file changed, 1 deletion(-) diff --git a/controller/registercontroller.php b/controller/registercontroller.php index e169d36..73c00a3 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -67,7 +67,6 @@ class RegisterController extends Controller { public function validateEmail() { $email = $this->request->getParam('email'); if ( !filter_var($email, FILTER_VALIDATE_EMAIL) ) { - // return new TemplateResponse('', 'error', array(array('error' => $this->l10n->t('Email address you entered is not valid'))), 'error'); return new TemplateResponse('', 'error', array( 'errors' => array(array( 'error' => $this->l10n->t('Email address you entered is not valid'), From 2c8cbe05b469d6bf1f73a45d735c65648bed4ce4 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Mon, 13 Jul 2015 07:46:05 +0200 Subject: [PATCH 22/28] placeholder to explain syntax of Domains option, todo: Testing --- templates/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin.php b/templates/admin.php index d4d1ce0..0911105 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,7 @@ foreach ( $_['groups'] as $group ) {

- > + id="allowed_domains" name="allowed_domains" value=>

From e7ac1e806f1fa98ab791f16f93434bd4d59201de Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Sun, 19 Jul 2015 06:11:07 +0200 Subject: [PATCH 23/28] Removed unneeded imports and outcommented lines --- controller/settingscontroller.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index da9b129..ec2fca0 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -20,7 +20,6 @@ use \OCP\IGroupManager; use \OCP\IL10N; use \OCP\IConfig; use \OCP\IUser; -use \OCP\AppFramework\Http\JSONResponse; class SettingsController extends Controller { @@ -50,12 +49,6 @@ class SettingsController extends Controller { if ( ( $allowed_domains==='' ) || ( $allowed_domains === NULL ) ){ $this->config->deleteAppValue($this->appName, 'allowed_domains'); }else{ - /* - $new_domains=''; - $domains=explode($allowed_domains,';'); - foreach ( $domains as $domain) { - if( (strlen($domain)i >= 3) && (strpos($domain,'.' - }*/ $this->config->setAppValue($this->appName, 'allowed_domains', $allowed_domains); } $groups = $this->groupmanager->search(''); From 05073ec592a701ed82df141d97bf086c3dd52e0b Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Sun, 19 Jul 2015 06:17:37 +0200 Subject: [PATCH 24/28] Updated german translation --- l10n/de.js | 1 + l10n/de.json | 1 + l10n/de.php | 1 + l10n/de_DE.js | 1 + l10n/de_DE.json | 1 + l10n/de_DE.php | 1 + 6 files changed, 6 insertions(+) diff --git a/l10n/de.js b/l10n/de.js index 71b3170..853e636 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -15,6 +15,7 @@ OC.L10N.register( "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de.json b/l10n/de.json index 192b6ec..7936e8c 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -13,6 +13,7 @@ "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de.php b/l10n/de.php index 6314ae0..870a820 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -14,6 +14,7 @@ $TRANSLATIONS = array( "No such group" => "Keine derartige Gruppe", "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", +"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" => "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 60aac7e..62e9944 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -15,6 +15,7 @@ OC.L10N.register( "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index e6ad56b..13e1ed9 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -13,6 +13,7 @@ "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de_DE.php b/l10n/de_DE.php index 8bc3df6..113102a 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -14,6 +14,7 @@ $TRANSLATIONS = array( "No such group" => "Keine derartige Gruppe", "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", +"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" => "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", From be9d2d27dbc72ae6cc3e18e72529195b9d193471 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Sun, 19 Jul 2015 06:27:37 +0200 Subject: [PATCH 25/28] Translation should work now for placeholder too --- templates/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin.php b/templates/admin.php index 0911105..30fce66 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,7 @@ foreach ( $_['groups'] as $group ) {

- id="allowed_domains" name="allowed_domains" value=> + t('"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com"');?> id="allowed_domains" name="allowed_domains" value=>

From 55a247499aad06ee3ac70c01e79ef00ceeb0eec7 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Sun, 19 Jul 2015 06:47:31 +0200 Subject: [PATCH 26/28] Explainaition now under input type --- templates/admin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/admin.php b/templates/admin.php index 30fce66..872806f 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,9 @@ foreach ( $_['groups'] as $group ) {

- t('"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com"');?> id="allowed_domains" name="allowed_domains" value=> + " id="allowed_domains" name="allowed_domains" value=> + t('"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com');?> +

From 321435090d2f400f4c70b67408c925e66d89ebd7 Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Sun, 19 Jul 2015 06:49:05 +0200 Subject: [PATCH 27/28] Fixed explaination in settings --- templates/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin.php b/templates/admin.php index 872806f..84f12c0 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,8 +17,8 @@ foreach ( $_['groups'] as $group ) {

- " id="allowed_domains" name="allowed_domains" value=> - t('"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com');?> + > + t('Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com'));?>

From 9efb38c904a86f506f1f269aa4f07b9021ce8fda Mon Sep 17 00:00:00 2001 From: Johannes Starosta Date: Sun, 19 Jul 2015 06:56:07 +0200 Subject: [PATCH 28/28] Further work on explaination --- l10n/de.js | 2 +- l10n/de.json | 2 +- l10n/de.php | 2 +- l10n/de_DE.js | 2 +- l10n/de_DE.json | 2 +- l10n/de_DE.php | 2 +- templates/admin.php | 4 +++- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/l10n/de.js b/l10n/de.js index 853e636..4017c23 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -15,7 +15,7 @@ OC.L10N.register( "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", - "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de.json b/l10n/de.json index 7936e8c..9e0b00b 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -13,7 +13,7 @@ "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", - "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de.php b/l10n/de.php index 870a820..56021ec 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -14,7 +14,7 @@ $TRANSLATIONS = array( "No such group" => "Keine derartige Gruppe", "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", -"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" => "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", +"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" => "Geben Sie die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 62e9944..0879546 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -15,7 +15,7 @@ OC.L10N.register( "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", - "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 13e1ed9..2abf0e3 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -13,7 +13,7 @@ "No such group" : "Keine derartige Gruppe", "Registration" : "Registrierung", "Default group that all registered users belong" : "Standardgruppe, zu der alle registrierten Benutzer gehören", - "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", + "Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" : "Geben Sie die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" : "Keine", "Allowed domains for registration" : "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" : "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/l10n/de_DE.php b/l10n/de_DE.php index 113102a..451b5b9 100644 --- a/l10n/de_DE.php +++ b/l10n/de_DE.php @@ -14,7 +14,7 @@ $TRANSLATIONS = array( "No such group" => "Keine derartige Gruppe", "Registration" => "Registrierung", "Default group that all registered users belong" => "Standardgruppe, zu der alle registrierten Benutzer gehören", -"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" => "Geben Sie hier die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", +"Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com" => "Geben Sie die freigeschalteten, durch Semikolons getrennten, Domains ein. Beispiel: owncloud.com;github.com", "None" => "Keine", "Allowed domains for registration" => "Für Registrierung freigeschaltete Domains", "Registration is only allowed for following domains:" => "Registrierung ist nur für folgende Domains freigeschaltet:", diff --git a/templates/admin.php b/templates/admin.php index 84f12c0..0d3d3b0 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -17,7 +17,9 @@ foreach ( $_['groups'] as $group ) {

- > + > +

+

t('Enter a semicolon-seperated list of allowed domains. Example: owncloud.com;github.com'));?>