From 306994f629c872da27bb062c47e8f513a17262c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B8nstantine=20Kovalensky?= <45331093+kovalensky@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:19:25 +0400 Subject: [PATCH] =?UTF-8?q?Timeline=20=E2=80=94=202.4.1=20(#1340)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bt/announce.php | 28 +++++----- common.php | 2 +- composer.json | 1 + filelist.php | 50 +++++++++++------- library/ajax/thanks.php | 49 ++++++++++------- library/attach_mod/displaying_torrent.php | 17 +++--- library/config.php | 4 +- library/includes/functions.php | 1 + library/language/source/main.php | 3 +- src/Ajax.php | 2 +- src/Legacy/Common/User.php | 7 +++ src/Legacy/Torrent.php | 2 +- src/Legacy/TorrentFileList.php | 28 +--------- .../clients/{Ttorrent.png => tTorrent.png} | Bin styles/images/flags/{AD.SVG => AD.svg} | 0 styles/images/flags/{AE.SVG => AE.svg} | 0 styles/images/flags/{AF.SVG => AF.svg} | 0 styles/images/flags/{AG.SVG => AG.svg} | 0 styles/images/flags/{AI.SVG => AI.svg} | 0 styles/images/flags/{AL.SVG => AL.svg} | 0 styles/images/flags/{AM.SVG => AM.svg} | 0 styles/images/flags/{AO.SVG => AO.svg} | 0 styles/images/flags/{AQ.SVG => AQ.svg} | 0 styles/images/flags/{AR.SVG => AR.svg} | 0 styles/images/flags/{ARAB.SVG => ARAB.svg} | 0 styles/images/flags/{AS.SVG => AS.svg} | 0 styles/images/flags/{AT.SVG => AT.svg} | 0 styles/images/flags/{AU.SVG => AU.svg} | 0 styles/images/flags/{AW.SVG => AW.svg} | 0 styles/images/flags/{AX.SVG => AX.svg} | 0 styles/images/flags/{AZ.SVG => AZ.svg} | 0 styles/images/flags/{BA.SVG => BA.svg} | 0 styles/images/flags/{BB.SVG => BB.svg} | 0 styles/images/flags/{BD.SVG => BD.svg} | 0 styles/images/flags/{BE.SVG => BE.svg} | 0 styles/images/flags/{BF.SVG => BF.svg} | 0 styles/images/flags/{BG.SVG => BG.svg} | 0 styles/images/flags/{BH.SVG => BH.svg} | 0 styles/images/flags/{BI.SVG => BI.svg} | 0 styles/images/flags/{BJ.SVG => BJ.svg} | 0 styles/images/flags/{BL.SVG => BL.svg} | 0 styles/images/flags/{BM.SVG => BM.svg} | 0 styles/images/flags/{BN.SVG => BN.svg} | 0 styles/images/flags/{BO.SVG => BO.svg} | 0 styles/images/flags/{BQ.SVG => BQ.svg} | 0 styles/images/flags/{BR.SVG => BR.svg} | 0 styles/images/flags/{BS.SVG => BS.svg} | 0 styles/images/flags/{BT.SVG => BT.svg} | 0 styles/images/flags/{BV.SVG => BV.svg} | 0 styles/images/flags/{BW.SVG => BW.svg} | 0 styles/images/flags/{BY.SVG => BY.svg} | 0 styles/images/flags/{BZ.SVG => BZ.svg} | 0 styles/images/flags/{CA.SVG => CA.svg} | 0 styles/images/flags/{CC.SVG => CC.svg} | 0 styles/images/flags/{CD.SVG => CD.svg} | 0 styles/images/flags/{CEFTA.SVG => CEFTA.svg} | 0 styles/images/flags/{CF.SVG => CF.svg} | 0 styles/images/flags/{CG.SVG => CG.svg} | 0 styles/images/flags/{CH.SVG => CH.svg} | 0 styles/images/flags/{CI.SVG => CI.svg} | 0 styles/images/flags/{CK.SVG => CK.svg} | 0 styles/images/flags/{CL.SVG => CL.svg} | 0 styles/images/flags/{CM.SVG => CM.svg} | 0 styles/images/flags/{CN.SVG => CN.svg} | 0 styles/images/flags/{CO.SVG => CO.svg} | 0 styles/images/flags/{CP.SVG => CP.svg} | 0 styles/images/flags/{CR.SVG => CR.svg} | 0 styles/images/flags/{CU.SVG => CU.svg} | 0 styles/images/flags/{CV.SVG => CV.svg} | 0 styles/images/flags/{CW.SVG => CW.svg} | 0 styles/images/flags/{CX.SVG => CX.svg} | 0 styles/images/flags/{CY.SVG => CY.svg} | 0 styles/images/flags/{CZ.SVG => CZ.svg} | 0 styles/images/flags/{DE.SVG => DE.svg} | 0 styles/images/flags/{DG.SVG => DG.svg} | 0 styles/images/flags/{DJ.SVG => DJ.svg} | 0 styles/images/flags/{DK.SVG => DK.svg} | 0 styles/images/flags/{DM.SVG => DM.svg} | 0 styles/images/flags/{DO.SVG => DO.svg} | 0 styles/images/flags/{DZ.SVG => DZ.svg} | 0 styles/images/flags/{EAC.SVG => EAC.svg} | 0 styles/images/flags/{EC.SVG => EC.svg} | 0 styles/images/flags/{EE.SVG => EE.svg} | 0 styles/images/flags/{EG.SVG => EG.svg} | 0 styles/images/flags/{EH.SVG => EH.svg} | 0 styles/images/flags/{ER.SVG => ER.svg} | 0 styles/images/flags/{ES-CT.SVG => ES-CT.svg} | 0 styles/images/flags/{ES-GA.SVG => ES-GA.svg} | 0 styles/images/flags/{ES-PV.SVG => ES-PV.svg} | 0 styles/images/flags/{ES.SVG => ES.svg} | 0 styles/images/flags/{ET.SVG => ET.svg} | 0 styles/images/flags/{EU.SVG => EU.svg} | 0 styles/images/flags/{FI.SVG => FI.svg} | 0 styles/images/flags/{FJ.SVG => FJ.svg} | 0 styles/images/flags/{FK.SVG => FK.svg} | 0 styles/images/flags/{FM.SVG => FM.svg} | 0 styles/images/flags/{FO.SVG => FO.svg} | 0 styles/images/flags/{FR.SVG => FR.svg} | 0 styles/images/flags/{GA.SVG => GA.svg} | 0 .../images/flags/{GB-ENG.SVG => GB-ENG.svg} | 0 .../images/flags/{GB-NIR.SVG => GB-NIR.svg} | 0 .../images/flags/{GB-SCT.SVG => GB-SCT.svg} | 0 .../images/flags/{GB-WLS.SVG => GB-WLS.svg} | 0 styles/images/flags/{GB.SVG => GB.svg} | 0 styles/images/flags/{GD.SVG => GD.svg} | 0 styles/images/flags/{GE.SVG => GE.svg} | 0 styles/images/flags/{GF.SVG => GF.svg} | 0 styles/images/flags/{GG.SVG => GG.svg} | 0 styles/images/flags/{GH.SVG => GH.svg} | 0 styles/images/flags/{GI.SVG => GI.svg} | 0 styles/images/flags/{GL.SVG => GL.svg} | 0 styles/images/flags/{GM.SVG => GM.svg} | 0 styles/images/flags/{GN.SVG => GN.svg} | 0 styles/images/flags/{GP.SVG => GP.svg} | 0 styles/images/flags/{GQ.SVG => GQ.svg} | 0 styles/images/flags/{GR.SVG => GR.svg} | 0 styles/images/flags/GR3.svg | 15 ++++++ styles/images/flags/{GS.SVG => GS.svg} | 0 styles/images/flags/{GT.SVG => GT.svg} | 0 styles/images/flags/{GU.SVG => GU.svg} | 0 styles/images/flags/{GW.SVG => GW.svg} | 0 styles/images/flags/{GY.SVG => GY.svg} | 0 styles/images/flags/{HK.SVG => HK.svg} | 0 styles/images/flags/{HM.SVG => HM.svg} | 0 styles/images/flags/{HN.SVG => HN.svg} | 0 styles/images/flags/{HR.SVG => HR.svg} | 0 styles/images/flags/{HT.SVG => HT.svg} | 0 styles/images/flags/{HU.SVG => HU.svg} | 0 styles/images/flags/{IC.SVG => IC.svg} | 0 styles/images/flags/{ID.SVG => ID.svg} | 0 styles/images/flags/{IE.SVG => IE.svg} | 0 styles/images/flags/{IL.SVG => IL.svg} | 0 styles/images/flags/{IM.SVG => IM.svg} | 0 styles/images/flags/{IN.SVG => IN.svg} | 0 styles/images/flags/{IO.SVG => IO.svg} | 0 styles/images/flags/{IQ.SVG => IQ.svg} | 0 styles/images/flags/{IR.SVG => IR.svg} | 0 styles/images/flags/{IS.SVG => IS.svg} | 0 styles/images/flags/{IT.SVG => IT.svg} | 0 styles/images/flags/{JE.SVG => JE.svg} | 0 styles/images/flags/{JM.SVG => JM.svg} | 0 styles/images/flags/{JO.SVG => JO.svg} | 0 styles/images/flags/{JP.SVG => JP.svg} | 0 styles/images/flags/{KE.SVG => KE.svg} | 0 styles/images/flags/{KG.SVG => KG.svg} | 0 styles/images/flags/{KH.SVG => KH.svg} | 0 styles/images/flags/{KI.SVG => KI.svg} | 0 styles/images/flags/{KM.SVG => KM.svg} | 0 styles/images/flags/{KN.SVG => KN.svg} | 0 styles/images/flags/{KP.SVG => KP.svg} | 0 styles/images/flags/{KR.SVG => KR.svg} | 0 styles/images/flags/{KW.SVG => KW.svg} | 0 styles/images/flags/{KY.SVG => KY.svg} | 0 styles/images/flags/{KZ.SVG => KZ.svg} | 0 styles/images/flags/{LA.SVG => LA.svg} | 0 styles/images/flags/{LB.SVG => LB.svg} | 0 styles/images/flags/{LC.SVG => LC.svg} | 0 styles/images/flags/{LI.SVG => LI.svg} | 0 styles/images/flags/{LK.SVG => LK.svg} | 0 styles/images/flags/{LR.SVG => LR.svg} | 0 styles/images/flags/{LS.SVG => LS.svg} | 0 styles/images/flags/{LT.SVG => LT.svg} | 0 styles/images/flags/{LU.SVG => LU.svg} | 0 styles/images/flags/{LV.SVG => LV.svg} | 0 styles/images/flags/{LY.SVG => LY.svg} | 0 styles/images/flags/{MA.SVG => MA.svg} | 0 styles/images/flags/{MC.SVG => MC.svg} | 0 styles/images/flags/{MD.SVG => MD.svg} | 0 styles/images/flags/{ME.SVG => ME.svg} | 0 styles/images/flags/{MF.SVG => MF.svg} | 0 styles/images/flags/{MG.SVG => MG.svg} | 0 styles/images/flags/{MH.SVG => MH.svg} | 0 styles/images/flags/{MK.SVG => MK.svg} | 0 styles/images/flags/{ML.SVG => ML.svg} | 0 styles/images/flags/{MM.SVG => MM.svg} | 0 styles/images/flags/{MN.SVG => MN.svg} | 0 styles/images/flags/{MO.SVG => MO.svg} | 0 styles/images/flags/{MP.SVG => MP.svg} | 0 styles/images/flags/{MQ.SVG => MQ.svg} | 0 styles/images/flags/{MR.SVG => MR.svg} | 0 styles/images/flags/{MS.SVG => MS.svg} | 0 styles/images/flags/{MT.SVG => MT.svg} | 0 styles/images/flags/{MU.SVG => MU.svg} | 0 styles/images/flags/{MV.SVG => MV.svg} | 0 styles/images/flags/{MW.SVG => MW.svg} | 0 styles/images/flags/{MX.SVG => MX.svg} | 0 styles/images/flags/{MY.SVG => MY.svg} | 0 styles/images/flags/{MZ.SVG => MZ.svg} | 0 styles/images/flags/{NA.SVG => NA.svg} | 0 styles/images/flags/{NC.SVG => NC.svg} | 0 styles/images/flags/{NE.SVG => NE.svg} | 0 styles/images/flags/{NF.SVG => NF.svg} | 0 styles/images/flags/{NG.SVG => NG.svg} | 0 styles/images/flags/{NI.SVG => NI.svg} | 0 styles/images/flags/{NL.SVG => NL.svg} | 0 styles/images/flags/{NO.SVG => NO.svg} | 0 styles/images/flags/{NP.SVG => NP.svg} | 0 styles/images/flags/{NR.SVG => NR.svg} | 0 styles/images/flags/{NU.SVG => NU.svg} | 0 styles/images/flags/{NZ.SVG => NZ.svg} | 0 styles/images/flags/{OM.SVG => OM.svg} | 0 styles/images/flags/{PA.SVG => PA.svg} | 0 styles/images/flags/{PC.SVG => PC.svg} | 0 styles/images/flags/{PE.SVG => PE.svg} | 0 styles/images/flags/{PF.SVG => PF.svg} | 0 styles/images/flags/{PG.SVG => PG.svg} | 0 styles/images/flags/{PH.SVG => PH.svg} | 0 styles/images/flags/{PK.SVG => PK.svg} | 0 styles/images/flags/{PL.SVG => PL.svg} | 0 styles/images/flags/{PM.SVG => PM.svg} | 0 styles/images/flags/{PN.SVG => PN.svg} | 0 styles/images/flags/{PR.SVG => PR.svg} | 0 styles/images/flags/{PS.SVG => PS.svg} | 0 styles/images/flags/{PT.SVG => PT.svg} | 0 styles/images/flags/{PW.SVG => PW.svg} | 0 styles/images/flags/{PY.SVG => PY.svg} | 0 styles/images/flags/{QA.SVG => QA.svg} | 0 styles/images/flags/{RE.SVG => RE.svg} | 0 styles/images/flags/{RO.SVG => RO.svg} | 0 styles/images/flags/{RS.SVG => RS.svg} | 0 styles/images/flags/{RU.SVG => RU.svg} | 0 styles/images/flags/{RW.SVG => RW.svg} | 0 styles/images/flags/{SA.SVG => SA.svg} | 0 styles/images/flags/{SB.SVG => SB.svg} | 0 styles/images/flags/{SC.SVG => SC.svg} | 0 styles/images/flags/{SD.SVG => SD.svg} | 0 styles/images/flags/{SE.SVG => SE.svg} | 0 styles/images/flags/{SG.SVG => SG.svg} | 0 styles/images/flags/{SH-AC.SVG => SH-AC.svg} | 0 styles/images/flags/{SH-HL.SVG => SH-HL.svg} | 0 styles/images/flags/{SH-TA.SVG => SH-TA.svg} | 0 styles/images/flags/{SH.SVG => SH.svg} | 0 styles/images/flags/{SI.SVG => SI.svg} | 0 styles/images/flags/{SJ.SVG => SJ.svg} | 0 styles/images/flags/{SK.SVG => SK.svg} | 0 styles/images/flags/{SL.SVG => SL.svg} | 0 styles/images/flags/{SM.SVG => SM.svg} | 0 styles/images/flags/{SN.SVG => SN.svg} | 0 styles/images/flags/{SO.SVG => SO.svg} | 0 styles/images/flags/{SR.SVG => SR.svg} | 0 styles/images/flags/{SS.SVG => SS.svg} | 0 styles/images/flags/{ST.SVG => ST.svg} | 0 styles/images/flags/{SU.SVG => SU.svg} | 0 styles/images/flags/{SV.SVG => SV.svg} | 0 styles/images/flags/{SX.SVG => SX.svg} | 0 styles/images/flags/{SY.SVG => SY.svg} | 0 styles/images/flags/{SZ.SVG => SZ.svg} | 0 styles/images/flags/{TC.SVG => TC.svg} | 0 styles/images/flags/{TD.SVG => TD.svg} | 0 styles/images/flags/{TF.SVG => TF.svg} | 0 styles/images/flags/{TG.SVG => TG.svg} | 0 styles/images/flags/{TH.SVG => TH.svg} | 0 styles/images/flags/{TJ.SVG => TJ.svg} | 0 styles/images/flags/{TK.SVG => TK.svg} | 0 styles/images/flags/{TL.SVG => TL.svg} | 0 styles/images/flags/{TM.SVG => TM.svg} | 0 styles/images/flags/{TN.SVG => TN.svg} | 0 styles/images/flags/{TO.SVG => TO.svg} | 0 styles/images/flags/{TR.SVG => TR.svg} | 0 styles/images/flags/{TT.SVG => TT.svg} | 0 styles/images/flags/{TV.SVG => TV.svg} | 0 styles/images/flags/{TW.SVG => TW.svg} | 0 styles/images/flags/{TZ.SVG => TZ.svg} | 0 styles/images/flags/{UA.SVG => UA.svg} | 0 styles/images/flags/{UG.SVG => UG.svg} | 0 styles/images/flags/{UM.SVG => UM.svg} | 0 styles/images/flags/{UN.SVG => UN.svg} | 0 styles/images/flags/{US.SVG => US.svg} | 0 styles/images/flags/{UY.SVG => UY.svg} | 0 styles/images/flags/{UZ.SVG => UZ.svg} | 0 styles/images/flags/{VA.SVG => VA.svg} | 0 styles/images/flags/{VC.SVG => VC.svg} | 0 styles/images/flags/{VE.SVG => VE.svg} | 0 styles/images/flags/{VG.SVG => VG.svg} | 0 styles/images/flags/{VI.SVG => VI.svg} | 0 styles/images/flags/{VN.SVG => VN.svg} | 0 styles/images/flags/{VU.SVG => VU.svg} | 0 styles/images/flags/{WF.SVG => WF.svg} | 0 styles/images/flags/{WS.SVG => WS.svg} | 0 styles/images/flags/{XK.SVG => XK.svg} | 0 styles/images/flags/{XX.SVG => XX.svg} | 0 styles/images/flags/{YE.SVG => YE.svg} | 0 styles/images/flags/{YT.SVG => YT.svg} | 0 styles/images/flags/{ZA.SVG => ZA.svg} | 0 styles/images/flags/{ZM.SVG => ZM.svg} | 0 styles/images/flags/{ZW.SVG => ZW.svg} | 0 styles/images/flags/gg.bat | 1 + styles/images/t_info.png | Bin 0 -> 916 bytes styles/templates/default/css/globals.css | 5 +- styles/templates/default/css/normalize.css | 1 + styles/templates/default/css/top.css | 2 +- styles/templates/default/usercp_register.tpl | 2 +- styles/templates/default/viewtopic_attach.tpl | 7 ++- tracker.php | 2 +- viewforum.php | 2 +- 295 files changed, 130 insertions(+), 101 deletions(-) rename styles/images/clients/{Ttorrent.png => tTorrent.png} (100%) rename styles/images/flags/{AD.SVG => AD.svg} (100%) rename styles/images/flags/{AE.SVG => AE.svg} (100%) rename styles/images/flags/{AF.SVG => AF.svg} (100%) rename styles/images/flags/{AG.SVG => AG.svg} (100%) rename styles/images/flags/{AI.SVG => AI.svg} (100%) rename styles/images/flags/{AL.SVG => AL.svg} (100%) rename styles/images/flags/{AM.SVG => AM.svg} (100%) rename styles/images/flags/{AO.SVG => AO.svg} (100%) rename styles/images/flags/{AQ.SVG => AQ.svg} (100%) rename styles/images/flags/{AR.SVG => AR.svg} (100%) rename styles/images/flags/{ARAB.SVG => ARAB.svg} (100%) rename styles/images/flags/{AS.SVG => AS.svg} (100%) rename styles/images/flags/{AT.SVG => AT.svg} (100%) rename styles/images/flags/{AU.SVG => AU.svg} (100%) rename styles/images/flags/{AW.SVG => AW.svg} (100%) rename styles/images/flags/{AX.SVG => AX.svg} (100%) rename styles/images/flags/{AZ.SVG => AZ.svg} (100%) rename styles/images/flags/{BA.SVG => BA.svg} (100%) rename styles/images/flags/{BB.SVG => BB.svg} (100%) rename styles/images/flags/{BD.SVG => BD.svg} (100%) rename styles/images/flags/{BE.SVG => BE.svg} (100%) rename styles/images/flags/{BF.SVG => BF.svg} (100%) rename styles/images/flags/{BG.SVG => BG.svg} (100%) rename styles/images/flags/{BH.SVG => BH.svg} (100%) rename styles/images/flags/{BI.SVG => BI.svg} (100%) rename styles/images/flags/{BJ.SVG => BJ.svg} (100%) rename styles/images/flags/{BL.SVG => BL.svg} (100%) rename styles/images/flags/{BM.SVG => BM.svg} (100%) rename styles/images/flags/{BN.SVG => BN.svg} (100%) rename styles/images/flags/{BO.SVG => BO.svg} (100%) rename styles/images/flags/{BQ.SVG => BQ.svg} (100%) rename styles/images/flags/{BR.SVG => BR.svg} (100%) rename styles/images/flags/{BS.SVG => BS.svg} (100%) rename styles/images/flags/{BT.SVG => BT.svg} (100%) rename styles/images/flags/{BV.SVG => BV.svg} (100%) rename styles/images/flags/{BW.SVG => BW.svg} (100%) rename styles/images/flags/{BY.SVG => BY.svg} (100%) rename styles/images/flags/{BZ.SVG => BZ.svg} (100%) rename styles/images/flags/{CA.SVG => CA.svg} (100%) rename styles/images/flags/{CC.SVG => CC.svg} (100%) rename styles/images/flags/{CD.SVG => CD.svg} (100%) rename styles/images/flags/{CEFTA.SVG => CEFTA.svg} (100%) rename styles/images/flags/{CF.SVG => CF.svg} (100%) rename styles/images/flags/{CG.SVG => CG.svg} (100%) rename styles/images/flags/{CH.SVG => CH.svg} (100%) rename styles/images/flags/{CI.SVG => CI.svg} (100%) rename styles/images/flags/{CK.SVG => CK.svg} (100%) rename styles/images/flags/{CL.SVG => CL.svg} (100%) rename styles/images/flags/{CM.SVG => CM.svg} (100%) rename styles/images/flags/{CN.SVG => CN.svg} (100%) rename styles/images/flags/{CO.SVG => CO.svg} (100%) rename styles/images/flags/{CP.SVG => CP.svg} (100%) rename styles/images/flags/{CR.SVG => CR.svg} (100%) rename styles/images/flags/{CU.SVG => CU.svg} (100%) rename styles/images/flags/{CV.SVG => CV.svg} (100%) rename styles/images/flags/{CW.SVG => CW.svg} (100%) rename styles/images/flags/{CX.SVG => CX.svg} (100%) rename styles/images/flags/{CY.SVG => CY.svg} (100%) rename styles/images/flags/{CZ.SVG => CZ.svg} (100%) rename styles/images/flags/{DE.SVG => DE.svg} (100%) rename styles/images/flags/{DG.SVG => DG.svg} (100%) rename styles/images/flags/{DJ.SVG => DJ.svg} (100%) rename styles/images/flags/{DK.SVG => DK.svg} (100%) rename styles/images/flags/{DM.SVG => DM.svg} (100%) rename styles/images/flags/{DO.SVG => DO.svg} (100%) rename styles/images/flags/{DZ.SVG => DZ.svg} (100%) rename styles/images/flags/{EAC.SVG => EAC.svg} (100%) rename styles/images/flags/{EC.SVG => EC.svg} (100%) rename styles/images/flags/{EE.SVG => EE.svg} (100%) rename styles/images/flags/{EG.SVG => EG.svg} (100%) rename styles/images/flags/{EH.SVG => EH.svg} (100%) rename styles/images/flags/{ER.SVG => ER.svg} (100%) rename styles/images/flags/{ES-CT.SVG => ES-CT.svg} (100%) rename styles/images/flags/{ES-GA.SVG => ES-GA.svg} (100%) rename styles/images/flags/{ES-PV.SVG => ES-PV.svg} (100%) rename styles/images/flags/{ES.SVG => ES.svg} (100%) rename styles/images/flags/{ET.SVG => ET.svg} (100%) rename styles/images/flags/{EU.SVG => EU.svg} (100%) rename styles/images/flags/{FI.SVG => FI.svg} (100%) rename styles/images/flags/{FJ.SVG => FJ.svg} (100%) rename styles/images/flags/{FK.SVG => FK.svg} (100%) rename styles/images/flags/{FM.SVG => FM.svg} (100%) rename styles/images/flags/{FO.SVG => FO.svg} (100%) rename styles/images/flags/{FR.SVG => FR.svg} (100%) rename styles/images/flags/{GA.SVG => GA.svg} (100%) rename styles/images/flags/{GB-ENG.SVG => GB-ENG.svg} (100%) rename styles/images/flags/{GB-NIR.SVG => GB-NIR.svg} (100%) rename styles/images/flags/{GB-SCT.SVG => GB-SCT.svg} (100%) rename styles/images/flags/{GB-WLS.SVG => GB-WLS.svg} (100%) rename styles/images/flags/{GB.SVG => GB.svg} (100%) rename styles/images/flags/{GD.SVG => GD.svg} (100%) rename styles/images/flags/{GE.SVG => GE.svg} (100%) rename styles/images/flags/{GF.SVG => GF.svg} (100%) rename styles/images/flags/{GG.SVG => GG.svg} (100%) rename styles/images/flags/{GH.SVG => GH.svg} (100%) rename styles/images/flags/{GI.SVG => GI.svg} (100%) rename styles/images/flags/{GL.SVG => GL.svg} (100%) rename styles/images/flags/{GM.SVG => GM.svg} (100%) rename styles/images/flags/{GN.SVG => GN.svg} (100%) rename styles/images/flags/{GP.SVG => GP.svg} (100%) rename styles/images/flags/{GQ.SVG => GQ.svg} (100%) rename styles/images/flags/{GR.SVG => GR.svg} (100%) create mode 100644 styles/images/flags/GR3.svg rename styles/images/flags/{GS.SVG => GS.svg} (100%) rename styles/images/flags/{GT.SVG => GT.svg} (100%) rename styles/images/flags/{GU.SVG => GU.svg} (100%) rename styles/images/flags/{GW.SVG => GW.svg} (100%) rename styles/images/flags/{GY.SVG => GY.svg} (100%) rename styles/images/flags/{HK.SVG => HK.svg} (100%) rename styles/images/flags/{HM.SVG => HM.svg} (100%) rename styles/images/flags/{HN.SVG => HN.svg} (100%) rename styles/images/flags/{HR.SVG => HR.svg} (100%) rename styles/images/flags/{HT.SVG => HT.svg} (100%) rename styles/images/flags/{HU.SVG => HU.svg} (100%) rename styles/images/flags/{IC.SVG => IC.svg} (100%) rename styles/images/flags/{ID.SVG => ID.svg} (100%) rename styles/images/flags/{IE.SVG => IE.svg} (100%) rename styles/images/flags/{IL.SVG => IL.svg} (100%) rename styles/images/flags/{IM.SVG => IM.svg} (100%) rename styles/images/flags/{IN.SVG => IN.svg} (100%) rename styles/images/flags/{IO.SVG => IO.svg} (100%) rename styles/images/flags/{IQ.SVG => IQ.svg} (100%) rename styles/images/flags/{IR.SVG => IR.svg} (100%) rename styles/images/flags/{IS.SVG => IS.svg} (100%) rename styles/images/flags/{IT.SVG => IT.svg} (100%) rename styles/images/flags/{JE.SVG => JE.svg} (100%) rename styles/images/flags/{JM.SVG => JM.svg} (100%) rename styles/images/flags/{JO.SVG => JO.svg} (100%) rename styles/images/flags/{JP.SVG => JP.svg} (100%) rename styles/images/flags/{KE.SVG => KE.svg} (100%) rename styles/images/flags/{KG.SVG => KG.svg} (100%) rename styles/images/flags/{KH.SVG => KH.svg} (100%) rename styles/images/flags/{KI.SVG => KI.svg} (100%) rename styles/images/flags/{KM.SVG => KM.svg} (100%) rename styles/images/flags/{KN.SVG => KN.svg} (100%) rename styles/images/flags/{KP.SVG => KP.svg} (100%) rename styles/images/flags/{KR.SVG => KR.svg} (100%) rename styles/images/flags/{KW.SVG => KW.svg} (100%) rename styles/images/flags/{KY.SVG => KY.svg} (100%) rename styles/images/flags/{KZ.SVG => KZ.svg} (100%) rename styles/images/flags/{LA.SVG => LA.svg} (100%) rename styles/images/flags/{LB.SVG => LB.svg} (100%) rename styles/images/flags/{LC.SVG => LC.svg} (100%) rename styles/images/flags/{LI.SVG => LI.svg} (100%) rename styles/images/flags/{LK.SVG => LK.svg} (100%) rename styles/images/flags/{LR.SVG => LR.svg} (100%) rename styles/images/flags/{LS.SVG => LS.svg} (100%) rename styles/images/flags/{LT.SVG => LT.svg} (100%) rename styles/images/flags/{LU.SVG => LU.svg} (100%) rename styles/images/flags/{LV.SVG => LV.svg} (100%) rename styles/images/flags/{LY.SVG => LY.svg} (100%) rename styles/images/flags/{MA.SVG => MA.svg} (100%) rename styles/images/flags/{MC.SVG => MC.svg} (100%) rename styles/images/flags/{MD.SVG => MD.svg} (100%) rename styles/images/flags/{ME.SVG => ME.svg} (100%) rename styles/images/flags/{MF.SVG => MF.svg} (100%) rename styles/images/flags/{MG.SVG => MG.svg} (100%) rename styles/images/flags/{MH.SVG => MH.svg} (100%) rename styles/images/flags/{MK.SVG => MK.svg} (100%) rename styles/images/flags/{ML.SVG => ML.svg} (100%) rename styles/images/flags/{MM.SVG => MM.svg} (100%) rename styles/images/flags/{MN.SVG => MN.svg} (100%) rename styles/images/flags/{MO.SVG => MO.svg} (100%) rename styles/images/flags/{MP.SVG => MP.svg} (100%) rename styles/images/flags/{MQ.SVG => MQ.svg} (100%) rename styles/images/flags/{MR.SVG => MR.svg} (100%) rename styles/images/flags/{MS.SVG => MS.svg} (100%) rename styles/images/flags/{MT.SVG => MT.svg} (100%) rename styles/images/flags/{MU.SVG => MU.svg} (100%) rename styles/images/flags/{MV.SVG => MV.svg} (100%) rename styles/images/flags/{MW.SVG => MW.svg} (100%) rename styles/images/flags/{MX.SVG => MX.svg} (100%) rename styles/images/flags/{MY.SVG => MY.svg} (100%) rename styles/images/flags/{MZ.SVG => MZ.svg} (100%) rename styles/images/flags/{NA.SVG => NA.svg} (100%) rename styles/images/flags/{NC.SVG => NC.svg} (100%) rename styles/images/flags/{NE.SVG => NE.svg} (100%) rename styles/images/flags/{NF.SVG => NF.svg} (100%) rename styles/images/flags/{NG.SVG => NG.svg} (100%) rename styles/images/flags/{NI.SVG => NI.svg} (100%) rename styles/images/flags/{NL.SVG => NL.svg} (100%) rename styles/images/flags/{NO.SVG => NO.svg} (100%) rename styles/images/flags/{NP.SVG => NP.svg} (100%) rename styles/images/flags/{NR.SVG => NR.svg} (100%) rename styles/images/flags/{NU.SVG => NU.svg} (100%) rename styles/images/flags/{NZ.SVG => NZ.svg} (100%) rename styles/images/flags/{OM.SVG => OM.svg} (100%) rename styles/images/flags/{PA.SVG => PA.svg} (100%) rename styles/images/flags/{PC.SVG => PC.svg} (100%) rename styles/images/flags/{PE.SVG => PE.svg} (100%) rename styles/images/flags/{PF.SVG => PF.svg} (100%) rename styles/images/flags/{PG.SVG => PG.svg} (100%) rename styles/images/flags/{PH.SVG => PH.svg} (100%) rename styles/images/flags/{PK.SVG => PK.svg} (100%) rename styles/images/flags/{PL.SVG => PL.svg} (100%) rename styles/images/flags/{PM.SVG => PM.svg} (100%) rename styles/images/flags/{PN.SVG => PN.svg} (100%) rename styles/images/flags/{PR.SVG => PR.svg} (100%) rename styles/images/flags/{PS.SVG => PS.svg} (100%) rename styles/images/flags/{PT.SVG => PT.svg} (100%) rename styles/images/flags/{PW.SVG => PW.svg} (100%) rename styles/images/flags/{PY.SVG => PY.svg} (100%) rename styles/images/flags/{QA.SVG => QA.svg} (100%) rename styles/images/flags/{RE.SVG => RE.svg} (100%) rename styles/images/flags/{RO.SVG => RO.svg} (100%) rename styles/images/flags/{RS.SVG => RS.svg} (100%) rename styles/images/flags/{RU.SVG => RU.svg} (100%) rename styles/images/flags/{RW.SVG => RW.svg} (100%) rename styles/images/flags/{SA.SVG => SA.svg} (100%) rename styles/images/flags/{SB.SVG => SB.svg} (100%) rename styles/images/flags/{SC.SVG => SC.svg} (100%) rename styles/images/flags/{SD.SVG => SD.svg} (100%) rename styles/images/flags/{SE.SVG => SE.svg} (100%) rename styles/images/flags/{SG.SVG => SG.svg} (100%) rename styles/images/flags/{SH-AC.SVG => SH-AC.svg} (100%) rename styles/images/flags/{SH-HL.SVG => SH-HL.svg} (100%) rename styles/images/flags/{SH-TA.SVG => SH-TA.svg} (100%) rename styles/images/flags/{SH.SVG => SH.svg} (100%) rename styles/images/flags/{SI.SVG => SI.svg} (100%) rename styles/images/flags/{SJ.SVG => SJ.svg} (100%) rename styles/images/flags/{SK.SVG => SK.svg} (100%) rename styles/images/flags/{SL.SVG => SL.svg} (100%) rename styles/images/flags/{SM.SVG => SM.svg} (100%) rename styles/images/flags/{SN.SVG => SN.svg} (100%) rename styles/images/flags/{SO.SVG => SO.svg} (100%) rename styles/images/flags/{SR.SVG => SR.svg} (100%) rename styles/images/flags/{SS.SVG => SS.svg} (100%) rename styles/images/flags/{ST.SVG => ST.svg} (100%) rename styles/images/flags/{SU.SVG => SU.svg} (100%) rename styles/images/flags/{SV.SVG => SV.svg} (100%) rename styles/images/flags/{SX.SVG => SX.svg} (100%) rename styles/images/flags/{SY.SVG => SY.svg} (100%) rename styles/images/flags/{SZ.SVG => SZ.svg} (100%) rename styles/images/flags/{TC.SVG => TC.svg} (100%) rename styles/images/flags/{TD.SVG => TD.svg} (100%) rename styles/images/flags/{TF.SVG => TF.svg} (100%) rename styles/images/flags/{TG.SVG => TG.svg} (100%) rename styles/images/flags/{TH.SVG => TH.svg} (100%) rename styles/images/flags/{TJ.SVG => TJ.svg} (100%) rename styles/images/flags/{TK.SVG => TK.svg} (100%) rename styles/images/flags/{TL.SVG => TL.svg} (100%) rename styles/images/flags/{TM.SVG => TM.svg} (100%) rename styles/images/flags/{TN.SVG => TN.svg} (100%) rename styles/images/flags/{TO.SVG => TO.svg} (100%) rename styles/images/flags/{TR.SVG => TR.svg} (100%) rename styles/images/flags/{TT.SVG => TT.svg} (100%) rename styles/images/flags/{TV.SVG => TV.svg} (100%) rename styles/images/flags/{TW.SVG => TW.svg} (100%) rename styles/images/flags/{TZ.SVG => TZ.svg} (100%) rename styles/images/flags/{UA.SVG => UA.svg} (100%) rename styles/images/flags/{UG.SVG => UG.svg} (100%) rename styles/images/flags/{UM.SVG => UM.svg} (100%) rename styles/images/flags/{UN.SVG => UN.svg} (100%) rename styles/images/flags/{US.SVG => US.svg} (100%) rename styles/images/flags/{UY.SVG => UY.svg} (100%) rename styles/images/flags/{UZ.SVG => UZ.svg} (100%) rename styles/images/flags/{VA.SVG => VA.svg} (100%) rename styles/images/flags/{VC.SVG => VC.svg} (100%) rename styles/images/flags/{VE.SVG => VE.svg} (100%) rename styles/images/flags/{VG.SVG => VG.svg} (100%) rename styles/images/flags/{VI.SVG => VI.svg} (100%) rename styles/images/flags/{VN.SVG => VN.svg} (100%) rename styles/images/flags/{VU.SVG => VU.svg} (100%) rename styles/images/flags/{WF.SVG => WF.svg} (100%) rename styles/images/flags/{WS.SVG => WS.svg} (100%) rename styles/images/flags/{XK.SVG => XK.svg} (100%) rename styles/images/flags/{XX.SVG => XX.svg} (100%) rename styles/images/flags/{YE.SVG => YE.svg} (100%) rename styles/images/flags/{YT.SVG => YT.svg} (100%) rename styles/images/flags/{ZA.SVG => ZA.svg} (100%) rename styles/images/flags/{ZM.SVG => ZM.svg} (100%) rename styles/images/flags/{ZW.SVG => ZW.svg} (100%) create mode 100644 styles/images/flags/gg.bat create mode 100644 styles/images/t_info.png diff --git a/bt/announce.php b/bt/announce.php index 4a6c48415..29a2f4001 100644 --- a/bt/announce.php +++ b/bt/announce.php @@ -82,7 +82,7 @@ if (!isset($info_hash)) { $info_hash_hex = bin2hex($info_hash); // Store peer id -$peer_id_sql = rtrim(DB()->escape(preg_replace('/[^a-zA-Z0-9\-\_]/', '', $peer_id)), ' '); +$peer_id_sql = preg_replace('/[^a-zA-Z0-9\-\_]/', '', $peer_id); // Check info_hash length if (strlen($info_hash) !== 20) { @@ -108,17 +108,15 @@ if (!isset($left) || $left < 0) { // IP $ip = $_SERVER['REMOTE_ADDR']; +// 'ip' query handling if (!$bb_cfg['ignore_reported_ip'] && isset($_GET['ip']) && $ip !== $_GET['ip']) { - if (!$bb_cfg['verify_reported_ip']) { - $ip = $_GET['ip']; - } elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && preg_match_all('#\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}#', $_SERVER['HTTP_X_FORWARDED_FOR'], $matches)) { - foreach ($matches[0] as $x_ip) { - if ($x_ip === $_GET['ip']) { - if (!$bb_cfg['allow_internal_ip'] && preg_match("#(127\.([0-9]{1,3}\.){2}[0-9]{1,3}|10\.([0-9]{1,3}\.){2}[0-9]{1,3}|172\.[123][0-9]\.[0-9]{1,3}\.[0-9]{1,3}|192\.168\.[0-9]{1,3}\.[0-9]{1,3})#", $x_ip)) { - break; - } - $ip = $x_ip; - break; + if (!$bb_cfg['verify_reported_ip'] && isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { + $x_ip = $_SERVER['HTTP_X_FORWARDED_FOR']; + + if ($x_ip === $_GET['ip']) { + $filteredIp = filter_var($x_ip, FILTER_VALIDATE_IP); + if ($filteredIp !== false && ($bb_cfg['allow_internal_ip'] || !filter_var($filteredIp, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE))) { + $ip = $filteredIp; } } } @@ -216,7 +214,12 @@ if ($lp_info) { // Check hybrid status if (!empty($row['info_hash']) && !empty($row['info_hash_v2'])) { - if ($info_hash !== $row['info_hash']) { // Change this to substr($row['info_hash_v2'], 0, 20) in the future for updating statistics, in case of v2 torrents being prioritized. + $stat_protocol = match($bb_cfg['tracker']['hybrid_stat_protocol']) { + 1 => $row['info_hash'], + 2 => substr($row['info_hash_v2'], 0, 20), + default => $row['info_hash'] + }; + if ($info_hash !== $stat_protocol) { $hybrid_unrecord = true; // This allows us to announce only for one info-hash } } @@ -450,7 +453,6 @@ if (!$output) { $output = [ 'interval' => (int)$announce_interval, - 'min interval' => (int)$announce_interval, 'complete' => (int)$seeders, 'incomplete' => (int)$leechers, 'downloaded' => (int)$client_completed, diff --git a/common.php b/common.php index 3ba700bd2..a60d45e00 100644 --- a/common.php +++ b/common.php @@ -44,7 +44,7 @@ date_default_timezone_set('UTC'); // Set remote address $allowedCDNs = ['HTTP_X_FORWARDED_FOR', 'HTTP_FASTLY_CLIENT_IP', 'HTTP_CF_CONNECTING_IP']; foreach ($allowedCDNs as $allowedCDN) { - if (isset($_SERVER[$allowedCDN]) && filter_var($_SERVER[$allowedCDN], FILTER_VALIDATE_IP)) { + if (isset($_SERVER[$allowedCDN]) && filter_var($_SERVER[$allowedCDN], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { $_SERVER['REMOTE_ADDR'] = $_SERVER[$allowedCDN]; } } diff --git a/composer.json b/composer.json index aa8c85a5d..2e678e70c 100644 --- a/composer.json +++ b/composer.json @@ -47,6 +47,7 @@ "ext-xml": "*", "ext-xmlwriter": "*", "arokettu/bencode": "^4.1.0", + "arokettu/torrent-file": "^5.2.1", "bugsnag/bugsnag": "^v3.29.1", "claviska/simpleimage": "^4.0", "egulias/email-validator": "^4.0.1", diff --git a/filelist.php b/filelist.php index 90697d7e6..9ae8bff4c 100644 --- a/filelist.php +++ b/filelist.php @@ -35,9 +35,10 @@ if (empty($row) || empty($row['physical_filename'])) { bb_simple_die($lang['INVALID_TOPIC_ID_DB'], 404); } -if (empty($row['info_hash_v2'])) { - bb_simple_die($lang['BT_V2_FLIST_ONLY'], 410); -} +// Method fields +$t_version_field = !empty($row['info_hash_v2']) ? 'v2' : 'v1'; +$t_files_field = ($t_version_field === 'v2') ? 'getFileTree' : 'getFiles'; +$t_hash_field = ($t_version_field === 'v2') ? 'piecesRoot' : 'sha1'; $file_path = get_attachments_dir() . '/' . $row['physical_filename']; @@ -48,32 +49,44 @@ if (!is_file($file_path)) { $file_contents = file_get_contents($file_path); if ($bb_cfg['flist_max_files']) { - $filetree_pos = strpos($file_contents, '9:file tree'); + $filetree_pos = !empty($row['info_hash_v2']) ? strpos($file_contents, '9:file tree') : false; $files_pos = !empty($row['info_hash']) ? strpos($file_contents, '5:files', $filetree_pos) : false; - $file_count = substr_count($file_contents, '6:length', $filetree_pos, ($files_pos ? ($files_pos - $filetree_pos) : null)); + + if ($filetree_pos) { + $file_count = substr_count($file_contents, '6:length', $filetree_pos, ($files_pos ? ($files_pos - $filetree_pos) : null)); + } + else { + $file_count = substr_count($file_contents, '6:length', $files_pos); + } if ($file_count > $bb_cfg['flist_max_files']) { - bb_simple_die(sprintf($lang['BT_V2_FLIST_LIMIT'], $bb_cfg['flist_max_files'], $file_count), 410); + bb_simple_die(sprintf($lang['BT_FLIST_LIMIT'], $bb_cfg['flist_max_files'], $file_count), 410); } } try { - $torrent = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY); + $torrent = \Arokettu\Torrent\TorrentFile::loadFromString($file_contents); } catch (\Exception $e) { bb_simple_die(htmlCHR("{$lang['TORFILE_INVALID']}: {$e->getMessage()}"), 410); } -if (isset($torrent['info']['private']) && IS_GUEST) { +if ($torrent->isPrivate() && IS_GUEST) { bb_simple_die($lang['BT_PRIVATE_TORRENT'], 403); } -$files = (new TorrentPier\Legacy\TorrentFileList($torrent))->fileTreeTable($torrent['info']['file tree']); +$files = $torrent->$t_version_field()->$t_files_field(); + +$allFiles = ''; +foreach ($files as $file) { + $allFiles .= '' . clean_tor_dirname(implode('/', $file->path)) . '' . humn_size($file->length, 2) . '' . ($t_hash_field === 'sha1' ? 'SHA1: ' : '') . $file->$t_hash_field . ''; +} $data = [ - 'name' => isset($torrent['info']['name']) ? htmlCHR(substr($torrent['info']['name'], 0, 255)) : 'undefined', - 'client' => isset($torrent['created by']) ? htmlCHR(substr($torrent['created by'], 0, 20)) : 'unknown client', - 'date' => (isset($torrent['creation date']) && is_numeric($torrent['creation date'])) ? date('d-M-Y H:i (e)', $torrent['creation date']) : 'unknown', - 'size' => humn_size($row['size']), + 'name' => !empty($t_name = $torrent->getName()) ? htmlCHR(substr($t_name, 0, 255)) : 'undefined', + 'client' => !empty($creator = $torrent->getCreatedBy()) ? htmlCHR(substr($creator, 0, 20)) : 'unknown client', + 'date' => (!empty($creation_date = $torrent->getCreationDate()->getTimestamp()) && is_numeric($creation_date)) ? date('d-M-Y H:i (e)', $creation_date) : 'unknown', + 'size' => humn_size($row['size'], 2), + 'file_count' => count($files), 'site_url' => FULL_URL, 'topic_url' => TOPIC_URL . $topic_id, ]; @@ -174,7 +187,7 @@ sup {
- + -EOF; - -echo $files['list']; - -echo ' +$allFiles
Path ({$files['count']} files)Path ({$data['file_count']} files) Size BTMR hash @@ -186,15 +199,12 @@ sup {

Generated by TorrentPier

-'; + +EOF; die(); diff --git a/library/ajax/thanks.php b/library/ajax/thanks.php index 272d89d8e..963ada63c 100644 --- a/library/ajax/thanks.php +++ b/library/ajax/thanks.php @@ -27,32 +27,41 @@ if (!$topic_id = (int)$this->request['topic_id']) { switch ($mode) { case 'add': - if (DB()->fetch_row('SELECT poster_id FROM ' . BB_BT_TORRENTS . " WHERE topic_id = $topic_id AND poster_id = " . $userdata['user_id'])) { - $this->ajax_die($lang['LIKE_OWN_POST']); - } + if (!IS_GUEST) { + if (DB()->fetch_row('SELECT poster_id FROM ' . BB_BT_TORRENTS . " WHERE topic_id = $topic_id AND poster_id = " . $userdata['user_id'])) { + $this->ajax_die($lang['LIKE_OWN_POST']); + } - if (DB()->fetch_row('SELECT topic_id FROM ' . BB_THX . " WHERE topic_id = $topic_id AND user_id = " . $userdata['user_id'])) { - $this->ajax_die($lang['LIKE_ALREADY']); - } + if (DB()->fetch_row('SELECT topic_id FROM ' . BB_THX . " WHERE topic_id = $topic_id AND user_id = " . $userdata['user_id'])) { + $this->ajax_die($lang['LIKE_ALREADY']); + } - $columns = 'topic_id, user_id, time'; - $values = "$topic_id, {$userdata['user_id']}, " . TIMENOW; - DB()->query('INSERT IGNORE INTO ' . BB_THX . " ($columns) VALUES ($values)"); - break; + $columns = 'topic_id, user_id, time'; + $values = "$topic_id, {$userdata['user_id']}, " . TIMENOW; + DB()->query('INSERT IGNORE INTO ' . BB_THX . " ($columns) VALUES ($values)"); + break; + } + else { + $this->ajax_die($lang['NEED_TO_LOGIN_FIRST']); + } case 'get': - $sql = DB()->fetch_rowset('SELECT u.username, u.user_rank, u.user_id, t.* FROM ' . BB_THX . ' t, ' . BB_USERS . " u WHERE t.topic_id = $topic_id AND t.user_id = u.user_id"); + if (!IS_GUEST || $bb_cfg['tor_thanks_list_guests']) { + $sql = DB()->fetch_rowset('SELECT u.username, u.user_rank, u.user_id, t.* FROM ' . BB_THX . ' t, ' . BB_USERS . " u WHERE t.topic_id = $topic_id AND t.user_id = u.user_id"); - $user_list = []; - foreach ($sql as $row) { - $user_list[] = '' . profile_url($row) . ' (' . bb_date($row['time']) . ')'; + $user_list = []; + foreach ($sql as $row) { + $user_list[] = '' . profile_url($row) . ' (' . bb_date($row['time']) . ')'; + } + + $this->response['html'] = join(', ', $user_list) ?: $lang['NO_LIKES']; + break; } - - $this->response['html'] = join(', ', $user_list) ?: $lang['NO_LIKES']; - break; - - default: - $this->ajax_die('Invalid mode: ' . $mode); + else { + $this->ajax_die($lang['NEED_TO_LOGIN_FIRST']); + } + default: + $this->ajax_die('Invalid mode: ' . $mode); } $this->response['mode'] = $mode; diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php index 8cfa32d7e..fc425855c 100644 --- a/library/attach_mod/displaying_torrent.php +++ b/library/attach_mod/displaying_torrent.php @@ -217,10 +217,10 @@ if ($tor_reged && $tor_info) { 'MAGNET' => $tor_magnet, 'HASH' => !empty($tor_info['info_hash']) ? strtoupper(bin2hex($tor_info['info_hash'])) : false, 'HASH_V2' => !empty($tor_info['info_hash_v2']) ? strtoupper(bin2hex($tor_info['info_hash_v2'])) : false, - 'FILELIST_LINK' => !empty($tor_info['info_hash_v2']) ? (FILELIST_URL . $tor_info['topic_id']) : false, + 'FILELIST_LINK' => FILELIST_URL . $tor_info['topic_id'], 'REGED_TIME' => bb_date($tor_info['reg_time']), 'REGED_DELTA' => delta_time($tor_info['reg_time']), - 'TORRENT_SIZE' => humn_size($tor_size), + 'TORRENT_SIZE' => humn_size($tor_size, 2), 'DOWNLOAD_COUNT' => $download_count, 'COMPLETED' => $tor_completed_count, ]); @@ -235,7 +235,7 @@ if ($tor_reged && $tor_info) { 'SHOW_DL_LIST' => true, 'SHOW_DL_LIST_TOR_INFO' => true, - 'TOR_SIZE' => humn_size($tor_size), + 'TOR_SIZE' => humn_size($tor_size, 1), 'TOR_LONGEVITY' => delta_time($tor_info['reg_time']), 'TOR_DOWNLOAD_COUNT' => $download_count, 'TOR_COMPLETED' => $tor_completed_count, @@ -282,7 +282,7 @@ if ($tor_reged && $tor_info) { WHERE topic_id = $tor_id LIMIT 1"; } elseif ($s_mode == 'names') { - $sql = "SELECT tr.user_id, tr.ip, tr.port, tr.remain, tr.seeder, u.username, u.user_rank + $sql = "SELECT tr.user_id, tr.ip, tr.ipv6, tr.port, tr.remain, tr.seeder, u.username, u.user_rank FROM " . BB_BT_TRACKER . " tr, " . BB_USERS . " u WHERE tr.topic_id = $tor_id AND u.user_id = tr.user_id @@ -290,7 +290,7 @@ if ($tor_reged && $tor_info) { LIMIT $show_peers_limit"; } else { $sql = "SELECT - tr.user_id, tr.ip, tr.port, tr.peer_id, tr.uploaded, tr.downloaded, tr.remain, + tr.user_id, tr.ip, tr.ipv6, tr.port, tr.peer_id, tr.uploaded, tr.downloaded, tr.remain, tr.seeder, tr.releaser, tr.speed_up, tr.speed_down, tr.update_time, tr.complete_percent, u.username, u.user_rank FROM " . BB_BT_TRACKER . " tr @@ -373,7 +373,12 @@ if ($tor_reged && $tor_info) { // Full details mode if ($s_mode == 'full') { - $ip = bt_show_ip($peer['ip']); + if (!empty($peer['ip']) && !empty($peer['ipv6'])) { + $ip = bt_show_ip($peer['ipv6']) . ' (' . bt_show_ip($peer['ip']) . ')'; + } + else { + $ip = bt_show_ip(!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']); + } $port = bt_show_port($peer['port']); // peer max/current up/down diff --git a/library/config.php b/library/config.php index ae6ba8023..aee5adc4d 100644 --- a/library/config.php +++ b/library/config.php @@ -528,6 +528,7 @@ $bb_cfg['user_not_active_days_keep'] = 180; // After how many days should I dele // Vote for torrents $bb_cfg['tor_thank'] = true; +$bb_cfg['tor_thanks_list_guests'] = true; // Show voters to guests // Groups $bb_cfg['group_members_per_page'] = 50; // How many groups will be displayed in a page @@ -682,7 +683,8 @@ $bb_cfg['tracker'] = [ 'search_by_tor_status' => true, 'freeleech' => false, // freeleech mode (If enabled, then disable "gold_silver_enabled") 'gold_silver_enabled' => true, // golden / silver days mode (If enabled, then disable "freeleech") - 'disabled_v1_torrents' => false, // disallow registration of v1-only torrents, for future implementations where client will use v2 only and there won't be need for v1, relieving tracker + 'hybrid_stat_protocol' => 1, // For hybrid torrents there are two identical requests sent by clients, for counting stats we gotta choose one, you can change this to '2' in future, when v1 protocol is outdated + 'disabled_v1_torrents' => false, // disallow registration of v1-only torrents, for future implementations where client will use v2 only and there won't be need for v1, thus relieving tracker 'disabled_v2_torrents' => false // disallow registration of v2-only torrents ]; diff --git a/library/includes/functions.php b/library/includes/functions.php index 5f686a27c..35d3b10c3 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -1327,6 +1327,7 @@ function render_flag(string $code): string 'GN' => 'Guinea', 'GP' => 'Guadeloupe', 'GQ' => 'Equatorial Guinea', + 'GR3' => 'German Reich (3rd)', 'GR' => 'Greece', 'GS' => 'South Georgia and the South Sandwich Islands', 'GT' => 'Guatemala', diff --git a/library/language/source/main.php b/library/language/source/main.php index 3e3ecb7bb..310fbabe6 100644 --- a/library/language/source/main.php +++ b/library/language/source/main.php @@ -1075,8 +1075,7 @@ $lang['BT_REG_FAIL'] = 'Could not register torrent on tracker'; $lang['BT_REG_FAIL_SAME_HASH'] = 'Another torrent with same info_hash already registered'; $lang['BT_V1_ONLY_DISALLOWED'] = 'v1-only torrents have been disabled by the administrator at the moment, allowed: v2 and hybrids'; $lang['BT_V2_ONLY_DISALLOWED'] = 'v2-only torrents have been disabled by the administrator at the moment, allowed: v1 and hybrids'; -$lang['BT_V2_FLIST_ONLY'] = 'Currently, only torrents with BitTorrent version 2 support are enabled for separate file listing'; -$lang['BT_V2_FLIST_LIMIT'] = 'Tracker settings do not allow to process lists with more than %d files. Current number is: %d'; +$lang['BT_FLIST_LIMIT'] = 'Tracker settings do not allow to process lists with more than %d files. Current number is: %d'; $lang['BT_UNREG_FROM_TRACKER'] = 'Remove from tracker'; $lang['BT_UNREGISTERED'] = 'Torrent unregistered'; $lang['BT_UNREGISTERED_ALREADY'] = 'Torrent already unregistered'; diff --git a/src/Ajax.php b/src/Ajax.php index f80406004..77a904158 100644 --- a/src/Ajax.php +++ b/src/Ajax.php @@ -38,10 +38,10 @@ class Ajax 'passkey' => ['user'], 'change_torrent' => ['user'], 'change_tor_status' => ['user'], - 'thx' => ['user'], 'manage_group' => ['user'], 'callseed' => ['user'], + 'thx' => ['guest'], 'view_post' => ['guest'], 'view_torrent' => ['guest'], 'user_register' => ['guest'], diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php index de4b818d9..21c32cd6b 100644 --- a/src/Legacy/Common/User.php +++ b/src/Legacy/Common/User.php @@ -569,6 +569,13 @@ class User return; } // prevent multiple calling + if (IS_GUEST && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { // Apply browser language + $http_accept_language = locale_get_primary_language(locale_accept_from_http($_SERVER['HTTP_ACCEPT_LANGUAGE'])); + if (isset($bb_cfg['lang'][$http_accept_language])) { + $bb_cfg['default_lang'] = $http_accept_language; + } + } + \define('DEFAULT_LANG_DIR', LANG_ROOT_DIR . '/' . $bb_cfg['default_lang'] . '/'); \define('SOURCE_LANG_DIR', LANG_ROOT_DIR . '/source/'); diff --git a/src/Legacy/Torrent.php b/src/Legacy/Torrent.php index a7f3a0c75..153706ce7 100644 --- a/src/Legacy/Torrent.php +++ b/src/Legacy/Torrent.php @@ -401,7 +401,7 @@ class Torrent } elseif (isset($bt_v1, $info['files']) && !isset($bt_v2) && \is_array($info['files'])) { foreach ($info['files'] as $fn => $f) { // Exclude padding files - if (($f['attr'] ?? null) !== 'p') { + if (!isset($f['attr']) || $f['attr'] !== 'p') { if (isset($f['length']) && is_numeric($f['length'])) { $totallen += $f['length']; } else { diff --git a/src/Legacy/TorrentFileList.php b/src/Legacy/TorrentFileList.php index caad01637..964c14b22 100644 --- a/src/Legacy/TorrentFileList.php +++ b/src/Legacy/TorrentFileList.php @@ -80,7 +80,7 @@ class TorrentFileList } if (isset($info['files']) && \is_array($info['files'])) { - $this->root_dir = isset($info['name']) ? '../' . clean_tor_dirname($info['name']) : '...'; + $this->root_dir = isset($info['name']) ? clean_tor_dirname($info['name']) : '...'; $this->multiple = true; foreach ($info['files'] as $f) { @@ -174,30 +174,4 @@ class TorrentFileList return $allItems; } - - /** - * Table generation for BitTorrent v2 compatible torrents - * - * @param array $array - * @param string $parent - * @return array - */ - public function fileTreeTable(array $array, string $parent = ''): array - { - static $filesList = ['list' => '', 'count' => 0]; - foreach ($array as $key => $value) { - $key = clean_tor_dirname($key); - $current = "$parent/$key"; - if (!isset($value[''])) { - $this->fileTreeTable($value, $current); - } else { - $length = $value['']['length']; - $root = bin2hex($value['']['pieces root'] ?? ''); - $filesList['list'] .= '' . $current . '' . humn_size($length, 2) . '' . $root . ''; - $filesList['count']++; - } - } - - return $filesList; - } } diff --git a/styles/images/clients/Ttorrent.png b/styles/images/clients/tTorrent.png similarity index 100% rename from styles/images/clients/Ttorrent.png rename to styles/images/clients/tTorrent.png diff --git a/styles/images/flags/AD.SVG b/styles/images/flags/AD.svg similarity index 100% rename from styles/images/flags/AD.SVG rename to styles/images/flags/AD.svg diff --git a/styles/images/flags/AE.SVG b/styles/images/flags/AE.svg similarity index 100% rename from styles/images/flags/AE.SVG rename to styles/images/flags/AE.svg diff --git a/styles/images/flags/AF.SVG b/styles/images/flags/AF.svg similarity index 100% rename from styles/images/flags/AF.SVG rename to styles/images/flags/AF.svg diff --git a/styles/images/flags/AG.SVG b/styles/images/flags/AG.svg similarity index 100% rename from styles/images/flags/AG.SVG rename to styles/images/flags/AG.svg diff --git a/styles/images/flags/AI.SVG b/styles/images/flags/AI.svg similarity index 100% rename from styles/images/flags/AI.SVG rename to styles/images/flags/AI.svg diff --git a/styles/images/flags/AL.SVG b/styles/images/flags/AL.svg similarity index 100% rename from styles/images/flags/AL.SVG rename to styles/images/flags/AL.svg diff --git a/styles/images/flags/AM.SVG b/styles/images/flags/AM.svg similarity index 100% rename from styles/images/flags/AM.SVG rename to styles/images/flags/AM.svg diff --git a/styles/images/flags/AO.SVG b/styles/images/flags/AO.svg similarity index 100% rename from styles/images/flags/AO.SVG rename to styles/images/flags/AO.svg diff --git a/styles/images/flags/AQ.SVG b/styles/images/flags/AQ.svg similarity index 100% rename from styles/images/flags/AQ.SVG rename to styles/images/flags/AQ.svg diff --git a/styles/images/flags/AR.SVG b/styles/images/flags/AR.svg similarity index 100% rename from styles/images/flags/AR.SVG rename to styles/images/flags/AR.svg diff --git a/styles/images/flags/ARAB.SVG b/styles/images/flags/ARAB.svg similarity index 100% rename from styles/images/flags/ARAB.SVG rename to styles/images/flags/ARAB.svg diff --git a/styles/images/flags/AS.SVG b/styles/images/flags/AS.svg similarity index 100% rename from styles/images/flags/AS.SVG rename to styles/images/flags/AS.svg diff --git a/styles/images/flags/AT.SVG b/styles/images/flags/AT.svg similarity index 100% rename from styles/images/flags/AT.SVG rename to styles/images/flags/AT.svg diff --git a/styles/images/flags/AU.SVG b/styles/images/flags/AU.svg similarity index 100% rename from styles/images/flags/AU.SVG rename to styles/images/flags/AU.svg diff --git a/styles/images/flags/AW.SVG b/styles/images/flags/AW.svg similarity index 100% rename from styles/images/flags/AW.SVG rename to styles/images/flags/AW.svg diff --git a/styles/images/flags/AX.SVG b/styles/images/flags/AX.svg similarity index 100% rename from styles/images/flags/AX.SVG rename to styles/images/flags/AX.svg diff --git a/styles/images/flags/AZ.SVG b/styles/images/flags/AZ.svg similarity index 100% rename from styles/images/flags/AZ.SVG rename to styles/images/flags/AZ.svg diff --git a/styles/images/flags/BA.SVG b/styles/images/flags/BA.svg similarity index 100% rename from styles/images/flags/BA.SVG rename to styles/images/flags/BA.svg diff --git a/styles/images/flags/BB.SVG b/styles/images/flags/BB.svg similarity index 100% rename from styles/images/flags/BB.SVG rename to styles/images/flags/BB.svg diff --git a/styles/images/flags/BD.SVG b/styles/images/flags/BD.svg similarity index 100% rename from styles/images/flags/BD.SVG rename to styles/images/flags/BD.svg diff --git a/styles/images/flags/BE.SVG b/styles/images/flags/BE.svg similarity index 100% rename from styles/images/flags/BE.SVG rename to styles/images/flags/BE.svg diff --git a/styles/images/flags/BF.SVG b/styles/images/flags/BF.svg similarity index 100% rename from styles/images/flags/BF.SVG rename to styles/images/flags/BF.svg diff --git a/styles/images/flags/BG.SVG b/styles/images/flags/BG.svg similarity index 100% rename from styles/images/flags/BG.SVG rename to styles/images/flags/BG.svg diff --git a/styles/images/flags/BH.SVG b/styles/images/flags/BH.svg similarity index 100% rename from styles/images/flags/BH.SVG rename to styles/images/flags/BH.svg diff --git a/styles/images/flags/BI.SVG b/styles/images/flags/BI.svg similarity index 100% rename from styles/images/flags/BI.SVG rename to styles/images/flags/BI.svg diff --git a/styles/images/flags/BJ.SVG b/styles/images/flags/BJ.svg similarity index 100% rename from styles/images/flags/BJ.SVG rename to styles/images/flags/BJ.svg diff --git a/styles/images/flags/BL.SVG b/styles/images/flags/BL.svg similarity index 100% rename from styles/images/flags/BL.SVG rename to styles/images/flags/BL.svg diff --git a/styles/images/flags/BM.SVG b/styles/images/flags/BM.svg similarity index 100% rename from styles/images/flags/BM.SVG rename to styles/images/flags/BM.svg diff --git a/styles/images/flags/BN.SVG b/styles/images/flags/BN.svg similarity index 100% rename from styles/images/flags/BN.SVG rename to styles/images/flags/BN.svg diff --git a/styles/images/flags/BO.SVG b/styles/images/flags/BO.svg similarity index 100% rename from styles/images/flags/BO.SVG rename to styles/images/flags/BO.svg diff --git a/styles/images/flags/BQ.SVG b/styles/images/flags/BQ.svg similarity index 100% rename from styles/images/flags/BQ.SVG rename to styles/images/flags/BQ.svg diff --git a/styles/images/flags/BR.SVG b/styles/images/flags/BR.svg similarity index 100% rename from styles/images/flags/BR.SVG rename to styles/images/flags/BR.svg diff --git a/styles/images/flags/BS.SVG b/styles/images/flags/BS.svg similarity index 100% rename from styles/images/flags/BS.SVG rename to styles/images/flags/BS.svg diff --git a/styles/images/flags/BT.SVG b/styles/images/flags/BT.svg similarity index 100% rename from styles/images/flags/BT.SVG rename to styles/images/flags/BT.svg diff --git a/styles/images/flags/BV.SVG b/styles/images/flags/BV.svg similarity index 100% rename from styles/images/flags/BV.SVG rename to styles/images/flags/BV.svg diff --git a/styles/images/flags/BW.SVG b/styles/images/flags/BW.svg similarity index 100% rename from styles/images/flags/BW.SVG rename to styles/images/flags/BW.svg diff --git a/styles/images/flags/BY.SVG b/styles/images/flags/BY.svg similarity index 100% rename from styles/images/flags/BY.SVG rename to styles/images/flags/BY.svg diff --git a/styles/images/flags/BZ.SVG b/styles/images/flags/BZ.svg similarity index 100% rename from styles/images/flags/BZ.SVG rename to styles/images/flags/BZ.svg diff --git a/styles/images/flags/CA.SVG b/styles/images/flags/CA.svg similarity index 100% rename from styles/images/flags/CA.SVG rename to styles/images/flags/CA.svg diff --git a/styles/images/flags/CC.SVG b/styles/images/flags/CC.svg similarity index 100% rename from styles/images/flags/CC.SVG rename to styles/images/flags/CC.svg diff --git a/styles/images/flags/CD.SVG b/styles/images/flags/CD.svg similarity index 100% rename from styles/images/flags/CD.SVG rename to styles/images/flags/CD.svg diff --git a/styles/images/flags/CEFTA.SVG b/styles/images/flags/CEFTA.svg similarity index 100% rename from styles/images/flags/CEFTA.SVG rename to styles/images/flags/CEFTA.svg diff --git a/styles/images/flags/CF.SVG b/styles/images/flags/CF.svg similarity index 100% rename from styles/images/flags/CF.SVG rename to styles/images/flags/CF.svg diff --git a/styles/images/flags/CG.SVG b/styles/images/flags/CG.svg similarity index 100% rename from styles/images/flags/CG.SVG rename to styles/images/flags/CG.svg diff --git a/styles/images/flags/CH.SVG b/styles/images/flags/CH.svg similarity index 100% rename from styles/images/flags/CH.SVG rename to styles/images/flags/CH.svg diff --git a/styles/images/flags/CI.SVG b/styles/images/flags/CI.svg similarity index 100% rename from styles/images/flags/CI.SVG rename to styles/images/flags/CI.svg diff --git a/styles/images/flags/CK.SVG b/styles/images/flags/CK.svg similarity index 100% rename from styles/images/flags/CK.SVG rename to styles/images/flags/CK.svg diff --git a/styles/images/flags/CL.SVG b/styles/images/flags/CL.svg similarity index 100% rename from styles/images/flags/CL.SVG rename to styles/images/flags/CL.svg diff --git a/styles/images/flags/CM.SVG b/styles/images/flags/CM.svg similarity index 100% rename from styles/images/flags/CM.SVG rename to styles/images/flags/CM.svg diff --git a/styles/images/flags/CN.SVG b/styles/images/flags/CN.svg similarity index 100% rename from styles/images/flags/CN.SVG rename to styles/images/flags/CN.svg diff --git a/styles/images/flags/CO.SVG b/styles/images/flags/CO.svg similarity index 100% rename from styles/images/flags/CO.SVG rename to styles/images/flags/CO.svg diff --git a/styles/images/flags/CP.SVG b/styles/images/flags/CP.svg similarity index 100% rename from styles/images/flags/CP.SVG rename to styles/images/flags/CP.svg diff --git a/styles/images/flags/CR.SVG b/styles/images/flags/CR.svg similarity index 100% rename from styles/images/flags/CR.SVG rename to styles/images/flags/CR.svg diff --git a/styles/images/flags/CU.SVG b/styles/images/flags/CU.svg similarity index 100% rename from styles/images/flags/CU.SVG rename to styles/images/flags/CU.svg diff --git a/styles/images/flags/CV.SVG b/styles/images/flags/CV.svg similarity index 100% rename from styles/images/flags/CV.SVG rename to styles/images/flags/CV.svg diff --git a/styles/images/flags/CW.SVG b/styles/images/flags/CW.svg similarity index 100% rename from styles/images/flags/CW.SVG rename to styles/images/flags/CW.svg diff --git a/styles/images/flags/CX.SVG b/styles/images/flags/CX.svg similarity index 100% rename from styles/images/flags/CX.SVG rename to styles/images/flags/CX.svg diff --git a/styles/images/flags/CY.SVG b/styles/images/flags/CY.svg similarity index 100% rename from styles/images/flags/CY.SVG rename to styles/images/flags/CY.svg diff --git a/styles/images/flags/CZ.SVG b/styles/images/flags/CZ.svg similarity index 100% rename from styles/images/flags/CZ.SVG rename to styles/images/flags/CZ.svg diff --git a/styles/images/flags/DE.SVG b/styles/images/flags/DE.svg similarity index 100% rename from styles/images/flags/DE.SVG rename to styles/images/flags/DE.svg diff --git a/styles/images/flags/DG.SVG b/styles/images/flags/DG.svg similarity index 100% rename from styles/images/flags/DG.SVG rename to styles/images/flags/DG.svg diff --git a/styles/images/flags/DJ.SVG b/styles/images/flags/DJ.svg similarity index 100% rename from styles/images/flags/DJ.SVG rename to styles/images/flags/DJ.svg diff --git a/styles/images/flags/DK.SVG b/styles/images/flags/DK.svg similarity index 100% rename from styles/images/flags/DK.SVG rename to styles/images/flags/DK.svg diff --git a/styles/images/flags/DM.SVG b/styles/images/flags/DM.svg similarity index 100% rename from styles/images/flags/DM.SVG rename to styles/images/flags/DM.svg diff --git a/styles/images/flags/DO.SVG b/styles/images/flags/DO.svg similarity index 100% rename from styles/images/flags/DO.SVG rename to styles/images/flags/DO.svg diff --git a/styles/images/flags/DZ.SVG b/styles/images/flags/DZ.svg similarity index 100% rename from styles/images/flags/DZ.SVG rename to styles/images/flags/DZ.svg diff --git a/styles/images/flags/EAC.SVG b/styles/images/flags/EAC.svg similarity index 100% rename from styles/images/flags/EAC.SVG rename to styles/images/flags/EAC.svg diff --git a/styles/images/flags/EC.SVG b/styles/images/flags/EC.svg similarity index 100% rename from styles/images/flags/EC.SVG rename to styles/images/flags/EC.svg diff --git a/styles/images/flags/EE.SVG b/styles/images/flags/EE.svg similarity index 100% rename from styles/images/flags/EE.SVG rename to styles/images/flags/EE.svg diff --git a/styles/images/flags/EG.SVG b/styles/images/flags/EG.svg similarity index 100% rename from styles/images/flags/EG.SVG rename to styles/images/flags/EG.svg diff --git a/styles/images/flags/EH.SVG b/styles/images/flags/EH.svg similarity index 100% rename from styles/images/flags/EH.SVG rename to styles/images/flags/EH.svg diff --git a/styles/images/flags/ER.SVG b/styles/images/flags/ER.svg similarity index 100% rename from styles/images/flags/ER.SVG rename to styles/images/flags/ER.svg diff --git a/styles/images/flags/ES-CT.SVG b/styles/images/flags/ES-CT.svg similarity index 100% rename from styles/images/flags/ES-CT.SVG rename to styles/images/flags/ES-CT.svg diff --git a/styles/images/flags/ES-GA.SVG b/styles/images/flags/ES-GA.svg similarity index 100% rename from styles/images/flags/ES-GA.SVG rename to styles/images/flags/ES-GA.svg diff --git a/styles/images/flags/ES-PV.SVG b/styles/images/flags/ES-PV.svg similarity index 100% rename from styles/images/flags/ES-PV.SVG rename to styles/images/flags/ES-PV.svg diff --git a/styles/images/flags/ES.SVG b/styles/images/flags/ES.svg similarity index 100% rename from styles/images/flags/ES.SVG rename to styles/images/flags/ES.svg diff --git a/styles/images/flags/ET.SVG b/styles/images/flags/ET.svg similarity index 100% rename from styles/images/flags/ET.SVG rename to styles/images/flags/ET.svg diff --git a/styles/images/flags/EU.SVG b/styles/images/flags/EU.svg similarity index 100% rename from styles/images/flags/EU.SVG rename to styles/images/flags/EU.svg diff --git a/styles/images/flags/FI.SVG b/styles/images/flags/FI.svg similarity index 100% rename from styles/images/flags/FI.SVG rename to styles/images/flags/FI.svg diff --git a/styles/images/flags/FJ.SVG b/styles/images/flags/FJ.svg similarity index 100% rename from styles/images/flags/FJ.SVG rename to styles/images/flags/FJ.svg diff --git a/styles/images/flags/FK.SVG b/styles/images/flags/FK.svg similarity index 100% rename from styles/images/flags/FK.SVG rename to styles/images/flags/FK.svg diff --git a/styles/images/flags/FM.SVG b/styles/images/flags/FM.svg similarity index 100% rename from styles/images/flags/FM.SVG rename to styles/images/flags/FM.svg diff --git a/styles/images/flags/FO.SVG b/styles/images/flags/FO.svg similarity index 100% rename from styles/images/flags/FO.SVG rename to styles/images/flags/FO.svg diff --git a/styles/images/flags/FR.SVG b/styles/images/flags/FR.svg similarity index 100% rename from styles/images/flags/FR.SVG rename to styles/images/flags/FR.svg diff --git a/styles/images/flags/GA.SVG b/styles/images/flags/GA.svg similarity index 100% rename from styles/images/flags/GA.SVG rename to styles/images/flags/GA.svg diff --git a/styles/images/flags/GB-ENG.SVG b/styles/images/flags/GB-ENG.svg similarity index 100% rename from styles/images/flags/GB-ENG.SVG rename to styles/images/flags/GB-ENG.svg diff --git a/styles/images/flags/GB-NIR.SVG b/styles/images/flags/GB-NIR.svg similarity index 100% rename from styles/images/flags/GB-NIR.SVG rename to styles/images/flags/GB-NIR.svg diff --git a/styles/images/flags/GB-SCT.SVG b/styles/images/flags/GB-SCT.svg similarity index 100% rename from styles/images/flags/GB-SCT.SVG rename to styles/images/flags/GB-SCT.svg diff --git a/styles/images/flags/GB-WLS.SVG b/styles/images/flags/GB-WLS.svg similarity index 100% rename from styles/images/flags/GB-WLS.SVG rename to styles/images/flags/GB-WLS.svg diff --git a/styles/images/flags/GB.SVG b/styles/images/flags/GB.svg similarity index 100% rename from styles/images/flags/GB.SVG rename to styles/images/flags/GB.svg diff --git a/styles/images/flags/GD.SVG b/styles/images/flags/GD.svg similarity index 100% rename from styles/images/flags/GD.SVG rename to styles/images/flags/GD.svg diff --git a/styles/images/flags/GE.SVG b/styles/images/flags/GE.svg similarity index 100% rename from styles/images/flags/GE.SVG rename to styles/images/flags/GE.svg diff --git a/styles/images/flags/GF.SVG b/styles/images/flags/GF.svg similarity index 100% rename from styles/images/flags/GF.SVG rename to styles/images/flags/GF.svg diff --git a/styles/images/flags/GG.SVG b/styles/images/flags/GG.svg similarity index 100% rename from styles/images/flags/GG.SVG rename to styles/images/flags/GG.svg diff --git a/styles/images/flags/GH.SVG b/styles/images/flags/GH.svg similarity index 100% rename from styles/images/flags/GH.SVG rename to styles/images/flags/GH.svg diff --git a/styles/images/flags/GI.SVG b/styles/images/flags/GI.svg similarity index 100% rename from styles/images/flags/GI.SVG rename to styles/images/flags/GI.svg diff --git a/styles/images/flags/GL.SVG b/styles/images/flags/GL.svg similarity index 100% rename from styles/images/flags/GL.SVG rename to styles/images/flags/GL.svg diff --git a/styles/images/flags/GM.SVG b/styles/images/flags/GM.svg similarity index 100% rename from styles/images/flags/GM.SVG rename to styles/images/flags/GM.svg diff --git a/styles/images/flags/GN.SVG b/styles/images/flags/GN.svg similarity index 100% rename from styles/images/flags/GN.SVG rename to styles/images/flags/GN.svg diff --git a/styles/images/flags/GP.SVG b/styles/images/flags/GP.svg similarity index 100% rename from styles/images/flags/GP.SVG rename to styles/images/flags/GP.svg diff --git a/styles/images/flags/GQ.SVG b/styles/images/flags/GQ.svg similarity index 100% rename from styles/images/flags/GQ.SVG rename to styles/images/flags/GQ.svg diff --git a/styles/images/flags/GR.SVG b/styles/images/flags/GR.svg similarity index 100% rename from styles/images/flags/GR.SVG rename to styles/images/flags/GR.svg diff --git a/styles/images/flags/GR3.svg b/styles/images/flags/GR3.svg new file mode 100644 index 000000000..32201bfd5 --- /dev/null +++ b/styles/images/flags/GR3.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/styles/images/flags/GS.SVG b/styles/images/flags/GS.svg similarity index 100% rename from styles/images/flags/GS.SVG rename to styles/images/flags/GS.svg diff --git a/styles/images/flags/GT.SVG b/styles/images/flags/GT.svg similarity index 100% rename from styles/images/flags/GT.SVG rename to styles/images/flags/GT.svg diff --git a/styles/images/flags/GU.SVG b/styles/images/flags/GU.svg similarity index 100% rename from styles/images/flags/GU.SVG rename to styles/images/flags/GU.svg diff --git a/styles/images/flags/GW.SVG b/styles/images/flags/GW.svg similarity index 100% rename from styles/images/flags/GW.SVG rename to styles/images/flags/GW.svg diff --git a/styles/images/flags/GY.SVG b/styles/images/flags/GY.svg similarity index 100% rename from styles/images/flags/GY.SVG rename to styles/images/flags/GY.svg diff --git a/styles/images/flags/HK.SVG b/styles/images/flags/HK.svg similarity index 100% rename from styles/images/flags/HK.SVG rename to styles/images/flags/HK.svg diff --git a/styles/images/flags/HM.SVG b/styles/images/flags/HM.svg similarity index 100% rename from styles/images/flags/HM.SVG rename to styles/images/flags/HM.svg diff --git a/styles/images/flags/HN.SVG b/styles/images/flags/HN.svg similarity index 100% rename from styles/images/flags/HN.SVG rename to styles/images/flags/HN.svg diff --git a/styles/images/flags/HR.SVG b/styles/images/flags/HR.svg similarity index 100% rename from styles/images/flags/HR.SVG rename to styles/images/flags/HR.svg diff --git a/styles/images/flags/HT.SVG b/styles/images/flags/HT.svg similarity index 100% rename from styles/images/flags/HT.SVG rename to styles/images/flags/HT.svg diff --git a/styles/images/flags/HU.SVG b/styles/images/flags/HU.svg similarity index 100% rename from styles/images/flags/HU.SVG rename to styles/images/flags/HU.svg diff --git a/styles/images/flags/IC.SVG b/styles/images/flags/IC.svg similarity index 100% rename from styles/images/flags/IC.SVG rename to styles/images/flags/IC.svg diff --git a/styles/images/flags/ID.SVG b/styles/images/flags/ID.svg similarity index 100% rename from styles/images/flags/ID.SVG rename to styles/images/flags/ID.svg diff --git a/styles/images/flags/IE.SVG b/styles/images/flags/IE.svg similarity index 100% rename from styles/images/flags/IE.SVG rename to styles/images/flags/IE.svg diff --git a/styles/images/flags/IL.SVG b/styles/images/flags/IL.svg similarity index 100% rename from styles/images/flags/IL.SVG rename to styles/images/flags/IL.svg diff --git a/styles/images/flags/IM.SVG b/styles/images/flags/IM.svg similarity index 100% rename from styles/images/flags/IM.SVG rename to styles/images/flags/IM.svg diff --git a/styles/images/flags/IN.SVG b/styles/images/flags/IN.svg similarity index 100% rename from styles/images/flags/IN.SVG rename to styles/images/flags/IN.svg diff --git a/styles/images/flags/IO.SVG b/styles/images/flags/IO.svg similarity index 100% rename from styles/images/flags/IO.SVG rename to styles/images/flags/IO.svg diff --git a/styles/images/flags/IQ.SVG b/styles/images/flags/IQ.svg similarity index 100% rename from styles/images/flags/IQ.SVG rename to styles/images/flags/IQ.svg diff --git a/styles/images/flags/IR.SVG b/styles/images/flags/IR.svg similarity index 100% rename from styles/images/flags/IR.SVG rename to styles/images/flags/IR.svg diff --git a/styles/images/flags/IS.SVG b/styles/images/flags/IS.svg similarity index 100% rename from styles/images/flags/IS.SVG rename to styles/images/flags/IS.svg diff --git a/styles/images/flags/IT.SVG b/styles/images/flags/IT.svg similarity index 100% rename from styles/images/flags/IT.SVG rename to styles/images/flags/IT.svg diff --git a/styles/images/flags/JE.SVG b/styles/images/flags/JE.svg similarity index 100% rename from styles/images/flags/JE.SVG rename to styles/images/flags/JE.svg diff --git a/styles/images/flags/JM.SVG b/styles/images/flags/JM.svg similarity index 100% rename from styles/images/flags/JM.SVG rename to styles/images/flags/JM.svg diff --git a/styles/images/flags/JO.SVG b/styles/images/flags/JO.svg similarity index 100% rename from styles/images/flags/JO.SVG rename to styles/images/flags/JO.svg diff --git a/styles/images/flags/JP.SVG b/styles/images/flags/JP.svg similarity index 100% rename from styles/images/flags/JP.SVG rename to styles/images/flags/JP.svg diff --git a/styles/images/flags/KE.SVG b/styles/images/flags/KE.svg similarity index 100% rename from styles/images/flags/KE.SVG rename to styles/images/flags/KE.svg diff --git a/styles/images/flags/KG.SVG b/styles/images/flags/KG.svg similarity index 100% rename from styles/images/flags/KG.SVG rename to styles/images/flags/KG.svg diff --git a/styles/images/flags/KH.SVG b/styles/images/flags/KH.svg similarity index 100% rename from styles/images/flags/KH.SVG rename to styles/images/flags/KH.svg diff --git a/styles/images/flags/KI.SVG b/styles/images/flags/KI.svg similarity index 100% rename from styles/images/flags/KI.SVG rename to styles/images/flags/KI.svg diff --git a/styles/images/flags/KM.SVG b/styles/images/flags/KM.svg similarity index 100% rename from styles/images/flags/KM.SVG rename to styles/images/flags/KM.svg diff --git a/styles/images/flags/KN.SVG b/styles/images/flags/KN.svg similarity index 100% rename from styles/images/flags/KN.SVG rename to styles/images/flags/KN.svg diff --git a/styles/images/flags/KP.SVG b/styles/images/flags/KP.svg similarity index 100% rename from styles/images/flags/KP.SVG rename to styles/images/flags/KP.svg diff --git a/styles/images/flags/KR.SVG b/styles/images/flags/KR.svg similarity index 100% rename from styles/images/flags/KR.SVG rename to styles/images/flags/KR.svg diff --git a/styles/images/flags/KW.SVG b/styles/images/flags/KW.svg similarity index 100% rename from styles/images/flags/KW.SVG rename to styles/images/flags/KW.svg diff --git a/styles/images/flags/KY.SVG b/styles/images/flags/KY.svg similarity index 100% rename from styles/images/flags/KY.SVG rename to styles/images/flags/KY.svg diff --git a/styles/images/flags/KZ.SVG b/styles/images/flags/KZ.svg similarity index 100% rename from styles/images/flags/KZ.SVG rename to styles/images/flags/KZ.svg diff --git a/styles/images/flags/LA.SVG b/styles/images/flags/LA.svg similarity index 100% rename from styles/images/flags/LA.SVG rename to styles/images/flags/LA.svg diff --git a/styles/images/flags/LB.SVG b/styles/images/flags/LB.svg similarity index 100% rename from styles/images/flags/LB.SVG rename to styles/images/flags/LB.svg diff --git a/styles/images/flags/LC.SVG b/styles/images/flags/LC.svg similarity index 100% rename from styles/images/flags/LC.SVG rename to styles/images/flags/LC.svg diff --git a/styles/images/flags/LI.SVG b/styles/images/flags/LI.svg similarity index 100% rename from styles/images/flags/LI.SVG rename to styles/images/flags/LI.svg diff --git a/styles/images/flags/LK.SVG b/styles/images/flags/LK.svg similarity index 100% rename from styles/images/flags/LK.SVG rename to styles/images/flags/LK.svg diff --git a/styles/images/flags/LR.SVG b/styles/images/flags/LR.svg similarity index 100% rename from styles/images/flags/LR.SVG rename to styles/images/flags/LR.svg diff --git a/styles/images/flags/LS.SVG b/styles/images/flags/LS.svg similarity index 100% rename from styles/images/flags/LS.SVG rename to styles/images/flags/LS.svg diff --git a/styles/images/flags/LT.SVG b/styles/images/flags/LT.svg similarity index 100% rename from styles/images/flags/LT.SVG rename to styles/images/flags/LT.svg diff --git a/styles/images/flags/LU.SVG b/styles/images/flags/LU.svg similarity index 100% rename from styles/images/flags/LU.SVG rename to styles/images/flags/LU.svg diff --git a/styles/images/flags/LV.SVG b/styles/images/flags/LV.svg similarity index 100% rename from styles/images/flags/LV.SVG rename to styles/images/flags/LV.svg diff --git a/styles/images/flags/LY.SVG b/styles/images/flags/LY.svg similarity index 100% rename from styles/images/flags/LY.SVG rename to styles/images/flags/LY.svg diff --git a/styles/images/flags/MA.SVG b/styles/images/flags/MA.svg similarity index 100% rename from styles/images/flags/MA.SVG rename to styles/images/flags/MA.svg diff --git a/styles/images/flags/MC.SVG b/styles/images/flags/MC.svg similarity index 100% rename from styles/images/flags/MC.SVG rename to styles/images/flags/MC.svg diff --git a/styles/images/flags/MD.SVG b/styles/images/flags/MD.svg similarity index 100% rename from styles/images/flags/MD.SVG rename to styles/images/flags/MD.svg diff --git a/styles/images/flags/ME.SVG b/styles/images/flags/ME.svg similarity index 100% rename from styles/images/flags/ME.SVG rename to styles/images/flags/ME.svg diff --git a/styles/images/flags/MF.SVG b/styles/images/flags/MF.svg similarity index 100% rename from styles/images/flags/MF.SVG rename to styles/images/flags/MF.svg diff --git a/styles/images/flags/MG.SVG b/styles/images/flags/MG.svg similarity index 100% rename from styles/images/flags/MG.SVG rename to styles/images/flags/MG.svg diff --git a/styles/images/flags/MH.SVG b/styles/images/flags/MH.svg similarity index 100% rename from styles/images/flags/MH.SVG rename to styles/images/flags/MH.svg diff --git a/styles/images/flags/MK.SVG b/styles/images/flags/MK.svg similarity index 100% rename from styles/images/flags/MK.SVG rename to styles/images/flags/MK.svg diff --git a/styles/images/flags/ML.SVG b/styles/images/flags/ML.svg similarity index 100% rename from styles/images/flags/ML.SVG rename to styles/images/flags/ML.svg diff --git a/styles/images/flags/MM.SVG b/styles/images/flags/MM.svg similarity index 100% rename from styles/images/flags/MM.SVG rename to styles/images/flags/MM.svg diff --git a/styles/images/flags/MN.SVG b/styles/images/flags/MN.svg similarity index 100% rename from styles/images/flags/MN.SVG rename to styles/images/flags/MN.svg diff --git a/styles/images/flags/MO.SVG b/styles/images/flags/MO.svg similarity index 100% rename from styles/images/flags/MO.SVG rename to styles/images/flags/MO.svg diff --git a/styles/images/flags/MP.SVG b/styles/images/flags/MP.svg similarity index 100% rename from styles/images/flags/MP.SVG rename to styles/images/flags/MP.svg diff --git a/styles/images/flags/MQ.SVG b/styles/images/flags/MQ.svg similarity index 100% rename from styles/images/flags/MQ.SVG rename to styles/images/flags/MQ.svg diff --git a/styles/images/flags/MR.SVG b/styles/images/flags/MR.svg similarity index 100% rename from styles/images/flags/MR.SVG rename to styles/images/flags/MR.svg diff --git a/styles/images/flags/MS.SVG b/styles/images/flags/MS.svg similarity index 100% rename from styles/images/flags/MS.SVG rename to styles/images/flags/MS.svg diff --git a/styles/images/flags/MT.SVG b/styles/images/flags/MT.svg similarity index 100% rename from styles/images/flags/MT.SVG rename to styles/images/flags/MT.svg diff --git a/styles/images/flags/MU.SVG b/styles/images/flags/MU.svg similarity index 100% rename from styles/images/flags/MU.SVG rename to styles/images/flags/MU.svg diff --git a/styles/images/flags/MV.SVG b/styles/images/flags/MV.svg similarity index 100% rename from styles/images/flags/MV.SVG rename to styles/images/flags/MV.svg diff --git a/styles/images/flags/MW.SVG b/styles/images/flags/MW.svg similarity index 100% rename from styles/images/flags/MW.SVG rename to styles/images/flags/MW.svg diff --git a/styles/images/flags/MX.SVG b/styles/images/flags/MX.svg similarity index 100% rename from styles/images/flags/MX.SVG rename to styles/images/flags/MX.svg diff --git a/styles/images/flags/MY.SVG b/styles/images/flags/MY.svg similarity index 100% rename from styles/images/flags/MY.SVG rename to styles/images/flags/MY.svg diff --git a/styles/images/flags/MZ.SVG b/styles/images/flags/MZ.svg similarity index 100% rename from styles/images/flags/MZ.SVG rename to styles/images/flags/MZ.svg diff --git a/styles/images/flags/NA.SVG b/styles/images/flags/NA.svg similarity index 100% rename from styles/images/flags/NA.SVG rename to styles/images/flags/NA.svg diff --git a/styles/images/flags/NC.SVG b/styles/images/flags/NC.svg similarity index 100% rename from styles/images/flags/NC.SVG rename to styles/images/flags/NC.svg diff --git a/styles/images/flags/NE.SVG b/styles/images/flags/NE.svg similarity index 100% rename from styles/images/flags/NE.SVG rename to styles/images/flags/NE.svg diff --git a/styles/images/flags/NF.SVG b/styles/images/flags/NF.svg similarity index 100% rename from styles/images/flags/NF.SVG rename to styles/images/flags/NF.svg diff --git a/styles/images/flags/NG.SVG b/styles/images/flags/NG.svg similarity index 100% rename from styles/images/flags/NG.SVG rename to styles/images/flags/NG.svg diff --git a/styles/images/flags/NI.SVG b/styles/images/flags/NI.svg similarity index 100% rename from styles/images/flags/NI.SVG rename to styles/images/flags/NI.svg diff --git a/styles/images/flags/NL.SVG b/styles/images/flags/NL.svg similarity index 100% rename from styles/images/flags/NL.SVG rename to styles/images/flags/NL.svg diff --git a/styles/images/flags/NO.SVG b/styles/images/flags/NO.svg similarity index 100% rename from styles/images/flags/NO.SVG rename to styles/images/flags/NO.svg diff --git a/styles/images/flags/NP.SVG b/styles/images/flags/NP.svg similarity index 100% rename from styles/images/flags/NP.SVG rename to styles/images/flags/NP.svg diff --git a/styles/images/flags/NR.SVG b/styles/images/flags/NR.svg similarity index 100% rename from styles/images/flags/NR.SVG rename to styles/images/flags/NR.svg diff --git a/styles/images/flags/NU.SVG b/styles/images/flags/NU.svg similarity index 100% rename from styles/images/flags/NU.SVG rename to styles/images/flags/NU.svg diff --git a/styles/images/flags/NZ.SVG b/styles/images/flags/NZ.svg similarity index 100% rename from styles/images/flags/NZ.SVG rename to styles/images/flags/NZ.svg diff --git a/styles/images/flags/OM.SVG b/styles/images/flags/OM.svg similarity index 100% rename from styles/images/flags/OM.SVG rename to styles/images/flags/OM.svg diff --git a/styles/images/flags/PA.SVG b/styles/images/flags/PA.svg similarity index 100% rename from styles/images/flags/PA.SVG rename to styles/images/flags/PA.svg diff --git a/styles/images/flags/PC.SVG b/styles/images/flags/PC.svg similarity index 100% rename from styles/images/flags/PC.SVG rename to styles/images/flags/PC.svg diff --git a/styles/images/flags/PE.SVG b/styles/images/flags/PE.svg similarity index 100% rename from styles/images/flags/PE.SVG rename to styles/images/flags/PE.svg diff --git a/styles/images/flags/PF.SVG b/styles/images/flags/PF.svg similarity index 100% rename from styles/images/flags/PF.SVG rename to styles/images/flags/PF.svg diff --git a/styles/images/flags/PG.SVG b/styles/images/flags/PG.svg similarity index 100% rename from styles/images/flags/PG.SVG rename to styles/images/flags/PG.svg diff --git a/styles/images/flags/PH.SVG b/styles/images/flags/PH.svg similarity index 100% rename from styles/images/flags/PH.SVG rename to styles/images/flags/PH.svg diff --git a/styles/images/flags/PK.SVG b/styles/images/flags/PK.svg similarity index 100% rename from styles/images/flags/PK.SVG rename to styles/images/flags/PK.svg diff --git a/styles/images/flags/PL.SVG b/styles/images/flags/PL.svg similarity index 100% rename from styles/images/flags/PL.SVG rename to styles/images/flags/PL.svg diff --git a/styles/images/flags/PM.SVG b/styles/images/flags/PM.svg similarity index 100% rename from styles/images/flags/PM.SVG rename to styles/images/flags/PM.svg diff --git a/styles/images/flags/PN.SVG b/styles/images/flags/PN.svg similarity index 100% rename from styles/images/flags/PN.SVG rename to styles/images/flags/PN.svg diff --git a/styles/images/flags/PR.SVG b/styles/images/flags/PR.svg similarity index 100% rename from styles/images/flags/PR.SVG rename to styles/images/flags/PR.svg diff --git a/styles/images/flags/PS.SVG b/styles/images/flags/PS.svg similarity index 100% rename from styles/images/flags/PS.SVG rename to styles/images/flags/PS.svg diff --git a/styles/images/flags/PT.SVG b/styles/images/flags/PT.svg similarity index 100% rename from styles/images/flags/PT.SVG rename to styles/images/flags/PT.svg diff --git a/styles/images/flags/PW.SVG b/styles/images/flags/PW.svg similarity index 100% rename from styles/images/flags/PW.SVG rename to styles/images/flags/PW.svg diff --git a/styles/images/flags/PY.SVG b/styles/images/flags/PY.svg similarity index 100% rename from styles/images/flags/PY.SVG rename to styles/images/flags/PY.svg diff --git a/styles/images/flags/QA.SVG b/styles/images/flags/QA.svg similarity index 100% rename from styles/images/flags/QA.SVG rename to styles/images/flags/QA.svg diff --git a/styles/images/flags/RE.SVG b/styles/images/flags/RE.svg similarity index 100% rename from styles/images/flags/RE.SVG rename to styles/images/flags/RE.svg diff --git a/styles/images/flags/RO.SVG b/styles/images/flags/RO.svg similarity index 100% rename from styles/images/flags/RO.SVG rename to styles/images/flags/RO.svg diff --git a/styles/images/flags/RS.SVG b/styles/images/flags/RS.svg similarity index 100% rename from styles/images/flags/RS.SVG rename to styles/images/flags/RS.svg diff --git a/styles/images/flags/RU.SVG b/styles/images/flags/RU.svg similarity index 100% rename from styles/images/flags/RU.SVG rename to styles/images/flags/RU.svg diff --git a/styles/images/flags/RW.SVG b/styles/images/flags/RW.svg similarity index 100% rename from styles/images/flags/RW.SVG rename to styles/images/flags/RW.svg diff --git a/styles/images/flags/SA.SVG b/styles/images/flags/SA.svg similarity index 100% rename from styles/images/flags/SA.SVG rename to styles/images/flags/SA.svg diff --git a/styles/images/flags/SB.SVG b/styles/images/flags/SB.svg similarity index 100% rename from styles/images/flags/SB.SVG rename to styles/images/flags/SB.svg diff --git a/styles/images/flags/SC.SVG b/styles/images/flags/SC.svg similarity index 100% rename from styles/images/flags/SC.SVG rename to styles/images/flags/SC.svg diff --git a/styles/images/flags/SD.SVG b/styles/images/flags/SD.svg similarity index 100% rename from styles/images/flags/SD.SVG rename to styles/images/flags/SD.svg diff --git a/styles/images/flags/SE.SVG b/styles/images/flags/SE.svg similarity index 100% rename from styles/images/flags/SE.SVG rename to styles/images/flags/SE.svg diff --git a/styles/images/flags/SG.SVG b/styles/images/flags/SG.svg similarity index 100% rename from styles/images/flags/SG.SVG rename to styles/images/flags/SG.svg diff --git a/styles/images/flags/SH-AC.SVG b/styles/images/flags/SH-AC.svg similarity index 100% rename from styles/images/flags/SH-AC.SVG rename to styles/images/flags/SH-AC.svg diff --git a/styles/images/flags/SH-HL.SVG b/styles/images/flags/SH-HL.svg similarity index 100% rename from styles/images/flags/SH-HL.SVG rename to styles/images/flags/SH-HL.svg diff --git a/styles/images/flags/SH-TA.SVG b/styles/images/flags/SH-TA.svg similarity index 100% rename from styles/images/flags/SH-TA.SVG rename to styles/images/flags/SH-TA.svg diff --git a/styles/images/flags/SH.SVG b/styles/images/flags/SH.svg similarity index 100% rename from styles/images/flags/SH.SVG rename to styles/images/flags/SH.svg diff --git a/styles/images/flags/SI.SVG b/styles/images/flags/SI.svg similarity index 100% rename from styles/images/flags/SI.SVG rename to styles/images/flags/SI.svg diff --git a/styles/images/flags/SJ.SVG b/styles/images/flags/SJ.svg similarity index 100% rename from styles/images/flags/SJ.SVG rename to styles/images/flags/SJ.svg diff --git a/styles/images/flags/SK.SVG b/styles/images/flags/SK.svg similarity index 100% rename from styles/images/flags/SK.SVG rename to styles/images/flags/SK.svg diff --git a/styles/images/flags/SL.SVG b/styles/images/flags/SL.svg similarity index 100% rename from styles/images/flags/SL.SVG rename to styles/images/flags/SL.svg diff --git a/styles/images/flags/SM.SVG b/styles/images/flags/SM.svg similarity index 100% rename from styles/images/flags/SM.SVG rename to styles/images/flags/SM.svg diff --git a/styles/images/flags/SN.SVG b/styles/images/flags/SN.svg similarity index 100% rename from styles/images/flags/SN.SVG rename to styles/images/flags/SN.svg diff --git a/styles/images/flags/SO.SVG b/styles/images/flags/SO.svg similarity index 100% rename from styles/images/flags/SO.SVG rename to styles/images/flags/SO.svg diff --git a/styles/images/flags/SR.SVG b/styles/images/flags/SR.svg similarity index 100% rename from styles/images/flags/SR.SVG rename to styles/images/flags/SR.svg diff --git a/styles/images/flags/SS.SVG b/styles/images/flags/SS.svg similarity index 100% rename from styles/images/flags/SS.SVG rename to styles/images/flags/SS.svg diff --git a/styles/images/flags/ST.SVG b/styles/images/flags/ST.svg similarity index 100% rename from styles/images/flags/ST.SVG rename to styles/images/flags/ST.svg diff --git a/styles/images/flags/SU.SVG b/styles/images/flags/SU.svg similarity index 100% rename from styles/images/flags/SU.SVG rename to styles/images/flags/SU.svg diff --git a/styles/images/flags/SV.SVG b/styles/images/flags/SV.svg similarity index 100% rename from styles/images/flags/SV.SVG rename to styles/images/flags/SV.svg diff --git a/styles/images/flags/SX.SVG b/styles/images/flags/SX.svg similarity index 100% rename from styles/images/flags/SX.SVG rename to styles/images/flags/SX.svg diff --git a/styles/images/flags/SY.SVG b/styles/images/flags/SY.svg similarity index 100% rename from styles/images/flags/SY.SVG rename to styles/images/flags/SY.svg diff --git a/styles/images/flags/SZ.SVG b/styles/images/flags/SZ.svg similarity index 100% rename from styles/images/flags/SZ.SVG rename to styles/images/flags/SZ.svg diff --git a/styles/images/flags/TC.SVG b/styles/images/flags/TC.svg similarity index 100% rename from styles/images/flags/TC.SVG rename to styles/images/flags/TC.svg diff --git a/styles/images/flags/TD.SVG b/styles/images/flags/TD.svg similarity index 100% rename from styles/images/flags/TD.SVG rename to styles/images/flags/TD.svg diff --git a/styles/images/flags/TF.SVG b/styles/images/flags/TF.svg similarity index 100% rename from styles/images/flags/TF.SVG rename to styles/images/flags/TF.svg diff --git a/styles/images/flags/TG.SVG b/styles/images/flags/TG.svg similarity index 100% rename from styles/images/flags/TG.SVG rename to styles/images/flags/TG.svg diff --git a/styles/images/flags/TH.SVG b/styles/images/flags/TH.svg similarity index 100% rename from styles/images/flags/TH.SVG rename to styles/images/flags/TH.svg diff --git a/styles/images/flags/TJ.SVG b/styles/images/flags/TJ.svg similarity index 100% rename from styles/images/flags/TJ.SVG rename to styles/images/flags/TJ.svg diff --git a/styles/images/flags/TK.SVG b/styles/images/flags/TK.svg similarity index 100% rename from styles/images/flags/TK.SVG rename to styles/images/flags/TK.svg diff --git a/styles/images/flags/TL.SVG b/styles/images/flags/TL.svg similarity index 100% rename from styles/images/flags/TL.SVG rename to styles/images/flags/TL.svg diff --git a/styles/images/flags/TM.SVG b/styles/images/flags/TM.svg similarity index 100% rename from styles/images/flags/TM.SVG rename to styles/images/flags/TM.svg diff --git a/styles/images/flags/TN.SVG b/styles/images/flags/TN.svg similarity index 100% rename from styles/images/flags/TN.SVG rename to styles/images/flags/TN.svg diff --git a/styles/images/flags/TO.SVG b/styles/images/flags/TO.svg similarity index 100% rename from styles/images/flags/TO.SVG rename to styles/images/flags/TO.svg diff --git a/styles/images/flags/TR.SVG b/styles/images/flags/TR.svg similarity index 100% rename from styles/images/flags/TR.SVG rename to styles/images/flags/TR.svg diff --git a/styles/images/flags/TT.SVG b/styles/images/flags/TT.svg similarity index 100% rename from styles/images/flags/TT.SVG rename to styles/images/flags/TT.svg diff --git a/styles/images/flags/TV.SVG b/styles/images/flags/TV.svg similarity index 100% rename from styles/images/flags/TV.SVG rename to styles/images/flags/TV.svg diff --git a/styles/images/flags/TW.SVG b/styles/images/flags/TW.svg similarity index 100% rename from styles/images/flags/TW.SVG rename to styles/images/flags/TW.svg diff --git a/styles/images/flags/TZ.SVG b/styles/images/flags/TZ.svg similarity index 100% rename from styles/images/flags/TZ.SVG rename to styles/images/flags/TZ.svg diff --git a/styles/images/flags/UA.SVG b/styles/images/flags/UA.svg similarity index 100% rename from styles/images/flags/UA.SVG rename to styles/images/flags/UA.svg diff --git a/styles/images/flags/UG.SVG b/styles/images/flags/UG.svg similarity index 100% rename from styles/images/flags/UG.SVG rename to styles/images/flags/UG.svg diff --git a/styles/images/flags/UM.SVG b/styles/images/flags/UM.svg similarity index 100% rename from styles/images/flags/UM.SVG rename to styles/images/flags/UM.svg diff --git a/styles/images/flags/UN.SVG b/styles/images/flags/UN.svg similarity index 100% rename from styles/images/flags/UN.SVG rename to styles/images/flags/UN.svg diff --git a/styles/images/flags/US.SVG b/styles/images/flags/US.svg similarity index 100% rename from styles/images/flags/US.SVG rename to styles/images/flags/US.svg diff --git a/styles/images/flags/UY.SVG b/styles/images/flags/UY.svg similarity index 100% rename from styles/images/flags/UY.SVG rename to styles/images/flags/UY.svg diff --git a/styles/images/flags/UZ.SVG b/styles/images/flags/UZ.svg similarity index 100% rename from styles/images/flags/UZ.SVG rename to styles/images/flags/UZ.svg diff --git a/styles/images/flags/VA.SVG b/styles/images/flags/VA.svg similarity index 100% rename from styles/images/flags/VA.SVG rename to styles/images/flags/VA.svg diff --git a/styles/images/flags/VC.SVG b/styles/images/flags/VC.svg similarity index 100% rename from styles/images/flags/VC.SVG rename to styles/images/flags/VC.svg diff --git a/styles/images/flags/VE.SVG b/styles/images/flags/VE.svg similarity index 100% rename from styles/images/flags/VE.SVG rename to styles/images/flags/VE.svg diff --git a/styles/images/flags/VG.SVG b/styles/images/flags/VG.svg similarity index 100% rename from styles/images/flags/VG.SVG rename to styles/images/flags/VG.svg diff --git a/styles/images/flags/VI.SVG b/styles/images/flags/VI.svg similarity index 100% rename from styles/images/flags/VI.SVG rename to styles/images/flags/VI.svg diff --git a/styles/images/flags/VN.SVG b/styles/images/flags/VN.svg similarity index 100% rename from styles/images/flags/VN.SVG rename to styles/images/flags/VN.svg diff --git a/styles/images/flags/VU.SVG b/styles/images/flags/VU.svg similarity index 100% rename from styles/images/flags/VU.SVG rename to styles/images/flags/VU.svg diff --git a/styles/images/flags/WF.SVG b/styles/images/flags/WF.svg similarity index 100% rename from styles/images/flags/WF.SVG rename to styles/images/flags/WF.svg diff --git a/styles/images/flags/WS.SVG b/styles/images/flags/WS.svg similarity index 100% rename from styles/images/flags/WS.SVG rename to styles/images/flags/WS.svg diff --git a/styles/images/flags/XK.SVG b/styles/images/flags/XK.svg similarity index 100% rename from styles/images/flags/XK.SVG rename to styles/images/flags/XK.svg diff --git a/styles/images/flags/XX.SVG b/styles/images/flags/XX.svg similarity index 100% rename from styles/images/flags/XX.SVG rename to styles/images/flags/XX.svg diff --git a/styles/images/flags/YE.SVG b/styles/images/flags/YE.svg similarity index 100% rename from styles/images/flags/YE.SVG rename to styles/images/flags/YE.svg diff --git a/styles/images/flags/YT.SVG b/styles/images/flags/YT.svg similarity index 100% rename from styles/images/flags/YT.SVG rename to styles/images/flags/YT.svg diff --git a/styles/images/flags/ZA.SVG b/styles/images/flags/ZA.svg similarity index 100% rename from styles/images/flags/ZA.SVG rename to styles/images/flags/ZA.svg diff --git a/styles/images/flags/ZM.SVG b/styles/images/flags/ZM.svg similarity index 100% rename from styles/images/flags/ZM.SVG rename to styles/images/flags/ZM.svg diff --git a/styles/images/flags/ZW.SVG b/styles/images/flags/ZW.svg similarity index 100% rename from styles/images/flags/ZW.SVG rename to styles/images/flags/ZW.svg diff --git a/styles/images/flags/gg.bat b/styles/images/flags/gg.bat new file mode 100644 index 000000000..7ec265c5f --- /dev/null +++ b/styles/images/flags/gg.bat @@ -0,0 +1 @@ +ren *.* *.svg diff --git a/styles/images/t_info.png b/styles/images/t_info.png new file mode 100644 index 0000000000000000000000000000000000000000..10ab2a456f5114493406642ffd3551048d626e93 GIT binary patch literal 916 zcmV;F18e+=P)KLZ*U+R`sCEkzKl)gj5&q@hY_5?)@_euSf22N!q0z{yc?Q2YY_Kym8e z5Fvwu2%hQO!{u_psMvL#(bD64NQRTZj^-}DnS22ry9f-;mW=gZvQj}U-ZdMsK&I8^7~DvX`q=i!hm(vW^r>w7I8|@&x39B)l#dnGxj?gbkTtf%D zXeowfjF&h-7sJt??mT*acXaMC-eV6d=En+N;9f*wFo`%LeWN@)#eJOR$?GHGeH$UZ z5yv~%W36u;E=?lu1nIjh?6q80zrxp|gatS78sG9BuSX)yWjMdF<93Sv$R8x;5&Txj`_=|@H qx>y=Yat}Y|eLMAId@uXa_HO_#JA72z%R`|60000 {L_LOCATION}: -

