From 4d3e4cb81564c3cffa6d89b253b37eee0e62f5b7 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Wed, 25 Feb 2015 18:15:16 +0000
Subject: [PATCH] Conference Center: Change PIN Length field to operate as a
 'minimum pin length'.  Added translation of error messages.

---
 app/conference_centers/app_languages.php      | 22 ++++++++++++++++++-
 .../conference_room_edit.php                  | 13 +++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php
index 3a443db5fa..dd6c917ba0 100644
--- a/app/conference_centers/app_languages.php
+++ b/app/conference_centers/app_languages.php
@@ -56,7 +56,7 @@
 		$text['description-extension']['pt-pt'] = "Introduza o número da extensão do centro de conferência.";
 		$text['description-extension']['fr-fr'] = "Choisir le numéro de la conférence. ";
 
-		$text['description-pin-length']['en-us'] = "Enter the required PIN length.";
+		$text['description-pin-length']['en-us'] = "Enter the minimum PIN length.";
 		$text['description-pin-length']['es-cl'] = "Ingrese el largo de PIN requerido.";
 		$text['description-pin-length']['pt-pt'] = "Introduza o tamanho do código PIN";
 		$text['description-pin-length']['fr-fr'] = "Choisir la longueur requise pour le code d'authentification.";
@@ -323,6 +323,26 @@
 		$text['button-search']['pt-pt'] = "Pesquisar";
 		$text['button-search']['fr-fr'] = "Chercher";
 
+		$text['message-unique_moderator_pin']['en-us'] = "Please provide a unique Moderator PIN number.";
+		$text['message-unique_moderator_pin']['es-cl'] = "Por favor, proporcione un número único Moderador PIN.";
+		$text['message-unique_moderator_pin']['pt-pt'] = "Por favor, forneça um número único Moderador PIN.";
+		$text['message-unique_moderator_pin']['fr-fr'] = "Se il vous plaît fournir un numéro unique Modérateur PIN.";
+
+		$text['message-unique_participant_pin']['en-us'] = "Please provide a unique Participant PIN number.";
+		$text['message-unique_participant_pin']['es-cl'] = "Por favor ingrese su número PIN participante único.";
+		$text['message-unique_participant_pin']['pt-pt'] = "Por favor, forneça um número PIN Participante único.";
+		$text['message-unique_participant_pin']['fr-fr'] = "Se il vous plaît fournir un numéro unique PIN de participant.";
+
+		$text['message-non_unique_pin']['en-us'] = "Moderator and Participant PIN numbers must be unique.";
+		$text['message-non_unique_pin']['es-cl'] = "Moderador números PIN y participante deben ser únicos.";
+		$text['message-non_unique_pin']['pt-pt'] = "Moderador números e PIN Participante deve ser exclusivo.";
+		$text['message-non_unique_pin']['fr-fr'] = "Numéros de modérateur et de PIN de participant doivent être uniques.";
+
+		$text['message-minimum_pin_length']['en-us'] = "Minimum PIN length required:";
+		$text['message-minimum_pin_length']['es-cl'] = "Longitud PIN mínima requerida:";
+		$text['message-minimum_pin_length']['pt-pt'] = "Comprimento PIN Requisitos mínimos:";
+		$text['message-minimum_pin_length']['fr-fr'] = "Longueur de PIN minimum requis:";
+
 	//Conference Sessions
 		$text['title-conference-sessions']['en-us'] = "Conference Sessions";
 		$text['title-conference-sessions']['es-cl'] = "Sesiones de Conferencia";
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index ffd1b7a689..7d14c02169 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -181,7 +181,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$prep_statement->execute();
 					$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
 					if ($row['num_rows'] > 0) {
-						$msg .= "Please provide a unique moderator pin number.<br>\n";
+						$msg .= $text['message-unique_moderator_pin']."<br />\n";
 					}
 				}
 
@@ -197,19 +197,16 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$prep_statement->execute();
 					$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
 					if ($row['num_rows'] > 0) {
-						$msg .= "Please provide a unique participant pin number.<br>\n";
+						$msg .= $text['message-unique_participant_pin']."<br />\n";
 					}
 				}
 
 			//additional checks
 				if ($moderator_pin == $participant_pin) {
-					$msg .= "Moderator and Participant PIN number must be unique.\n";
+					$msg .= $text['message-non_unique_pin']."<br />\n";
 				}
-				if (strlen($moderator_pin) != $pin_length) {
-					$msg .= "Please provide a moderator PIN number that is the required length.\n";
-				}
-				if (strlen($participant_pin) != $pin_length) {
-					$msg .= "Please provide a participant PIN number that is the required length.\n";
+				if (strlen($moderator_pin) < $pin_length || strlen($participant_pin) < $pin_length) {
+					$msg .= $text['message-minimum_pin_length']." ".$pin_length."<br />\n";
 				}
 		}