From 375588aef82f1d7ec71944aed1dd398bf850e428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 00:42:44 +0500
Subject: [PATCH 01/51] Update phone-book.js

---
 phone-book.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 69fb468..b1d6d8c 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -17,8 +17,20 @@ var phoneBook;
  * @param {String} name
  * @param {String} email
  */
-exports.add = function (phone, name, email) {
-
+exports.add = function(phone, name, email) {
+    phone = String(phone);
+    if (name === '' || (phone.length !== 10 && phone.length !== 0)) return false;
+    if (phone === undefined) phone = '';
+    if (email === undefined) email = '';
+    for (i = 0; i < phoneBook.length; i++) {
+        if (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) return false;
+    }
+    phoneBook.push({
+        name: name,
+        phone: phone,
+        email: email
+    });
+    return true;
 };
 
 /**

From 0acdb4630a5df845bee21be1d6df438218a6310d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 00:50:47 +0500
Subject: [PATCH 02/51] Update phone-book.js

---
 phone-book.js | 49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index b1d6d8c..3087122 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -39,24 +39,50 @@ exports.add = function(phone, name, email) {
  * @param {String} name
  * @param {String} email
  */
-exports.update = function (phone, name, email) {
-
+exports.update = function(phone, name, email) {
+    phone = String(phone);
+    if (phone.length !== 10 && phone.length !== 0) return false;
+    if (name === undefined) name = '';
+    if (email === undefined) email = '';
+    for (i = 0; i < phoneBook.length; i++) {
+        if (phoneBook[i].phone === phone) {
+            phoneBook[i].name = name;
+            phoneBook[i].email = email;
+            return true;
+        }
+    }
+    return false;
 };
 
 /**
  * Удаление записей по запросу из телефонной книги
  * @param {String} query
  */
-exports.findAndRemove = function (query) {
-
+exports.findAndRemove = function(query) {
+    if (query === '') return undefined;
+    var schet = 0;
+    for (i = phoneBook.length - 1; i >= 0; i--) {
+        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
+            phoneBook.splice(i, i + 1);
+            schet += 1;
+        }
+    }
+    return schet;
 };
-
 /**
  * Поиск записей по запросу в телефонной книге
  * @param {String} query
  */
-exports.find = function (query) {
-
+exports.find = function(query) {
+    if (query === '') return undefined;
+    var exit = [];
+    for (i = 0; i < phoneBook.length; i++) {
+        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
+            exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email)
+        }
+    }
+    exit.sort();
+    return exit;
 };
 
 /**
@@ -66,6 +92,15 @@ exports.find = function (query) {
  * @returns {Number} – количество добавленных и обновленных записей
  */
 exports.importFromCsv = function (csv) {
+    var name1;
+var phone1;
+var email1;;    
+csv1=csv1.split('\n');
+	for (i=0; i<csv1.length;i++){
+name1=csv1[i].slice(0,csv1[i].indexOf(';'));
+phone1=csv1[i].slice(csv1[i].indexOf(';')+1,csv1[i].lastIndexOf(';'));
+email1=csv1[i].slice(csv1[i].lastIndexOf(';')+1, csv1[i].length);
+exports.add(phone1, name1, email1)}
     // Парсим csv
     // Добавляем в телефонную книгу
     // Либо обновляем, если запись с таким телефоном уже существует

From f97faaf523de7b5c9a4de993d95a94500434a921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:10:37 +0500
Subject: [PATCH 03/51] Update phone-book.js

---
 phone-book.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 3087122..d9eb218 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -91,8 +91,8 @@ exports.find = function(query) {
  * @param {String} csv
  * @returns {Number} – количество добавленных и обновленных записей
  */
-exports.importFromCsv = function (csv) {
-    var name1;
+exports.importFromCsv = function (csv) {var schet=0;
+var name1;
 var phone1;
 var email1;;    
 csv1=csv1.split('\n');
@@ -100,7 +100,8 @@ csv1=csv1.split('\n');
 name1=csv1[i].slice(0,csv1[i].indexOf(';'));
 phone1=csv1[i].slice(csv1[i].indexOf(';')+1,csv1[i].lastIndexOf(';'));
 email1=csv1[i].slice(csv1[i].lastIndexOf(';')+1, csv1[i].length);
-exports.add(phone1, name1, email1)}
+if (add(phone1, name1, email1)) {schet+=1; }
+if (upd(phone1, name1, email1)){schet+=1;} } return schet}
     // Парсим csv
     // Добавляем в телефонную книгу
     // Либо обновляем, если запись с таким телефоном уже существует

From e522d34111ba11840872002790667f7077917e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:14:16 +0500
Subject: [PATCH 04/51] Update phone-book.js

---
 phone-book.js | 131 +++++++++++++++++++++++++-------------------------
 1 file changed, 66 insertions(+), 65 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index d9eb218..cc71ccf 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -1,16 +1,13 @@
 'use strict';
-
 /**
  * Сделано задание на звездочку
  * Реализован метод importFromCsv
  */
 exports.isStar = true;
-
 /**
  * Телефонная книга
  */
 var phoneBook;
-
 /**
  * Добавление записи в телефонную книгу
  * @param {String} phone
@@ -18,21 +15,20 @@ var phoneBook;
  * @param {String} email
  */
 exports.add = function(phone, name, email) {
-    phone = String(phone);
-    if (name === '' || (phone.length !== 10 && phone.length !== 0)) return false;
-    if (phone === undefined) phone = '';
-    if (email === undefined) email = '';
-    for (i = 0; i < phoneBook.length; i++) {
-        if (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) return false;
-    }
-    phoneBook.push({
-        name: name,
-        phone: phone,
-        email: email
-    });
-    return true;
+	phone = String(phone);
+	if (name === '' || (phone.length !== 10 && phone.length !== 0)) return false;
+	if (phone === undefined) phone = '';
+	if (email === undefined) email = '';
+	for (i = 0; i < phoneBook.length; i++) {
+		if (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) return false;
+	}
+	phoneBook.push({
+		name: name,
+		phone: phone,
+		email: email
+	});
+	return true;
 };
-
 /**
  * Обновление записи в телефонной книге
  * @param {String} phone
@@ -40,71 +36,76 @@ exports.add = function(phone, name, email) {
  * @param {String} email
  */
 exports.update = function(phone, name, email) {
-    phone = String(phone);
-    if (phone.length !== 10 && phone.length !== 0) return false;
-    if (name === undefined) name = '';
-    if (email === undefined) email = '';
-    for (i = 0; i < phoneBook.length; i++) {
-        if (phoneBook[i].phone === phone) {
-            phoneBook[i].name = name;
-            phoneBook[i].email = email;
-            return true;
-        }
-    }
-    return false;
+	phone = String(phone);
+	if (phone.length !== 10 && phone.length !== 0) return false;
+	if (name === undefined) name = '';
+	if (email === undefined) email = '';
+	for (i = 0; i < phoneBook.length; i++) {
+		if (phoneBook[i].phone === phone) {
+			phoneBook[i].name = name;
+			phoneBook[i].email = email;
+			return true;
+		}
+	}
+	return false;
 };
-
 /**
  * Удаление записей по запросу из телефонной книги
  * @param {String} query
  */
 exports.findAndRemove = function(query) {
-    if (query === '') return undefined;
-    var schet = 0;
-    for (i = phoneBook.length - 1; i >= 0; i--) {
-        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
-            phoneBook.splice(i, i + 1);
-            schet += 1;
-        }
-    }
-    return schet;
+	if (query === '') return undefined;
+	var schet = 0;
+	for (i = phoneBook.length - 1; i >= 0; i--) {
+		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
+			phoneBook.splice(i, i + 1);
+			schet += 1;
+		}
+	}
+	return schet;
 };
 /**
  * Поиск записей по запросу в телефонной книге
  * @param {String} query
  */
 exports.find = function(query) {
-    if (query === '') return undefined;
-    var exit = [];
-    for (i = 0; i < phoneBook.length; i++) {
-        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
-            exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email)
-        }
-    }
-    exit.sort();
-    return exit;
+	if (query === '') return undefined;
+	var exit = [];
+	for (i = 0; i < phoneBook.length; i++) {
+		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
+			exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email)
+		}
+	}
+	exit.sort();
+	return exit;
 };
