From 3bc9bbb2921834fa33d0b0e15d96b60b9ff720ae Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Sun, 24 Jun 2018 23:03:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 functions.php | 13 ++++++++-----
 post.php      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/functions.php b/functions.php
index e03f1fe..1763e26 100644
--- a/functions.php
+++ b/functions.php
@@ -2711,7 +2711,7 @@ function show_shop_items($it, $from = 'shop')
  * @param bool $returned
  * @return string
  */
-function showitem($row, $type, $returned = false)
+function showitem($row, $type, $returned = false, $infOnly = false)
 {
     global $user, $runes_exp;
     $returnHTML = '';
@@ -2730,11 +2730,12 @@ function showitem($row, $type, $returned = false)
     $incmagic['cur'] = $row['includemagicdex'];
     $incmagic['max'] = $row['includemagicmax'];
 
-    if (!$row['count'] || $type == 10) {
+    $returnHTML .= '<TR bgcolor="#C7C7C7">';
+    if ((!$row['count'] || $type == 10) && $infOnly == false) {
         $up = ($row['upgrade'] > 0 ? " <b>[" . $row['upgrade'] . "]</b>" : "");
-        $returnHTML .= '<TR bgcolor="#C7C7C7" ><TD align="center" width="100">';
+        $returnHTML .= '<TD align="center" width="100">';
         if ($incmagic['max']) {
-            $returnHTML .= "<img class=\"tooltip\" src='mg2.php?p=" . ($incmagic['cur'] / $incmagic['max'] * 100) . "&i={$row['img']}' style=\"filter:shadow(color=red, direction=90, strength=3);\"><BR>";//<img ".((($row['maxdur']-2)<=$row['duration']  && $dress['duration'] > 2)?" style='background-image:url(i/blink.gif);' ":"")." src='i/sh/{$row['img']}' style=\"margin:0px,0px,-100000%,0px;\"><BR>
+            $returnHTML .= "<img class=\"tooltip\" src='mg2.php?p=" . ($incmagic['cur'] / $incmagic['max'] * 100) . "&i={$row['img']}' style=\"filter:shadow(color=red, direction=90, strength=3);\"><BR>";
         } else {
             $returnHTML .= "<img " . ((($row['maxdur'] - 2) <= $row['duration'] && $dress['duration'] > 2) ? " style='background-image:url(i/blink.gif);' " : "") . " src='i/sh/{$row['img']}'><BR>";
         }
@@ -2777,10 +2778,12 @@ function showitem($row, $type, $returned = false)
             if ($row["koll"] > 1) $returnHTML .= "<a title=\"Разделить\" onclick=\"splitstack('$row[name]','main.php?edit=1&unstack=$row[id]', '$row[img]', 1);return false;\" href=\"javascript:void(0)\"><img border=\"0\" src=\"i/unstack.gif\"></a>&nbsp;";
             $returnHTML .= "<img src=i/clear.gif style=\"cursor:hand;\" onclick=\"delItmsNo('Выкинуть предмет?','deleteItems',0,'','" . $row['img'] . "','" . $row['name'] . "','main.php?edit=1&destruct=" . $row['id'] . "');\"></TD><td>";
         } else {
-            $returnHTML .= "<a href=upgrade_items.php?up=" . $row['id'] . ">Улучшить</a></td><td>";
+            $returnHTML .= "<a href=upgrade_items.php?up=" . $row['id'] . ">Улучшить</a></td>";
         }
     }
 
+    $returnHTML .= "<td>";
+
     if ($row['destinyinv'] > 0) {
         $returnHTML .= "{$row['name']}{$up}<img src=i/align_{$row['nalign']}.gif>&nbsp;(Масса:&nbsp;{$row['massa']})<img src=i/destiny{$row['destinyinv']}.gif alt=\"Этот предмет связан с Вами общей судьбой. Вы не можете передать его кому-либо еще.\"><img src=i/artefact{$row['artefact']}.gif>" . (($row['present']) ? '&nbsp;<IMG SRC="i/podarok.gif" TITLE="Этот предмет вам подарил ' . $row['present'] . '. Вы не сможете передать этот предмет кому-либо еще." ALT="Этот предмет вам подарил ' . $row['present'] . '. Вы не сможете передать этот предмет кому-либо еще.">' : "") . "<BR>";
     } elseif ($row['destiny'] > 0) {
diff --git a/post.php b/post.php
index 0d4669e..b435e72 100644
--- a/post.php
+++ b/post.php
@@ -111,7 +111,7 @@ if ($_SESSION['receiverName']) {
                                 </form>
                             </td>
                             <td valign=top>
-                                <?php echo showitem($row, '',true); ?>
+                                <?php showitem($row, '','',true); ?>
                             </td>
                         </tr>
                     <?php endwhile ?>