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 ff6184bcb4
commit 5e9b4115ff
3 changed files with 253 additions and 216 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 420
      yimian/.viminfo
  2. 47
      yimian/www/settlement/api/index.php
  3. 2
      yimian/www/settlement/imgbed/upload.php

420
yimian/.viminfo
Unescape View File

@ -15,8 +15,8 @@ $
# Command Line History (newest to oldest): # Command Line History (newest to oldest):
:wq :wq
:q
:w :w
:q
:q! :q!
:Q! :Q!
:Wq :Wq
@ -32,28 +32,11 @@ $
# Input Line History (newest to oldest): # Input Line History (newest to oldest):
# Registers: # Registers:
""0 CHAR 0 "0 LINE 0
include '/home/ushio/conf/dbKeys/log.db.key.php';
yimian__mail( ""1 LINE 0
$GLOBALS['usrMail'][$usr_from],
'ERP - Pay £'.$GLOBALS['g_threshold'].' to '.$usr_to,
'Dear '.$usr_from.',\n\n'.
392
< 'You may need to pay £'.$GLOBALS['g_threshold'].' to '.$usr_to. ' 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> .\n\n'.
'If you are confused about this email, please feel free to email i@yimian.xyz, or directly come to me.\n\n'.
'Best Regards,\n'.
'Yimian LIU (@iotcat)',
'ERP - CP Home'
);
"1 LINE 0
"2 LINE 0
break;
"3 LINE 0
$tmp_total = 0; $tmp_total = 0;
"4 CHAR 0 "2 CHAR 0
@ -96,14 +79,14 @@ $
} }
"5 LINE 0 "3 LINE 0
array_push($ = $row['total']; array_push($ = $row['total'];
} }
"6 LINE 0 "4 LINE 0
$firstItem = $result->fetch_assoc(); $firstItem = $result->fetch_assoc();
"7 LINE 0 "5 LINE 0
} }
"8 CHAR 0 "6 CHAR 0
$datetime_start = date_create($firstDate); $datetime_start = date_create($firstDate);
$datetime_end = date_create(date('Y-m-d')); $datetime_end = date_create(date('Y-m-d'));
$days = date_diff($datetime_start, $datetime_end)->days; $days = date_diff($datetime_start, $datetime_end)->days;
@ -134,131 +117,132 @@ $
} }
"9 LINE 0 "7 LINE 0
$firstItem = $result->fetch_assoc(); $firstItem = $result->fetch_assoc();
"8 LINE 0
"9 LINE 0
"- CHAR 0 "- CHAR 0
# File marks: # File marks:
'0 140 10 ~/www/settlement/api/index.php '0 158 59 ~/www/settlement/api/index.php
'1 139 48 ~/www/settlement/api/index.php '1 189 0 ~/www/settlement/api/index.php
'2 46 0 ~/www/settlement/func/functions.php '2 182 7 ~/www/settlement/api/index.php
'3 157 152 ~/www/settlement/api/index.php '3 4 423 ~/www/settlement/imgbed/js/jquery.imageuploader.js
'4 40 3 ~/www/settlement/func/functions.php '4 69 8 ~/www/settlement/imgbed/index.html
'5 129 11 ~/www/settlement/api/index.php '5 26 6 ~/www/settlement/api/getWeekData.php
'6 289 6 ~/www/settlement/index.html '6 19 68 ~/www/settlement/api/index.php
'7 285 37 ~/www/settlement/index.html '7 73 93 ~/www/settlement/func/functions.php
'8 74 0 ~/www/settlement/api/index.php '8 4 0 ~/www/settlement/api/index.php
'9 30 54 ~/www/settlement/imgbed/upload.php '9 1 7 ~/www/settlement/imgbed/.gitignore
# Jumplist (newest first): # Jumplist (newest first):
-' 140 10 ~/www/settlement/api/index.php -' 158 59 ~/www/settlement/api/index.php
-' 139 4 ~/www/settlement/api/index.php -' 189 0 ~/www/settlement/api/index.php
-' 46 0 ~/www/settlement/func/functions.php -' 182 8 ~/www/settlement/api/index.php
-' 157 8 ~/www/settlement/api/index.php -' 140 4 ~/www/settlement/api/index.php
-' 40 0 ~/www/settlement/func/functions.php -' 4 423 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 129 8 ~/www/settlement/api/index.php -' 9 452 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 73 1 ~/www/settlement/func/functions.php -' 22 4 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 74 0 ~/www/settlement/api/index.php -' 16 12 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 289 6 ~/www/settlement/index.html -' 69 8 ~/www/settlement/imgbed/index.html
-' 285 16 ~/www/settlement/index.html -' 47 4 ~/www/settlement/imgbed/index.html
-' 293 0 ~/www/settlement/index.html -' 14 4 ~/www/settlement/imgbed/index.html
-' 277 0 ~/www/settlement/index.html -' 26 6 ~/www/settlement/api/getWeekData.php
-' 273 0 ~/www/settlement/index.html -' 1 0 ~/www/settlement/api/getWeekData.php
-' 258 0 ~/www/settlement/index.html -' 37 43 ~/www/settlement/api/getWeekData.php
-' 255 0 ~/www/settlement/index.html -' 38 4 ~/www/settlement/api/getWeekData.php
-' 252 0 ~/www/settlement/index.html -' 19 68 ~/www/settlement/api/index.php
-' 242 0 ~/www/settlement/index.html -' 4 0 ~/www/settlement/api/index.php
-' 226 0 ~/www/settlement/index.html -' 73 93 ~/www/settlement/func/functions.php
-' 220 0 ~/www/settlement/index.html -' 70 0 ~/www/settlement/func/functions.php
-' 161 0 ~/www/settlement/index.html -' 78 0 ~/www/settlement/func/functions.php
-' 102 0 ~/www/settlement/index.html -' 87 0 ~/www/settlement/func/functions.php
-' 93 0 ~/www/settlement/index.html -' 117 73 ~/www/settlement/func/functions.php
-' 90 0 ~/www/settlement/index.html -' 118 0 ~/www/settlement/func/functions.php
-' 77 0 ~/www/settlement/index.html -' 119 0 ~/www/settlement/func/functions.php
-' 74 0 ~/www/settlement/index.html -' 121 0 ~/www/settlement/func/functions.php
-' 68 0 ~/www/settlement/index.html -' 122 0 ~/www/settlement/func/functions.php
-' 63 0 ~/www/settlement/index.html -' 151 66 ~/www/settlement/func/functions.php
-' 36 0 ~/www/settlement/index.html -' 120 0 ~/www/settlement/func/functions.php
-' 34 0 ~/www/settlement/index.html -' 86 0 ~/www/settlement/func/functions.php
-' 30 0 ~/www/settlement/index.html -' 152 0 ~/www/settlement/func/functions.php
-' 307 0 ~/www/settlement/index.html -' 157 0 ~/www/settlement/func/functions.php
-' 314 0 ~/www/settlement/index.html -' 164 0 ~/www/settlement/func/functions.php
-' 317 0 ~/www/settlement/index.html -' 179 0 ~/www/settlement/func/functions.php
-' 321 2 ~/www/settlement/index.html -' 184 0 ~/www/settlement/func/functions.php
-' 19 0 ~/www/settlement/api/index.php -' 189 0 ~/www/settlement/func/functions.php
-' 30 54 ~/www/settlement/imgbed/upload.php -' 196 0 ~/www/settlement/func/functions.php
-' 319 3 ~/www/settlement/index.html -' 199 0 ~/www/settlement/func/functions.php
-' 26 0 ~/www/settlement/index.html -' 204 0 ~/www/settlement/func/functions.php
-' 23 0 ~/www/settlement/index.html -' 207 0 ~/www/settlement/func/functions.php
-' 20 0 ~/www/settlement/index.html -' 211 0 ~/www/settlement/func/functions.php
-' 14 0 ~/www/settlement/index.html -' 213 0 ~/www/settlement/func/functions.php
-' 324 0 ~/www/settlement/index.html -' 220 0 ~/www/settlement/func/functions.php
-' 326 0 ~/www/settlement/index.html -' 222 0 ~/www/settlement/func/functions.php
-' 332 0 ~/www/settlement/index.html -' 219 0 ~/www/settlement/func/functions.php
-' 336 0 ~/www/settlement/index.html -' 195 0 ~/www/settlement/func/functions.php
-' 342 0 ~/www/settlement/index.html -' 188 0 ~/www/settlement/func/functions.php
-' 345 0 ~/www/settlement/index.html -' 178 0 ~/www/settlement/func/functions.php
-' 351 0 ~/www/settlement/index.html -' 154 0 ~/www/settlement/func/functions.php
-' 354 0 ~/www/settlement/index.html -' 59 0 ~/www/settlement/func/functions.php
-' 360 0 ~/www/settlement/index.html -' 39 0 ~/www/settlement/func/functions.php
-' 363 0 ~/www/settlement/index.html -' 67 28 ~/www/settlement/func/functions.php
-' 369 0 ~/www/settlement/index.html -' 60 0 ~/www/settlement/func/functions.php
-' 373 0 ~/www/settlement/index.html -' 61 42 ~/www/settlement/func/functions.php
-' 403 0 ~/www/settlement/index.html -' 4 0 ~/www/settlement/func/functions.php
-' 407 0 ~/www/settlement/index.html -' 122 12 ~/www/settlement/api/index.php
-' 414 0 ~/www/settlement/index.html -' 1 7 ~/www/settlement/imgbed/.gitignore
-' 372 0 ~/www/settlement/index.html -' 327 0 ~/www/settlement/func/functions.php
-' 418 0 ~/www/settlement/index.html -' 341 8 ~/www/settlement/func/functions.php
-' 420 0 ~/www/settlement/index.html -' 2 0 /home/ushio/www/api/functions.php
-' 430 0 ~/www/settlement/index.html -' 1 0 /home/ushio/www/api/functions.php
-' 464 0 ~/www/settlement/index.html -' 5 68 ~/www/settlement/api/test.php
-' 471 0 ~/www/settlement/index.html -' 1 0 ~/www/settlement/api/test.php
-' 474 0 ~/www/settlement/index.html -' 78 0 ~/www/settlement/api/index.php
-' 30 54 ~/www/settlement/imgbed/upload.php -' 30 58 ~/www/settlement/imgbed/upload.php
-' 289 6 ~/www/settlement/index.html -' 27 16 ~/www/settlement/imgbed/upload.php
-' 285 16 ~/www/settlement/index.html -' 1 0 ~/www/settlement/imgbed/upload
-' 293 0 ~/www/settlement/index.html -' 5 0 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 277 0 ~/www/settlement/index.html -' 52 44 ~/www/settlement/imgbed/js/main.js
-' 273 0 ~/www/settlement/index.html -' 1 0 ~/www/settlement/imgbed/js/main.js
-' 258 0 ~/www/settlement/index.html -' 10 4 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 255 0 ~/www/settlement/index.html -' 26 17 ~/www/settlement/api/getCurrent.php
-' 252 0 ~/www/settlement/index.html -' 13 0 ~/www/settlement/api/getCurrent.php
-' 242 0 ~/www/settlement/index.html -' 15 0 ~/www/settlement/api/getCurrent.php
-' 226 0 ~/www/settlement/index.html -' 1 0 ~/www/settlement/api/getCurrent.php
-' 220 0 ~/www/settlement/index.html -' 73 93 ~/www/settlement/func/functions.php
-' 161 0 ~/www/settlement/index.html -' 70 0 ~/www/settlement/func/functions.php
-' 102 0 ~/www/settlement/index.html -' 78 0 ~/www/settlement/func/functions.php
-' 93 0 ~/www/settlement/index.html -' 87 0 ~/www/settlement/func/functions.php
-' 90 0 ~/www/settlement/index.html -' 117 73 ~/www/settlement/func/functions.php
-' 77 0 ~/www/settlement/index.html -' 118 0 ~/www/settlement/func/functions.php
-' 74 0 ~/www/settlement/index.html -' 119 0 ~/www/settlement/func/functions.php
-' 68 0 ~/www/settlement/index.html -' 121 0 ~/www/settlement/func/functions.php
-' 63 0 ~/www/settlement/index.html -' 122 0 ~/www/settlement/func/functions.php
-' 36 0 ~/www/settlement/index.html -' 151 66 ~/www/settlement/func/functions.php
-' 34 0 ~/www/settlement/index.html -' 120 0 ~/www/settlement/func/functions.php
-' 30 0 ~/www/settlement/index.html -' 86 0 ~/www/settlement/func/functions.php
-' 307 0 ~/www/settlement/index.html -' 152 0 ~/www/settlement/func/functions.php
-' 314 0 ~/www/settlement/index.html -' 157 0 ~/www/settlement/func/functions.php
-' 317 0 ~/www/settlement/index.html -' 164 0 ~/www/settlement/func/functions.php
-' 321 2 ~/www/settlement/index.html -' 179 0 ~/www/settlement/func/functions.php
-' 68 0 ~/www/settlement/api/index.php -' 184 0 ~/www/settlement/func/functions.php
-' 30 54 ~/www/settlement/imgbed/upload.php -' 189 0 ~/www/settlement/func/functions.php
-' 319 3 ~/www/settlement/index.html -' 196 0 ~/www/settlement/func/functions.php
-' 26 0 ~/www/settlement/index.html -' 199 0 ~/www/settlement/func/functions.php
-' 23 0 ~/www/settlement/index.html -' 204 0 ~/www/settlement/func/functions.php
-' 20 0 ~/www/settlement/index.html -' 207 0 ~/www/settlement/func/functions.php
-' 14 0 ~/www/settlement/index.html -' 211 0 ~/www/settlement/func/functions.php
-' 324 0 ~/www/settlement/index.html
# History of marks within files (newest to oldest): # History of marks within files (newest to oldest):
> ~/www/settlement/api/index.php > ~/www/settlement/api/index.php
" 140 10 " 158 59
^ 140 11 ^ 158 60
. 140 10 . 158 59
+ 6 0
+ 5 56
+ 66 14 + 66 14
+ 54 21 + 54 21
+ 102 1 + 102 1
@ -267,7 +251,7 @@ $
+ 109 0 + 109 0
+ 104 0 + 104 0
+ 116 20 + 116 20
+ 178 49 + 201 49
+ 116 0 + 116 0
+ 122 9 + 122 9
+ 129 13 + 129 13
@ -303,72 +287,67 @@ $
+ 30 29 + 30 29
+ 136 0 + 136 0
+ 140 0 + 140 0
+ 165 3 + 188 3
+ 141 104 + 141 104
+ 144 7 + 144 7
+ 142 40 + 142 40
+ 144 31 + 144 31
+ 145 9 + 148 9
+ 144 31 + 144 31
+ 145 385 + 148 385
+ 150 0 + 160 0
+ 145 389 + 148 389
+ 146 116 + 152 116
+ 147 26 + 156 26
+ 148 31 + 158 31
+ 149 21 + 159 21
+ 150 0 + 160 0
+ 151 0 + 161 0
+ 153 33 + 163 33
+ 154 68 + 164 68
+ 155 22 + 165 22
+ 156 218 + 169 218
+ 156 332 + 169 332
+ 157 140 + 173 140
+ 139 14 + 139 14
+ 157 152 + 173 152
+ 139 49 + 139 49
+ 140 10 + 140 10
+ 144 28
> ~/www/settlement/func/functions.php + 145 8
" 46 0 + 156 22
^ 46 1 + 148 383
. 73 93 + 153 8
+ 3 37 + 166 8
+ 9 2 + 170 8
+ 4 0 + 173 159
+ 61 95 + 174 8
+ 71 56 + 178 8
+ 72 86 + 181 22
+ 73 93 + 182 10
+ 178 15
> ~/www/settlement/index.html + 174 15
" 289 6 + 170 15
^ 289 7 + 166 15
. 289 6 + 157 11
+ 6 9 + 153 15
+ 8 59 + 145 15
+ 9 77 + 149 15
+ 318 56 + 145 12
+ 319 51 + 161 12
+ 320 163 + 149 12
+ 321 164 + 153 12
+ 284 0 + 166 12
+ 283 58 + 170 12
+ 284 44 + 174 12
+ 286 12 + 178 12
+ 287 3 + 183 60
+ 287 15 + 158 59
+ 286 33
+ 285 37
+ 287 8
+ 288 15
+ 289 6
> ~/www/settlement/imgbed/upload.php > ~/www/settlement/imgbed/upload.php
" 30 54 " 30 3
^ 30 55 ^ 30 42
. 30 47 . 30 41
+ 43 0 + 43 0
+ 42 24 + 42 24
+ 43 60 + 43 60
@ -382,12 +361,12 @@ $
+ 30 59 + 30 59
+ 42 0 + 42 0
+ 43 0 + 43 0
+ 30 47 + 30 41
> ~/www/settlement/imgbed/js/jquery.imageuploader.js > ~/www/settlement/imgbed/js/jquery.imageuploader.js
" 9 451 " 4 423
^ 9 452 ^ 9 455
. 9 451 . 4 0
+ 4 412 + 4 412
+ 9 559 + 9 559
+ 23 0 + 23 0
@ -406,8 +385,43 @@ $
+ 16 23 + 16 23
+ 18 13 + 18 13
+ 10 4 + 10 4
+ 4 421 + 4 376
+ 9 451 + 4 0
> ~/www/settlement/func/functions.php
" 46 0
^ 46 1
. 73 93
+ 3 37
+ 9 2
+ 4 0
+ 61 95
+ 71 56
+ 72 86
+ 73 93
> ~/www/settlement/index.html
" 289 6
^ 289 7
. 289 6
+ 6 9
+ 8 59
+ 9 77
+ 318 56
+ 319 51
+ 320 163
+ 321 164
+ 284 0
+ 283 58
+ 284 44
+ 286 12
+ 287 3
+ 287 15
+ 286 33
+ 285 37
+ 287 8
+ 288 15
+ 289 6
> ~/www/settlement/api/getWeekData.php > ~/www/settlement/api/getWeekData.php
" 51 64 " 51 64

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

