{:__('Real time')}
-
{:__('Article count')}
+{:__('Attachment count')}
-
-
-
-
diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html
index 9c10db8d78aa17d444b3c6da58b7eb4419a9f37e..80910bf4423826ed58eb87590fb6a4eb639fb4c3 100644
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -113,7 +113,7 @@
{if $Think.config.fastadmin.login_captcha}
}/index.php?s=/captcha)
diff --git a/application/common.php b/application/common.php
index 43b53a30d00478abc37d71619c3e5c03536ed6b4..67bf8e02fb968164af5f24df970da69695fe829e 100755
--- a/application/common.php
+++ b/application/common.php
@@ -33,15 +33,16 @@ if (!function_exists('format_bytes')) {
* 将字节转换为可读文本
* @param int $size 大小
* @param string $delimiter 分隔符
+ * @param int $precision 小数位数
* @return string
*/
- function format_bytes($size, $delimiter = '')
+ function format_bytes($size, $delimiter = '', $precision = 2)
{
$units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB');
for ($i = 0; $size >= 1024 && $i < 6; $i++) {
$size /= 1024;
}
- return round($size, 2) . $delimiter . $units[$i];
+ return round($size, $precision) . $delimiter . $units[$i];
}
}
diff --git a/application/common/library/Email.php b/application/common/library/Email.php
index 8d186fc35e22e4753c3be8c2fa7389ba51b826f7..7636d761db6d51b92dadf63c3c0e8f4ce779b40e 100644
--- a/application/common/library/Email.php
+++ b/application/common/library/Email.php
@@ -62,7 +62,8 @@ class Email
$secureArr = [0 => '', 1 => 'tls', 2 => 'ssl'];
$secure = isset($secureArr[$this->options['mail_verify_type']]) ? $secureArr[$this->options['mail_verify_type']] : '';
- $this->mail = new Mailer();
+ $logger = isset($this->options['debug']) && $this->options['debug'] ? new Log : null;
+ $this->mail = new Mailer($logger);
$this->mail->setServer($this->options['mail_smtp_host'], $this->options['mail_smtp_port'], $secure);
$this->mail->setAuth($this->options['mail_from'], $this->options['mail_smtp_pass']);
@@ -96,10 +97,9 @@ class Email
/**
* 设置收件人
* @param mixed $email 收件人,多个收件人以,进行分隔
- * @param string $name 收件人名称
* @return $this
*/
- public function to($email, $name = '')
+ public function to($email)
{
$emailArr = $this->buildAddress($email);
foreach ($emailArr as $address => $name) {
@@ -176,7 +176,12 @@ class Email
*/
protected function buildAddress($emails)
{
- $emails = is_array($emails) ? $emails : array_flip(explode(',', str_replace(";", ",", $emails)));
+ if (!is_array($emails)) {
+ $emails = array_flip(explode(',', str_replace(";", ",", $emails)));
+ foreach ($emails as $key => $value) {
+ $emails[$key] = strstr($key, '@', true);
+ }
+ }
return $emails;
}
diff --git a/application/common/library/Log.php b/application/common/library/Log.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9d891dca4fab40eee3781eb3ccc1471def333e9
--- /dev/null
+++ b/application/common/library/Log.php
@@ -0,0 +1,29 @@
+handler = \think\Db::name($this->options['table']);
}
+ $time = time();
+ $tokentime = cache('tokentime');
+ if (!$tokentime || $tokentime < $time - 86400) {
+ cache('tokentime', $time);
+ $this->handler->where('expiretime', '<', $time)->where('expiretime', '>', 0)->delete();
+ }
}
/**
* 存储Token
- * @param string $token Token
- * @param int $user_id 会员ID
- * @param int $expire 过期时长,0表示无限,单位秒
+ * @param string $token Token
+ * @param int $user_id 会员ID
+ * @param int $expire 过期时长,0表示无限,单位秒
* @return bool
*/
public function set($token, $user_id, $expire = null)
@@ -50,12 +56,12 @@ class Mysql extends Driver
$expiretime = !is_null($expire) && $expire !== 0 ? time() + $expire : 0;
$token = $this->getEncryptedToken($token);
$this->handler->insert(['token' => $token, 'user_id' => $user_id, 'createtime' => time(), 'expiretime' => $expiretime]);
- return TRUE;
+ return true;
}
/**
* 获取Token内的信息
- * @param string $token
+ * @param string $token
* @return array
*/
public function get($token)
@@ -77,8 +83,8 @@ class Mysql extends Driver
/**
* 判断Token是否可用
- * @param string $token Token
- * @param int $user_id 会员ID
+ * @param string $token Token
+ * @param int $user_id 会员ID
* @return boolean
*/
public function check($token, $user_id)
@@ -89,7 +95,7 @@ class Mysql extends Driver
/**
* 删除Token
- * @param string $token
+ * @param string $token
* @return boolean
*/
public function delete($token)
@@ -100,7 +106,7 @@ class Mysql extends Driver
/**
* 删除指定用户的所有Token
- * @param int $user_id
+ * @param int $user_id
* @return boolean
*/
public function clear($user_id)
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index 31f96d2086ed2e54cc8c28b577fe22cf9d356c2b..bef9626fb4402f5feca95eeef967dac5c6e84ddc 100755
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -74,7 +74,7 @@
diff --git a/application/index/view/layout/default.html b/application/index/view/layout/default.html
index 3e6ccca00d77662fb5939d0839bb75990473e107..48e87caf360fffdda47d2fd81943e17412c340b9 100644
--- a/application/index/view/layout/default.html
+++ b/application/index/view/layout/default.html
@@ -52,11 +52,11 @@
{include file="common/script" /}
1234
-
- {:__('Comment count')}
+
{$attachmentnums}
+
+ {:__('Attachment nums')}
-
@@ -351,21 +366,21 @@
6754
-
- {:__('Like count')}
+
{$attachmentsize|format_bytes=###,'',0}
+
+ {:__('Attachment size')}
{:__('Real time')}
-
{:__('News count')}
+{:__('Picture count')}
-
5302
-
- {:__('Comment count')}
+
{$picturenums}
+
+ {:__('Picture nums')}
-
@@ -385,12 +400,3 @@
8205
-
- {:__('Like count')}
+
{$picturesize|format_bytes=###,'',0}
+
+ {:__('Picture size')}
-
+