From fbabf6706ca1ad60d61efbb639a254390ddbab0b Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Mon, 18 Jan 2016 14:35:44 -0700
Subject: [PATCH] Add the translations for Users, and add the new permissions.

---
 app/contacts/app_config.php    | 16 ++++++++++++++++
 app/contacts/app_languages.php | 20 ++++++++++++++++++++
 app/contacts/contact_edit.php  |  8 ++++----
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php
index f3f858a156..0d2323ec06 100644
--- a/app/contacts/app_config.php
+++ b/app/contacts/app_config.php
@@ -102,6 +102,22 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "contact_user_view";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "contact_user_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "contact_user_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "contact_user_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "contact_email_view";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php
index 2e2031957f..517c637e33 100644
--- a/app/contacts/app_languages.php
+++ b/app/contacts/app_languages.php
@@ -1033,6 +1033,16 @@ $text['label-import_delimiter']['sv-se'] = "Avgränsare";
 $text['label-import_delimiter']['de-at'] = "Trennzeichen";
 $text['label-import_delimiter']['he'] = "";
 
+$text['label-users']['en-us'] = "Users";
+$text['label-users']['es-cl'] = "Usuarios";
+$text['label-users']['pt-pt'] = "Utilizadores";
+$text['label-users']['fr-fr'] = "Utilisateurs";
+$text['label-users']['pt-br'] = "Usuários";
+$text['label-users']['pl'] = "Użytkownicy";
+$text['label-users']['sv-se'] = "Användare";
+$text['label-users']['uk'] = "Користувачі";
+$text['label-users']['de-at'] = "Benutzer";
+
 $text['label-groups']['en-us'] = "Groups";
 $text['label-groups']['es-cl'] = "Grupos";
 $text['label-groups']['pt-pt'] = "Grupos";
@@ -2108,6 +2118,16 @@ $text['description-import_delimiter']['sv-se'] = "Välj avgränsare (comma or pi
 $text['description-import_delimiter']['de-at'] = "Wählen Sie das Trennzeichen (Beistrich oder Wagrechter Strich)";
 $text['description-import_delimiter']['he'] = "";
 
+$text['description-users']['en-us'] = "Assign additional users as administrators of this conference room.";
+$text['description-users']['es-cl'] = "Asignar usuarios adicionales como administradores de esta sala de conferencia.";
+$text['description-users']['pt-pt'] = "Atribuir utilizadores adicionais como administradores da sala de conferência.";
+$text['description-users']['fr-fr'] = "Ajouter des utilisateurs comme administrateurs des cette salle de conférence.";
+$text['description-users']['pt-br'] = "Atribuir usuários adicionais como administradores da sala de conferência. ";
+$text['description-users']['pl'] = "'Dodaj dodatkowych użytkowników jako administratorów tego pokoju konferencyjnego.";
+$text['description-users']['sv-se'] = "Lägg till ytterligare användare som administratörer för detta konferensrum.";
+$text['description-users']['uk'] = "Зв'язати додаткових користувачів як адміністраторів цього конференц-залу.";
+$text['description-users']['de-at'] = "Weisen Sie diesem Konferenzraum weitere Administratoren zu. ";
+
 $text['description-groups']['en-us'] = "Contacts assigned to a group are only visible to users in the group.  Contacts not assigned to a group will be visible to all users in the domain.";
 $text['description-groups']['es-cl'] = "Contactos asignados a un grupo sólo son visibles para los usuarios del grupo. Los contactos no asignados a un grupo serán visibles para todos los usuarios del dominio.";
 $text['description-groups']['pt-pt'] = "Contatos atribuídos a um grupo só são visíveis para os usuários do grupo. Contatos não atribuídos a um grupo será visível para todos os usuários no domínio.";
diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index 8f8155f990..433c65c077 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -285,10 +285,10 @@ else {
 	unset($prep_statement, $sql);
 
 //get the users assigned to this contact
-	$sql = "SELECT * FROM v_contact_users as u, v_contact_users as c ";
+	$sql = "SELECT * FROM v_contacts as u, v_contact_users as c ";
 	$sql .= "where u.user_uuid = c.user_uuid ";
-	$sql .= "and m.domain_uuid = '".$_SESSION['domain_uuid']."' ";
-	$sql .= "and m.contact_uuid = '".$contact_uuid."' ";
+	$sql .= "and u.domain_uuid = '".$_SESSION['domain_uuid']."' ";
+	$sql .= "and u.contact_uuid = '".$contact_uuid."' ";
 	$sql .= "order by u.username asc ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
@@ -640,7 +640,7 @@ else {
 		echo "</tr>\n";
 		echo "</table>";
 
-		if (if_group("superadmin") || if_group("admin")) {
+		if (permission_exists('contact_user_view')) {
 			echo "	<tr>";
 			echo "		<td class='vncell' valign='top'>".$text['label-users']."</td>";
 			echo "		<td class='vtable' align='left'>";