From 3885639cdb8d256a7ab4c8d7849aa9d42f68d58b Mon Sep 17 00:00:00 2001
From: Maxim Lihachev <envrm@yandex.ru>
Date: Fri, 6 Sep 2013 15:38:48 +0600
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=B8=D0=B7=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=86=D1=8B,=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B9=20iplist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wtf | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/wtf b/wtf
index c7a635c..f8607f3 100755
--- a/wtf
+++ b/wtf
@@ -4,15 +4,18 @@
 
 USERINFO=$(\grep -i -E $(echo "$*" | tr ' ' '_') /cygdrive/d/etc/wiki/IP.wiki)
 
-USERFULLNAME=$(echo $USERINFO | cut -d '|' -f 2)
-USERNAME=$(echo $USERINFO | cut -d '|' -f 3)
-USERIP=$(echo $USERINFO | cut -d '|' -f 4 | sed 's/ //g')
-USERNAME=$(echo $USERINFO | cut -d '|' -f 3)
+USERBASE=$(echo $USERINFO | cut -d '|' -f 2)
+USERFULLNAME=$(echo $USERINFO | cut -d '|' -f 3)
+USERPHONE=$(echo $USERINFO | cut -d '|' -f 4)
+USERNAME=$(echo $USERINFO | cut -d '|' -f 5)
+USERIP=$(echo $USERINFO | cut -d '|' -f 6 | sed 's/ //g')
 
 USERPC=$(cmd /c "$WINDIR\\system32\\ping.exe" -a $USERIP -n 1 -l 0 \
 	| \grep -i -E -o "\\s.+\\s\\[$USERIP\\]")
 
-echo "$yellowИмя, телефон:    " $rstc $USERFULLNAME
-echo "$yellowИмя пользователя:" $rstc $USERNAME
-echo "$yellowАдрес компьютера:" $rstc $USERPC
+echo "$yellowПодразделение:   $rstc" $USERBASE
+echo "$yellowИмя, фамилия:    $rstc" $USERFULLNAME
+echo "$yellowВнутренний номер:$rstc" $USERPHONE
+echo "$yellowИмя пользователя:$rstc" $USERNAME
+echo "$yellowАдрес компьютера:$rstc" $USERPC