Subversion Repositories vnag

Compare Revisions

No changes between revisions

Regard whitespace Rev 77 → Rev 78

/trunk/framework/vnag_framework.inc.php
1,26 → 1,26
<?php /* <ViaThinkSoftSignature>
M5+YhhUygumyDtPS4a66WBocZDh6eW5QS3W3UiTvc3lMfo+epXCDhkO5F6Rd2pMX1
1opoSnc9AGCKequhuGjOq9PCgAM0VScCmRk4J0U1oj4fzAzXW7GQlg++UL4OQ3Dg/
2ya6GzYOxoK38T57W7WZr4U6Te1+nT0wcc/kpfYOLAQSePjzT6S2ErRUp5RUjEy9l
g+5dBcDFZ0kmVpjyRg6kPubiW5HntmQczkn0nRfUkW45TZFs7LwbTk+CI7+fbRokm
s5mt0DIiZPZckelCfszWVHHRhumhazpp+B9rOL/FYj/jle/27z9n3VbCdc7JVhppo
KZ6ReahFS6h1vn9mo0o4Adzj9YnlfMgeb8AYftDzmdIpJl/BYZfdqOfjt0osffJdl
ahvduFCvLt1lR6hVNJes+h6mSigq5+EO6C3fhsmOGFfvs3DEXljqy1LLPySbHAFQQ
eYDrY3Rac9Y2uPSkZW+YJkiVTrvBT30T14Z59YA/4UrLTkVPAS5Rmg6tJc1KjNuWk
AQ0xM5wI04DWI383qXhbh0inBZWAJJNUX4H2VAVnbIuj0wmvI2/sif5mu/o+rkfKf
tDwR9Tzi2sr8J1byi5CJksH6h8XN+ro6bkg+Z0N1ztRHKo49gjhJFSj0XSss+hWNB
bXwp/oHRS8Krdu1DFAYCafGs4T4zuMoOW1F1mLg/hkARI/sO4dWFRRT/AMkhAZLaD
6IqmrTNY0QT6Rn0ByajSr+7Onr8efgRmgZr+ZG2GDxTMtJYhoG+3szOC/bDWsq6IB
tdyHTg7mkL4zYsuAtCH9DUDKtGr4Ngm7ejzpo3LgWXLxFBqM9KN0AGfgld+m1OH0D
pzjg2WEYfhksndhOqzetaEGqIiLCkpZz2lZF979eeNwAEqSXgaRSypi3tNzjddlGc
gtx7VZOIqBEmlnBLZ83k3FPC73C+EMPCqw+QFVryC0c9FvInuSRKc9/e6ssE8f6qu
SljEB4+Z1N4SE5yO6bfwKfznZDIZ5YsdUMYsgD7XsxKpomz9nmfcxoU9vKtnuIoy5
gJ4Ca2xhbfyrJ7X1fk6+5301fU6czjn/zeweXLbdaD+CbCUc7TZmsCxC86otmWF4S
Kx0MLHCSA8T94bNY0ia4ncWo+CVjUMmZbu5QE1QBWuklzlfFZxpIx/rgnQFrAv4rD
qbPsplr46kzlcZCQkLVBfI/O6a+0vPXT9JjH+wxcsYRHuodLmPAQlpaFkO6C4Kq+e
ocOj5OGWD/wSXB8ZSX6HnYdJSHHZm8E/Vl9LXumhjas+2LgaSa6RosW2KVZY0DfK8
U+j/QJ7KoFQ+srSvhUySfXEpwSbcQgM5zH7DAZXT0FxDHit2iimANwxgtla+u7G3S
A==
H8RS2FtzJ6oXxHoX7qyolomkUVb5hPPq71/+xoZIME1BY1QcCif7imp/jeGKoOezw
YhYVmKrS0zYZG04mhfGnrMez9NcvMrtqSbBBNXZ3dsGcjkYMYq8VVbvOW9A9MOoaw
vVSZydPls7FxszGfPmL1M9ebZmj03TUeGbBfE+kIiw+dAMsO+rjYZmi5khwZPb6nn
bP+6DVMqg1blhaESl2k0Eqhe7kX9NWhZ3y0QuxGj7nVm3gFojo02TQubgRr9l2f7z
6QqS7jt7YSwQg2nP+3KVNBJZoXU/hTx3Bo/PaJG/9Dotp0/wmFHb6YqTkUHdP5DEu
M9LxOFEKNjrmPbVHPDxNPyTaoF06fI8rXI46XyUULkw1LXOUv8nzaoK3WXJzfO/74
o/GOMEV01Aeq0ooTdyi/ktpS43T4sYA5qod66dKTUKwUTU8IgEp/GcZnugpvlXi0b
U1hfF5W32Rp3vbeh37edXCMRkOw+7svvFQle5JzC+xHloW3jbzRJvfDULAd6bUrbl
QAy6pOEA26Sjpi5pmo5qRu3LHHXiu9V3eYpPzl2orADnyOyKiqyj8Yvw3U/cvqxwq
YSSxXEPYxOQN+Cl/ncUOJeNv8C+AYBU9S5aSXwQWnIl3baVbS9NL4CW9Fy2AM1/Vf
uMBVz3NWclUFO6qPMoaCEdVsuUSbpo6/HDXGm5kr4Yzc/lv1Q3lUKQ+a5B3ZMAfhY
yMKdSPnUZwQhuCxaAjpMdkVf5s2qECgT/e1psSKCOqLd9fhWQuV1eHa9gxqBL7ClS
m1jy8TRbSSZ6v7yQ397GDU8iyKvXCpeBs+g6VXkFd5ZM2Ajgb+uIfzPD3qPfPC+nK
bhsMzDwBmu444dvGC9OCNLb3efZXLSxZ6wMG2MoA7c814qrEYFokTKeMiYKCGQkx5
kgamyPtizgOpiis6XSKFs9GXSY0vT+q3rSCo+23xjNHPhaCjLmywDoeoeOX1tmf30
Blh0RrNEXgmlMuVkXaHrKAepU0K2oXhw63bRQUzcZMY1rORoML6Rro6u0PI3mT7VQ
6ZnnyxZgUljxpo6ZdP8XqE8oyR9P6dhmdN6xI3rYyrIDrPWsoRGCMQk/ej8eS8Ve7
Y1Z3hC9njExmmrZrVoymMcJNDK99jBQCs49qXA+OuCRbfgU0B12FwEUy8xDnUlzY9
t6b1fwHL2G25m3wMXzk0CHnQWOoAS+3zG+nlfF1RRbx0U3TC4O3Epy30zC/v/TvV7
73uEr/LLezls3KBddOI1FRkWC5CoERg9Bi4XoLFiZqpF/eOWsRaYzrwqv0d9sCgnU
RFzD9MdFjT3EiQDnlvbf9nTtN3Dpw1IaYFb/u/4AhjugS2p1XFIZpYP4U1J6wL5Vl
Q==
</ViaThinkSoftSignature> */ ?>
<?php
 
