iotcat
/
Ushio-cn-old
mirror of https://github.com/IoTcat/Ushio-cn-old.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

auto update

Browse Source
dependabot/npm_and_yarn/ushio/www/session/lodash-4.17.15
iotcat 5 years ago
parent ec0cd93878
commit 377758347e
4 changed files with 290 additions and 280 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 523
      yimian/.viminfo
  2. 15
      yimian/www/settlement/api/index.php
  3. 12
      yimian/www/settlement/index.html
  4. 20
      yimian/www/settlement/login.html

523
yimian/.viminfo
Unescape View File

@ -17,6 +17,7 @@ $
:wq
:q
:w
:s
:q!
:Q!
:Wq
@ -32,105 +33,120 @@ $
# Input Line History (newest to oldest):
# Registers:
""0 CHAR 0
   
"1 LINE 0
$s = '';
"0 CHAR 0
$usrMail = Array(
"liu" => "i@yimian.xyz",
"yang" => "boyao1999@163.com",
"li" => "x.li203@student.liverpool.ac.uk",
"jia" => "mingranjia@163.com",
"zheng" => "hao.zheng17@student.xjtlu.edu.cn"
);
""1 LINE 0
Last name:<br>
"2 LINE 0
yimian__mail('i@yimian.xyz', 'Hi~', 'Test from Yimian LIU', 'ERP TEST');
<p>如果您点击提交，表单数据会被发送到名为 demo_form.asp 的页面。</p>
"3 LINE 0
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<br><br>
"4 LINE 0
<input type="text" name="lastname" value="Mouse">
"5 LINE 0
$tmp_total = 0;
"6 CHAR 0
$total_arr[$ii]['date']=date('Y-m-d', strtotime('-'.($ii+1).'day'));
$total_arr[$ii]['total']=$tmp;
$firstTime = $firstItem['datetime'];
$firstDate = substr($firstTime, 0, 10);
$datetime_start = date_create($firstDate);
$datetime_end = date_create(date('Y-m-d'));
$days = date_diff($datetime_start, $datetime_end)->days;
for($ii = 0; $ii < (($days < 30) ? $days: 30); $ii ++){
$sql = "select * from account where datetime>='".date('Y-m-d',strtotime('-'.($ii+1).' day'))." 00:00:00' and datetime<'".date('Y-m-d', strtotime("-$ii day"))." 00:00:00' order by id DESC limit 1";
$result = $conn->query($sql);
$tmp = 0;
while($row = $result->fetch_assoc()) {
$tmp = $row['total'];
}
$total_arr[$ii]['date']=date('Y-m-d', strtotime('-'.($ii+1).'day'));
$total_arr[$ii]['total']=$tmp;
}
for($i = 0; $i < count($total_arr); $i++){
if($i < count($total_arr) - 1) $total_arr[$i]['val'] = $total_arr[$i]['total'] - $total_arr[$i+1]['total'];
else $total_arr[$i]['val'] = 0;
}
for($i = 0; $i < count($total_arr); $i ++){
if($i < count($total_arr) - 7) $total_arr[$i]['week_val'] = $total_arr[$i]['total'] - $total_arr[$i+7]['total'];
else $total_arr[$i]['week_val'] = 0;
}
$s = '';
"6 LINE 0
yimian__mail('i@yimian.xyz', 'Hi~', 'Test from Yimian LIU', 'ERP TEST');
"7 LINE 0
array_push($ = $row['total'];
}
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
"8 LINE 0
$firstItem = $result->fetch_assoc();
"9 LINE 0
}
$tmp_total = 0;
"- CHAR 0
# File marks:
'0 36 134 ~/www/settlement/api/test.php
'1 11 3 ~/www/settlement/api/test.php
'2 33 118 ~/www/settlement/api/test.php
'3 34 251 ~/www/settlement/api/test.php
'4 18 7 ~/www/settlement/api/test.php
'5 50 0 ~/www/settlement/api/test.php
'6 27 0 ~/www/settlement/api/index.php
'7 52 0 ~/www/settlement/api/test.php
'8 13 1 ~/www/settlement/buy-sell.html
'9 14 127 ~/www/settlement/index.html
'0 170 11 ~/www/settlement/api/index.php
'1 573 1 ~/www/settlement/index.html
'2 5 105 ~/www/settlement/login.html
'3 289 17 ~/www/settlement/index.html
'4 10 37 ~/www/settlement/login.html
'5 1 0 ~/www/settlement/login.php
'6 282 1 ~/www/settlement/index.html
'7 27 49 ~/www/settlement/api/index.php
'8 6 0 ~/www/settlement/api/test.php
'9 187 0 ~/www/settlement/api/index.php
# Jumplist (newest first):
-' 36 134 ~/www/settlement/api/test.php
-' 170 11 ~/www/settlement/api/index.php
-' 27 0 ~/www/settlement/api/index.php
-' 573 1 ~/www/settlement/index.html
-' 294 24 ~/www/settlement/index.html
-' 289 16 ~/www/settlement/index.html
-' 5 105 ~/www/settlement/login.html
-' 10 0 ~/www/settlement/login.html
-' 285 6 ~/www/settlement/index.html
-' 292 6 ~/www/settlement/index.html
-' 282 1 ~/www/settlement/index.html
-' 1 0 ~/www/settlement/login.html
-' 1 0 ~/www/settlement/login.php
-' 296 0 ~/www/settlement/index.html
-' 310 0 ~/www/settlement/index.html
-' 317 0 ~/www/settlement/index.html
-' 320 0 ~/www/settlement/index.html
-' 327 0 ~/www/settlement/index.html
-' 329 0 ~/www/settlement/index.html
-' 335 0 ~/www/settlement/index.html
-' 339 0 ~/www/settlement/index.html
-' 345 0 ~/www/settlement/index.html
-' 348 0 ~/www/settlement/index.html
-' 354 0 ~/www/settlement/index.html
-' 357 0 ~/www/settlement/index.html
-' 363 0 ~/www/settlement/index.html
-' 366 0 ~/www/settlement/index.html
-' 372 0 ~/www/settlement/index.html
-' 376 0 ~/www/settlement/index.html
-' 406 0 ~/www/settlement/index.html
-' 410 0 ~/www/settlement/index.html
-' 417 0 ~/www/settlement/index.html
-' 421 0 ~/www/settlement/index.html
-' 423 0 ~/www/settlement/index.html
-' 433 0 ~/www/settlement/index.html
-' 467 0 ~/www/settlement/index.html
-' 474 0 ~/www/settlement/index.html
-' 477 0 ~/www/settlement/index.html
-' 481 0 ~/www/settlement/index.html
-' 502 0 ~/www/settlement/index.html
-' 509 0 ~/www/settlement/index.html
-' 519 0 ~/www/settlement/index.html
-' 528 0 ~/www/settlement/index.html
-' 537 0 ~/www/settlement/index.html
-' 540 0 ~/www/settlement/index.html
-' 550 0 ~/www/settlement/index.html
-' 555 0 ~/www/settlement/index.html
-' 577 0 ~/www/settlement/index.html
-' 187 7 ~/www/settlement/api/index.php
-' 6 0 ~/www/settlement/api/test.php
-' 36 0 ~/www/settlement/api/test.php
-' 8 0 ~/www/settlement/api/index.php
-' 36 3 ~/www/settlement/index.html
-' 14 1 ~/www/settlement/index.html
-' 11 4 ~/www/settlement/api/test.php
-' 33 0 ~/www/settlement/api/test.php
-' 34 0 ~/www/settlement/api/test.php
-' 18 4 ~/www/settlement/api/test.php
-' 50 0 ~/www/settlement/api/test.php
-' 52 0 ~/www/settlement/api/test.php
-' 27 0 ~/www/settlement/api/index.php
-' 90 3 ~/www/settlement/api/index.php
-' 91 3 ~/www/settlement/api/index.php
-' 13 1 ~/www/settlement/buy-sell.html
-' 1 0 ~/www/settlement/buy-sell.html
-' 14 127 ~/www/settlement/index.html
-' 13 127 ~/www/settlement/index.html
-' 277 9 ~/www/settlement/index.html
-' 290 6 ~/www/settlement/index.html
-' 191 8 ~/www/settlement/api/index.php
-' 161 8 ~/www/settlement/api/index.php
-' 178 8 ~/www/settlement/api/index.php
-' 213 0 ~/www/settlement/api/index.php
-' 204 8 ~/www/settlement/api/index.php
-' 160 4 ~/www/settlement/api/index.php
-' 192 8 ~/www/settlement/api/index.php
-' 162 8 ~/www/settlement/api/index.php
-' 179 8 ~/www/settlement/api/index.php
-' 214 0 ~/www/settlement/api/index.php
-' 205 8 ~/www/settlement/api/index.php
-' 161 4 ~/www/settlement/api/index.php
-' 4 423 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 9 452 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 22 4 ~/www/settlement/imgbed/js/jquery.imageuploader.js
@ -158,62 +174,173 @@ $
-' 86 0 ~/www/settlement/func/functions.php
-' 152 0 ~/www/settlement/func/functions.php
-' 157 0 ~/www/settlement/func/functions.php
-' 164 0 ~/www/settlement/func/functions.php
-' 179 0 ~/www/settlement/func/functions.php
-' 184 0 ~/www/settlement/func/functions.php
-' 189 0 ~/www/settlement/func/functions.php
-' 196 0 ~/www/settlement/func/functions.php
-' 199 0 ~/www/settlement/func/functions.php
-' 204 0 ~/www/settlement/func/functions.php
-' 207 0 ~/www/settlement/func/functions.php
-' 211 0 ~/www/settlement/func/functions.php
-' 213 0 ~/www/settlement/func/functions.php
-' 220 0 ~/www/settlement/func/functions.php
-' 222 0 ~/www/settlement/func/functions.php
-' 219 0 ~/www/settlement/func/functions.php
-' 195 0 ~/www/settlement/func/functions.php
-' 188 0 ~/www/settlement/func/functions.php
-' 178 0 ~/www/settlement/func/functions.php
-' 154 0 ~/www/settlement/func/functions.php
-' 59 0 ~/www/settlement/func/functions.php
-' 39 0 ~/www/settlement/func/functions.php
-' 67 28 ~/www/settlement/func/functions.php
-' 60 0 ~/www/settlement/func/functions.php
-' 61 42 ~/www/settlement/func/functions.php
-' 4 0 ~/www/settlement/func/functions.php
-' 142 12 ~/www/settlement/api/index.php
-' 1 7 ~/www/settlement/imgbed/.gitignore
-' 327 0 ~/www/settlement/func/functions.php
-' 341 8 ~/www/settlement/func/functions.php
-' 2 0 /home/ushio/www/api/functions.php
-' 1 0 /home/ushio/www/api/functions.php
-' 1 0 ~/www/settlement/api/test.php
-' 80 0 ~/www/settlement/api/index.php
-' 30 58 ~/www/settlement/imgbed/upload.php
-' 27 16 ~/www/settlement/imgbed/upload.php
-' 1 0 ~/www/settlement/imgbed/upload
-' 5 0 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 52 44 ~/www/settlement/imgbed/js/main.js
-' 1 0 ~/www/settlement/imgbed/js/main.js
-' 10 4 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 26 17 ~/www/settlement/api/getCurrent.php
-' 13 0 ~/www/settlement/api/getCurrent.php
-' 15 0 ~/www/settlement/api/getCurrent.php
-' 1 0 ~/www/settlement/api/getCurrent.php
-' 73 93 ~/www/settlement/func/functions.php
-' 70 0 ~/www/settlement/func/functions.php
-' 78 0 ~/www/settlement/func/functions.php
-' 87 0 ~/www/settlement/func/functions.php
-' 117 73 ~/www/settlement/func/functions.php
-' 118 0 ~/www/settlement/func/functions.php
-' 119 0 ~/www/settlement/func/functions.php
-' 121 0 ~/www/settlement/func/functions.php
# History of marks within files (newest to oldest):
> ~/www/settlement/api/index.php
" 170 11
^ 170 12
. 169 413
+ 83 62
+ 84 0
+ 5 0
+ 2 0
+ 3 37
+ 21 69
+ 27 192
+ 27 96
+ 27 126
+ 27 154
+ 27 183
+ 157 0
+ 161 0
+ 213 3
+ 162 104
+ 165 7
+ 163 40
+ 165 31
+ 169 9
+ 165 31
+ 169 385
+ 183 0
+ 169 389
+ 173 116
+ 177 26
+ 179 31
+ 182 21
+ 183 0
+ 184 0
+ 186 33
+ 187 68
+ 188 22
+ 192 218
+ 192 332
+ 196 140
+ 160 14
+ 196 152
+ 160 49
+ 161 10
+ 165 28
+ 166 8
+ 177 22
+ 169 383
+ 174 8
+ 189 8
+ 193 8
+ 196 159
+ 197 8
+ 201 8
+ 204 22
+ 205 10
+ 201 15
+ 197 15
+ 193 15
+ 189 15
+ 178 11
+ 174 15
+ 166 15
+ 170 15
+ 166 12
+ 184 12
+ 170 12
+ 174 12
+ 189 12
+ 193 12
+ 197 12
+ 201 12
+ 206 60
+ 179 59
+ 16 48
+ 17 21
+ 113 17
+ 114 8
+ 118 13
+ 115 14
+ 116 27
+ 88 7
+ 85 14
+ 86 100
+ 116 105
+ 196 169
+ 196 42
+ 192 91
+ 169 90
+ 180 11
+ 207 12
+ 192 335
+ 196 153
+ 91 64
+ 92 1
+ 96 0
+ 93 44
+ 196 257
+ 196 152
+ 91 39
+ 8 15
+ 28 0
+ 28 0
+ 192 507
+ 169 413
> ~/www/settlement/index.html
" 573 1
^ 572 54
. 572 53
+ 6 9
+ 8 59
+ 9 77
+ 321 56
+ 322 51
+ 323 163
+ 324 164
+ 286 0
+ 285 58
+ 286 44
+ 289 12
+ 290 3
+ 290 15
+ 289 33
+ 287 37
+ 290 8
+ 291 15
+ 292 6
+ 13 78
+ 14 127
+ 539 58
+ 538 57
+ 283 31
+ 285 0
+ 284 22
+ 285 25
+ 284 40
+ 285 8
+ 284 0
+ 288 48
+ 289 17
+ 572 53
> ~/www/settlement/login.html
" 5 105
^ 5 106
. 5 105
+ 19 7
+ 14 0
+ 17 0
+ 14 0
+ 11 3
+ 12 41
+ 10 37
+ 7 6
+ 4 0
+ 5 105
> ~/www/settlement/login.php
" 1 0
^ 1 0
> ~/www/settlement/api/test.php
" 36 134
^ 36 135
" 6 0
^ 36 0
. 33 134
+ 3 57
+ 52 68
@ -275,141 +402,11 @@ $
+ 30 163
+ 33 134
> ~/www/settlement/api/index.php
" 27 0
^ 90 4
. 90 39
+ 103 26
+ 104 1
+ 105 0
+ 103 0
+ 83 21
+ 82 62
+ 83 0
+ 5 0
+ 2 0
+ 3 37
+ 21 69
+ 28 142
+ 29 29
+ 30 30
+ 31 28
+ 32 29
+ 156 0
+ 160 0
+ 212 3
+ 161 104
+ 164 7
+ 162 40
+ 164 31
+ 168 9
+ 164 31
+ 168 385
+ 182 0
+ 168 389
+ 172 116
+ 176 26
+ 178 31
+ 181 21
+ 182 0
+ 183 0
+ 185 33
+ 186 68
+ 187 22
+ 191 218
+ 191 332
+ 195 140
+ 159 14
+ 195 152
+ 159 49
+ 160 10
+ 164 28
+ 165 8
+ 176 22
+ 168 383
+ 173 8
+ 188 8
+ 192 8
+ 195 159
+ 196 8
+ 200 8
+ 203 22
+ 204 10
+ 200 15
+ 196 15
+ 192 15
+ 188 15
+ 177 11
+ 173 15
+ 165 15
+ 169 15
+ 165 12
+ 183 12
+ 169 12
+ 173 12
+ 188 12
+ 192 12
+ 196 12
+ 200 12
+ 205 60
+ 178 59
+ 16 48
+ 17 21
+ 112 17
+ 113 8
+ 117 13
+ 114 14
+ 115 27
+ 87 7
+ 84 14
+ 85 100
+ 115 105
+ 195 169
+ 195 42
+ 191 91
+ 168 90
+ 179 11
+ 206 12
+ 191 335
+ 195 153
+ 90 64
+ 91 1
+ 95 0
+ 92 44
+ 195 257
+ 195 152
+ 90 39
> ~/www/settlement/buy-sell.html
" 13 1
. 13 0
+ 13 0
> ~/www/settlement/index.html
" 14 127
^ 14 128
. 14 127
+ 6 9
+ 8 59
+ 9 77
+ 319 56
+ 320 51
+ 321 163
+ 322 164
+ 285 0
+ 284 58
+ 285 44
+ 287 12
+ 288 3
+ 288 15
+ 287 33
+ 286 37
+ 288 8
+ 289 15
+ 290 6
+ 13 78
+ 14 127
> ~/www/settlement/imgbed/upload.php
" 30 3
^ 30 42
@ -667,13 +664,3 @@ $
> ~/www/settlement/imgbed/js/jquery.hwLayer.js
" 10 0
^ 1 0
> ~/www/settlement/imgbed/style/main.css
" 1 29
^ 1 0
. 1 62
+ 1 62
> ~/www/settlement/imgbed/uploadp
" 1 0
^ 1 0

