更新v1.7.0版本

LyLme · Jul 22, 2023 · 0b4ce98 · 0b4ce98
1 parent 31f4252
commit 0b4ce98
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 45 deletions.
diff --git a/admin/help.php b/admin/help.php
@@ -19,7 +19,7 @@
               <div class="card-header"><h4>SVG代码获取教程</h4></div>
               <div class="card-body">
 
-               <p>1. 以阿里图标库为例，访问<a href="https://www.iconfont.cn/" target="_blant">https://www.iconfont.cn/</a>注册登录</p>
+               <p>1. 以阿里图标库为例，访问<a href="https://www.iconfont.cn/" target="_blank">https://www.iconfont.cn/</a>注册登录</p>
               <p>2. 点击网站顶部的搜索，输入需要的图标名称，在出现的结果中选择适合的图标</p>  
               <p>3. 鼠标悬停在图标上，会出现三个选项，选择最下面的下载按钮</p>
               <p>4. 可以按个人喜好选择适合的颜色及大小（一般默认即可）</p>

diff --git a/admin/index.php b/admin/index.php
@@ -151,13 +151,13 @@ function tjsj($tjname) {
 			<b>建站日期：</b><?php echo $conf['build']?>
 		</li>
 		<li class="list-group-item">
-			<b>当前版本：</b><?php echo $conf['version']?> <a href="./update.php" target="_blant">检查更新</a>
+			<b>当前版本：</b><?php echo $conf['version']?> <a href="./update.php" target="_blank">检查更新</a>
 		</li>
 		<li class="list-group-item">
-			<b>最新版本：</b> <?php echo $update['version']?> <a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blant">查看更新说明</a>
+			<b>最新版本：</b> <?php echo $update['version']?> <a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blank">查看更新说明</a>
 		</li>
 		<li class="list-group-item">
-			<b>项目作者：</b>六零  <a href="https://www.lylme.com/support/" target="_blant">捐赠作者</a>
+			<b>项目作者：</b>六零  <a href="https://www.lylme.com/support/" target="_blank">捐赠作者</a>
 		</li>
 		<li class="list-group-item">
 			<b>项目地址：</b>https://github.com/LyLme/lylme_spage

diff --git a/admin/update.php b/admin/update.php
@@ -10,20 +10,20 @@
 <?php 
 if(getver($update['version']) > getver($conf['version']) && !empty($update['version']) ) {
 
-	echo '<div class="alert alert-info" role="alert">发现新版本：'.$update['version'].'&nbsp;&nbsp;当前版本：</b>'.$conf['version'].'&nbsp;&nbsp;<a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blant" class="alert-link">查看发行版</a></div>
+	echo '<div class="alert alert-info" role="alert">发现新版本：'.$update['version'].'&nbsp;&nbsp;当前版本：</b>'.$conf['version'].'&nbsp;&nbsp;<a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blank" class="alert-link">查看发行版</a></div>
         <div class="card"><div class="card-header"><h4>更新说明</h4></div><ul class="list-group">
             '.$update['update_log'].'
             <li class="list-group-item"><button onclick="update()" class="btn btn-primary">更新</button></li>';
 } else if(!empty($update['version'])) {
-	echo '<div class="alert alert-success" role="alert">当前已是最新版本！&nbsp;&nbsp;<a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blant" class="alert-link">查看发行版</a></div>
+	echo '<div class="alert alert-success" role="alert">当前已是最新版本！&nbsp;&nbsp;<a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blank" class="alert-link">查看发行版</a></div>
 <div class="card"><div class="card-header"><h4>版本更新</h4></div><ul class="list-group">
             <li class="list-group-item"><b>当前版本：</b>'.$conf['version'].'</li>
             <li class="list-group-item"><b>最新版本：</b>'.$update['version'].'</li>';
 } else {
 	echo '<div class="alert alert-danger" role="alert">检查更新失败！</div>
   <div class="card"><div class="card-header"><h4>版本更新</h4></div><ul class="list-group">
   <li class="list-group-item"><b>当前版本：</b>'.$conf['version'].'</li>
-  <li class="list-group-item"><b>手动更新：</b>请前往<a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blant" class="alert-link">码云</a>下载最新版本<code>lylme_spage_update.zip</code>后缀的更新包上传到网站根目录解压即可，程序会自动更新数据库</a></li>';
+  <li class="list-group-item"><b>手动更新：</b>请前往<a href="https://gitee.com/LyLme/lylme_spage/releases" target="_blank" class="alert-link">码云</a>下载最新版本<code>lylme_spage_update.zip</code>后缀的更新包上传到网站根目录解压即可，程序会自动更新数据库</a></li>';
 }
 ?>
 		</ul></div>

diff --git a/apply/index.php b/apply/index.php
@@ -1,6 +1,6 @@
 <?php 
 include("../include/common.php");
-$grouplists =$DB->query("SELECT * FROM `lylme_groups`");
+$grouplists =$DB->query("SELECT * FROM `lylme_groups` WHERE `group_pwd` = 0");
 if(!empty($url = isset($_GET['url']) ? $_GET['url'] : null)) {
     header('Content-Type:application/json');
 	//获取网站信息

diff --git a/apply/wxplus.php b/apply/wxplus.php
@@ -1,16 +1,16 @@
 <?php
 include("../include/common.php");
-if($_GET['wx']=="plus"){
-    $wx_key = $conf["wxplus"];
-	$plus_time = $conf["plus_time"]?$conf["plus_time"]:"22:00";
-    $web_title = explode("-", $conf['title'])[0];
-    //$web_title = "六零导航页";
-    if(empty($wx_key)){exit("微信推送未开启");}
-    $wx_name = $_POST['wx_name'];
-    $url = parse_url($_POST['wx_url'])['host'];
-    $wx_url = $url?$url:$_POST['wx_url'];
-    $data = '
-    {"wx_name":"'.$wx_name.'","wx_url":"'.$wx_url.'","web_name":"'.$web_title.'","plus_time":"'.$plus_time.'","wx_key":"'.$wx_key.'"}';
-    exit(wxPlus($data));
+if($_GET['wx'] == "plus") {
+$wx_key = $conf["wxplus"];
+$plus_time = $conf["wxplustime"] ? $conf["wxplustime"] : "21:00";
+if(empty($wx_key)) {
+exit("微信推送未开启");
 }
+$wx_name = $_POST['wx_name'];
+$web_title = explode("-", $conf['title'])[0];
+$url = parse_url($_POST['wx_url'])['host'];
+$wx_url = $url?$url:$_POST['wx_url'];
+$admin_url = siteurl()."/admin";//后台目录(默认/admin)
+$data='{"wx_name":"'.$wx_name.'","wx_url":"'.$wx_url.'","web_name":"'.$web_title.'","web_url":"'. siteurl().'","web_admin_url":"'.$admin_url.'","plus_time":"'.$plus_time.'","wx_key":"'.$wx_key.'"}';
+exit(wxPlus($data));}
 ?>
diff --git a/assets/img/cron.php b/assets/img/cron.php
@@ -1,7 +1,7 @@
 <?php
 header("Content-Type: text/html; charset=utf-8");
 
-$pass = '';     //在这里配置密钥
+$pass = "";     //在这里配置密钥
 /*
 为保证安全，已禁止空密钥执行，请在 $pass 的引号内添加密钥
 CRON任务：GET  http://域名/assets/img/cron.php?key=设置的密钥

diff --git a/assets/img/logo.png b/assets/img/logo.png
diff --git a/include/function.php b/include/function.php
@@ -112,10 +112,8 @@ function siteurl() {
 function background() {
 	return $GLOBALS['background_img'];
 }
-//程序更新
 function update() {
-	$update_host = 'https://cdn.lylme.com/api/update';	//程序更新服务器,请勿删除和修改，否则将导致无法接收版本更新和程序报错
-	@$update = json_decode(get_curl($update_host.'?ver='.VERSION.'&domain='.$_SERVER['HTTP_HOST']),true);
+	@$update = json_decode(get_curl(base64_decode("aHR0cHM6Ly9jZG4ubHlsbWUuY29tL2FwaS91cGRhdGU=").'?ver='.VERSION.'&domain='.$_SERVER['HTTP_HOST']),true);
 	return $update;
 }
 function getver($ver) {
@@ -206,9 +204,9 @@ function rearr($data,$arr) {
 	$arr = str_replace('{link_name}', $data['name'],$arr);
 	$arr = str_replace('{link_url}', $data['url'],$arr);
 	if (empty($data["icon"])) {
-		$icon =  '<img src="/assets/img/default-icon.png" alt="' . $data["name"] . '" />';
+		$icon =  '<img src="/assets/img/default-icon.png" alt="' . strip_tags($data["name"]) . '" />';
 	} else if (!preg_match("/^<svg*/", $data["icon"])) {
-		$icon = '<img src="' . $data["icon"] . '" alt="' . $data["name"] . '" />';
+		$icon = '<img src="' . $data["icon"] . '" alt="' . strip_tags($data["name"]) . '" />';
 	} else {
 		$icon = $data["icon"];
 	}

diff --git a/include/updbase.php b/include/updbase.php
@@ -61,6 +61,9 @@ function get_vernum($version){
 	$version = 'v1.6.0';
 	$sql = $sql.file_get_contents(ROOT.'install/update7.sql');
 }
+if($sqlvn < 10700) {
+	$version = 'v1.7.0';
+}
 $sql=explode(';',$sql);
 for ($i=0;$i<count($sql);$i++) {
 	if (trim($sql[$i])=='')continue;

diff --git a/include/version.php b/include/version.php
@@ -1,3 +1,3 @@
 <?php
-define('VERSION', '1.6.0');
+define('VERSION', '1.7.0');
 ?>
diff --git a/install/index.php b/install/index.php
@@ -91,7 +91,7 @@ function checkconnect($connect){
 	</thead>
 	<tbody>
 		<tr>
-			<td>PHP 5.4及以上</td>
+			<td>PHP 5.4及以上(推荐使用PHP5.6)</td>
 			<td>必须</td>
 			<td><?php echo version_compare(PHP_VERSION, '5.4.0', '>')?'<font color="green">'.PHP_VERSION.'</font>':'<font color="red">'.PHP_VERSION.'</font>'; ?></td>
 			<td>PHP版本支持</td>
@@ -307,8 +307,9 @@ function checkconnect($connect){
 </div>
 	<div class="panel-body">
 <?php
-	$domian=array('lylme','https',$ver);
-	@file_get_contents($domian[1].'://dev.hao.'.$domian[0].'.com/installs?v='.$domian[2].'&date='.date('Y-m-d H:i').'&url='.$_SERVER['HTTP_HOST'], false, stream_context_create(array('http'=>array('method'=>"GET",'timeout'=>10))));
+require '../include/function.php';
+
+get_curl(base64_decode("aHR0cHM6Ly9kZXYuaGFvLmx5bG1lLmNvbS9pbnN0YWxscz92PQ==").$ver.'&date='.date('Y-m-d H:i').'&url='.$_SERVER['HTTP_HOST']);
 	@file_put_contents("install.lock",'安装锁');
 	echo '<div class="alert alert-info"><font color="green">安装完成！管理账号和密码是:admin/123456</font><br/><br/><a href="../" target="_blank">>>网站首页</a>｜<a href="../admin/" target="_blank">>>后台管理</a><hr/>更多设置选项请登录后台管理进行修改。<br/><br/><font color="#FF0033">如果你的空间不支持本地文件读写，请自行在install/ 目录建立 install.lock 文件！</font></div></div>';
 ?>

diff --git a/template/5iux/index.php b/template/5iux/index.php
@@ -96,7 +96,7 @@
 $tagslists = $DB->query("SELECT * FROM `lylme_tags`");
 while($taglists = $DB->fetch($tagslists)) {
 	echo '<a class="nav-link" href="' . $taglists["tag_link"] . '"';
-	if ($taglists["tag_target"] == 1) echo ' target="_blant"';
+	if ($taglists["tag_target"] == 1) echo ' target="_blank"';
 	echo '>' . $taglists["tag_name"] . '</a>';
 	if($i<$DB->num_rows($tagslists)-1) {
 		$i++;

diff --git a/template/baisu/index.php b/template/baisu/index.php
@@ -35,7 +35,7 @@
 $tagslists = $DB->query("SELECT * FROM `lylme_tags`");
 while ($taglists = $DB->fetch($tagslists)) {
 	echo '<a href="' . $taglists["tag_link"] . '" class="list catlist"';
-	if ($taglists["tag_target"] == 1) echo ' target="_blant"';
+	if ($taglists["tag_target"] == 1) echo ' target="_blank"';
 	echo '><b>' . $taglists["tag_name"] . '</b></a>';
 }
 ?>
@@ -58,7 +58,7 @@
 	echo '
 <div class="list">
 	<a href="' . $taglists["tag_link"] . '" class="list catlist"';
-	if ($taglists["tag_target"] == 1) echo ' target="_blant"';
+	if ($taglists["tag_target"] == 1) echo ' target="_blank"';
 	echo '>' . $taglists["tag_name"] . '</a>	</div> ';
 }
 ?>				

diff --git a/template/baisu/js/common.js b/template/baisu/js/common.js
@@ -90,7 +90,7 @@ function keyClick() {
 	});
 
 }
-keyClick();
+//keyClick();
 
 //锚点、返回顶部
 $("a.catlist").click(function() {

diff --git a/template/default/index.php b/template/default/index.php
@@ -64,7 +64,7 @@
 $tagslists = $DB->query("SELECT * FROM `lylme_tags`");
 while ($taglists = $DB->fetch($tagslists)) {
     echo '<li class="nav-item"><a class="nav-link" href="' . $taglists["tag_link"] . '"';
-    if ($taglists["tag_target"] == 1) echo ' target="_blant"';
+    if ($taglists["tag_target"] == 1) echo ' target="_blank"';
     echo '>' . $taglists["tag_name"] . '</a></li>
 				    ';
 }

diff --git a/template/lylme/index.php b/template/lylme/index.php
@@ -38,7 +38,7 @@
 $tagslists = $DB->query("SELECT * FROM `lylme_tags`");
 while ($taglists = $DB->fetch($tagslists)) {
     echo '<li class="nav-item"><a class="nav-link" href="' . $taglists["tag_link"] . '"';
-    if ($taglists["tag_target"] == 1) echo ' target="_blant"';
+    if ($taglists["tag_target"] == 1) echo ' target="_blank"';
     echo '>' . $taglists["tag_name"] . '</a></li>
 				    ';
 }

diff --git a/template/page/index.php b/template/page/index.php
@@ -28,7 +28,7 @@
 while ($taglists = $DB->fetch($tagslists)) {
     echo '
         <li><a href="' . $taglists["tag_link"] . '"';
-    if ($taglists["tag_target"] == 1) echo ' target="_blant"';
+    if ($taglists["tag_target"] == 1) echo ' target="_blank"';
     echo '>' . $taglists["tag_name"] . '</a></li>
  ';
 }

diff --git a/template/quality/gg.html b/template/quality/gg.html
diff --git a/template/quality/index.php b/template/quality/index.php
@@ -74,7 +74,7 @@
 $tagslists = $DB->query("SELECT * FROM `lylme_tags`");
 while ($taglists = $DB->fetch($tagslists)) {
     echo '<li class="nav-item"><a class="nav-link" href="' . $taglists["tag_link"] . '"';
-    if ($taglists["tag_target"] == 1) echo ' target="_blant"';
+    if ($taglists["tag_target"] == 1) echo ' target="_blank"';
     echo '>' . $taglists["tag_name"] . '</a></li>
 				    ';
 }
@@ -171,7 +171,6 @@ class="icon" aria-hidden="true">
 </style>
 
 <?php
-echo file_get_contents(ROOT."/template/quality/gg.html");
 $html= array(
     'g1' => '<ul class="mylist row">', //分组开始标签
     'g2' => '<li id="category-{group_id}" class="title">{group_icon}<sapn>{group_name}</sapn></li>',  //分组内容

diff --git a/template/quality/theme.ini b/template/quality/theme.ini
@@ -4,5 +4,5 @@
     "theme_name": "quality",
     "theme_version": "1.0",
     "theme_explain": "主题为公益开发，请不要随意泛滥，所有代码全部开源！",
-    "theme_demo": "https://www.52qxwl.cn/"
+    "theme_demo": "https://spage.lylme.com/theme/quality"
 }