{L_LOCATION_FLAGS} {L_LIST}
+

{L_LOCATION_FLAGS} {L_LIST}
diff --git a/styles/templates/default/viewtopic_attach.tpl b/styles/templates/default/viewtopic_attach.tpl index 59bf63bbe..89007d951 100644 --- a/styles/templates/default/viewtopic_attach.tpl +++ b/styles/templates/default/viewtopic_attach.tpl @@ -145,7 +145,9 @@ - + @@ -171,9 +173,6 @@

{postrow.attach.tor_reged.FILESIZE}

- -

...

- diff --git a/tracker.php b/tracker.php index 56b1e9456..e84715f73 100644 --- a/tracker.php +++ b/tracker.php @@ -751,7 +751,7 @@ if ($allowed_forums) { 'TOR_STATUS_TEXT' => $lang['TOR_STATUS_NAME'][$tor['tor_status']], 'TOR_SIZE_RAW' => $size, - 'TOR_SIZE' => humn_size($size), + 'TOR_SIZE' => humn_size($size, 1), 'UL_SPEED' => $ul_sp, 'DL_SPEED' => $dl_sp, 'SEEDS' => $seeds ?: 0, diff --git a/viewforum.php b/viewforum.php index f4c18bc21..c24bc109a 100644 --- a/viewforum.php +++ b/viewforum.php @@ -476,7 +476,7 @@ foreach ($topic_rowset as $topic) { $template->assign_block_vars('t.tor', [ 'SEEDERS' => (int)$topic['seeders'], 'LEECHERS' => (int)$topic['leechers'], - 'TOR_SIZE' => humn_size($topic['tor_size']), + 'TOR_SIZE' => humn_size($topic['tor_size'], 1), 'COMPL_CNT' => (int)$topic['complete_count'], 'ATTACH_ID' => $topic['attach_id'], 'MAGNET' => $tor_magnet,
{postrow.attach.tor_reged.DOWNLOAD_NAME} {postrow.attach.tor_reged.MAGNET}{postrow.attach.tor_reged.DOWNLOAD_NAME} + +  {postrow.attach.tor_reged.MAGNET}