*/}}
YimingWu 1 month ago
parent
commit
a9a82c210b
1 changed files with 20 additions and 16 deletions
  1. 20 16
      index.php

+ 20 - 16
index.php

@@ -220,15 +220,15 @@ class LA{
         if(isset($this->Redirect) && isset($this->Redirect[0])) foreach($this->Redirect as $r){
             if($r['for']=='P'){
                 if(!preg_match('/[0-9]{14}/',$r['target'])){
-                    fwrite($conf,"RewriteRule ^".$r['format'].'$ /index.php?'.$r['target'].' [R=302,L]'.PHP_EOL.PHP_EOL);
+                    fwrite($conf,"RewriteRule ^".$r['format'].'$ /index.php?'.$r['target'].' [R=302,L,NC]'.PHP_EOL.PHP_EOL);
                 }
-                fwrite($conf,"RewriteRule ^".$r['format'].'$ /index.php?post='.$r['target'].' [R=302,L]'.PHP_EOL.PHP_EOL);
+                fwrite($conf,"RewriteRule ^".$r['format'].'$ /index.php?post='.$r['target'].' [R=302,L,NC]'.PHP_EOL.PHP_EOL);
             }// do site redirect in php.
         }
         fwrite($conf, 'RewriteCond %{HTTPS} !=on'.PHP_EOL.
                       'RewriteCond %{HTTP_HOST} !=localhost'.PHP_EOL.
                       'RewriteCond %{REQUEST_URI}  !^.*(jpg|png|gif)$'.PHP_EOL.
-                      'RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]'.PHP_EOL.PHP_EOL);
+                      'RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301,NC]'.PHP_EOL.PHP_EOL);
         fwrite($conf,'<Files ~ "\.md$">'.PHP_EOL.'deny from all'.PHP_EOL.'</Files>'.PHP_EOL);
         fflush($conf);fclose($conf);
     }
@@ -629,7 +629,7 @@ overflow:auto;max-height:calc(100vh - 2.6em);}
 .imd_float{float:right;width:50% !important;clear:both;margin-left:0.5em !important;}
 .center_wide{display:inline-block;vertical-align:top;width:75%;padding-left:0.3em;overflow:visible;padding-bottom:4rem;}
 .center_full{display:inline-block;vertical-align:top;width:100%;overflow:visible;padding-bottom:4rem;}