15
yimian/www/settlement/api/index.php
Unescape View File

@ -5,7 +5,7 @@ header("Access-Control-Allow-Origin: *");
include '/home/yimian/www/settlement/func/functions.php';
/* global const */
$g_threshold = 50;
$g_threshold = 20;
/* get URL val */
if(isset($_REQUEST['type'])) $type = $_REQUEST['type'];
@ -27,12 +27,13 @@ $tmpItem['datetime'] = $datetime;
$usrArray = ['liu', 'yang', 'li', 'jia', 'zheng'];
$usrMail = Array(
"liu" => "i@yimian.xyz",
"yang" => "i@yimian.xyz",
"li" => "i@yimian.xyz",
"jia" => "i@yimian.xyz",
"zheng" => "i@yimian.xyz"
"yang" => "boyao1999@163.com",
"li" => "x.li203@student.liverpool.ac.uk",
"jia" => "mingranjia@163.com",
"zheng" => "hao.zheng17@student.xjtlu.edu.cn"
);
/* total count func */
function getAvg($array){
return ($array['liu'] + $array['yang'] + $array['li'] + $array['jia'] + $array['zheng']) / 5;
@ -165,7 +166,7 @@ function setCurrent($tmpItem, $usr_to, $usr_from){
<br>
<br>
'.
'You may need to pay £'.$GLOBALS['g_threshold'].' to <strong>'.$usr_to. '</strong> as the public payment is not so balanced now. After the payment, please do ask '.$usr_to.' to CONFIRM your payment in his/her email or on the ERP online platform. More details can be accessed from the ERP online platform, which is <a href="https://settlement.yimian.xyz/">https://settlement.yimian.xyz/</a> .
'You may need to pay £'.$GLOBALS['g_threshold'].' to <strong>'.$usr_to. '</strong> as the public payment is not so balanced now. After the payment, please do ask '.$usr_to.' to CONFIRM your payment in his/her email or on the ERP online platform. More details can be accessed from the ERP online platform, which is <a href="https://settlement.yimian.xyz/">https://settlement.yimian.xyz/?surname='.$usr_from.'</a> .
<br>
<br>
'.
@ -188,7 +189,7 @@ function setCurrent($tmpItem, $usr_to, $usr_from){
<br>
<br>
'.
'You will reveive £'.$GLOBALS['g_threshold'].' from <strong>'.$usr_from. '</strong> who will help you to undertake some money of the public payment. Thank you for your Great Contribution to our life. After you receive the money, please do remember to come back to this email or go to the online ERP platform to CONFIRM your friend"s payment. More details can be accessed from the ERP online platform, which is <a href="https://settlement.yimian.xyz/">https://settlement.yimian.xyz/</a> .
'You will reveive £'.$GLOBALS['g_threshold'].' from <strong>'.$usr_from. '</strong> who will help you to undertake some money of the public payment. Thank you for your Great Contribution to our life. After you receive the money, please do remember to come back to this email or go to the online ERP platform to CONFIRM your friend"s payment. More details can be accessed from the ERP online platform, which is <a href="https://settlement.yimian.xyz/">https://settlement.yimian.xyz/?surname='.$usr_to.'</a> .
<br>
<br>
'.

12
yimian/www/settlement/index.html
Unescape View File

@ -281,10 +281,12 @@
var usr_arr = ['liu', 'yang', 'li', 'jia', 'zheng'];
if(cookie.get('usr') == null){
usr=prompt("please input your surname","").toLowerCase();
if('surname' in page.params)
usr=page.params.surname.toLowerCase();
if(usr_arr.indexOf(usr) == -1) {
alert('Wrong surname!!');
location.reload();
window.location.href='/login.html';
//location.reload();
}else{
cookie.set("usr", usr);
}
@ -533,8 +535,8 @@ function notice(){
<div class="ml-10">
<h4 class="coin-name">`;
if(item.usr_to == usr) s += `You will Get £50 from `+ item.usr_from + ` <button style="color: green;" onClick="javascript:confirm(`+item.id+`);">Confirm to Recived</button>`;
if(item.usr_from == usr) s += `Please Give £50 to `+ item.usr_to;
if(item.usr_to == usr) s += `You will Get £20 from `+ item.usr_from + ` <button style="color: green;" onClick="javascript:confirm(`+item.id+`);">Confirm to Recived</button>`;
if(item.usr_from == usr) s += `Please Give £20 to `+ item.usr_to;
s += `</h4>
<small class="text-muted">`;
@ -567,7 +569,7 @@ notice();
function logout(){
cookie.del('usr');
cookie.del('val');
location.reload();
window.location.href='https://settlement.yimian.xyz/';
}
</script>

20
yimian/www/settlement/login.html
Unescape View File

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
</head>
<body>
<form action="/index.html" action="GET">
Surname:<br>
<input type="text" name="surname" value="">
<br>
<input type="submit" value="Submit">
</form>
</body>
</html>
Write Preview
Loading…
Cancel
Save