はてブ投稿機能を廃止／トビラにキーワード一覧を戻す／スパム対策の調整／リリースの準備。

[yanmah2/YANMAH2-season2-.git] / keywords.php

diff --git a/keywords.php b/keywords.php
index 9764723..d1aac3b 100644 (file)
--- a/keywords.php
+++ b/keywords.php
@@ -12,13 +12,11 @@ require_once "common_functions.php";
 <?php
 require_once "init_processor.php";
 if (!isset($_SESSION['auth']) || $_SESSION['auth'] != TRUE){
-// if ($_SESSION['image'] != 'on'){
   $_SESSION = array();
   if (isset($_COOKIE[session_name()])){
        setcookie(session_name(), '', time() - 42000, dirname($_SERVER['SCRIPT_NAME']) . '/', $_SERVER["SERVER_NAME"]);
   }
   session_destroy();
-// }
 }
 //session_regenerate_id(TRUE);
 ?>
@@ -36,10 +34,6 @@ if (isset($_GET["user"])) checkId($_GET["user"]);
 if (isset($_GET['page'])) checkPagenum($_GET['page']);
 ?>
 <?php
-//
-// require 'login_processor.php';
-?>
-<?php
 if (isset($_GET['word']) && $_GET['word'] != ''){
   $get_word = $_GET['word'];
   $get_word = mb_convert_encoding($get_word, 'UTF-8', $charcode);
@@ -75,7 +69,12 @@ if (isset($_GET['page']) && $_GET['page'] != ''){
        $relog_back = $self_anchor_possibly_with_pagenum . '&log=try';
        $relogin = $self_anchor_possibly_with_pagenum . '&amp;with=haiku&amp;callback='.rawurlencode($relog_back);
 } else {
-       $self_anchor_possibly_with_pagenum = $self_anchor;
+       if ($list_mode != 'default'){
+         $self_anchor_possibly_with_pagenum = $self_anchor.'&page=1';
+       } else {
+         $self_anchor_possibly_with_pagenum = $self_anchor.'?page=1';
+       }
+//     $self_anchor_possibly_with_pagenum = $self_anchor;
        if (isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != ''){
          $relog_back = $self_anchor_possibly_with_pagenum . '&log=try';
          $relogin = $self_anchor_possibly_with_pagenum . '&amp;with=haiku&amp;callback='.rawurlencode($relog_back);
@@ -118,31 +117,34 @@ $echo = $echo . "<h1 id=\"entries-head\" class=\"head1\">{$page_head}</h1>\n<hr
 $echo = $echo . "</div>\n";
 ?>
 <?php
-$echo = $echo . '<div class="contents"><ul class="kwd-ls">';
-$echo = $echo . '<li><form method="get" action="./keywords.php" accept-charset="'.$meta_charset.'">
-';
-$echo = $echo . '<label for="go2keyword">キーワード</label><input type="text" name="word" maxlength="170" id="go2keyword" /><label for="go2keyword">を</label>
-';
-// if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
-$echo = $echo . '<input type="submit" value="検索" /></form></li>';
-?>
-<?php
-if (isset($_GET["page"]) && $_GET["page"] != ''){
-       if (isset($get_word) && $get_word != ''){
-               $request_url = $json_url . "&page=" . htmlspecialchars($_GET["page"], ENT_QUOTES);
-       }       elseif (isset($get_user) && $get_user != ''){
+$echo = $echo . '<div class="contents">'."\n";
+if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){
+  $echo = $echo . '<ul class="kwd-ls">'."\n";
+  $echo = $echo . '<li><form method="get" action="./keywords.php" accept-charset="'.$meta_charset.'">
+  ';
+  $echo = $echo . '<label for="go2keyword">キーワード</label><input type="text" name="word" maxlength="170" id="go2keyword" /><label for="go2keyword">を</label>
+  ';
+  $echo = $echo . '<input type="submit" value="検索" /></form></li>';
+  if (isset($_GET["page"]) && $_GET["page"] != ''){
+         if (isset($get_word) && $get_word != ''){
                  $request_url = $json_url . "&page=" . htmlspecialchars($_GET["page"], ENT_QUOTES);
-       }       elseif (isset($get_related) && $get_related != ''){
-               $request_url = $json_url . '?page='.htmlspecialchars($_GET['page'], ENT_QUOTES);
-       } else {
-                       $request_url = $json_url . '&page=' . htmlspecialchars($_GET['page'], ENT_QUOTES);
-       }
-}      else {
-       $request_url = $json_url;
+         }     elseif (isset($get_user) && $get_user != ''){
+                   $request_url = $json_url . "&page=" . htmlspecialchars($_GET["page"], ENT_QUOTES);
+         }     elseif (isset($get_related) && $get_related != ''){
+                 $request_url = $json_url . '?page='.htmlspecialchars($_GET['page'], ENT_QUOTES);
+         } else {
+                         $request_url = $json_url . '&page=' . htmlspecialchars($_GET['page'], ENT_QUOTES);
+         }
+  }    else {
+         $request_url = $json_url;
+  }
+  // var_dump($request_url);
+  require_once 'keywords_processor.php';
+  $echo = $echo . "</ul>\n";
+} else {
+  $echo = $echo . '<p>内容を読むには<a href="./login.php?return='.rawurlencode(rawurldecode($self_anchor_with_imagemode)).'" class="navigation-link">ログイン</a>してください。</p>';
 }
-// var_dump($request_url);
-require_once 'keywords_processor.php';
-$echo = $echo . "</ul><hr /></div>";
+$echo = $echo . "<hr /></div>\n";
 ?>
 <?php
 if ($list_mode == 'related' || $list_mode == 'following'){