-.center_wide .p_thumb{height:12rem;margin:0;margin-right:1em;margin-bottom:1em;box-shadow:5px 5px 15px 2px black;}
+.center_wide .p_thumb{height:12rem;width:12rem;margin:0;margin-right:0.5rem;margin-bottom:0.5rem;box-shadow:5px 5px 15px 2px black;}
 .linked_posts{padding:0.5em;background-color:#0004;box-shadow:0px 0.2em 0.2em -0.2em inset %shadow%;}
 .active_post .linked_posts{background-color:%highlight_slice%;}
 input:checked~.linked_posts,input:checked~a{display:none;}
@@ -718,7 +718,7 @@ h1,h2,h3,h4,h5{scroll-margin:2.5em;}
 .file_thumb{width:4em;height:4em;display:inline-block;line-height:0;vertical-align:middle;overflow:hidden;}
 .p_row{display:flex;flex-wrap:wrap;width:100%;}
 .p_thumb{display:flex;flex-grow:100;height:6rem;overflow:hidden;position:relative;margin-right:0.5em;margin-bottom:0.5em;}
-.p_thumb_narrow{width:1rem;flex-grow:1;opacity:0.2;}
+.p_thumb_narrow{width:1rem !important;flex-grow:1;opacity:0.2;}
 .p_thumb img,.p_thumb video{object-fit:cover;max-height:100%;min-width:100%;}.p_thumb a{display:contents;}
 .p_thumb:hover .post_menu_button{display:block;}
 .p_thumb_selected{color:%black% !important;}
@@ -856,7 +856,7 @@ label{text-align:left;display:inline-block;}
 @media screen and (max-width:1000px) and (min-width:666px){
 .left{width:35%;}
 .center,.center_wide{width:65%;}
-.center_wide .p_thumb{height:8rem;margin-right:0.7em;margin-bottom:0.7em;box-shadow:3px 3px 12px 2px black;}
+.center_wide .p_thumb{height:8rem;width:8rem;margin-right:0.4rem;margin-bottom:0.4rem;box-shadow:3px 3px 12px 2px black;}
 .post_width{width:calc(100% - 1.5rem);padding-left:0.2em;}
 .hidden_on_wide{display:unset;}
 .pop_right{width:30%;}
@@ -882,9 +882,9 @@ pre{max-width:85vw;}
 .mobile_fold{display:none !important;}
 .hidden_m{display:none !important;}
 .block_m{display:block !important;}
-.hidden_on_desktop{display:unset;}
-.hidden_on_wide{display:unset;}
-header{position:unset;}
+.hidden_on_desktop{display:inherit;}
+.hidden_on_wide{display:inherit;}
+header{position:inherit;}
 header ul{display:block;}
 header li{display:block;}
 header li::before{content:''}
@@ -892,7 +892,7 @@ header::before{box-shadow:none;display:none;}
 .small_footer::before{box-shadow:none;display:none;}
 .left{position:relative;width:100%;top:unset;height:unset;max-height:unset;padding-right:0;display:block;}
 .center,.center_wide,.center_full{display:block;position:relative;line-break:anywhere;left:0;top:0;width:100%;padding-left:0;}
-.center_wide .p_thumb{height:6rem;margin-right:0.5em;margin-bottom:0.5em;box-shadow:2px 2px 10px 1px black;}
+.center_wide .p_thumb{height:6rem;width:6rem;margin-right:0.3rem;margin-bottom:0.3rem;box-shadow:2px 2px 10px 1px black;}
 .pop_right,.pop_right_big{top:unset;right:0;bottom:0;left:0;width:100%;}
 .pop_right{height:30%;}
 .pop_right_big{height:70%;}
@@ -3386,7 +3386,7 @@ blockquote{border-left:2px solid black;}
         $this->Anchors = []; if(isset($post['slides']) || ($is_thread&&isset($post['tid']['slides']))) $centerclass='center_slides'; else $centerclass='center';
         if(isset($this->TagID)){ $STR.=<<<EOT
             <style>{$this->CssNumberID($this->TagID)}{display:block;}</style>
-        EOT; }  $th=NULL; $STR.="<h2>";
+        EOT; }  $th=NULL; $STR.="<br /><h2>";
         $is_wide = (isset($post['wide'])&&$post['wide']) || ($is_thread && isset($post['tid']['wide']) && $post['tid']['wide']);
         if($is_thread){ $th = $post['tid']; $STR.=$this->T('话题'); }else{ $STR.=$this->T('话题');$this->T('详细'); } $STR.="</h2>";
         $this->TFill(2,$STR); $this->TExtra("class='hidden_on_print'"); $this->TRow();
@@ -3436,9 +3436,10 @@ blockquote{border-left:2px solid black;}
         $this->TFill(2,$STR); $this->TRow(); $STR="";
         if(!$is_reversed && ($this->LoggedIn && (!$this->InHereMode))){
             $STR.="<div class='hidden_on_print'><br />{$this->MakePostingFieldsV2($is_thread?$th['last']['id']:$post['id'], true)}</div>";
+            $this->TFill(2,$STR); $this->TRow();
         }
         //$this->MakeCommentSection($post);
-        $this->TFill(2,$STR); $this->TRow(); $STR="";
+        $STR="";
         if(isset($post['slides']) || ($is_thread&&isset($post['tid']['slides']))){
             $STR.=<<<EOL
             <div class='slides_buttons code' onclick="event.stopPropagation();">
@@ -3508,6 +3509,7 @@ blockquote{border-left:2px solid black;}
                                     " <span class='gray invert_a hidden_on_print'>".//"<a href='index.php?&set_wayback=true'>↶</a>".
                                     ($this->LoggedIn?"<a href='".$INDEXPHP."?comments=all'>@</a> <a href='".$INDEXPHP."?statistics=all'>%</a>":"")."</span>")).
                     "</h2>";
+        $this->TFill(2,$STR); $this->TRow();
         if(isset($search_term)){
             $STR.="<form action='".$INDEXPHP."' method='post' style='display:none;' id='search_form'></form>".
             "<input id='search_content' name='search_content' rows='4' form='search_form' type='text' value='$search_term'>".
@@ -3548,11 +3550,11 @@ blockquote{border-left:2px solid black;}
             if($i >= $this->PostsPerPage * (1+$this->CurrentOffset)) {break;}
             $last_end_wide = sizeof($p['tid']['arr'])==1 && isset($p['end_wide']) && $p['end_wide']; 
         }
-        $STR=""; $EXTRA="class='clean_a'"; $STR.="<br /><br />
-        <a ".($this->CurrentOffset>0?("href='".$INDEXPHP."?offset=".($this->CurrentOffset-1).
+        $STR=""; $EXTRA="class='clean_a'"; $STR.="<br /><br />".
+        "<a ".($this->CurrentOffset>0?("href='".$INDEXPHP."?offset=".($this->CurrentOffset-1).
                     (isset($search_term)?"&search=".$search_term:(isset($category)?"&category=".$category:""))."'"):"").
-            ($this->CurrentOffset==0?" class='gray'":"")."{$this->T('上一页')} ← <`/a>";
-        $this->CurrentOffset+1;
+            ($this->CurrentOffset==0?" class='gray'":"").">{$this->T('上一页')} ← </a>";
+        $STR.=" [ ".($this->CurrentOffset+1)." ] ";
         $STR.="<a href='".$INDEXPHP."?offset=".($this->CurrentOffset+1).
             (isset($search_term)?"&search=".$search_term:(isset($category)?"&category=".$category:""))."'>".
             " → {$this->T('下一页')}</a>";
@@ -4157,6 +4159,8 @@ blockquote{border-left:2px solid black;}
         <li><a rel="alternate" type="application/rss+xml" href="?rss=<?=$this->LanguageAppendix;?>" />RSS/Atom<sup><?=$this->LanguageAppendix;?></sup></a></li>
         </ul>
         </div>
+        <br />
+        <hr class="hidden_on_desktop" />
         </div>
     <?php }
     function MakePostSection(&$post){ $is_thread = isset($post['tid']['count'])&&$post['tid']['count']>1;