diff --git a/phone-book.js b/phone-book.js
index 69fb468..4c6cc8d 100644
--- a/phone-book.js
+++ b/phone-book.js
@@ -9,16 +9,61 @@ exports.isStar = true;
 /**
 * Телефонная книга
 */
-var phoneBook;
+var phoneBook = [];
+
+function isValidation(phone, name, email) {
+ var re = /^\d{10}$/;
+ if (re.test(phone) && name !== undefined && name.length> 0 &&
+ typeof name === 'string' &&
+ (typeof email === 'string' || email === undefined)) {
+
+ return true;
+ }
+
+ return false;
+}
+
+function isHave(phone) {
+ for (var i = 0; i < phoneBook.length; i++) {
+ if (phoneBook[i].phone === phone.toString()) {
+
+ return false;
+ }
+ }
+
+ return true;
+}
+
+function getContact(contact) {
+ var correctEmail = '';
+ var newPhone = '+7 (' + contact.phone.slice(0, 3) +
+ ') ' + contact.phone.slice(3, 6) +
+ '-' + contact.phone.slice(6, 8) +
+ '-' + contact.phone.slice(-2);
+ if (contact.email !== undefined) {
+ correctEmail = ', ' + contact.email;
+ }
+
+ return contact.name + ', ' + newPhone + correctEmail;
+}
 
 /**
 * Добавление записи в телефонную книгу
 * @param {String} phone
 * @param {String} name
 * @param {String} email
+ * @returns {boolean}
 */
 exports.add = function (phone, name, email) {
+ if (isValidation(phone, name, email) && isHave(phone)) {
+ phoneBook.push({ 'phone': phone.toString(),
+ 'name': name,
+ 'email': email });
+
+ return true;
+ }
 
+ return false;
 };
 
 /**
@@ -26,25 +71,63 @@ exports.add = function (phone, name, email) {
 * @param {String} phone
 * @param {String} name
 * @param {String} email
+ * @returns {boolean}
 */
 exports.update = function (phone, name, email) {
+ if (!isValidation(phone, name, email)) {
+
+ return false;
+ }
+ for (var i = 0; i < phoneBook.length; i++) {
+ if (phoneBook[i].phone === phone.toString()) {
+ phoneBook[i].name = name;
+ phoneBook[i].email = email;
 
+ return true;
+ }
+ }
+
+ return false;
 };
 
 /**
 * Удаление записей по запросу из телефонной книги
 * @param {String} query
+ * @returns {number}
 */
 exports.findAndRemove = function (query) {
+ var contactsWithQuery = exports.find(query);
+ phoneBook = phoneBook.filter(function (contacts) {
+ return contactsWithQuery.indexOf(getContact(contacts)) === -1;
+ });
 
+ return contactsWithQuery.length;
 };
 
 /**
 * Поиск записей по запросу в телефонной книге
 * @param {String} query
+ * @returns {Array}
 */
 exports.find = function (query) {
+ var contacts = [];
+ if (query === '') {
+
+ return contacts;
+ }
+ if (query === '*') {
+ contacts = phoneBook.map(getContact).sort();
+
+ return contacts;
+ }
+ contacts = phoneBook.filter(function (item) {
+ return item.phone.toString().indexOf(query) !== -1 &#124;&#124;
+ item.name.indexOf(query) !== -1 &#124;&#124;
+ (item.email !== undefined &&
+ item.email.indexOf(query) !== -1);
+ });
 
+ return contacts.map(getContact).sort();
 };
 
 /**
@@ -57,6 +140,19 @@ exports.importFromCsv = function (csv) {
 // Парсим csv
 // Добавляем в телефонную книгу
 // Либо обновляем, если запись с таким телефоном уже существует
+ var count = 0;
+ if (!csv) {
+ return count;
+ }
+ var contactInfo = [];
+ var contacts = csv.split('\n');
+ for (var i = 0; i < contacts.length; i++) {
+ contactInfo = contacts[i].split(';');
+ if (exports.add(contactInfo[1], contactInfo[0], contactInfo[2]) &#124;&#124;
+ exports.update(contactInfo[1], contactInfo[0], contactInfo[2])) {
+ count++;
+ }
+ }
 
- return csv.split('\n').length;
+ return count;
 };
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/urfu-2016/javascript-task-2/pull/43.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/urfu-2016/javascript-task-2/pull/43.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>