1339,7 → 1339,7
 
// This is not used by the framework itself, but can be useful for a lot of plugins
protected function url_get_contents($url, $max_cache_time=1*60*60, $context=null) {
$cache_file = $this->get_cache_dir().'/'.sha1($url);
$cache_file = $this->get_cache_dir().'/'.hash('sha256',$url);
if (file_exists($cache_file) && (time()-filemtime($cache_file) < $max_cache_time)) {
$cont = @file_get_contents($cache_file);
if ($cont === false) throw new Exception("Failed to get contents from $cache_file");
/trunk/plugins/last/LastCheck.class.php
1,26 → 1,26
<?php /* <ViaThinkSoftSignature>
cNxgmYaPudAjw7GVR3a8SaJwW1pTIXIVKgsgZHEZ/F+STg0sfH7Ulvmikp0JAFSf5
96xzM57qOw5v9UVkE20zL56ZDyc48D1nrtBsNp6Pf22UVC3Kg2x+MYiOo06oV4WgA
9aA8dsyf4m0sqifbQPmSh7IXq3ZSp/nnpYSgbLGRvLr/LshnRIohLrbcFd0oaVuT+
HPtvUsOLgKMXYa8U5U86aOvW0aAMDOxNDassNbYLwcp+shNWiMwi4TVKtGbzIThYM
hCCvo4JuCKqEYbvMKT8SwbPP00DUCjnxPkytagC5Y4x5L5Hqu8z30fxB/aiKclJ1L
DncG4NrCvBfg/O589suxghv1AOThIxi+hcRDyy/+VX3Lk/FPkd8XBbTQYPp8KIOij
TyOdBhr3mHtRsmWvHhwhFo4H0HPA9d1rfAoECuvk6MLcTO2x7nJByA+WG3SPZkOn8
N24+SAaM+DxR086kOl3sxLd/khWZgp35mObWyKnH0gZ9038X9k2m5qXnRkssVhLih
Ff4BKOGcMrigx+xcteJp26AUJo6YCxvlobCSEo61Dm1bokv/xSawA8fexpVCSNOhR
F/eZM1DAoxR7oMQRNcnZQYcTlLhmEOdcARRGJa03EkAVNYAdhDB9Fw1dUyZ9GI0M7
ElQ6zj6djPZBzEOVjhbTwc0RlbrzFi2EDilZxmeC+dy/lp+w60xe0AgZ/xjM8JRFc
vWWGlQ9Y94nPeEnqz7HjWijzCAXinY76WBjK298SF/df5yfDgKPf4xCaNS5OaJwMp
IcE4g2I4UHhhRyA0FLaP8kqwHIqYJGO+fKA8034IWFjUIJmA14H9lpd1dxVnQ7hNp
3tnW71tluuT8Xuz++qkGFXAIqV8WefymZbNPgWyCoyuC91F9l3+4eoUXGU9R/dqw1
AbtPWmttngs96Ico2U972NfLf/PTwWuElSccHwkHCTSEmtEmhwCxRVMFDG8wvm8sg
HFam2Y8ObeeYc2UpDP1lsRXsNMNLjvdi/MuF1qeATf/4oqAjnxcZg5qTCH8VVa1iL
CNqa+SqazNKOmpSOALRAw/tr9fJsQyvdAF0mE7JiAdvyRgiTG63ab+Dc0njHWeTOC
Ol4D7NgtY70pIwB8DKteivgLOZU05Pp4LGlYcvQCRreTNqRD0kv83zxogpT4kGnNS
htJA0k484/KFe3lNLzKe7b7xH7CoBOKnEdemaMGDds8bc4mHDN2i0cBGuqQW9URTo
vwGF46UgiE4DcRBEOrTeZ0e8h8I1Zk6ZhXuM3pX2sOhzPlq+JCCQ6LIsjirPVTEPS
mrBfP64pFDKeXmMcdiYctq29dlaZtcYohUm7bS5V5HcEWk6LlNYv+XoPmsL3wzHX8
g==
nPj2Ge28Yr6M12/PcAB0jcBhoEu8jOQxCmQGGimC9FD/I/AVWxpG+QqNDbQxjCueH
WFqtPEM2HsROB8HE8KZkUPo99/m+teX/wNro3ZK6rI+6NcHtnOipY2SimPpeLjn76
WBJ+r/4WX7UM9tA0ivyUycOAITO8XQtL1JbSyp7zrxN1fONVXnZ0P0JIhthc5myFa
h4OlEWbED0Dmpa23jL+amEeo27JOkewjt56iTkJTXOW8u+oKl86F0SKfPd7q5232y
0ioNIa3S6iWH4u9kHta4AHjoWPd7CpUyMB3kZGKN1YS4RJWjNNs5VZSUaDevYaOM0
rni8Rogtv3jDOGnBZH/wsysZcYzs/drn+72FN6gQGc0rlNbAxTvsa0EFnwx8D0oh4
XjiB/TBvzgEbCxVEkXYLrXJ7sXay8BiJY0958JxjCppWbuieRg621FEabG6r/gAs7
kjddREytPoN6mLd8H9/zNCGFH8BKSZMKKmjLkQjOJd5xk0Owb6QH99QtD5XoISbQx
rXc4UOSNq9YrVZTFDLo9inqay1Ne268MUwi8PGN0ouDUIuCcFQRIO/vQUp+aKmD/R
WJZcv/m7RLSsXplMC7FHUMjgM5f1vdSA70ac1zzStO2iq+jqnbBxf+NJBjn7A+sCP
8JaTM1Vt8VOoj0pJhV6SclkEEkSq2cEcDFDwy99LNcuz9Bf2k+eTRuutO+h0ESYR0
R6U6Spx7WQA11BMinkxaQ0spfOt5VAyHInW9Tbv2QD0tEz3h3VryAbqI0HO6kcGxK
gnyVJV69H15BPz6TGeoF5a7QAwqjQxxoWZwlDbnNTSG+c6wWcJhoyoiLsa8gYZ4tS
/C8+1V/QPX0X2nE74M2Q0AWQXGmjLnDTZHPDiN8ZCqayekuWT90SQIMAQ1j/nv703
K7Bf+IUuIwKNRdi+LQolu7X3ovgpGi9fBAKxXAR6k7Oi8U5FxKvo6mthIQO4imGQZ
aUNsutwqy2tLnLkQmb+aUdSkL/Fkynf7BkW+s64iSOt+OI3RTR/qPSaYL/MDD7eMC
Vwq2wjsueThpszPaAuv22BOAfhWngIjdbPlN7CDgB+8H5MuAA1Zkqmm5lsQyMlUNT
FecOvytEOA1BR0slyXZsZtf5dX6zZYB1d26U115+2utF1LBPJJ9fcPIEcjAvTakVx
5tRbDRFXW2Sn4MgPs7ljqoQ0sjzyUti6t+HODtDHgSdMZfjP7VimDqRmcsPUJfv50
YG2Lw0nvle1m6AMb4oDue8s06c3W29z+D75bVH0n2KLw/PLQx2ycbNUc7OgoCrLlr
gwwZ/IU3dhaQQxD2wgpq6RvYaNvMWd37snfIFXAVOdw6qsKyKjlUa5LqMs9ZqGZno
A==
</ViaThinkSoftSignature> */ ?>
<?php
 
70,7 → 70,7
$this->getHelpManager()->setSyntax('$SCRIPTNAME$ [-v] [-e] [-u username] [-R regex] [--ipInfoToken token]');
$this->getHelpManager()->setFootNotes('If you encounter bugs, please contact ViaThinkSoft at www.viathinksoft.com');
 
$this->cacheFile = $this->get_cache_dir() . '/.last_ip_cache';
$this->cacheFile = $this->get_cache_dir().'/'.hash('sha256','LastCheck:last_ip_cache');
if (!file_exists($this->cacheFile)) @touch($this->cacheFile);
$this->cache = $this->cacheFile ? json_decode(file_get_contents($this->cacheFile),true) : array();
}
/trunk/plugins/minecraft_java_version/MinecraftJavaVersionCheck.class.php
1,26 → 1,26
<?php /* <ViaThinkSoftSignature>
FQlTtB4vrAiggW1zDAtMmBdIYp0YEeSO7wEVXsbNI9mW4w2KsRno1wltN+lQt7WF5
220EzyN/9dQy8SudsduA7Mzkxi4oJU8TdZBruleBNcNBpEK49Sw2tN9HBTzWWAthV
bcUY1oKO36L4q1hO4vUBQ6t07pTlkEnNfofVCq7kOpbcNFzEdghjwSNs/kT2KVa8s
0/KdKq1ioHxJDf/QhBrNM0yOQowmQvMTZToNEao+jrymTM5gu5XW0k18NoXIV3yVn
KsbGL4AroYiHrw7CrkDunaIMJI2yLZLk6m8+akOJTmCMeiJPC8wu8jFuz6r6957yg
F24b5+UTwQkmwnZM/9MYbabOjzR7rqb85aztxNT8a0dOxgeCm6emW3DkW/pKbLSAA
Xekfy8TH/+wEY1a4g+B/K33ZSiWqhs5uuOXQXhTN1bt5bhxeZv1WF1wpq6BUxdIbM
Tfo8JtfOsNIcj6+pJFcuAaDPr5EOZ5MVxwmNftx/2W5zr+fKWQUVpkKgwE+y0qMf2
ZU5dPj84IRXW7IhtnXgll5erdL71K8nURXdjtD+as4Enwxbw9VDeGWlIWohIdU7NH
9JBP+YBzX/22XHHMTCd6nl7qDBKxGhfeWr2qKsLcIH69ii7GGQDE0x9W7caxyWpp7
LPrH20ZAtOJeIOeGbiesqP8u6D1JzOPmlESRVOhBDp5JNVRVg3xCjH2gI1CjKLwHB
/kxSRilS2C3Ehcx1li1bcnItLk42SxG0rzFlsBlLYQXvujbl8TTnu8qn8oqcShM0M
b0IqpAZoZp/v39N8pJOtFY36L7JIcE+p51kTRvwHaG/YB5EgZTrPUaSwJ3+72CPC9
NYQ4uFS8oZjNhgeAwwX2cimA09TELhoYMzfrEIVy1k2znfI6Ax/jllwQ4wEdtM7cv
bajmdkDdxCLiXjIl6qqO2NBrZcW4E2kTn1c0KoC4CeMAMWWlVu39n/z+eXAknGF20
6aBmGMLoPQGpu33U4RMq83racjR3ZCnYhMwxWEWP6kkVdh+dXEkS3GExm0ZhR94dO
OJgEjqZhCCTS5VyOVrZV0yHf7WLfboEbfBiLpa6WmYPuWpmPTm0O+zO/E7Vsu39Mp
4FIhMBVR+5hpeO2zXdks86wvAPj6H0sDbcoHHsZt8Q87RyY5/uo7WRDd6tL2N/4Gv
zx3ZHRfQgjryssRYJHFzG0NGf3JL1HYKIY9sQvc+5OI+p+kfEUfRPWuRwbiyLGatX
Z7/s+z5rRr8Ky+2ETDwKyDMju8d3ZnV+Hug7jozmLj5UqZ/+QvOmnBL9zby6E3xKE
SMy/WLKbweLljrusnIZql0SUCwEIXblUTRtwzdU1Aapj26HiuXCqRyX91SPcAVeLW
A==
UW2wHYguBI0V/FDoEIL9OPSFCBTIDfdJAKlietlbUOy09dhIqhsWaXTn3jtd2Bh0O
KfHPU3JvgNNpkYUCIAatf1V6DMb4L2yyYA++Dla8708PriOen8QwcWEEKCjWbBong
8fBvHbGyJh8if8uiJDOnfbcYEiKxtMQ2N+xdkndhIudbYOj/Tz4eNR5wZ7176aV6d
Kin7ZahX4w/IL/TSBqMYi3M35QK+9GFJ15c77Fc+PLoCfss0qaRNgcHgDPUNxPQPk
c7CCHUwO1j/GIJ2gmd2uHsp8vvUhdSUmCloyk+ea/WUIBs4C4nr68EBDu05zTeCtz
ED9WthnwqLdemP56dlerzS+VhdHyYKTs6xDwOtCaueibBJLdnNPVTjSwWfMIPGan/
uiD//WKA11RFFMI8GtmQ/Fivd0qcHl4dgXPup6oVUssaKyzHarggZKkPs+0aENHtO
smXcznxb+sdtZAGwwqoc9Ga9jUrfbNJIqa9kxOn+6aUvUxHw88o5mlbfNhv1LpgL7
LbVigNSmVh5MCMKiajndozFXVuNlOaTyMyMNDTgSZv2z7Msg7k3vtUd7Clr8hO1VF
VrW5pZiZijqaen/Llv3FJXtftf6mJtCDHLOPn6E5c4M5FQthN3gzxlW/ticIQPfWk
Ie3Cv23UGin065x84Yj8Mlb7GZJc9jyt3FdEPS8RK/8GXAYpSjk+/1PHv/YF+Hp8r
z1HdDcRr07vrT1bRog6L0LBgqub1HaznRxmzdvt/MeZ8STUqGK9GBSx2qBLkEnM+x
F8C/tJxrLytmDAM+Mnc6uA3tj3ntdlA96k+Is5rrnG8JKQv3JOnoGUZ+niy74rNyd
98v6uuFqFAwLOjYtjkWZu3heiVGX/BT4WWqB+5szJM+qQr149OmnKZ6omLwEK4LJX
HrXNyXPx+0DNiNbEb7Hbf97kxXzwU07hYg+Yd7LQe41MMmytiL8u+cuAU5ND2lI2V
3qOO8ps6A8ZiGYERhAATKOlPP/kdwp5VqYqbFytavaTqLKqGRAwpiRfTM78zEy0v5
PW2RDyBPY4HzcblXfDVZkAMz2LWnTgvM9uUd+eI+xULRH47U4G60xN6DzSi6u5wrm
FcYqesfnWM5gsVjj8aGSDq3xmSILgjUH2aH9naRsLLGqTUpefRWzMIkBggMETtAk+
IlUqaWwV2baFESGfebhIfwLziBm9Ikd248RelD5o3MAqfbuiZOVFMp35IYvze2fly
6yqauVfJxRxYZNdbwJrkGlEh29By8CzX4yBcEhuefwa1il+SXmTbjuPTKyuhRo/TJ
mkfzMLjOwfnT1+/0p+ZJxVahMYT6ts4U0wVopjS5Zes+8q9Ae5qYJkHdNG18Ogg4j
g==
</ViaThinkSoftSignature> */ ?>
<?php
 
72,8 → 72,8
 
 
 
$cache_id = 'minecraft:server.jar('.filemtime($server_jar).'/'.filesize($server_jar).'):version.json';
$cache_file = $this->get_cache_dir().'/'.sha1($cache_id);
$cache_id = 'MinecraftJavaVersionCheck:server.jar('.filemtime($server_jar).'/'.filesize($server_jar).'):version.json';
$cache_file = $this->get_cache_dir().'/'.hash('sha256',$cache_id);
if (file_exists($cache_file)) {
$cont = @file_get_contents($cache_file);
} else {
/trunk
Property changes:
Modified: svn:ignore
plugins_intern
phpstan.neon
.phpstan.tmp
+phpstan.bat
+phpstan.phar