-
 /**
  * Импорт записей из csv-формата
  * @star
  * @param {String} csv
  * @returns {Number} – количество добавленных и обновленных записей
  */
-exports.importFromCsv = function (csv) {var schet=0;
-var name1;
-var phone1;
-var email1;;    
-csv1=csv1.split('\n');
-	for (i=0; i<csv1.length;i++){
-name1=csv1[i].slice(0,csv1[i].indexOf(';'));
-phone1=csv1[i].slice(csv1[i].indexOf(';')+1,csv1[i].lastIndexOf(';'));
-email1=csv1[i].slice(csv1[i].lastIndexOf(';')+1, csv1[i].length);
-if (add(phone1, name1, email1)) {schet+=1; }
-if (upd(phone1, name1, email1)){schet+=1;} } return schet}
-    // Парсим csv
-    // Добавляем в телефонную книгу
-    // Либо обновляем, если запись с таким телефоном уже существует
-
-    return csv.split('\n').length;
+exports.importFromCsv = function(csv) {
+		var schet = 0;
+		var name1;
+		var phone1;
+		var email1;;
+		csv1 = csv1.split('\n');
+		for (i = 0; i < csv1.length; i++) {
+			name1 = csv1[i].slice(0, csv1[i].indexOf(';'));
+			phone1 = csv1[i].slice(csv1[i].indexOf(';') + 1, csv1[i].lastIndexOf(';'));
+			email1 = csv1[i].slice(csv1[i].lastIndexOf(';') + 1, csv1[i].length);
+			if (add(phone1, name1, email1)) {
+				schet += 1;
+			}
+			if (upd(phone1, name1, email1)) {
+				schet += 1;
+			}
+		}
+		return schet
+	}
+	// Парсим csv
+	// Добавляем в телефонную книгу
+	// Либо обновляем, если запись с таким телефоном уже существует
+return csv.split('\n').length;
 };

