change

README.md

@@ -152,6 +152,7 @@ $HTTP["url"] =~ "^/(i|public)/" {
 * 2022-04-02 v2.5.9 deving
 - 增加安装提示
 - 增加检测水印图片/水印字体是否存在
+- 修复登陆逻辑
 - 修复广场重复显示图片
 - 调整了广告的位置
 - 调整后台设置分表

application/function.php

@@ -1033,9 +1033,8 @@ function get_whole_url($search = null)
     if ($search) {
         // 返回指定符号之前
         return substr($whole_domain, 0, strrpos($whole_domain, $search));
-    } else {
-        return $whole_domain;
     }
+    return $whole_domain;
 }
 
 /**

application/list.php

@@ -79,49 +79,49 @@ if ($config['ad_top']) echo $config['ad_top_info'];
       </div>
     </div>
     <!-- 按格式 -->
-    <div class="row">
+    <!-- <div class="row">
       <div class="col-md-2 col-xs-6">
-        <form action="list.php" method="get">
+        <form action="<php echo '?' . http_build_query($httpUrl) . '&'; ?>" method="get">
           <div class="input-group">
-            <select name="&search" class="form-control input-sm">
+            <select name="search" class="form-control input-sm">
               <option value="jpg">JPG</option>
               <option value="png">PNG</option>
               <option value="gif">Gif</option>
-              <option value="gif">WEBP</option>
+              <option value="webp">WEBP</option>
             </select>
             <span class="input-group-btn">
               <input type="submit" value="按格式" class="btn btn-primary input-sm" />
             </span>
           </div>
         </form>
-      </div>
-      <!-- <div class="col-md-2 col-xs-6">
-        <div class="btn-group">
-          <a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=jpg'; ?>">JPG</a>
-          <a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=png'; ?>">PNG</a>
-          <a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=gif'; ?>">GIF</a>
-          <a class="btn btn-sm" href="<php echo '?' . http_build_query($httpUrl) . '&search=webp'; ?>">Webp</a>
-        </div>
       </div> -->
-      <!-- 按日期-->
+    <div class="col-md-2 col-xs-6">
-      <div class="col-md-2 col-xs-6">
+      <div class="btn-group">
-        <form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="get">
+        <a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=jpg'; ?>">JPG</a>
-          <div class="input-group">
+        <a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=png'; ?>">PNG</a>
-            <span class="input-group-addon fix-border fix-padding"></span>
+        <a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=gif'; ?>">GIF</a>
-            <input type="text" class="form-control form-date input-sm" name="date" value="<?php echo date('Y/m/d/'); ?>" readonly="readonly">
+        <a class="btn btn-sm" href="<?php echo '?' . http_build_query($httpUrl) . '&search=webp'; ?>">Webp</a>
-            <span class="input-group-btn">
-              <button type="submit" class="btn btn-primary input-sm">按日期</button>
-            </span>
-          </div>
-        </form>
       </div>
     </div>
+    <!-- 按日期-->
+    <div class="col-md-2 col-xs-6">
+      <form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="get">
+        <div class="input-group">
+          <span class="input-group-addon fix-border fix-padding"></span>
+          <input type="text" class="form-control form-date input-sm" name="date" value="<?php echo date('Y/m/d/'); ?>" readonly="readonly">
+          <span class="input-group-btn">
+            <button type="submit" class="btn btn-primary input-sm">按日期</button>
+          </span>
+        </div>
+      </form>
+    </div>
   </div>
-  <!-- 返回顶部 -->
+</div>
-  <div style="display: none;" id="rocket-to-top">
+<!-- 返回顶部 -->
-    <div style="opacity:0;display: block;" class="level-2"></div>
+<div style="display: none;" id="rocket-to-top">
-    <div class="level-3"></div>
+  <div style="opacity:0;display: block;" class="level-2"></div>
-  </div>
+  <div class="level-3"></div>
+</div>
 </div>
 <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/EasyImage.css">
 <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.css">

config/config.php

@@ -83,7 +83,7 @@ var _hmt = _hmt || [];
 	'chart_on'=>1,
 	'check_ip'=>0,
 	'check_ip_model'=>0,
-	'check_ip_list'=>'127.0.0.1',
+	'check_ip_list'=>'',
 	'public'=>0,
 	'public_list'=>Array
 		(
@@ -104,7 +104,7 @@ var _hmt = _hmt || [];
 	'delDir'=>'thumbnails/',
 	'hide'=>0,
 	'version'=>'2.5.8',
-	'update'=>'2022-04-11 13:31:22',
+	'update'=>'2022-04-11 13:38:41',
 	'terms'=>'<div class="container">
   <div class="row">
     <div class="col-xs-3">

install/index.php

@@ -109,25 +109,21 @@ function checkPASS($name)
             </tr>
         </tbody>
     </table>
-    <!-- 使用按钮 -->
-    <p class="text-primary">图床需要权限0755,所有者用户组为www, 命令: <code>chmod -R 0755 /网站的绝对目录/*</code>
-        <a href="./README/chmod.png" data-toggle="lightbox" class="btn btn-mini btn-primary">宝塔面板演示</a>
-    </p>
     <?php
     $checkres = array($phpEnv, $fileinfo, $gd, $i_wjj, $file_php, $userINI);
 
-    if (in_array(false, $checkres)) {
+    if (in_array(false, $checkres)) : ?>
-        echo '<p class="text-danger">如果你的PHP版本较低或者不想安装上述PHP扩展请删除<code>install</code>目录</p>
+        <p class="text-primary">对于Liunx主机可以使用以下命令: <a href="./README/chmod.png" data-toggle="lightbox" class="btn btn-mini btn-primary">宝塔面板演示</a></p>
-        <a href="./index.php" ><button class="btn btn-lg btn-danger" type="button">请满足上述要求后点击刷新</button></a>';
+        <h6 class="code">chmod 755 -R /data/wwwroot/<?php echo $_SERVER['HTTP_HOST']; ?></h6>
-    } else {
+        <h6 class="code">chown -R www:www /data/wwwroot/<?php echo $_SERVER['HTTP_HOST']; ?></h6>
-        echo '
+        <p class="text-danger">如果你的PHP版本较低或者不想安装上述PHP扩展请删除<code>install</code>目录</p>
-    <form action="install.php" method="post">
+        <a href="./index.php"><button class="btn btn-danger" type="button">请满足上述要求后点击刷新</button></a>
-        <input type="hidden" name="check" value="checked" readonly>
+    <?php else : ?>
-        <input type="submit" class="btn btn-lg btn-primary" value="下一步(1/2)" >
+        <form action="install.php" method="post">
-    </form>
+            <input type="hidden" name="check" value="checked" readonly>
-    ';
+            <input type="submit" class="btn btn-primary" value="下一步(1/2)">
-    }
+        </form>
-    ?>
+    <?php endif; ?>
     <!-- install bottom HTML start -->
     <div class="modal fade" id="myModal">
         <div class="modal-dialog modal-sm">