修改自动生成头像在php严格模式下的bug
This commit is contained in:
hdm
parent
356d0df745
commit
c3f8bbc9c9
@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
declare (strict_types = 1);
|
||||||
namespace app\admin\model;
|
namespace app\admin\model;
|
||||||
|
|
||||||
use think\Model;
|
use think\Model;
|
||||||
@ -12,43 +13,43 @@ class AdminLog extends Model
|
|||||||
*/
|
*/
|
||||||
public function get_title($type)
|
public function get_title($type)
|
||||||
{
|
{
|
||||||
$type_array=[
|
$type_array = [
|
||||||
'Conf/conf_submit'=>'配置信息',
|
'Conf/conf_submit' => '配置信息',
|
||||||
'Menu/post_submit'=>'菜单',
|
'Menu/post_submit' => '菜单',
|
||||||
'Menu/delete'=>'菜单',
|
'Menu/delete' => '菜单',
|
||||||
'Rule/post_submit'=>'节点',
|
'Rule/post_submit' => '节点',
|
||||||
'Rule/delete'=>'节点',
|
'Rule/delete' => '节点',
|
||||||
'Role/post_submit'=>'角色',
|
'Role/post_submit' => '角色',
|
||||||
'Role/delete'=>'角色',
|
'Role/delete' => '角色',
|
||||||
'Admin/post_submit'=>'管理员',
|
'Admin/post_submit' => '管理员',
|
||||||
'Admin/view'=>'管理员',
|
'Admin/view' => '管理员',
|
||||||
'Admin/delete'=>'管理员',
|
'Admin/delete' => '管理员',
|
||||||
'Nav/post_submit'=>'导航组',
|
'Nav/post_submit' => '导航组',
|
||||||
'Nav/delete'=>'导航组',
|
'Nav/delete' => '导航组',
|
||||||
'Nav/nav_info_submit'=>'导航',
|
'Nav/nav_info_submit' => '导航',
|
||||||
'Nav/nav_info_delete'=>'导航',
|
'Nav/nav_info_delete' => '导航',
|
||||||
'Sitemap/post_submit'=>'网站地图分类',
|
'Sitemap/post_submit' => '网站地图分类',
|
||||||
'Sitemap/delete'=>'网站地图分类',
|
'Sitemap/delete' => '网站地图分类',
|
||||||
'Sitemap/sitemap_info'=>'网站地图',
|
'Sitemap/sitemap_info' => '网站地图',
|
||||||
'Sitemap/sitemap_info_submit'=>'网站地图',
|
'Sitemap/sitemap_info_submit' => '网站地图',
|
||||||
'Sitemap/sitemap_info_delete'=>'网站地图',
|
'Sitemap/sitemap_info_delete' => '网站地图',
|
||||||
'Slide/post_submit'=>'轮播组',
|
'Slide/post_submit' => '轮播组',
|
||||||
'Slide/delete'=>'轮播组',
|
'Slide/delete' => '轮播组',
|
||||||
'Slide/slide_info_submit'=>'轮播图',
|
'Slide/slide_info_submit' => '轮播图',
|
||||||
'Slide/slide_info_delete'=>'轮播图',
|
'Slide/slide_info_delete' => '轮播图',
|
||||||
'Keywords/post_submit'=>'SEO关键字',
|
'Keywords/post_submit' => 'SEO关键字',
|
||||||
'Keywords/delete'=>'SEO关键字',
|
'Keywords/delete' => 'SEO关键字',
|
||||||
'Search/delete'=>'搜索关键字',
|
'Search/delete' => '搜索关键字',
|
||||||
'User/post_submit'=>'用户',
|
'User/post_submit' => '用户',
|
||||||
'User/view'=>'用户',
|
'User/view' => '用户',
|
||||||
'User/delete'=>'用户',
|
'User/delete' => '用户',
|
||||||
'Article/cate_post_submit'=>'文章分类',
|
'Article/cate_post_submit' => '文章分类',
|
||||||
'Article/cate_delete'=>'文章分类',
|
'Article/cate_delete' => '文章分类',
|
||||||
'Article/post_submit'=>'文章',
|
'Article/post_submit' => '文章',
|
||||||
'Article/delete'=>'文章',
|
'Article/delete' => '文章',
|
||||||
'Api/upload'=>'附件',
|
'Api/upload' => '附件',
|
||||||
'Login/login_submit'=>'系统'
|
'Login/login_submit' => '系统',
|
||||||
];
|
];
|
||||||
if (!empty($type_array[$type])) {
|
if (!empty($type_array[$type])) {
|
||||||
return $type_array[$type];
|
return $type_array[$type];
|
||||||
} else {
|
} else {
|
||||||
@ -59,16 +60,15 @@ class AdminLog extends Model
|
|||||||
* 读取日志模块
|
* 读取日志模块
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function get_controller($controller,$fun)
|
public function get_controller($controller, $fun)
|
||||||
{
|
{
|
||||||
$controller_array = ['Admin' => '系统用户', 'Article' => '文章', 'Conf' => '配置信息', 'Index' => '系统1', 'Keywords' => '关键字', 'Login' => '系统', 'Menu' => '菜单','Nav' => '导航分类', 'Role' => '角色', 'Rule' => '节点', 'Search' => '搜索词', 'Sitemap' => '网站地图', 'Slide' => '广告', 'User' => '用户','Api'=>''];
|
$controller_array = ['Admin' => '系统用户', 'Article' => '文章', 'Conf' => '配置信息', 'Index' => '系统1', 'Keywords' => '关键字', 'Login' => '系统', 'Menu' => '菜单', 'Nav' => '导航分类', 'Role' => '角色', 'Rule' => '节点', 'Search' => '搜索词', 'Sitemap' => '网站地图', 'Slide' => '广告', 'User' => '用户', 'Api' => ''];
|
||||||
if (!empty($controller_array[$controller])) {
|
if (!empty($controller_array[$controller])) {
|
||||||
if($fun=='cate_post_submit'){
|
if ($fun == 'cate_post_submit') {
|
||||||
return '文章分类';
|
return '文章分类';
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
return $controller_array[$controller];
|
return $controller_array[$controller];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
@ -98,14 +98,14 @@ class AdminLog extends Model
|
|||||||
foreach ($content as $k => $v) {
|
foreach ($content as $k => $v) {
|
||||||
$data = $v;
|
$data = $v;
|
||||||
$param_array = json_decode($v['param'], true);
|
$param_array = json_decode($v['param'], true);
|
||||||
$name='';
|
$name = '';
|
||||||
if(!empty($param_array['name'])){
|
if (!empty($param_array['name'])) {
|
||||||
$name=$param_array['name'];
|
$name = $param_array['name'];
|
||||||
}
|
}
|
||||||
if(!empty($param_array['title'])){
|
if (!empty($param_array['title'])) {
|
||||||
$name=$param_array['title'];
|
$name = $param_array['title'];
|
||||||
}
|
}
|
||||||
$data['content'] = $v['nickname'] . $v['title']. '了' .$this->get_title($v['controller'].'/'.$v['function']) .$name ;
|
$data['content'] = $v['nickname'] . $v['title'] . '了' . $this->get_title($v['controller'] . '/' . $v['function']) . $name;
|
||||||
$data['times'] = time_trans($v['create_time']);
|
$data['times'] = time_trans($v['create_time']);
|
||||||
$content->offsetSet($k, $data);
|
$content->offsetSet($k, $data);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -129,7 +129,7 @@ class Login
|
|||||||
$param['headimgurl'] = $this->to_avatars($char);
|
$param['headimgurl'] = $this->to_avatars($char);
|
||||||
$uid = Db::name('User')->strict(false)->field(true)->insertGetId($param);
|
$uid = Db::name('User')->strict(false)->field(true)->insertGetId($param);
|
||||||
add_user_log('reg', $uid, $param);
|
add_user_log('reg', $uid, $param);
|
||||||
return to_assign(1, '注册成功', $uid);
|
return to_assign(1, '注册成功，请登录', $uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -235,7 +235,7 @@
|
|||||||
if (res.code === 1) {
|
if (res.code === 1) {
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
window.location.href="{:url('/home/login/index')}";
|
window.location.href="{:url('/home/login/index')}";
|
||||||
}, 1500);
|
}, 2000);
|
||||||
} else {
|
} else {
|
||||||
$('[alt="captcha"]').click();
|
$('[alt="captcha"]').click();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,17 @@
|
|||||||
<?php
|
<?php
|
||||||
|
/*
|
||||||
|
* Material-Design-Avatars
|
||||||
|
* https://github.com/lincanbin/Material-Design-Avatars
|
||||||
|
*
|
||||||
|
* Copyright 2015 Canbin Lin (lincanbin@hotmail.com)
|
||||||
|
* http://www.94cb.com/
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0:
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Create material deisgn avatars for users just like Gmail or Messager in Android.
|
||||||
|
*/
|
||||||
|
declare (strict_types = 1);
|
||||||
namespace avatars;
|
namespace avatars;
|
||||||
|
|
||||||
class MDAvatars
|
class MDAvatars
|
||||||
@ -339,15 +351,7 @@ class MDAvatars
|
|||||||
$Y = $Height - $Padding - (13 / 196) * $FontSize;
|
$Y = $Height - $Padding - (13 / 196) * $FontSize;
|
||||||
}
|
}
|
||||||
// 在圆正中央填入字符
|
// 在圆正中央填入字符
|
||||||
imagettftext($this->Avatar,
|
imagettftext($this->Avatar, $FontSize,0,intval($X), intval($Y),$FontColor,$this->FontFile, $this->Char);
|
||||||
$FontSize,
|
|
||||||
0,
|
|
||||||
$X,
|
|
||||||
$Y,
|
|
||||||
$FontColor,
|
|
||||||
$this->FontFile,
|
|
||||||
$this->Char
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function Resize($TargetSize)
|
private function Resize($TargetSize)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user