From 9ec68cc5d3c72223010bbce79869a24c665151ff Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sat, 19 Mar 2022 19:57:57 +0800
Subject: [PATCH] fix promotion bar display

---
 include/constants.php    |  2 +-
 public/mybar.php         | 18 +++++++++++-------
 public/promotionlink.php |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/constants.php b/include/constants.php
index 18217814..48e8b77f 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,5 +1,5 @@
 <?php
-defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.6.2');
+defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.6.3');
 defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-03-19');
 defined('IN_TRACKER') || define('IN_TRACKER', true);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
diff --git a/public/mybar.php b/public/mybar.php
index 525390fe..56f2af0e 100644
--- a/public/mybar.php
+++ b/public/mybar.php
@@ -7,7 +7,7 @@ if (!$userid)
 	die;
 if (!preg_match("/.*userid=([0-9]+)\.png$/i", $_SERVER['REQUEST_URI']))
 	die;
-if (!$my_img = $Cache->get_value('userbar_'.$_SERVER['REQUEST_URI'])){
+if (!$my_img_string = $Cache->get_value('userbar_'.$_SERVER['REQUEST_URI'])){
 $res = sql_query("SELECT username, uploaded, downloaded, class, privacy FROM users WHERE id=".sqlesc($userid)." LIMIT 1");
 $row = mysql_fetch_array($res);
 if (!$row)
@@ -24,7 +24,7 @@ else{
 $my_img=imagecreatefrompng(getFullDirectory("pic/userbar/".$bgpic.".png"));
 imagealphablending($my_img, false);
 
-if (!$_GET['noname'])
+if (empty($_GET['noname']))
 {
 	if (isset($_GET['namered']) && $_GET['namered']>=0 && $_GET['namered']<=255)
 		$namered = intval($_GET['namered'] ?? 0);
@@ -48,7 +48,7 @@ if (!$_GET['noname'])
 	imagestring($my_img, $namesize, $namex, $namey, $username, $name_colour);
 }
 
-if (!$_GET['noup'])
+if (empty($_GET['noup']))
 {
 	if (isset($_GET['upred']) && $_GET['upred']>=0 && $_GET['upred']<=255)
 		$upred = intval($_GET['upred'] ?? 0);
@@ -72,7 +72,7 @@ if (!$_GET['noup'])
 	imagestring($my_img, $upsize, $upx, $upy, $uploaded, $up_colour);
 }
 
-if (!$_GET['nodown'])
+if (empty($_GET['nodown']))
 {
 	if (isset($_GET['downred']) && $_GET['downred']>=0 && $_GET['downred']<=255)
 		$downred = intval($_GET['downred'] ?? 0);
@@ -96,10 +96,14 @@ if (!$_GET['nodown'])
 	imagestring($my_img, $downsize, $downx, $downy, $downloaded, $down_colour);
 }
 imagesavealpha($my_img, true);
-$Cache->cache_value('userbar_'.$_SERVER['REQUEST_URI'], $my_img, 300);
+ob_start();
+imagepng($my_img);
+$imgContent = ob_get_contents();
+ob_end_clean();
+$my_img_string = gzdeflate($imgContent);
+$Cache->cache_value('userbar_'.$_SERVER['REQUEST_URI'], $my_img_string, 300);
 }
 header("Content-type: image/png");
-imagepng($my_img);
-imagedestroy($my_img);
+echo gzinflate($my_img_string);
 ?>
 
diff --git a/public/promotionlink.php b/public/promotionlink.php
index 5535f6b1..5102d7fa 100644
--- a/public/promotionlink.php
+++ b/public/promotionlink.php
@@ -57,7 +57,7 @@ if (get_user_class() > $userbar_class)
 {
 ?>
 <tr><td class="colfollow"><?php echo $lang_promotionlink['row_bbcode_userbar']?></td><td class="colfollow"><textarea cols="50" rows="4"><?php echo htmlspecialchars("[url=".$yourlink."][img]".get_protocol_prefix() . $BASEURL."/mybar.php?userid=".$CURUSER['id'].".png[/img][/url]")?></textarea></td><td class="colfollow"><div><a href="<?php echo $yourlink?>"><img src="<?php echo get_protocol_prefix() . $BASEURL?>/mybar.php?userid=<?php echo $CURUSER['id']?>.png" /></a></div><div style="padding-top: 10px"><?php echo $lang_promotionlink['text_bbcode_userbar_note']?></div></td></tr>
-<tr><td class="colfollow"><?php echo $lang_promotionlink['row_bbcode_userbar_alt']?></td><td class="colfollow"><textarea cols="50" rows="4"><?php echo htmlspecialchars("[url=".$yourlink."][img]".get_protocol_prefix() . $BASEURL."/cc98bar.php/id".$CURUSER['id'].".png[/img][/url]")?></textarea></td><td class="colfollow"><div><a href="<?php echo $yourlink?>"><img src="<?php echo get_protocol_prefix() . $BASEURL?>/cc98bar.php/id<?php echo $CURUSER['id']?>.png" /></a></div><div style="padding-top: 10px"><?php echo $lang_promotionlink['text_bbcode_userbar_alt_note']?></div></td></tr>
+<!--<tr><td class="colfollow">--><?php //echo $lang_promotionlink['row_bbcode_userbar_alt']?><!--</td><td class="colfollow"><textarea cols="50" rows="4">--><?php //echo htmlspecialchars("[url=".$yourlink."][img]".get_protocol_prefix() . $BASEURL."/cc98bar.php/id".$CURUSER['id'].".png[/img][/url]")?><!--</textarea></td><td class="colfollow"><div><a href="--><?php //echo $yourlink?><!--"><img src="--><?php //echo get_protocol_prefix() . $BASEURL?><!--/cc98bar.php/id--><?php //echo $CURUSER['id']?><!--.png" /></a></div><div style="padding-top: 10px">--><?php //echo $lang_promotionlink['text_bbcode_userbar_alt_note']?><!--</div></td></tr>-->
 <?php
 }
 ?>