@ -141,23 +141,46 @@ function setCurrent($tmpItem, $usr_to, $usr_from){
yimian__mail( yimian__mail(
$GLOBALS['usrMail'][$usr_from], $GLOBALS['usrMail'][$usr_from],
'ERP - Pay £'.$GLOBALS['g_threshold'].' to '.$usr_to, 'ERP - Pay £'.$GLOBALS['g_threshold'].' to '.$usr_to,
'Dear '.$usr_from.',\n\n'. 'Dear '.$usr_from.',
'You may need to pay £'.$GLOBALS['g_threshold'].' to '.$usr_to. ' 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> .\n\n'. <br>
'If you are confused about this email, please feel free to email i@yimian.xyz, or directly come to me.\n\n'. <br>
'Best Regards,\n'. '.
'Yimian LIU (@iotcat)', 'You may need to pay £'.$GLOBALS['g_threshold'].' to '.$usr_to. ' 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> .
<br>
<br>
'.
'If you are confused about this email, please feel free to email i@yimian.xyz, or directly come to me.
<br>
<br>
'.
'Best Regards,
<br>'.
'Yimian LIU (@<a href="https://iotcat.me">iotcat</a>)',
'ERP - CP Home' 'ERP - CP Home'
); );
sleep(1);
yimian__mail( yimian__mail(
$GLOBALS['usrMail'][$usr_to], $GLOBALS['usrMail'][$usr_to],
'ERP - Receive £'.$GLOBALS['g_threshold'].' from '.$usr_from, 'ERP - Receive £'.$GLOBALS['g_threshold'].' from '.$usr_from,
'Dear '.$usr_to.',\n\n'. 'Dear '.$usr_to.',
'You will reveive £'.$GLOBALS['g_threshold'].' from '.$usr_from. ' 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 firend"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> .\n\n'. <br>
'Your CONFIRM LINK: <a href="https://settlement.yimian.xyz/api/?type=confirm&id='.$id.'">https://settlement.yimian.xyz/api/?type=confirm&id='.$id.'</a>\n\n'. <br>
'If you are confused about this email, please feel free to email i@yimian.xyz, or directly come to me.\n\n'. '.
'Best Regards,\n'. 'You will reveive £'.$GLOBALS['g_threshold'].' from '.$usr_from. ' 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 firend"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> .
'Yimian LIU (@iotcat)', <br>
<br>
'.
'Your CONFIRM LINK: <a href="https://settlement.yimian.xyz/api/?type=confirm&id='.$id.'">https://settlement.yimian.xyz/api/?type=confirm&id='.$id.'</a>
<br>
<br>
'.
'If you are confused about this email, please feel free to email i@yimian.xyz, or directly come to me.
<br>
<br>
'.
'Best Regards,
<br>'.
'Yimian LIU (@<a href="https://iotcat.me/">iotcat</a>)',
'ERP - CP Home' 'ERP - CP Home'
); );

2
yimian/www/settlement/imgbed/upload.php
Unescape View File

@ -27,7 +27,7 @@ foreach($file['name'] as $key=>$val){
break; break;
} }
$o["url"].="https://api.yimian.xyz/img/path=invoice/".$imgname."\n\n"; $o["url"].="https://api.yimian.xyz/img?path=invoice/".$imgname."\n\n";
} }
}else{ }else{

Write Preview
Loading…
Cancel
Save