From 548476432f144e4bf31549d5018b234d7d145e9a Mon Sep 17 00:00:00 2001
From: charyn bryant <357346640@qq.com>
Date: Sun, 21 May 2017 21:19:43 +0800
Subject: [PATCH 1/5] cccxz

---
 lib/config-simple.php | 90 -------------------------------------------
 1 file changed, 90 deletions(-)
 delete mode 100644 lib/config-simple.php

diff --git a/lib/config-simple.php b/lib/config-simple.php
deleted file mode 100644
index 16fea7f54..000000000
--- a/lib/config-simple.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/*
- * ss-panel配置文件
- * https://github.com/orvice/ss-panel
- * Author @orvice
- * https://orvice.org
- */
-
-//定义流量
-$tokb = 1024;
-$tomb = 1024*1024;
-$togb = $tomb*1024;
-//Define DB Connection  数据库信息
-define('DB_HOST','localhost');
-define('DB_USER','root');
-define('DB_PWD','password');
-define('DB_DBNAME','db');
-define('DB_CHARSET','utf8');
-define('DB_TYPE','mysql'); 
-/*
- * 下面的东西根据需求修改
- */
-
-//define Plan
-//注册用户的初始化流量
-//默认5GiB
-$a_transfer = $togb*5;
-
-//签到设置 签到活的的最低最高流量,单位MB
-$check_min = 1;
-$check_max = 100;
-
-//name
-$site_name = "ss-panel";
-$site_url  = "https://panel.com/";
-/**
- * 站点盐值，用于加密密码
- * 第一次安装请修改此值，安装后请勿修改！！否则会使所有密码失效，仅限加密方式不为1的时候有效
- */
-$salt = "ss-panel";
-/**
- * 密码加密方式，注意： 2.4以前的版本，请修改加密方式为「1」，否则会使密码失效！
- * 更多说明见wiki https://github.com/orvice/ss-panel/wiki/Install-Guide-zh_cn
- * 加密方式:
- * 1 md5
- * 2 带salt的Sha256加密，新安装建议使用此加密方式！
- */
-$pwd_mode = 1;
-
-//用户注册后获得的邀请码最低最高
-//都设置为0用户就不能邀请
-$user_invite_min = '1';
-$user_invite_max = '1';
-
-
-//
-//选择邮件服务
-// smtp未完成，现在只能用mailgun
-//mail-gun
-//mail-smtp
-$Selectmailservice = "mail-gun";
-//邮件发件人
-$sender = "xxx@xxx.xx";
-
-//mail-gun
-// Get your key from https://mailgun.com
-$mailgun_key = "";
-$mailgun_domain = "";
-
-
-//
-//mail-smtp
-// smtp发件方式暂时无法使用
-//设置smtp服务器连接方式:  
-//加密连接(ssl) = "1"
-//普通连接 = "0"
-$mail_smtp_Connection = "1";
-//smtp服务器端口 25 , 465 ...
-$mail_smtp_Port = 465;
-//smtp服务器
-$mail_smtp_Server = "smtp.gmail.com";
-//邮件帐号
-$mail_smtp_Account = "xxxx@gmail.com";
-//邮件密码
-$mail_smtp_password = "密码";
-
-
-
-//
-require_once 'do.php';

From fe546ec9c24276eb9abc0e024d5e96c87fd84768 Mon Sep 17 00:00:00 2001
From: charyn bryant <357346640@qq.com>
Date: Sun, 21 May 2017 21:48:05 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/config.php | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 lib/config.php

