lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-24 03:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix enable second icon display error + tag padding

Browse Source
This commit is contained in:
xiaomlove
2022-03-19 16:47:46 +08:00
parent 0578aa3752
commit b926b4ddbd
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Repositories/TagRepository.php
+1 -1
View File
@@ -67,7 +67,7 @@ class TagRepository extends BaseRepository
foreach ($renderIdArr as $tagId) { foreach ($renderIdArr as $tagId) {
$value = $tagKeyById->get($tagId); $value = $tagKeyById->get($tagId);
if ($value) { if ($value) {
$item = "<span style=\"background-color:{$value->color};color:white;border-radius:15%\">{$value->name}</span> "; $item = "<span style=\"background-color:{$value->color};color:white;padding: 1px 2px\">{$value->name}</span> ";
if ($withFilterLink) { if ($withFilterLink) {
$html .= sprintf('<a href="torrents.php?tag_id=%s">%s</a>', $tagId, $item); $html .= sprintf('<a href="torrents.php?tag_id=%s">%s</a>', $tagId, $item);
} else { } else {
include/functions.php
+8 -7
View File
@@ -2241,7 +2241,7 @@ function get_cat_folder($cat = 101)
// $caticonrow = get_category_icon_row($CURUSER['caticon']); // $caticonrow = get_category_icon_row($CURUSER['caticon']);
/** /**
* @since v1.6 * @since v1.6
* use setting, not user's caticon, that filed make no sense! * use setting, not user's caticon, that field make no sense!
*/ */
$caticonrow = get_category_icon_row($catrow['icon_id'] ?: 1); $caticonrow = get_category_icon_row($catrow['icon_id'] ?: 1);
$path = sprintf('category/%s/%s', trim($catmode, '/'), trim($caticonrow['folder'], '/')); $path = sprintf('category/%s/%s', trim($catmode, '/'), trim($caticonrow['folder'], '/'));
@@ -3199,7 +3199,7 @@ foreach ($rows as $row)
if (isset($row["category"])) { if (isset($row["category"])) {
print(return_category_image($row["category"], "?")); print(return_category_image($row["category"], "?"));
if ($has_secondicon){ if ($has_secondicon){
print(get_second_icon($row, "pic/".$catimgurl."additional/")); print(get_second_icon($row));
} }
} }
else else
@@ -3910,7 +3910,7 @@ function get_category_row($catid = NULL)
} }
} }
function get_second_icon($row, $catimgurl) //for CHDBits function get_second_icon($row) //for CHDBits
{ {
global $CURUSER, $Cache; global $CURUSER, $Cache;
$source=$row['source']; $source=$row['source'];
@@ -3920,18 +3920,19 @@ function get_second_icon($row, $catimgurl) //for CHDBits
$processing=$row['processing']; $processing=$row['processing'];
$team=$row['team']; $team=$row['team'];
$audiocodec=$row['audiocodec']; $audiocodec=$row['audiocodec'];
if (!$sirow = $Cache->get_value('secondicon_'.$source.'_'.$medium.'_'.$codec.'_'.$standard.'_'.$processing.'_'.$team.'_'.$audiocodec.'_content')){ $cacheKey = 'secondicon_'.$source.'_'.$medium.'_'.$codec.'_'.$standard.'_'.$processing.'_'.$team.'_'.$audiocodec.'_content';
if (!$sirow = $Cache->get_value($cacheKey)){
$res = sql_query("SELECT * FROM secondicons WHERE (source = ".sqlesc($source)." OR source=0) AND (medium = ".sqlesc($medium)." OR medium=0) AND (codec = ".sqlesc($codec)." OR codec = 0) AND (standard = ".sqlesc($standard)." OR standard = 0) AND (processing = ".sqlesc($processing)." OR processing = 0) AND (team = ".sqlesc($team)." OR team = 0) AND (audiocodec = ".sqlesc($audiocodec)." OR audiocodec = 0) LIMIT 1"); $res = sql_query("SELECT * FROM secondicons WHERE (source = ".sqlesc($source)." OR source=0) AND (medium = ".sqlesc($medium)." OR medium=0) AND (codec = ".sqlesc($codec)." OR codec = 0) AND (standard = ".sqlesc($standard)." OR standard = 0) AND (processing = ".sqlesc($processing)." OR processing = 0) AND (team = ".sqlesc($team)." OR team = 0) AND (audiocodec = ".sqlesc($audiocodec)." OR audiocodec = 0) LIMIT 1");
$sirow = mysql_fetch_array($res); $sirow = mysql_fetch_array($res);
if (!$sirow) if (!$sirow)
$sirow = 'not allowed'; $sirow = 'not allowed';
$Cache->cache_value('secondicon_'.$source.'_'.$medium.'_'.$codec.'_'.$standard.'_'.$processing.'_'.$team.'_'.$audiocodec.'_content', $sirow, 116400); $Cache->cache_value($cacheKey, $sirow, 600);
} }
$catimgurl = get_cat_folder($row['category']); $catimgurl = get_cat_folder($row['category']);
if ($sirow == 'not allowed') if ($sirow == 'not allowed')
return "<img src=\"pic/cattrans.gif\" style=\"background-image: url(pic/". $catimgurl. "additional/notallowed.png);\" alt=\"" . $sirow["name"] . "\" alt=\"Not Allowed\" />"; return "<img src=\"pic/cattrans.gif\" style=\"background-image: url(pic/". $catimgurl. "/additional/notallowed.png);\" title=\"Not Allowed\" alt=\"Not Allowed\" />";
else { else {
return "<img".($sirow['class_name'] ? " class=\"".$sirow['class_name']."\"" : "")." src=\"pic/cattrans.gif\" style=\"background-image: url(pic/". $catimgurl. "additional/". $sirow['image'].");\" alt=\"" . $sirow["name"] . "\" title=\"".$sirow['name']."\" />"; return "<img".($sirow['class_name'] ? " class=\"".$sirow['class_name']."\"" : "")." src=\"pic/cattrans.gif\" style=\"background-image: url(pic/". $catimgurl. "/additional/". $sirow['image'].");\" alt=\"" . $sirow["name"] . "\" title=\"".$sirow['name']."\" />";
} }
} }