From 37f06799589d9bb92ecfa6368197daf187251ab4 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 21 Jul 2015 16:03:46 +0200
Subject: First draft for registration form

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/Controllers/authController.php')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index b55892475..1c8ad2193 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -346,4 +346,10 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 			}
 		}
 	}
+
+	/**
+	 * This action gives possibility to a user to create an account.
+	 */
+	public function registerAction() {
+	}
 }
-- 
cgit v1.2.3


From f560c44a003ca69644f8e7262dca2f8f7e6932d5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 14:00:08 +0200
Subject: Hide registration form if max registration reached

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 3 +++
 app/views/auth/formLogin.phtml     | 4 +++-
 app/views/auth/personaLogin.phtml  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'app/Controllers/authController.php')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 1c8ad2193..223282afb 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -351,5 +351,8 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 	 * This action gives possibility to a user to create an account.
 	 */
 	public function registerAction() {
+		if (max_registrations_reached()) {
+			Minz_Error::error(403);
+		}
 	}
 }
diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml
index 75537ee26..3a6053065 100644
--- a/app/views/auth/formLogin.phtml
+++ b/app/views/auth/formLogin.phtml
@@ -1,7 +1,9 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
-	<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php if (!max_registrations_reached()) { ?>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php } ?>
 
 	<form id="crypto-form" method="post" action="<?php echo _url('auth', 'login'); ?>">
 		<div>
diff --git a/app/views/auth/personaLogin.phtml b/app/views/auth/personaLogin.phtml
index 545ed2eac..91349a67e 100644
--- a/app/views/auth/personaLogin.phtml
+++ b/app/views/auth/personaLogin.phtml
@@ -2,6 +2,10 @@
 <div class="prompt">
 	<h1><?php echo _t('gen.auth.login'); ?></h1>
 
+	<?php if (!max_registrations_reached()) { ?>
+		<a href="<?php echo _url('auth', 'register'); ?>"><?php echo _t('gen.auth.register.ask'); ?></a>
+	<?php } ?>
+
 	<p>
 		<a class="signin btn btn-important" href="<?php echo _url('auth', 'login'); ?>">
 			<?php echo _i('login'); ?> <?php echo _t('gen.auth.login_persona'); ?>
-- 
cgit v1.2.3


From f0a1b26584787e173c8c9cd1a5fea27bb3044f1c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 23:06:46 +0200
Subject: Add title to the account creation page

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 2 ++
 app/i18n/cz/gen.php                | 1 +
 app/i18n/de/gen.php                | 1 +
 app/i18n/en/gen.php                | 1 +
 app/i18n/fr/gen.php                | 1 +
 5 files changed, 6 insertions(+)

(limited to 'app/Controllers/authController.php')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 223282afb..aff184263 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -354,5 +354,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (max_registrations_reached()) {
 			Minz_Error::error(403);
 		}
+
+		Minz_View::prependTitle(_t('gen.auth.registration.title') . ' · ');
 	}
 }
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index a89bf6b49..53127998f 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Reset přihlášení',
 		'username' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index d6fcfe1e4..f8f4823a6 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 063322cbf..1feb8d6ac 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',
 			'ask' => 'Create an account?',
+			'title' => 'Account creation',
 		),
 		'reset' => 'Authentication reset',
 		'username' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 5abc7a27b..67d278be4 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'Nouveau compte',
 			'ask' => 'Créer un compte ?',
+			'title' => 'Création de compte',
 		),
 		'reset' => 'Réinitialisation de l’authentification',
 		'username' => array(
-- 
cgit v1.2.3