diff --git a/lib/config.php b/lib/config.php
new file mode 100644
index 000000000..110abd595
--- /dev/null
+++ b/lib/config.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ * ss-panel配置文件
+ * https://github.com/orvice/ss-panel
+ * Author @orvice
+ * https://orvice.org
+ */
+
+//定义流量
+$tokb = 1024;
+$tomb = 1024*1024;
+$togb = $tomb*1024;
+//Define DB Connection  数据库信息
+define('DB_HOST','localhost');
+define('DB_USER','root');
+define('DB_PWD','radpass');
+define('DB_DBNAME','shadowsocks');
+define('DB_CHARSET','utf8');
+define('DB_TYPE','mysql'); 
+/*
+ * 下面的东西根据需求修改
+ */
+
+//define Plan
+//注册用户的初始化流量
+//默认5GiB
+$a_transfer = $togb*5;
+
+//签到设置 签到活的的最低最高流量,单位MB
+$check_min = 1;
+$check_max = 100;
+
+//name
+$site_name = "52VPN";
+$site_url  = "http://www.52vpn.cf/";
+/**
+ * 站点盐值，用于加密密码
+ * 第一次安装请修改此值，安装后请勿修改！！否则会使所有密码失效，仅限加密方式不为1的时候有效
+ */
+$salt = "ss-panel";
+/**
+ * 密码加密方式，注意： 2.4以前的版本，请修改加密方式为「1」，否则会使密码失效！
+ * 更多说明见wiki https://github.com/orvice/ss-panel/wiki/Install-Guide-zh_cn
+ * 加密方式:
+ * 1 md5
+ * 2 带salt的Sha256加密，新安装建议使用此加密方式！
+ */
+$pwd_mode = 1;
+
+//用户注册后获得的邀请码最低最高
+//都设置为0用户就不能邀请
+$user_invite_min = '1';
+$user_invite_max = '1';
+
+
+//
+//选择邮件服务
+// smtp未完成，现在只能用mailgun
+//mail-gun
+//mail-smtp
+$Selectmailservice = "mail-gun";
+//邮件发件人
+$sender = "xxx@xxx.xx";
+
+//mail-gun
+// Get your key from https://mailgun.com
+$mailgun_key = "";
+$mailgun_domain = "";
+
+
+//
+//mail-smtp
+// smtp发件方式暂时无法使用
+//设置smtp服务器连接方式:  
+//加密连接(ssl) = "1"
+//普通连接 = "0"
+$mail_smtp_Connection = "1";
+//smtp服务器端口 25 , 465 ...
+$mail_smtp_Port = 465;
+//smtp服务器
+$mail_smtp_Server = "smtp.gmail.com";
+//邮件帐号
+$mail_smtp_Account = "xxxx@gmail.com";
+//邮件密码
+$mail_smtp_password = "密码";
+
+
+
+//
+require_once 'do.php';

From f9726e5cc3ac0702d675d8d4777d2ef51d1f65ec Mon Sep 17 00:00:00 2001
From: chary1n <357346640@qq.com>
Date: Wed, 5 Sep 2018 14:54:40 +0800
Subject: [PATCH 3/5] Update user.php

1111
---
 admin/user.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/user.php b/admin/user.php
index bda3bb90b..3f5054b0a 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -30,6 +30,7 @@
                                     <th>剩余流量</th>
                                     <th>已使用流量</th>
                                     <th>最后签到</th>
+                                    <th>注册时间</th>
                                     <th>邀请人</th>
                                     <th>操作</th>
                                 </tr>
@@ -45,6 +46,7 @@
                                         <td><?php \Ss\Etc\Comm::flowAutoShow(($rs['transfer_enable']-$rs['u']-$rs['d'])); ?></td>
                                         <td><?php \Ss\Etc\Comm::flowAutoShow(($rs['u']+$rs['d'])); ?></td>
                                         <td><?php echo date('Y-m-d H:i:s',$rs['last_check_in_time']); ?></td>
+                                        <td><?php echo date('Y-m-d H:i:s',$rs['last_check_in_time']); ?></td>
                                         <td>
 <?php 
 if ( $rs['ref_by'] != 0 ){

From 0752df5449c1654def12c4a4e5a504d03cb5636d Mon Sep 17 00:00:00 2001
From: chary1n <357346640@qq.com>
Date: Wed, 5 Sep 2018 15:05:30 +0800
Subject: [PATCH 4/5] Update user.php

---
 admin/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/user.php b/admin/user.php
index 3f5054b0a..6f2c4b4f5 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -46,7 +46,7 @@
                                         <td><?php \Ss\Etc\Comm::flowAutoShow(($rs['transfer_enable']-$rs['u']-$rs['d'])); ?></td>
                                         <td><?php \Ss\Etc\Comm::flowAutoShow(($rs['u']+$rs['d'])); ?></td>
                                         <td><?php echo date('Y-m-d H:i:s',$rs['last_check_in_time']); ?></td>
-                                        <td><?php echo date('Y-m-d H:i:s',$rs['last_check_in_time']); ?></td>
+                                        <td><?php echo date('Y-m-d H:i:s',$rs['reg_date']); ?></td>
                                         <td>
 <?php 
 if ( $rs['ref_by'] != 0 ){

From 60ed24e5a4e01327cc05dcaaf4ae9ffdd348a924 Mon Sep 17 00:00:00 2001
From: chary1n <357346640@qq.com>
Date: Wed, 5 Sep 2018 15:06:43 +0800
Subject: [PATCH 5/5] Update user.php

---
 admin/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/user.php b/admin/user.php
index 6f2c4b4f5..843e0c4d8 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -46,7 +46,7 @@
                                         <td><?php \Ss\Etc\Comm::flowAutoShow(($rs['transfer_enable']-$rs['u']-$rs['d'])); ?></td>
                                         <td><?php \Ss\Etc\Comm::flowAutoShow(($rs['u']+$rs['d'])); ?></td>
                                         <td><?php echo date('Y-m-d H:i:s',$rs['last_check_in_time']); ?></td>
-                                        <td><?php echo date('Y-m-d H:i:s',$rs['reg_date']); ?></td>
+                                        <td><?php echo $rs['reg_date']; ?></td>
                                         <td>
 <?php 
 if ( $rs['ref_by'] != 0 ){