From 8a31d5b7c1dffad1c78b52228473b6268a41571a Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sat, 30 Apr 2016 13:58:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=B4=D0=BE=D0=BF.=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8F=D1=85=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B2=D0=BE=D0=B4=D1=8F=D1=82=D1=81=D1=8F=20=D0=B2=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BA=D1=80=D0=B0=D1=89=D1=91=D0=BD=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D0=B2=D0=B8=D0=B4=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Helper.php | 8 ++++++--
 views/point.php    | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/classes/Helper.php b/classes/Helper.php
index c8cb93e..91147b9 100644
--- a/classes/Helper.php
+++ b/classes/Helper.php
@@ -104,10 +104,14 @@ class Helper
 		return $string;
 	}
 
-	static function replaceUrls($string)
+	static function replaceUrls($string, $short = FALSE)
 	{
 		$pr = '((https{0,1}:\/\/[\da-z\.-]+\.[a-z]{2,6})([\/\w\?=&#%+,-]|(\.[^\s]))*\/?)';
-		$rep = '<a href="/go/away/?url=$0" title="Ссылка откроется в новом окне" target="_blank">$0</a>';
+		if ($short) {
+			$rep = '<a href="/go/away/?url=$0" title="Ссылка откроется в новом окне" target="_blank">$1</a>';
+		} else {
+			$rep = '<a href="/go/away/?url=$0" title="Ссылка откроется в новом окне" target="_blank">$0</a>';
+		}
 		return preg_replace($pr, $rep, $string);
 	}
 
diff --git a/views/point.php b/views/point.php
index d809280..41553d6 100644
--- a/views/point.php
+++ b/views/point.php
@@ -103,7 +103,7 @@ if ($pointsAirport && $usersAirport && $pointsAirport->id != $usersAirport->id){
 									print '<span style="display: none;" id="extraData' . $extraParam->id . '"  class="extraData">' . Helper::replaceUrls($extraParam->value) . '</span>';
 									print '</td>';
 								} else {
-									print '<td>' . Helper::replaceUrls($extraParam->value) . '</td>';
+									print '<td>' . Helper::replaceUrls($extraParam->value, TRUE) . '</td>';
 								}
 								print '</tr>';
 							}