From fd90b537a2c3729d912d97d2e9f704a49552c961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:16:40 +0500
Subject: [PATCH 05/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index cc71ccf..dfae7ff 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -107,5 +107,5 @@ exports.importFromCsv = function(csv) {
 	// Парсим csv
 	// Добавляем в телефонную книгу
 	// Либо обновляем, если запись с таким телефоном уже существует
-return csv.split('\n').length;
+return csv.split('\n').length;{
 };

From a3eadac08373f139b08763e7ddadf56672e8522b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:24:20 +0500
Subject: [PATCH 06/51] Update phone-book.js

---
 phone-book.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index dfae7ff..1f18528 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -90,11 +90,11 @@ exports.importFromCsv = function(csv) {
 		var name1;
 		var phone1;
 		var email1;;
-		csv1 = csv1.split('\n');
-		for (i = 0; i < csv1.length; i++) {
-			name1 = csv1[i].slice(0, csv1[i].indexOf(';'));
-			phone1 = csv1[i].slice(csv1[i].indexOf(';') + 1, csv1[i].lastIndexOf(';'));
-			email1 = csv1[i].slice(csv1[i].lastIndexOf(';') + 1, csv1[i].length);
+		csv = csv.split('\n');
+		for (i = 0; i < csv.length; i++) {
+			name1 = csv[i].slice(0, csv[i].indexOf(';'));
+			phone1 = csv[i].slice(csv[i].indexOf(';') + 1, csv[i].lastIndexOf(';'));
+			email1 = csv[i].slice(csv[i].lastIndexOf(';') + 1, csv[i].length);
 			if (add(phone1, name1, email1)) {
 				schet += 1;
 			}
@@ -103,9 +103,7 @@ exports.importFromCsv = function(csv) {
 			}
 		}
 		return schet
-	}
+	};
 	// Парсим csv
 	// Добавляем в телефонную книгу
 	// Либо обновляем, если запись с таким телефоном уже существует
-return csv.split('\n').length;{
-};

From 60f5943dc48117705e8dfbfe25c0cab021b24168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:27:10 +0500
Subject: [PATCH 07/51] Update phone-book.js

---
 phone-book.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 1f18528..f2648fe 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -95,14 +95,14 @@ exports.importFromCsv = function(csv) {
 			name1 = csv[i].slice(0, csv[i].indexOf(';'));
 			phone1 = csv[i].slice(csv[i].indexOf(';') + 1, csv[i].lastIndexOf(';'));
 			email1 = csv[i].slice(csv[i].lastIndexOf(';') + 1, csv[i].length);
-			if (add(phone1, name1, email1)) {
+			if (exports.add(phone1, name1, email1)) {
 				schet += 1;
 			}
-			if (upd(phone1, name1, email1)) {
+			if (exports.update(phone1, name1, email1)) {
 				schet += 1;
 			}
 		}
-		return schet
+		return schet;
 	};
 	// Парсим csv
 	// Добавляем в телефонную книгу

From b63bdcb3ede8f164044b955f986a3403dc92d9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:41:37 +0500
Subject: [PATCH 08/51] Update phone-book.js

---
 phone-book.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index f2648fe..09f78ae 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -19,7 +19,7 @@ exports.add = function(phone, name, email) {
 	if (name === '' || (phone.length !== 10 && phone.length !== 0)) return false;
 	if (phone === undefined) phone = '';
 	if (email === undefined) email = '';
-	for (i = 0; i < phoneBook.length; i++) {
+	for (var i = 0; i < phoneBook.length; i++) {
 		if (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) return false;
 	}
 	phoneBook.push({
@@ -40,7 +40,7 @@ exports.update = function(phone, name, email) {
 	if (phone.length !== 10 && phone.length !== 0) return false;
 	if (name === undefined) name = '';
 	if (email === undefined) email = '';
-	for (i = 0; i < phoneBook.length; i++) {
+	for (var i = 0; i < phoneBook.length; i++) {
 		if (phoneBook[i].phone === phone) {
 			phoneBook[i].name = name;
 			phoneBook[i].email = email;
@@ -56,7 +56,7 @@ exports.update = function(phone, name, email) {
 exports.findAndRemove = function(query) {
 	if (query === '') return undefined;
 	var schet = 0;
-	for (i = phoneBook.length - 1; i >= 0; i--) {
+	for (var i = phoneBook.length - 1; i >= 0; i--) {
 		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
 			phoneBook.splice(i, i + 1);
 			schet += 1;
@@ -71,7 +71,7 @@ exports.findAndRemove = function(query) {
 exports.find = function(query) {
 	if (query === '') return undefined;
 	var exit = [];
-	for (i = 0; i < phoneBook.length; i++) {
+	for (var i = 0; i < phoneBook.length; i++) {
 		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
 			exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email)
 		}
@@ -91,19 +91,19 @@ exports.importFromCsv = function(csv) {
 		var phone1;
 		var email1;;
 		csv = csv.split('\n');
-		for (i = 0; i < csv.length; i++) {
+		for (var i = 0; i < csv.length; i++) {
 			name1 = csv[i].slice(0, csv[i].indexOf(';'));
 			phone1 = csv[i].slice(csv[i].indexOf(';') + 1, csv[i].lastIndexOf(';'));
 			email1 = csv[i].slice(csv[i].lastIndexOf(';') + 1, csv[i].length);
-			if (exports.add(phone1, name1, email1)) {
-				schet += 1;
-			}
-			if (exports.update(phone1, name1, email1)) {
-				schet += 1;
-			}
-		}
-		return schet;
-	};
-	// Парсим csv
-	// Добавляем в телефонную книгу
-	// Либо обновляем, если запись с таким телефоном уже существует
+        if (exports.add(phone1, name1, email1)) {
+            schet += 1;
+        }
+        if (exports.update(phone1, name1, email1)) {
+            schet += 1;
+        }
+    }
+    return schet;
+};
+// Парсим csv
+// Добавляем в телефонную книгу
+// Либо обновляем, если запись с таким телефоном уже существует

From 3a073fbfe1782019a09b13b0d70f894e8c53f8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:53:48 +0500
Subject: [PATCH 09/51] Update phone-book.js

---
 phone-book.js | 99 ++++++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 09f78ae..1b17502 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -15,19 +15,19 @@ var phoneBook;
  * @param {String} email
  */
 exports.add = function(phone, name, email) {
-	phone = String(phone);
-	if (name === '' || (phone.length !== 10 && phone.length !== 0)) return false;
-	if (phone === undefined) phone = '';
-	if (email === undefined) email = '';
-	for (var i = 0; i < phoneBook.length; i++) {
-		if (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) return false;
-	}
-	phoneBook.push({
-		name: name,
-		phone: phone,
-		email: email
-	});
-	return true;
+    phone = String(phone);
+    if (name === '' || (phone.length !== 10 && phone.length !== 0)) return false;
+    if (phone === undefined) phone = '';
+    if (email === undefined) email = '';
+    for (var i = 0; i < phoneBook.length; i++) {
+        if (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) return false;
+    }
+    phoneBook.push({
+        name: name,
+        phone: phone,
+        email: email
+    });
+    return true;
 };
 /**
  * Обновление записи в телефонной книге
@@ -36,33 +36,33 @@ exports.add = function(phone, name, email) {
  * @param {String} email
  */
 exports.update = function(phone, name, email) {
-	phone = String(phone);
-	if (phone.length !== 10 && phone.length !== 0) return false;
-	if (name === undefined) name = '';
-	if (email === undefined) email = '';
-	for (var i = 0; i < phoneBook.length; i++) {
-		if (phoneBook[i].phone === phone) {
-			phoneBook[i].name = name;
-			phoneBook[i].email = email;
-			return true;
-		}
-	}
-	return false;
+    phone = String(phone);
+    if (phone.length !== 10 && phone.length !== 0) return false;
+    if (name === undefined) name = '';
+    if (email === undefined) email = '';
+    for (var i = 0; i < phoneBook.length; i++) {
+        if (phoneBook[i].phone === phone) {
+            phoneBook[i].name = name;
+            phoneBook[i].email = email;
+            return true;
+        }
+    }
+    return false;
 };
 /**
  * Удаление записей по запросу из телефонной книги
  * @param {String} query
  */
 exports.findAndRemove = function(query) {
-	if (query === '') return undefined;
-	var schet = 0;
-	for (var i = phoneBook.length - 1; i >= 0; i--) {
-		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
+    if (query === '') return undefined;
+    var schet = 0;
+    for (var i = phoneBook.length - 1; i >= 0; i--) {
+        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
 			phoneBook.splice(i, i + 1);
-			schet += 1;
-		}
-	}
-	return schet;
+            schet += 1;
+        }
+    }
+    return schet;
 };
 /**
  * Поиск записей по запросу в телефонной книге
@@ -72,12 +72,15 @@ exports.find = function(query) {
 	if (query === '') return undefined;
 	var exit = [];
 	for (var i = 0; i < phoneBook.length; i++) {
-		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
-			exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email)
-		}
-	}
-	exit.sort();
-	return exit;
+		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
+ phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
+			exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
+ phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + 
+', ' + phoneBook[i].email);
+        }
+    }
+    exit.sort();
+    return exit;
 };
 /**
  * Импорт записей из csv-формата
@@ -86,15 +89,15 @@ exports.find = function(query) {
  * @returns {Number} – количество добавленных и обновленных записей
  */
 exports.importFromCsv = function(csv) {
-		var schet = 0;
-		var name1;
-		var phone1;
-		var email1;;
-		csv = csv.split('\n');
-		for (var i = 0; i < csv.length; i++) {
-			name1 = csv[i].slice(0, csv[i].indexOf(';'));
-			phone1 = csv[i].slice(csv[i].indexOf(';') + 1, csv[i].lastIndexOf(';'));
-			email1 = csv[i].slice(csv[i].lastIndexOf(';') + 1, csv[i].length);
+    var schet = 0;
+    var name1;
+    var phone1;
+    var email1;;
+    csv = csv.split('\n');
+    for (var i = 0; i < csv.length; i++) {
+        name1 = csv[i].slice(0, csv[i].indexOf(';'));
+        phone1 = csv[i].slice(csv[i].indexOf(';') + 1, csv[i].lastIndexOf(';'));
+        email1 = csv[i].slice(csv[i].lastIndexOf(';') + 1, csv[i].length);
         if (exports.add(phone1, name1, email1)) {
             schet += 1;
         }

From d8bcf8f2825a5429438bcc75bc06551f6b053b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:21:48 +0500
Subject: [PATCH 10/51] Update phone-book.js

---
 phone-book.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index 1b17502..60c2235 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -14,9 +14,13 @@ var phoneBook;
  * @param {String} name
  * @param {String} email
  */
+exports.addhel = function(phone, name) {
+    if (name === '' || (phone.length !== 10 && phone.length !== 0)) return true; }
+
+
 exports.add = function(phone, name, email) {
     phone = String(phone);
-    if (name === '' || (phone.length !== 10 && phone.length !== 0)) return false;
+    if (exports.adhel(phone,name)) return false;
     if (phone === undefined) phone = '';
     if (email === undefined) email = '';
     for (var i = 0; i < phoneBook.length; i++) {

From c45f9e7a50086a3d709c312d7dfc5bfa60641a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:26:40 +0500
Subject: [PATCH 11/51] Update phone-book.js

---
 phone-book.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 60c2235..e631041 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -15,7 +15,10 @@ var phoneBook;
  * @param {String} email
  */
 exports.addhel = function(phone, name) {
-    if (name === '' || (phone.length !== 10 && phone.length !== 0)) return true; }
+    if (name === '' || (phone.length !== 10 && phone.length !== 0)) {return true; }}
+
+exports.addhelpen = function(phone, name, email) {
+    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) {return true; }}
 
 
 exports.add = function(phone, name, email) {
@@ -24,7 +27,7 @@ exports.add = function(phone, name, email) {
     if (phone === undefined) phone = '';
     if (email === undefined) email = '';
     for (var i = 0; i < phoneBook.length; i++) {
-        if (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) return false;
+        if (exports.adhelpen = function(phone, name, email)) return false;
     }
     phoneBook.push({
         name: name,

From 4584ab1f671fd8eb0b0a74b290b9fb3cd75af875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:28:52 +0500
Subject: [PATCH 12/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index e631041..ba25593 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -18,7 +18,7 @@ exports.addhel = function(phone, name) {
     if (name === '' || (phone.length !== 10 && phone.length !== 0)) {return true; }}
 
 exports.addhelpen = function(phone, name, email) {
-    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) {return true; }}
+    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) { return true; }}
 
 
 exports.add = function(phone, name, email) {

From a58a5d24400766e936565a79687e2f6fc6f83230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:29:47 +0500
Subject: [PATCH 13/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index ba25593..01f1680 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -27,7 +27,7 @@ exports.add = function(phone, name, email) {
     if (phone === undefined) phone = '';
     if (email === undefined) email = '';
     for (var i = 0; i < phoneBook.length; i++) {
-        if (exports.adhelpen = function(phone, name, email)) return false;
+        if (exports.adhelpen(phone, name, email)) return false;
     }
     phoneBook.push({
         name: name,

From bbf66e0919738f0bacd4802879d76739a3a533af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:32:27 +0500
Subject: [PATCH 14/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index 01f1680..3e3873d 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -18,7 +18,7 @@ exports.addhel = function(phone, name) {
     if (name === '' || (phone.length !== 10 && phone.length !== 0)) {return true; }}
 
 exports.addhelpen = function(phone, name, email) {
-    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email) { return true; }}
+    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email)) { return true; } }
 
 
 exports.add = function(phone, name, email) {

From 5e4dfe19bd6210b07f688696dc89f8af8e3eda21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:36:55 +0500
Subject: [PATCH 15/51] Update phone-book.js

---
 phone-book.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 3e3873d..2b7de10 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -15,10 +15,12 @@ var phoneBook;
  * @param {String} email
  */
 exports.addhel = function(phone, name) {
-    if (name === '' || (phone.length !== 10 && phone.length !== 0)) {return true; }}
+    if (name === '' || phone.length !== 10) { return true; }
+}
 
 exports.addhelpen = function(phone, name, email) {
-    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email)) { return true; } }
+    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email)) { return true; } 
+}
 
 
 exports.add = function(phone, name, email) {

From 7ff888152be89157f99c4ddb8f18b94f83658f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:42:50 +0500
Subject: [PATCH 16/51] Update phone-book.js

---
 phone-book.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 2b7de10..86b6c9d 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -16,18 +16,19 @@ var phoneBook;
  */
 exports.addhel = function(phone, name) {
     if (name === '' || phone.length !== 10) { return true; }
-}
+};
 
 exports.addhelpen = function(phone, name, email) {
-    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email)) { return true; } 
-}
+    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone 
+|| phoneBook[i].email === email)) { return true; } 
+};
 
 
 exports.add = function(phone, name, email) {
     phone = String(phone);
-    if (exports.adhel(phone,name)) return false;
-    if (phone === undefined) phone = '';
-    if (email === undefined) email = '';
+    if (exports.adhel(phone, name)) { return false; }
+    if (phone === undefined) { phone = ''; }
+    if (email === undefined) { email = ''; }
     for (var i = 0; i < phoneBook.length; i++) {
         if (exports.adhelpen(phone, name, email)) return false;
     }
@@ -46,9 +47,9 @@ exports.add = function(phone, name, email) {
  */
 exports.update = function(phone, name, email) {
     phone = String(phone);
-    if (phone.length !== 10 && phone.length !== 0) return false;
-    if (name === undefined) name = '';
-    if (email === undefined) email = '';
+    if (phone.length !== 10 && phone.length !== 0) { return false; }
+    if (name === undefined) { name = ''; }
+    if (email === undefined) { email = ''; }
     for (var i = 0; i < phoneBook.length; i++) {
         if (phoneBook[i].phone === phone) {
             phoneBook[i].name = name;
@@ -66,7 +67,8 @@ exports.findAndRemove = function(query) {
     if (query === '') return undefined;
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
-        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
+        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 
+            || phoneBook[i].email.indexOf(query) !== -1) {
 			phoneBook.splice(i, i + 1);
             schet += 1;
         }

From e2e2a0a7bf60fa7b5b47fa3bd707122a8e9047b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:47:42 +0500
Subject: [PATCH 17/51] Update phone-book.js

---
 phone-book.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 86b6c9d..c14c439 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -18,9 +18,9 @@ exports.addhel = function(phone, name) {
     if (name === '' || phone.length !== 10) { return true; }
 };
 
-exports.addhelpen = function(phone, name, email) {
-    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone 
-|| phoneBook[i].email === email)) { return true; } 
+exports.addhelpen = function(phone, name, email, phoneBook[i].name, phoneBook[i].phone ,phoneBook[i].email) {
+    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email)) {
+        return true; } 
 };
 
 
@@ -30,7 +30,8 @@ exports.add = function(phone, name, email) {
     if (phone === undefined) { phone = ''; }
     if (email === undefined) { email = ''; }
     for (var i = 0; i < phoneBook.length; i++) {
-        if (exports.adhelpen(phone, name, email)) return false;
+        if (exports.adhelpen(phone, name, email, phoneBook[i].name, phoneBook[i].phone, phoneBook[i].email)) {
+            return false; }
     }
     phoneBook.push({
         name: name,
@@ -67,8 +68,7 @@ exports.findAndRemove = function(query) {
     if (query === '') return undefined;
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
-        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 
-            || phoneBook[i].email.indexOf(query) !== -1) {
+        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
 			phoneBook.splice(i, i + 1);
             schet += 1;
         }

From e3c44362bf158e3dd46b551d0f7daecc8e1bca68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 10:52:01 +0500
Subject: [PATCH 18/51] Update phone-book.js

---
 phone-book.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index c14c439..94d6166 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -18,8 +18,8 @@ exports.addhel = function(phone, name) {
     if (name === '' || phone.length !== 10) { return true; }
 };
 
-exports.addhelpen = function(phone, name, email, phoneBook[i].name, phoneBook[i].phone ,phoneBook[i].email) {
-    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone || phoneBook[i].email === email)) {
+exports.addhelpen = function(phone, name, email, name1, phone1, email1) {
+    if (name === '' || (name1 === name || phone1 === phone || email1 === email)) {
         return true; } 
 };
 

From 70aafc95f3fef14e15aca8b2c6295a51c64aeec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 11:05:56 +0500
Subject: [PATCH 19/51] Update phone-book.js

---
 phone-book.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phone-book.js b/phone-book.js
index 94d6166..a4cbb4b 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -9,6 +9,7 @@ exports.isStar = true;
  */
 var phoneBook;
 /**
+ * @return string
  * Добавление записи в телефонную книгу
  * @param {String} phone
  * @param {String} name

From 985709e7c4a7e34cc9d9c7089f9bc78aef9933e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 18:50:29 +0500
Subject: [PATCH 20/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index a4cbb4b..0f5a92a 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -9,7 +9,7 @@ exports.isStar = true;
  */
 var phoneBook;
 /**
- * @return string
+ * @return Boolean;
  * Добавление записи в телефонную книгу
  * @param {String} phone
  * @param {String} name

From 61723f1ebee7ee4cf5b785a6ca84b8ce8b5f44e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:01:16 +0500
Subject: [PATCH 21/51] Update phone-book.js

---
 phone-book.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phone-book.js b/phone-book.js
index 0f5a92a..10a3300 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -14,6 +14,7 @@ var phoneBook;
  * @param {String} phone
  * @param {String} name
  * @param {String} email
+ * @return {boolean} 
  */
 exports.addhel = function(phone, name) {
     if (name === '' || phone.length !== 10) { return true; }

From f9b3aa0d2909b9eb18053bc5e2b081961d3c465e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:08:07 +0500
Subject: [PATCH 22/51] Update phone-book.js

---
 phone-book.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 10a3300..037a76e 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -9,12 +9,11 @@ exports.isStar = true;
  */
 var phoneBook;
 /**
- * @return Boolean;
  * Добавление записи в телефонную книгу
  * @param {String} phone
  * @param {String} name
  * @param {String} email
- * @return {boolean} 
+ * @returns {boolean} 
  */
 exports.addhel = function(phone, name) {
     if (name === '' || phone.length !== 10) { return true; }

From 7d6ff18b206979aeb585aac464cb896bf4036f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:11:57 +0500
Subject: [PATCH 23/51] Update phone-book.js

---
 phone-book.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phone-book.js b/phone-book.js
index 037a76e..dfe51cc 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -4,6 +4,7 @@
  * Реализован метод importFromCsv
  */
 exports.isStar = true;
+
 /**
  * Телефонная книга
  */

From d2a10050dabb6b56a70069fe9a8df29d0d35b858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:23:29 +0500
Subject: [PATCH 24/51] Update phone-book.js

---
 phone-book.js | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index dfe51cc..d01b285 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -60,41 +60,47 @@ exports.update = function(phone, name, email) {
             return true;
         }
     }
-    return false;
+    return false
 };
+
 /**
  * Удаление записей по запросу из телефонной книги
  * @param {String} query
+ * @return {number}
  */
 exports.findAndRemove = function(query) {
-    if (query === '') return undefined;
+    if (query === '') { return undefined; }
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
-        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 || phoneBook[i].email.indexOf(query) !== -1) {
-			phoneBook.splice(i, i + 1);
+        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
+phoneBook[i].email.indexOf(query) !== -1) {
+            phoneBook.splice(i, i + 1);
             schet += 1;
         }
     }
-    return schet;
+    return schet
 };
+
 /**
  * Поиск записей по запросу в телефонной книге
  * @param {String} query
+ * @return {array}
  */
 exports.find = function(query) {
-	if (query === '') return undefined;
-	var exit = [];
-	for (var i = 0; i < phoneBook.length; i++) {
-		if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
+    if (query === '') { return undefined; }
+    var exit = [];
+    for (var i = 0; i < phoneBook.length; i++) {
+        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
  phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
-			exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
- phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + 
+            exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
+phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) +
 ', ' + phoneBook[i].email);
         }
     }
     exit.sort();
-    return exit;
+    return exit
 };
+
 /**
  * Импорт записей из csv-формата
  * @star
@@ -105,7 +111,7 @@ exports.importFromCsv = function(csv) {
     var schet = 0;
     var name1;
     var phone1;
-    var email1;;
+    var email1;
     csv = csv.split('\n');
     for (var i = 0; i < csv.length; i++) {
         name1 = csv[i].slice(0, csv[i].indexOf(';'));
@@ -118,7 +124,7 @@ exports.importFromCsv = function(csv) {
             schet += 1;
         }
     }
-    return schet;
+    return schet
 };
 // Парсим csv
 // Добавляем в телефонную книгу

From 87b8a2336ff0ce8d21e70ba98f148b9a76250ef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:31:43 +0500
Subject: [PATCH 25/51] Update phone-book.js

---
 phone-book.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index d01b285..d95ee77 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -40,6 +40,7 @@ exports.add = function(phone, name, email) {
         phone: phone,
         email: email
     });
+
     return true;
 };
 /**
@@ -60,6 +61,7 @@ exports.update = function(phone, name, email) {
             return true;
         }
     }
+
     return false
 };
 
@@ -78,7 +80,8 @@ phoneBook[i].email.indexOf(query) !== -1) {
             schet += 1;
         }
     }
-    return schet
+
+    return schet;
 };
 
 /**
@@ -98,7 +101,8 @@ phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + ph
         }
     }
     exit.sort();
-    return exit
+
+    return exit;
 };
 
 /**
@@ -124,7 +128,8 @@ exports.importFromCsv = function(csv) {
             schet += 1;
         }
     }
-    return schet
+    
+    return schet;
 };
 // Парсим csv
 // Добавляем в телефонную книгу

From bfa72950da28f46962b71f9ddf0b9f2196f7bddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:41:32 +0500
Subject: [PATCH 26/51] Update phone-book.js

---
 phone-book.js | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index d95ee77..1d5c12d 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -16,19 +16,21 @@ var phoneBook;
  * @param {String} email
  * @returns {boolean} 
  */
-exports.addhel = function(phone, name) {
-    if (name === '' || phone.length !== 10) { return true; }
+exports.addhel = function (phone, name) {
+    if (name === '' || phone.length !== 10) {
+        return true; }
 };
 
-exports.addhelpen = function(phone, name, email, name1, phone1, email1) {
+exports.addhelpen = function (phone, name, email, name1, phone1, email1) {
     if (name === '' || (name1 === name || phone1 === phone || email1 === email)) {
         return true; } 
 };
 
 
-exports.add = function(phone, name, email) {
+exports.add = function (phone, name, email) {
     phone = String(phone);
-    if (exports.adhel(phone, name)) { return false; }
+    if (exports.adhel(phone, name)) {
+        return false; }
     if (phone === undefined) { phone = ''; }
     if (email === undefined) { email = ''; }
     for (var i = 0; i < phoneBook.length; i++) {
@@ -49,11 +51,14 @@ exports.add = function(phone, name, email) {
  * @param {String} name
  * @param {String} email
  */
-exports.update = function(phone, name, email) {
+exports.update = function (phone, name, email) {
     phone = String(phone);
-    if (phone.length !== 10 && phone.length !== 0) { return false; }
-    if (name === undefined) { name = ''; }
-    if (email === undefined) { email = ''; }
+    if (phone.length !== 10 && phone.length !== 0) {
+        return false; }
+    if (name === undefined) {
+        name = ''; }
+    if (email === undefined) {
+        email = ''; }
     for (var i = 0; i < phoneBook.length; i++) {
         if (phoneBook[i].phone === phone) {
             phoneBook[i].name = name;
@@ -70,8 +75,9 @@ exports.update = function(phone, name, email) {
  * @param {String} query
  * @return {number}
  */
-exports.findAndRemove = function(query) {
-    if (query === '') { return undefined; }
+exports.findAndRemove = function (query) {
+    if (query === '') {
+        return undefined; }
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
         if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
@@ -87,17 +93,18 @@ phoneBook[i].email.indexOf(query) !== -1) {
 /**
  * Поиск записей по запросу в телефонной книге
  * @param {String} query
- * @return {array}
+ * @returns {array}
  */
-exports.find = function(query) {
-    if (query === '') { return undefined; }
+exports.find = function (query) {
+    if (query === '') {
+        return undefined; }
     var exit = [];
     for (var i = 0; i < phoneBook.length; i++) {
         if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
  phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
             exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
-phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) +
-', ' + phoneBook[i].email);
+phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
+phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email);
         }
     }
     exit.sort();
@@ -111,7 +118,7 @@ phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + ph
  * @param {String} csv
  * @returns {Number} – количество добавленных и обновленных записей
  */
-exports.importFromCsv = function(csv) {
+exports.importFromCsv = function (csv) {
     var schet = 0;
     var name1;
     var phone1;
@@ -128,7 +135,7 @@ exports.importFromCsv = function(csv) {
             schet += 1;
         }
     }
-    
+
     return schet;
 };
 // Парсим csv

From d6a8d818b85d8b4a3ae40c4521825597f6837724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:46:44 +0500
Subject: [PATCH 27/51] Update phone-book.js

---
 phone-book.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 1d5c12d..68fb521 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -1,4 +1,5 @@
 'use strict';
+
 /**
  * Сделано задание на звездочку
  * Реализован метод importFromCsv
@@ -18,12 +19,14 @@ var phoneBook;
  */
 exports.addhel = function (phone, name) {
     if (name === '' || phone.length !== 10) {
-        return true; }
+        return true;
+    }
 };
 
 exports.addhelpen = function (phone, name, email, name1, phone1, email1) {
     if (name === '' || (name1 === name || phone1 === phone || email1 === email)) {
-        return true; } 
+        return true;
+    } 
 };
 
 
@@ -35,7 +38,8 @@ exports.add = function (phone, name, email) {
     if (email === undefined) { email = ''; }
     for (var i = 0; i < phoneBook.length; i++) {
         if (exports.adhelpen(phone, name, email, phoneBook[i].name, phoneBook[i].phone, phoneBook[i].email)) {
-            return false; }
+            return false;
+        }
     }
     phoneBook.push({
         name: name,
@@ -56,9 +60,11 @@ exports.update = function (phone, name, email) {
     if (phone.length !== 10 && phone.length !== 0) {
         return false; }
     if (name === undefined) {
-        name = ''; }
+        name = '';
+    }
     if (email === undefined) {
-        email = ''; }
+        email = '';
+    }
     for (var i = 0; i < phoneBook.length; i++) {
         if (phoneBook[i].phone === phone) {
             phoneBook[i].name = name;

From dc5c1d8730cfa765dfecf714b442d4e04f48c72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 19:58:30 +0500
Subject: [PATCH 28/51] Update phone-book.js

---
 phone-book.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 68fb521..49e3dc3 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -10,6 +10,7 @@ exports.isStar = true;
  * Телефонная книга
  */
 var phoneBook;
+
 /**
  * Добавление записи в телефонную книгу
  * @param {String} phone
@@ -33,11 +34,17 @@ exports.addhelpen = function (phone, name, email, name1, phone1, email1) {
 exports.add = function (phone, name, email) {
     phone = String(phone);
     if (exports.adhel(phone, name)) {
-        return false; }
-    if (phone === undefined) { phone = ''; }
-    if (email === undefined) { email = ''; }
+        return false;
+    }
+    if (phone === undefined) {
+        phone = '';
+    }
+    if (email === undefined) {
+        email = '';
+    }
     for (var i = 0; i < phoneBook.length; i++) {
-        if (exports.adhelpen(phone, name, email, phoneBook[i].name, phoneBook[i].phone, phoneBook[i].email)) {
+        if (exports.adhelpen(phone, name, email, phoneBook[i].name,
+phoneBook[i].phone, phoneBook[i].email)) {
             return false;
         }
     }
@@ -54,6 +61,7 @@ exports.add = function (phone, name, email) {
  * @param {String} phone
  * @param {String} name
  * @param {String} email
+ * @returns {boolean}
  */
 exports.update = function (phone, name, email) {
     phone = String(phone);
@@ -73,13 +81,13 @@ exports.update = function (phone, name, email) {
         }
     }
 
-    return false
+    return false;
 };
 
 /**
  * Удаление записей по запросу из телефонной книги
  * @param {String} query
- * @return {number}
+ * @returns{number}
  */
 exports.findAndRemove = function (query) {
     if (query === '') {
@@ -103,7 +111,8 @@ phoneBook[i].email.indexOf(query) !== -1) {
  */
 exports.find = function (query) {
     if (query === '') {
-        return undefined; }
+        return undefined;
+    }
     var exit = [];
     for (var i = 0; i < phoneBook.length; i++) {
         if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||

From 6268c452eebfd61e0844b8601a4025eaffaeaafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 20:02:34 +0500
Subject: [PATCH 29/51] Update phone-book.js

---
 phone-book.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 49e3dc3..d2a56c7 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -27,7 +27,7 @@ exports.addhel = function (phone, name) {
 exports.addhelpen = function (phone, name, email, name1, phone1, email1) {
     if (name === '' || (name1 === name || phone1 === phone || email1 === email)) {
         return true;
-    } 
+    }
 };
 
 
@@ -44,7 +44,7 @@ exports.add = function (phone, name, email) {
     }
     for (var i = 0; i < phoneBook.length; i++) {
         if (exports.adhelpen(phone, name, email, phoneBook[i].name,
-phoneBook[i].phone, phoneBook[i].email)) {
+            phoneBook[i].phone, phoneBook[i].email)) {
             return false;
         }
     }
@@ -56,6 +56,7 @@ phoneBook[i].phone, phoneBook[i].email)) {
 
     return true;
 };
+
 /**
  * Обновление записи в телефонной книге
  * @param {String} phone
@@ -66,7 +67,8 @@ phoneBook[i].phone, phoneBook[i].email)) {
 exports.update = function (phone, name, email) {
     phone = String(phone);
     if (phone.length !== 10 && phone.length !== 0) {
-        return false; }
+        return false;
+    }
     if (name === undefined) {
         name = '';
     }
@@ -91,7 +93,8 @@ exports.update = function (phone, name, email) {
  */
 exports.findAndRemove = function (query) {
     if (query === '') {
-        return undefined; }
+        return undefined;
+    }
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
         if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||

From 940c81965cceede33cba990d40979d182de5ec9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 20:12:37 +0500
Subject: [PATCH 30/51] Update phone-book.js

---
 phone-book.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index d2a56c7..9a00841 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -79,6 +79,7 @@ exports.update = function (phone, name, email) {
         if (phoneBook[i].phone === phone) {
             phoneBook[i].name = name;
             phoneBook[i].email = email;
+
             return true;
         }
     }
@@ -97,8 +98,8 @@ exports.findAndRemove = function (query) {
     }
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
-        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
-phoneBook[i].email.indexOf(query) !== -1) {
+        if (exports.findhelp(phoneBook[i].name.indexOf(query), 
+            phoneBook[i].phone.indexOf(query), phoneBook[i].email.indexOf(query)) {
             phoneBook.splice(i, i + 1);
             schet += 1;
         }
@@ -107,6 +108,11 @@ phoneBook[i].email.indexOf(query) !== -1) {
     return schet;
 };
 
+exports.findhelp = function (one, two, free) {
+    if (one !== -1 || two !== -1 || free !== -1) {
+        return true;
+    } 
+
 /**
  * Поиск записей по запросу в телефонной книге
  * @param {String} query

From 7983756b7e38a11ba369525e2b23cafb8ef04393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 20:16:25 +0500
Subject: [PATCH 31/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index 9a00841..71b3e31 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -99,7 +99,7 @@ exports.findAndRemove = function (query) {
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
         if (exports.findhelp(phoneBook[i].name.indexOf(query), 
-            phoneBook[i].phone.indexOf(query), phoneBook[i].email.indexOf(query)) {
+            phoneBook[i].phone.indexOf(query), phoneBook[i].email.indexOf(query))) {
             phoneBook.splice(i, i + 1);
             schet += 1;
         }

From 3f98f0dc49ba305bec6c54eaaaa20296c4195591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 20:20:32 +0500
Subject: [PATCH 32/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index 71b3e31..a817e1e 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -112,7 +112,7 @@ exports.findhelp = function (one, two, free) {
     if (one !== -1 || two !== -1 || free !== -1) {
         return true;
     } 
-
+};
 /**
  * Поиск записей по запросу в телефонной книге
  * @param {String} query

From 0d3a77abd183bc1c84cb9d10fc2253bbf969ec16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 20:26:53 +0500
Subject: [PATCH 33/51] Update phone-book.js

---
 phone-book.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index a817e1e..4e2d3b1 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -98,7 +98,7 @@ exports.findAndRemove = function (query) {
     }
     var schet = 0;
     for (var i = phoneBook.length - 1; i >= 0; i--) {
-        if (exports.findhelp(phoneBook[i].name.indexOf(query), 
+        if (exports.findhelp(phoneBook[i].name.indexOf(query),
             phoneBook[i].phone.indexOf(query), phoneBook[i].email.indexOf(query))) {
             phoneBook.splice(i, i + 1);
             schet += 1;
@@ -111,8 +111,9 @@ exports.findAndRemove = function (query) {
 exports.findhelp = function (one, two, free) {
     if (one !== -1 || two !== -1 || free !== -1) {
         return true;
-    } 
+    }
 };
+
 /**
  * Поиск записей по запросу в телефонной книге
  * @param {String} query
@@ -124,8 +125,9 @@ exports.find = function (query) {
     }
     var exit = [];
     for (var i = 0; i < phoneBook.length; i++) {
-        if (phoneBook[i].name.indexOf(query) !== -1 || phoneBook[i].phone.indexOf(query) !== -1 ||
- phoneBook[i].email.indexOf(query) !== -1 || query === '*') {
+        if (exports.findhelp(phoneBook[i].name.indexOf(query),
+            phoneBook[i].phone.indexOf(query), phoneBook[i].email.indexOf(query)) ||
+            query === '*') {
             exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
 phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
 phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email);

From 2324b6d6be2cea438607bfaefdb1694fc33d14f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 20:30:51 +0500
Subject: [PATCH 34/51] Update phone-book.js

---
 phone-book.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 4e2d3b1..0e12aa5 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -24,8 +24,8 @@ exports.addhel = function (phone, name) {
     }
 };
 
-exports.addhelpen = function (phone, name, email, name1, phone1, email1) {
-    if (name === '' || (name1 === name || phone1 === phone || email1 === email)) {
+exports.addhelpen = function (phone, name, name1, phone1) {
+    if (name === '' || (name1 === name || phone1 === phone)) {
         return true;
     }
 };
@@ -43,8 +43,8 @@ exports.add = function (phone, name, email) {
         email = '';
     }
     for (var i = 0; i < phoneBook.length; i++) {
-        if (exports.adhelpen(phone, name, email, phoneBook[i].name,
-            phoneBook[i].phone, phoneBook[i].email)) {
+        if (exports.adhelpen(phone, name, phoneBook[i].name,
+            phoneBook[i].phone)) {
             return false;
         }
     }

From 8c219269b8bb03343178ce0933c8079d9ba512fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 20:44:30 +0500
Subject: [PATCH 35/51] Update phone-book.js

---
 phone-book.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/phone-book.js b/phone-book.js
index 0e12aa5..8cab31d 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -21,12 +21,16 @@ var phoneBook;
 exports.addhel = function (phone, name) {
     if (name === '' || phone.length !== 10) {
         return true;
+    } else {
+        return false;
     }
 };
 
 exports.addhelpen = function (phone, name, name1, phone1) {
     if (name === '' || (name1 === name || phone1 === phone)) {
         return true;
+    } else {
+        return false;
     }
 };
 
@@ -111,6 +115,8 @@ exports.findAndRemove = function (query) {
 exports.findhelp = function (one, two, free) {
     if (one !== -1 || two !== -1 || free !== -1) {
         return true;
+    } else {
+        return false;
     }
 };
 

From 3c0f653f6385c2ef3ba83adf17121c00faa96fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:09:42 +0500
Subject: [PATCH 36/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index 8cab31d..51bca95 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -37,7 +37,7 @@ exports.addhelpen = function (phone, name, name1, phone1) {
 
 exports.add = function (phone, name, email) {
     phone = String(phone);
-    if (exports.adhel(phone, name)) {
+    if (exports.addhel(phone, name)) {
         return false;
     }
     if (phone === undefined) {

From e6f68e090fd76a088440fa267473b0ba48813533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:13:06 +0500
Subject: [PATCH 37/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index 51bca95..9e32b12 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -47,7 +47,7 @@ exports.add = function (phone, name, email) {
         email = '';
     }
     for (var i = 0; i < phoneBook.length; i++) {
-        if (exports.adhelpen(phone, name, phoneBook[i].name,
+        if (exports.addhelpen(phone, name, phoneBook[i].name,
             phoneBook[i].phone)) {
             return false;
         }

From f18ca6f32012b4c5fbd8035a090c5404030f5e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:18:18 +0500
Subject: [PATCH 38/51] Update phone-book.js

---
 phone-book.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 9e32b12..3c136ae 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -21,9 +21,8 @@ var phoneBook;
 exports.addhel = function (phone, name) {
     if (name === '' || phone.length !== 10) {
         return true;
-    } else {
-        return false;
     }
+    return false;
 };
 
 exports.addhelpen = function (phone, name, name1, phone1) {

From f2ee88b0d83c13879f61e673f3494bf7245248f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:44:02 +0500
Subject: [PATCH 39/51] Update phone-book.js

---
 phone-book.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phone-book.js b/phone-book.js
index 3c136ae..98cc903 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -22,6 +22,7 @@ exports.addhel = function (phone, name) {
     if (name === '' || phone.length !== 10) {
         return true;
     }
+
     return false;
 };
 

From 9756942e4fa0fa5f426ed8411bcc970bcce1014a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:47:41 +0500
Subject: [PATCH 40/51] Update phone-book.js

---
 phone-book.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 98cc903..f6a4e7c 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -29,9 +29,9 @@ exports.addhel = function (phone, name) {
 exports.addhelpen = function (phone, name, name1, phone1) {
     if (name === '' || (name1 === name || phone1 === phone)) {
         return true;
-    } else {
-        return false;
     }
+
+    return false;
 };
 
 
@@ -115,9 +115,9 @@ exports.findAndRemove = function (query) {
 exports.findhelp = function (one, two, free) {
     if (one !== -1 || two !== -1 || free !== -1) {
         return true;
-    } else {
-        return false;
     }
+
+    return false;
 };
 
 /**

From f775881ba134c1f6ef6e0a8354e5fc5ba715daeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:51:50 +0500
Subject: [PATCH 41/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index f6a4e7c..eb4d1cf 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -9,7 +9,7 @@ exports.isStar = true;
 /**
  * Телефонная книга
  */
-var phoneBook;
+var phoneBook = [];
 
 /**
  * Добавление записи в телефонную книгу

From 8efd4064df9481a40dabe3e89c60d1df2df70195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:56:04 +0500
Subject: [PATCH 42/51] Update phone-book.js

---
 phone-book.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/phone-book.js b/phone-book.js
index eb4d1cf..46835fd 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -34,6 +34,13 @@ exports.addhelpen = function (phone, name, name1, phone1) {
     return false;
 };
 
+exports.addhelpena = function (email, email1) {
+    if (email === email1)) {
+        return true;
+    }
+
+    return false;
+};
 
 exports.add = function (phone, name, email) {
     phone = String(phone);
@@ -51,6 +58,9 @@ exports.add = function (phone, name, email) {
             phoneBook[i].phone)) {
             return false;
         }
+        if (exports.addhelpena(email, phoneBook[i].email)) {
+            return false;
+        }
     }
     phoneBook.push({
         name: name,

From 1e0020be4db3b9b869a4bbe07bc5940c7911d8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 21:57:47 +0500
Subject: [PATCH 43/51] Update phone-book.js

---
 phone-book.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phone-book.js b/phone-book.js
index 46835fd..e7990d7 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -35,7 +35,7 @@ exports.addhelpen = function (phone, name, name1, phone1) {
 };
 
 exports.addhelpena = function (email, email1) {
-    if (email === email1)) {
+    if (email === email1) {
         return true;
     }
 

From d3010834f2bf430d9c294317857971ec89a7ddc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 22:04:12 +0500
Subject: [PATCH 44/51] Update phone-book.js

---
 phone-book.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index e7990d7..ace432a 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -42,6 +42,14 @@ exports.addhelpena = function (email, email1) {
     return false;
 };
 
+exports.addhela = function (name, phone, email) {
+    phoneBook.push({
+        name: name,
+        phone: phone,
+        email: email
+    });
+};
+
 exports.add = function (phone, name, email) {
     phone = String(phone);
     if (exports.addhel(phone, name)) {
@@ -62,11 +70,7 @@ exports.add = function (phone, name, email) {
             return false;
         }
     }
-    phoneBook.push({
-        name: name,
-        phone: phone,
-        email: email
-    });
+    exports.addhela(name, phone, email);
 
     return true;
 };

From 2ba8695a96d642743ecec707f66ea715dfe575cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 22:07:43 +0500
Subject: [PATCH 45/51] Update phone-book.js

---
 phone-book.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index ace432a..bc4f930 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -63,10 +63,7 @@ exports.add = function (phone, name, email) {
     }
     for (var i = 0; i < phoneBook.length; i++) {
         if (exports.addhelpen(phone, name, phoneBook[i].name,
-            phoneBook[i].phone)) {
-            return false;
-        }
-        if (exports.addhelpena(email, phoneBook[i].email)) {
+            phoneBook[i].phone) || exports.addhelpena(email, phoneBook[i].email)) {
             return false;
         }
     }

From 00b17e50f2ee871fa9fe7b3285a9daf4148aabad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 22:13:38 +0500
Subject: [PATCH 46/51] Update phone-book.js

---
 phone-book.js | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index bc4f930..5cdc96d 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -26,29 +26,17 @@ exports.addhel = function (phone, name) {
     return false;
 };
 
-exports.addhelpen = function (phone, name, name1, phone1) {
-    if (name === '' || (name1 === name || phone1 === phone)) {
+exports.addhelpen = function (phone, name, email, i) {
+    if (name === '' || (phoneBook[i].name === name || phoneBook[i].phone === phone ||
+        phoneBook[i].email === email)) {
         return true;
     }
 
     return false;
 };
 
-exports.addhelpena = function (email, email1) {
-    if (email === email1) {
-        return true;
-    }
 
-    return false;
-};
 
-exports.addhela = function (name, phone, email) {
-    phoneBook.push({
-        name: name,
-        phone: phone,
-        email: email
-    });
-};
 
 exports.add = function (phone, name, email) {
     phone = String(phone);
@@ -62,12 +50,15 @@ exports.add = function (phone, name, email) {
         email = '';
     }
     for (var i = 0; i < phoneBook.length; i++) {
-        if (exports.addhelpen(phone, name, phoneBook[i].name,
-            phoneBook[i].phone) || exports.addhelpena(email, phoneBook[i].email)) {
+        if (exports.addhelpen(phone, name, email, i)) {
             return false;
         }
     }
-    exports.addhela(name, phone, email);
+    phoneBook.push({
+        name: name,
+        phone: phone,
+        email: email
+    });
 
     return true;
 };

From aabd863dde383b1c5431342333e4be3ecc06b15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 22:15:37 +0500
Subject: [PATCH 47/51] Update phone-book.js

---
 phone-book.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 5cdc96d..9d73663 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -35,9 +35,6 @@ exports.addhelpen = function (phone, name, email, i) {
     return false;
 };
 
-
-
-
 exports.add = function (phone, name, email) {
     phone = String(phone);
     if (exports.addhel(phone, name)) {

From 9cfde4ce89c6176447e60a6413b32f1c52e0d7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 22:51:57 +0500
Subject: [PATCH 48/51] Update phone-book.js

---
 phone-book.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 9d73663..83061ee 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -159,10 +159,10 @@ exports.importFromCsv = function (csv) {
         name1 = csv[i].slice(0, csv[i].indexOf(';'));
         phone1 = csv[i].slice(csv[i].indexOf(';') + 1, csv[i].lastIndexOf(';'));
         email1 = csv[i].slice(csv[i].lastIndexOf(';') + 1, csv[i].length);
-        if (exports.add(phone1, name1, email1)) {
+        if (exports.update(phone1, name1, email1)) {
             schet += 1;
         }
-        if (exports.update(phone1, name1, email1)) {
+        if (exports.add(phone1, name1, email1)) {
             schet += 1;
         }
     }

From 938084c234a08174c42396c31f72fd9ae9a5aa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 23:11:01 +0500
Subject: [PATCH 49/51] Update phone-book.js

---
 phone-book.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 83061ee..6cbd338 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -133,9 +133,7 @@ exports.find = function (query) {
         if (exports.findhelp(phoneBook[i].name.indexOf(query),
             phoneBook[i].phone.indexOf(query), phoneBook[i].email.indexOf(query)) ||
             query === '*') {
-            exit.push(phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
-phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
-phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email);
+            exit.push(exports.finder(i));
         }
     }
     exit.sort();
@@ -143,6 +141,20 @@ phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email);
     return exit;
 };
 
+exports.finder = function (i) {
+    var tert;
+    if (phoneBook[i].email==='') {
+        tert=phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
+phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
+phoneBook[i].phone.slice(8, 10);
+    } else { tert = phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
+phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
+phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email;
+    }
+    
+    retun tert;
+};
+
 /**
  * Импорт записей из csv-формата
  * @star

From c8b26cbc0a005321a6588aab24ebf1d4a825eb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 23:13:30 +0500
Subject: [PATCH 50/51] Update phone-book.js

---
 phone-book.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 6cbd338..9293256 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -144,7 +144,7 @@ exports.find = function (query) {
 exports.finder = function (i) {
     var tert;
     if (phoneBook[i].email==='') {
-        tert=phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
+        tert = phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
 phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
 phoneBook[i].phone.slice(8, 10);
     } else { tert = phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
@@ -152,7 +152,7 @@ phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
 phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email;
     }
     
-    retun tert;
+    return tert;
 };
 
 /**

From 0e787d3b4189968bd6698125c123eb898f7efd75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A7=D0=B0=D0=B9=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD?=
 <32215785+Kotyan7@users.noreply.github.com>
Date: Wed, 11 Oct 2017 23:16:45 +0500
Subject: [PATCH 51/51] Update phone-book.js

---
 phone-book.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/phone-book.js b/phone-book.js
index 9293256..be682d2 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -143,15 +143,16 @@ exports.find = function (query) {
 
 exports.finder = function (i) {
     var tert;
-    if (phoneBook[i].email==='') {
+    if (phoneBook[i].email === '') {
         tert = phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
 phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
 phoneBook[i].phone.slice(8, 10);
-    } else { tert = phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
+    } else {
+        tert = phoneBook[i].name + ', +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' +
 phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' +
 phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email;
     }
-    
+
     return tert;
 };