auto update

yimian/.viminfo

@@ -14,10 +14,10 @@
 $
 
 # Command Line History (newest to oldest):
+:q
 :wq
 :Wq
 :w
-:q
 :q!
 :Q!
 :q1
@@ -39,11 +39,17 @@ $
 # Input Line History (newest to oldest):
 
 # Registers:
-"0	LINE	0
-	    Header("HTTP/1.1 301 Moved Permanently"); 
-""1	LINE	0
-	    Header("HTTP/1.1 301 Moved Permanently"); 
-"2	CHAR	0
+""0	CHAR	0
+	
+	
+	/* obs get img */
+	function getImg($path, $time = 300){
+	
+	    return str_replace('yimian-image.obs.cn-east-2.myhuaweicloud.com:443','image.yimian.xyz',trim(exec("obs sign obs://yimian-image/". $path ." -e=". $time)));
+	}
+	
+	
+"1	CHAR	0
 	
 	function getMatchedKeys($str, $arr){
 	    if(!is_array($str)){
@@ -60,7 +66,7 @@ $
 	        return $o;
 	    }   
 	}
-"3	CHAR	0
+"2	CHAR	0
 	elseif($type){
 	
 	    $arr = getImgsInfo($type);
@@ -111,36 +117,38 @@ $
 		}while($R18 != true && $arr[6][$arr_keys[$index]] != "normal");
 	        $path = $type. '/' .$arr[0][$arr_keys[$index]];
 	        
+"3	LINE	0
+	
 "4	LINE	0
 	
 "5	LINE	0
-	
-"6	LINE	0
 	if(isset($range) && $range > 0) $range = $range; else $range = 0;
-"7	LINE	0
+"6	LINE	0
 	if($R18 != "true") $R18 = false; else $R18 = true;
-"8	LINE	0
+"7	LINE	0
 	if($display != "true") $display = false; else $display = true;
-"9	LINE	0
+"8	LINE	0
 	if(!isset($path)) $path = null;
+"9	LINE	0
+	if(!isset($size)) $size = null;
 "-	CHAR	0
 		
 
 # File marks:
-'0  14  28  ~/www/shorturl/index.php
-'1  3  44  ~/www/shorturl/index.php
-'2  3  50  ~/www/shorturl/index.php
-'3  6  21  ~/www/shorturl/.db.key.php
-'4  2  33  ~/www/shorturl/functions.php
-'5  14  32  ~/conf/nginx/settlement.yimian.xyz.conf
-'6  308  60  ~/www/settlement/index.html
-'7  22  28  /home/ushio/www/img/usr/themes/photograph/index.php
-'8  1  0  /home/ushio/www/img/usr/themes/photograph/index.
-'9  1  0  /home/lib/php/anti-ddos.php
+'0  3  0  ~/www/shorturl/index.php
+'1  5  0  ~/www/shorturl/index.php
+'2  6  21  ~/www/shorturl/.db.key.php
+'3  2  33  ~/www/shorturl/functions.php
+'4  14  32  ~/conf/nginx/settlement.yimian.xyz.conf
+'5  308  60  ~/www/settlement/index.html
+'6  22  28  /home/ushio/www/img/usr/themes/photograph/index.php
+'7  1  0  /home/ushio/www/img/usr/themes/photograph/index.
+'8  1  0  /home/lib/php/anti-ddos.php
+'9  1  0  /home/ushio/www/img/index.php
 
 # Jumplist (newest first):
--'  14  28  ~/www/shorturl/index.php
 -'  3  0  ~/www/shorturl/index.php
+-'  5  0  ~/www/shorturl/index.php
 -'  6  21  ~/www/shorturl/.db.key.php
 -'  1  0  ~/www/shorturl/.db.key.php
 -'  2  33  ~/www/shorturl/functions.php
@@ -240,21 +248,17 @@ $
 # History of marks within files (newest to oldest):
 
 > ~/www/shorturl/index.php
-	"	14	28
-	^	14	29
-	.	14	28
+	"	3	0
+	^	3	0
+	.	3	44
 	+	2	0
 	+	3	50
-	+	3	50
+	+	4	0
 	+	3	44
-	+	9	28
-	+	10	0
-	+	7	0
-	+	6	0
-	+	10	41
-	+	13	0
-	+	11	9
-	+	14	28
+
+> ~/conf/nginx/eee.dog.conf
+	"	15	37
+	^	15	38
 
 > ~/www/shorturl/.db.key.php
 	"	6	21
@@ -583,28 +587,3 @@ $
 	+	42	0
 	+	43	0
 	+	30	41
