diff --git a/application/config/mimes.php b/application/config/mimes.php index 0ec9db0..31a1924 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -180,5 +180,6 @@ return array( 'odt' => 'application/vnd.oasis.opendocument.text', 'odm' => 'application/vnd.oasis.opendocument.text-master', 'ott' => 'application/vnd.oasis.opendocument.text-template', - 'oth' => 'application/vnd.oasis.opendocument.text-web' + 'oth' => 'application/vnd.oasis.opendocument.text-web', + 'webp' => 'image/webp' ); diff --git a/application/controllers/Found.php b/application/controllers/Found.php index 91324a0..f9bd748 100644 --- a/application/controllers/Found.php +++ b/application/controllers/Found.php @@ -32,7 +32,14 @@ //每页显示16张图片 $limit = 16; //echo $page; - $siteinfo->title = '探索发现 - '.$siteinfo->title; + //设置页面标题 + if($page == 0){ + $siteinfo->title = $siteinfo->title.'，探索发现'; + } + else{ + $siteinfo->title = $siteinfo->title.'，探索发现 - '."第{$page}页"; + } + //根据条件生成不同的SQL语句 switch($type){ @@ -82,6 +89,7 @@ $this->pagination->initialize($config); $data['page'] = $this->pagination->create_links(); + //设置标题 //加载视图 $this->load->view('user/header',$siteinfo); $this->load->view('user/found',$data); diff --git a/application/controllers/Home.php b/application/controllers/Home.php index a53fa3f..62141a4 100644 --- a/application/controllers/Home.php +++ b/application/controllers/Home.php @@ -54,9 +54,27 @@ $siteinfo = json_decode($siteinfo->values); //echo $siteinfo->title; //$data['title'] = '图片上传'; + $siteinfo->title = "ImgURL更新日志"; $this->load->view('user/header.php',$siteinfo); $this->load->view('user/log.php'); $this->load->view('user/footer.php'); } + //站点地图页面 + public function sitemap(){ + //页面路径 + $page_path = FCPATH.'data/pages'; + $pages = scandir($page_path); + + foreach ($pages as $page) { + if(($page === '.') OR ($page === '..')){ + continue; + } + $page = str_replace('.md','',$page); + echo "
  • {$page}
    • "; + } + + //加载数据库模型 + $this->load->view('user/sitemap.php'); + } } ?> \ No newline at end of file diff --git a/application/controllers/Img.php b/application/controllers/Img.php index 0381b2e..e4ffa71 100644 --- a/application/controllers/Img.php +++ b/application/controllers/Img.php @@ -31,6 +31,7 @@ $imginfo = $this->query->onepic($imgid); //查询的img_imginfo $picinfo = $this->query->imginfo($imgid); + $siteinfo->description = $picinfo->client_name.",由网友上传至ImgURL图床。"; //查询图片域名 @$domain = $this->query->domain($imginfo->storage); diff --git a/application/controllers/Page.php b/application/controllers/Page.php index b698458..a512fd5 100644 --- a/application/controllers/Page.php +++ b/application/controllers/Page.php @@ -22,12 +22,25 @@ //载入markdown解析类 $this->load->library("parsedown"); $content = $this->parsedown->text($content); + //截取页面标题 + $pattern = '/

    (.*)<\/h1>/'; + preg_match($pattern,$content,$arr); + //截取描述 + $description = mb_substr($content, 0, 180,'utf-8'); + $description = str_replace('#','',$description); + //$description = str_replace('','',$description); + $description = strip_tags($description); + $description = trim($description); + //echo $description; + //echo $title; //$data['content'] = $content; //加载数据库视图 $this->load->model('query','',TRUE); $data = $this->query->site_setting('1'); $data->content = $content; + $data->title = $arr[1]; + $data->description = $description; //载入页面视图 $this->load->view('/user/header',$data); $this->load->view('/user/page',$data); diff --git a/application/controllers/Upload.php b/application/controllers/Upload.php index 1014ade..af51f13 100644 --- a/application/controllers/Upload.php +++ b/application/controllers/Upload.php @@ -64,7 +64,7 @@ } // var_dump(); $config['upload_path'] = $upload_path; - $config['allowed_types'] = 'gif|jpg|png|bmp|webp'; + $config['allowed_types'] = 'gif|jpg|jpeg|png|bmp|webp'; $config['max_size'] = 5120; $config['file_ext_tolower'] = TRUE; //文件名转换为小写 $config['overwrite'] = TRUE; //覆盖同名文件 @@ -123,7 +123,7 @@ } //CI获取获取.bmp 图片的像素，认为.bmp不是图像类型，改用其它方法获取像素 - if($data['file_type'] == 'image/x-ms-bmp'){ + if(($data['file_type'] == 'image/x-ms-bmp') OR ($data['file_type'] == 'image/webp')){ $tmpinfo = getimagesize($full_path); $data['image_width'] = $tmpinfo[0]; $data['image_height'] = $tmpinfo[1]; diff --git a/application/libraries/Image.php b/application/libraries/Image.php index e32546a..7b0485d 100644 --- a/application/libraries/Image.php +++ b/application/libraries/Image.php @@ -20,6 +20,8 @@ $img_w = $imginfo[0]; //图片高 $img_h = $imginfo[1]; + //图片MIME类型 + $mime = $imginfo['mime']; //获取源文件名 $filename = end($imgarr); $imgname = explode(".",$filename); @@ -33,8 +35,12 @@ // 创建缩略图 //原图宽高大于缩略图 if(($img_w > $width) || ($img_h > $height)){ + //如果是WEBP则不裁剪 + if($mime === 'image/webp'){ + return FALSE; + } //检测是否支持ImageMagick - if($this->check()){ + elseif($this->check()){ //使用ImageMagick裁剪图像 $image = new Imagick($source); $image->cropThumbnailImage( $width, $height ); diff --git a/application/views/user/header.php b/application/views/user/header.php index adfaf52..1c0a3ee 100644 --- a/application/views/user/header.php +++ b/application/views/user/header.php @@ -6,7 +6,7 @@ } ?> - + <?php echo @$title; ?> diff --git a/data/pages/readme.md b/data/pages/readme.md deleted file mode 100644 index 237ed17..0000000 --- a/data/pages/readme.md +++ /dev/null @@ -1,39 +0,0 @@ -# zdir -使用PHP开发的目录列表程序 - -![](https://imgurl.org/upload/1806/349f3b54028d58d6.png) - -### 使用方法 -* 下载源码放到站点根目录 -* 修改`config.php`设置自己的网站标题/关键词/描述 -* 如果需要排除某个目录，再次修改`config.php` ，里面有说明 -* 更多说明请查看帮助文档：[https://doc.xiaoz.me/docs/zdir](https://doc.xiaoz.me/docs/zdir) - -### 主要功能 -* 目录浏览 -* MarkDown文件预览 -* CSS/JavaScript一键复制 -* 文件hash -* 图片预览 -* 视频播放（仅支持mp4格式） -* 文本查看器（支持的格式有.txt .sh .py .go .c .cpp） -* 文件索引 -* 二维码生成 -* 文件删除 -* 详细说明请访问： [Zdir 实用的目录列表程序](https://www.xiaoz.me/archives/10465) - -### 注意事项 -* ~~不要使用中文命名目录/文件，否则可能发生不可预料的错误。~~ -* 2018.08.30 已解决中文命名问题（仅在Linux下做过测试） - -### Demo -* [http://soft.xiaoz.org/](http://soft.xiaoz.org/) - -### 获取捐赠版 -扫描下方二维码，并留言您的网址可获取捐赠版，捐赠版可去除底部版权。 - -![](https://imgurl.org/upload/1712/cb349aa4a1b95997.png) - -### 联系我 -* Blog：[https://www.xiaoz.me/](https://www.xiaoz.me/) -* QQ:337003006 \ No newline at end of file diff --git a/static/embed.js b/static/embed.js index 0ac6e13..bc89f21 100644 --- a/static/embed.js +++ b/static/embed.js @@ -41,6 +41,8 @@ layui.use(['upload','form','element','layer','flow'], function(){ //this.url = '/upload/' + storage; //console.log(this.url); } + ,accept:'file' + ,acceptMime:'image/webp,image/jpeg,image/pjpeg,image/bmp,image/png,image/x-png,image/gif' ,size:5120 ,before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。 layer.load(); //上传loading