tazpkg rev 733
pkgs.cgi: tiny edit
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Dec 29 11:46:12 2014 +0200 (2014-12-29) |
parents | 0c62d7e3cbfb |
children | 3b9ffb4e8793 |
files | tazpanel/pkgs.cgi |
line diff
1.1 --- a/tazpanel/pkgs.cgi Mon Dec 29 05:05:36 2014 +0200 1.2 +++ b/tazpanel/pkgs.cgi Mon Dec 29 11:46:12 2014 +0200 1.3 @@ -498,20 +498,20 @@ 1.4 make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' -vc="$category" ' 1.5 { 1.6 if (PKG && PKG != $1) { 1.7 - if (CAT) { 1.8 + if (SEL) { 1.9 if (DSCL) DSC = DSCL 1.10 printf "<tr><td><input type=\"checkbox\" name=\"pkg\" value=\"%s\"><a class=\"pkg%s%s\" href=\"?info=%s\">%s</a></td><td>%s</td><td>%s</td><td><a href=\"%s\"></a></td></tr>\n", PKG, INS, BLK, gensub(/\+/, "%2B", "g", PKG), PKG, VER, DSC, WEB 1.11 } 1.12 - VER = DSC = WEB = DSCL = INS = BLK = CAT = "" 1.13 + VER = DSC = WEB = DSCL = INS = BLK = SEL = "" 1.14 } 1.15 1.16 PKG = $1 1.17 if (NF == 1) { BLK = "b"; next } 1.18 if (NF == 2) { DSCL = $2; next } 1.19 if (c == "all" || $3 == c) { 1.20 - CAT = c 1.21 - if ($9 == "i") { PKG = $1; VER = $2; DSC = $4; WEB = $5; INS = "i"; next} 1.22 - if (! INS) { PKG = $1; VER = $2; DSC = $4; WEB = $5 } 1.23 + SEL = $1 1.24 + if ($9 == "i") { VER = $2; DSC = $4; WEB = $5; INS = "i"; next} 1.25 + if (! INS) { VER = $2; DSC = $4; WEB = $5 } 1.26 } 1.27 }' > $cached 1.28 page=$(GET page); [ -z "$page" ] && page=1 1.29 @@ -1154,18 +1154,18 @@ 1.30 make_mixed_list | sort -t$'\t' -k1,1 | awk -F$'\t' -vt="$tag" ' 1.31 { 1.32 if (PKG && PKG != $1) { 1.33 - if (TAG) { 1.34 + if (SEL) { 1.35 if (DSCL) DSC = DSCL 1.36 printf "<tr><td><input type=\"checkbox\" name=\"pkg\" value=\"%s\"><a class=\"pkg%s%s\" href=\"?info=%s\">%s</a></td><td>%s</td><td>%s</td><td><a href=\"%s\"></a></td></tr>\n", PKG, INS, BLK, gensub(/\+/, "%2B", "g", PKG), PKG, VER, DSC, WEB 1.37 } 1.38 - VER = DSC = WEB = DSCL = INS = BLK = TAG = "" 1.39 + VER = DSC = WEB = DSCL = INS = BLK = SEL = "" 1.40 } 1.41 1.42 PKG = $1 1.43 if (NF == 1) { BLK = "b"; next } 1.44 if (NF == 2) { DSCL = $2; next } 1.45 if (index(" "$6" ", " "t" ")) { 1.46 - TAG = t 1.47 + SEL = $1 1.48 if ($9 == "i") { VER = $2; DSC = $4; WEB = $5; INS = "i"; next} 1.49 if (! INS) { VER = $2; DSC = $4; WEB = $5 } 1.50 }