feat: add conditions when registering

MineWeb · Jun 18, 2018 · 27e89d0 · 27e89d0
1 parent 7f51608
commit 27e89d0
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 2 deletions.
diff --git a/app/Config/Schema/schema.php b/app/Config/Schema/schema.php
@@ -70,6 +70,7 @@ public function after($event = array(), $install = false, $updateContent = array
 				'server_cache' => 0,
 				'server_secretkey' => '',
 				'server_timeout' => 1,
+				'condition' => null,
 				'skype' => 'http://mineweb.org',
 				'youtube' => 'http://mineweb.org',
 				'twitter' => 'http://mineweb.org',
@@ -203,6 +204,7 @@ public function after($event = array(), $install = false, $updateContent = array
 		'server_cache' => array('type' => 'integer', 'null' => false, 'default' => 0, 'length' => 1, 'unsigned' => false),
 		'server_secretkey' => array('type' => 'string', 'null' => false, 'default' => null, 'length' => 50, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'server_timeout' => array('type' => 'float', 'null' => false, 'default' => null, 'unsigned' => false),
+		'condition' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 250, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'skype' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'youtube' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),
 		'twitter' => array('type' => 'text', 'null' => false, 'default' => null, 'collate' => 'latin1_swedish_ci', 'charset' => 'latin1'),

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -124,6 +124,7 @@ public function __initConfiguration()
         // Variables
         $google_analytics = $this->Configuration->getKey('google_analytics');
         $configuration_end_code = $this->Configuration->getKey('end_layout_code');
+		$condition = $this->Configuration->getKey('condition');
 
         $this->loadModel('SocialButton');
         $findSocialButtons = $this->SocialButton->find('all');
@@ -133,6 +134,7 @@ public function __initConfiguration()
 
         $this->set(compact(
             'reCaptcha',
+			'condition',
             'website_name',
             'theme_config',
             'facebook_link',

diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php
@@ -37,7 +37,8 @@ function ajax_register()
         $this->autoRender = false;
         $this->response->type('json');
         if ($this->request->is('Post')) { // si la requête est bien un post
-            if (!empty($this->request->data['pseudo']) && !empty($this->request->data['password']) && !empty($this->request->data['password_confirmation']) && !empty($this->request->data['email'])) { // si tout les champs sont bien remplis
+	$conditionsChecked = !empty($this->request->data['condition']) || !$this->Configuration->getKey('condition');
+            if (!empty($this->request->data['pseudo']) && !empty($this->request->data['password']) && $conditionsChecked && !empty($this->request->data['password_confirmation']) && !empty($this->request->data['email'])) { // si tout les champs sont bien remplis
 
                 // Captcha
                 if ($this->Configuration->getKey('captcha_type') == "2") { // ReCaptcha
@@ -51,7 +52,6 @@ function ajax_register()
 
                 }
                 //
-
                 if ($validCaptcha) { // on check le captcha déjà
                     $this->loadModel('User');
                     $isValid = $this->User->validRegister($this->request->data, $this->Util);

diff --git a/app/View/Configuration/admin_index.ctp b/app/View/Configuration/admin_index.ctp
@@ -119,6 +119,21 @@
                   <small class="text-danger"><?= $Lang->get('CONFIG__KEY_PASSWORDS_ADVERTISSEMENT') ?></small>
                 </div>
 
+                <hr>
+                <div class="form-group">
+                  <label><?= $Lang->get('CONFIG__CONDITION_TITLE') ?></label>
+                  <div class="form-group">
+                    <?= $this->Form->input(false, array(
+                      'div' => false,
+                      'type' => 'text',
+                      'name' => 'condition',
+                      'class' => 'form-control',
+                      'value' => $config['condition']
+                    )); ?>
+                  </div>
+                  <small class="text-danger"><?= $Lang->get('CONFIG__CONDITION') ?></small>
+                </div>
+
                 <hr>
 
                 <div class="form-group">

diff --git a/app/View/Elements/modals.ctp b/app/View/Elements/modals.ctp
@@ -126,6 +126,16 @@
                 <input type="text" class="form-control" name="captcha" id="inputPassword3" placeholder="<?= $Lang->get('FORM__CAPTCHA_LABEL') ?>">
             </div>
           <?php } ?>
+		  <?php if (!empty($condition)) { ?>
+		  <div class="form-group">
+			<div class="checkbox">
+				<label>
+					<input type="checkbox" name="condition">
+					<?=$Lang->get('USER__CONDITION_1')?> <a href="<?= $condition ?>"> <?= $Lang->get('USER__CONDITION_2')?></a>
+				</label>
+			</div>
+		  </div>
+		 <?php } ?>
       </div>
       <div class="modal-footer">
         <button type="submit" class="btn btn-primary btn-block"><?= $Lang->get('USER__REGISTER') ?></button>

diff --git a/lang/en_US.json b/lang/en_US.json
@@ -185,6 +185,8 @@
 		"PLUGIN__ERROR_UNINSTALLED": "The plugin is uninstalled",
 
 		"CONFIG__GENERAL_PREFERENCES": "General Preferences",
+		"CONFIG__CONDITION_TITLE": "Conditions of use",
+		"CONFIG__CONDITION": "Put the link of the general conditions of use to activate this option. ! Please note, not all themes are compatible and may prevent registration.",
         "CONFIG__SOCIAL_PREFERENCES": "Social preferences",
         "CONFIG__OTHER_PREFERENCES": "Preferences other",
         "CONFIG__EDIT_SUCCESS": "Configuration successfully changed!",
@@ -346,6 +348,8 @@
         "USER__LOGIN": "Login",
         "USER__REGISTER": "Register",
         "USER__USERNAME": "Nickname",
+		"USER__CONDITION_1":"Accept the",
+		"USER__CONDITION_2":"conditions",
         "USER__USERNAME_LABEL": "Enter your username",
         "USER__PASSWORD": "Password",
         "USER__PASSWORD_LABEL": "Enter your password",

diff --git a/lang/fr_FR.json b/lang/fr_FR.json
@@ -183,6 +183,8 @@
         "PLUGIN__ERROR_UNINSTALLED":"Le plugin est désinstallé",
 
         "CONFIG__GENERAL_PREFERENCES": "Préférences générales",
+		"CONFIG__CONDITION_TITLE": "Conditions d'utilisations",
+		"CONFIG__CONDITION": "Mettez le lien des conditions générales d'utilisations pour activer cette option. ! Attention, tous les thèmes ne sont pas compatibles et peuvent empêcher l'inscription",
         "CONFIG__SOCIAL_PREFERENCES": "Préférences sociales",
         "CONFIG__OTHER_PREFERENCES": "Préférences autres",
         "CONFIG__EDIT_SUCCESS":"Configuration modifié avec succès !",
@@ -344,6 +346,8 @@
         "USER__LOGIN":"Connexion",
         "USER__REGISTER":"S'inscrire",
         "USER__USERNAME":"Pseudo",
+		"USER__CONDITION_1":"Accepter les",
+		"USER__CONDITION_2":"conditions",
         "USER__USERNAME_LABEL":"Entrez votre pseudo",
         "USER__PASSWORD":"Mot de passe",
         "USER__PASSWORD_LABEL":"Entrez votre mot de passe",