-
-> ~/www/settlement/imgbed/js/jquery.imageuploader.js
-	"	4	423
-	^	9	455
-	.	4	0
-	+	4	412
-	+	9	559
-	+	23	0
-	+	11	47
-	+	12	54
-	+	13	28
-	+	14	35
-	+	15	35
-	+	17	24
-	+	19	33
-	+	20	63
-	+	16	23
-	+	10	52
-	+	11	16
-	+	11	0
-	+	16	23
-	+	18	13
-	+	10	4
-	+	4	376
-	+	4	0

yimian/conf/nginx/eee.dog.conf

@@ -1,6 +1,6 @@
 server {
     listen       80;
-    #listen       [::]:80;
+    listen       [::]:80;
     server_name  eee.dog;
     rewrite ^(.*)$  https://$host$1 permanent;
 }
@@ -12,11 +12,11 @@ server {
     listen       443 ssl;
 
     server_name  eee.dog;
-    root         /home/yimian/www/blog;
+    root         /home/yimian/www/shorturl;
     index index.php index.html;
 
-    ssl_certificate /etc/letsencrypt/live/www.eee.dog/fullchain.pem; #2
-    ssl_certificate_key /etc/letsencrypt/live/www.eee.dog/privkey.pem; #3
+    ssl_certificate /etc/letsencrypt/live/eee.dog/fullchain.pem; #2
+    ssl_certificate_key /etc/letsencrypt/live/eee.dog/privkey.pem; #3
 
     ssl_session_cache shared:SSL:1m;
     ssl_session_timeout 5m;
@@ -25,20 +25,20 @@ server {
     ssl_prefer_server_ciphers on;
     #error_page 404 = /404.php;
 
-    rewrite ^(.*)$  https://www.$host$1 permanent;
+#   rewrite ^(.*)$  https://www.$host$1 permanent;
 
     # Load configuration files for the default server block.
     include /etc/nginx/default.d/*.conf;
     include /home/ushio/conf/nginx/default.d/*.conf;
 
-    if (-f $request_filename/index.html){     rewrite (.*) $1/index.html break; } 
-    if (-f $request_filename/index.php){     rewrite (.*) $1/index.php; } 
-    if (!-f $request_filename){     rewrite (.*) /index.php; }
-    if (!-e $request_filename) {    rewrite ^(.*)$ /index.php$1 last; }
+#   if (-f $request_filename/index.html){     rewrite (.*) $1/index.html break; } 
+#   if (-f $request_filename/index.php){     rewrite (.*) $1/index.php; } 
+#   if (!-f $request_filename){     rewrite (.*) /index.php; }
+#   if (!-e $request_filename) {    rewrite ^(.*)$ /index.php$1 last; }
 
-    location /s/ {
-        rewrite  ^(.*)$  /s/index.php?s=$1  last;
-    }
+    location / {
+        rewrite  ^(.*)$  https://shorturl.yimian.xyz/index.php?s=$1  last;
+   }
 
     error_page 404 /404.html;
         location = /40x.html {

yimian/conf/nginx/shorturl.yimian.xyz.conf

@@ -0,0 +1,29 @@
+server {
+    listen       80;
+    #listen       [::]:80;
+    server_name  shorturl.yimian.xyz;
+    rewrite ^(.*)$  https://$host$1 permanent;
+}
+
+
+server {
+    #listen       80;
+    #listen       [::]:80;
+    listen       443 ssl;
+
+    server_name  shorturl.yimian.xyz;
+    root         /home/yimian/www/shorturl;
+    index index.php index.html;
+
+    ssl_certificate /home/yimian/ssl/star.yimian.xyz.ssl/star.yimian.xyz.crt; #2
+    ssl_certificate_key /home/yimian/ssl/star.yimian.xyz.ssl/star.yimian.xyz.key; #3
+
+    ssl_session_cache shared:SSL:1m;
+    ssl_session_timeout 5m;
+    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers on;
+    #error_page 404 = /404.php;
+
+    include /home/ushio/conf/nginx/default.d/*.conf;
+}

yimian/www/shorturl/index.php

@@ -4,11 +4,25 @@ include '/home/yimian/www/shorturl/functions.php';
 
 
 Header("HTTP/1.1 301 Moved Permanently"); 
-
+echo 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'];
 
 if(!isset($_REQUEST['s'])) {
     Header("Location: https://www.eee.dog/");
     die();
 }
 
-$keyword = $_REQUEST['keyword'];
+$keyword = substr($_REQUEST['s'], 1);
+
+$conn = db__connect();
+
+$res = db__getData($conn, "reflect", "keyword", $keyword);
+
+
+if($res === 404){
+    Header("Location: https://www.eee.dog/");
+    die();
+}
+
+$cmd = "Location: ".$res[0]['url'];
+Header($cmd);
+die();