ログイン必須化（Forbidden対策）。

diff --git a/entries.php b/entries.php
index a2fb9c6..3aa04b4 100644 (file)
--- a/entries.php
+++ b/entries.php
@@ -356,65 +356,66 @@ $request_url = constRequest($json_url);
 // var_dump($get_image);
 if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){
   $json = getJson($request_url, TRUE, $conkey, $conkey_sec, $_SESSION['acstoken'], $_SESSION['acs_sec']);
-} else {
-  $json = getJson($request_url, FALSE);
-}
-if (preg_match("/^oauth_problem=token_rejected$/", $json['body'])){
-    $echo = $echo . "<p class=\"oauth-res\">アクセストークンが無効になっています。<a href=\"{$relogin}\">再認証</a>を行なってください。</p>";
-    $json = getJson(constRequest($json_url_noaouth), FALSE);
-}
-if ($json['stat'] !== TRUE){
-  $contents = strip_tags($json['stat']);
-  $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
-  $echo = $echo . "<blockquote>";
-  if (isset($json['http'])) echo "HTTP {$json['http']}<br />";
-  $echo = $echo . "{$json['stat']}<br />{$contents}</blockquote>\n";
-  $timeline_putted = FALSE;
-} else {
-  $json_body = $json['body'];
-  $contents = checkEntryData($json_body);
-  if ($contents['stat'] == FALSE && $contents['ercode'] != 'x'){
-//   var_dump($contents);
-//   var_dump($json['body']);
-       $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
-       $echo = $echo . "<blockquote>HTTP {$json['http']}<br />";
-       $echo = $echo . 'XML error '.$contents['ercode'].':'.$contents['ermes'];
-       $echo = $echo . "<br />".strip_tags($json['body'])."</blockquote>\n";
-       $timeline_putted = FALSE;
-  } elseif ($contents['stat'] == FALSE && $contents['ercode'] == 'x'){
-       $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
-       $echo = $echo . "<blockquote>HTTP {$json['http']}<br />{$contents['ermes']}</blockquote>\n";    
-       $timeline_putted = FALSE;
+  if (preg_match("/^oauth_problem=token_rejected$/", $json['body'])){
+      $echo = $echo . "<p class=\"oauth-res\">アクセストークンが無効になっています。<a href=\"{$relogin}\">再認証</a>を行なってください。</p>";
+      $json = getJson(constRequest($json_url_noaouth), FALSE);
+  }
+  if ($json['stat'] !== TRUE){
+    $contents = strip_tags($json['stat']);
+    $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
+    $echo = $echo . "<blockquote>";
+    if (isset($json['http'])) echo "HTTP {$json['http']}<br />";
+    $echo = $echo . "{$json['stat']}<br />{$contents}</blockquote>\n";
+    $timeline_putted = FALSE;
   } else {
-//     var_dump($contents);
-       $first_e = 'first';
-       if ($entries_mode == 'default' || $entries_mode == 'album'){ $dict = array(); $spam = 0; }
-       if ($entries_mode  == 'users' || $entries_mode == 'keyword_users' || $entries_mode == 'favours'){
-         $ustock = array();
-         $echo = $echo . "<dl class=\"users-list\">\n";
-       }
-       foreach ($contents['contents'] as $val){
-         echo mb_convert_encoding($echo, $charcode, 'UTF-8');
-         $echo = '';
-         if ($entries_mode == 'users' || $entries_mode == 'keyword_users' || $entries_mode == 'favours'){
-               $entry_processor_mode = 'users';
-               require 'entry_processor.php';
-         } else {
-               $entry_processor_mode = "entries";
-               require 'entry_processor.php';
-               echo mb_convert_encoding($echo, $charcode, 'UTF-8');
-               $echo = '';
+    $json_body = $json['body'];
+    $contents = checkEntryData($json_body);
+    if ($contents['stat'] == FALSE && $contents['ercode'] != 'x'){
+  //   var_dump($contents);
+  //   var_dump($json['body']);
+         $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
+         $echo = $echo . "<blockquote>HTTP {$json['http']}<br />";
+         $echo = $echo . 'XML error '.$contents['ercode'].':'.$contents['ermes'];
+         $echo = $echo . "<br />".strip_tags($json['body'])."</blockquote>\n";
+         $timeline_putted = FALSE;
+    } elseif ($contents['stat'] == FALSE && $contents['ercode'] == 'x'){
+         $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
+         $echo = $echo . "<blockquote>HTTP {$json['http']}<br />{$contents['ermes']}</blockquote>\n";  
+         $timeline_putted = FALSE;
+    } else {
+  //     var_dump($contents);
+         $first_e = 'first';
+         if ($entries_mode == 'default' || $entries_mode == 'album'){ $dict = array(); $spam = 0; }
+         if ($entries_mode  == 'users' || $entries_mode == 'keyword_users' || $entries_mode == 'favours'){
+           $ustock = array();
+           $echo = $echo . "<dl class=\"users-list\">\n";
          }
-         $timeline_putted = TRUE;
-       }
-       if (isset($spam) && $spam > 0) $echo = "<p>{$spam} スパムっぽいのを表示しませんでした。</p>";
-       if ($entries_mode  == 'users' || $entries_mode == 'keyword_users' || $entries_mode == 'favours') {
-         $echo = $echo . "</dl>\n";
-//     var_dump($dict);
-         $echo = $echo . '<p>' . count($ustock) . '/' . count($contents['contents']) . 
-           ' unique</p>' . "\n";
-       }
+         foreach ($contents['contents'] as $val){
+           echo mb_convert_encoding($echo, $charcode, 'UTF-8');
+           $echo = '';
+           if ($entries_mode == 'users' || $entries_mode == 'keyword_users' || $entries_mode == 'favours'){
+                 $entry_processor_mode = 'users';
+                 require 'entry_processor.php';
+           } else {
+                 $entry_processor_mode = "entries";
+                 require 'entry_processor.php';
+                 echo mb_convert_encoding($echo, $charcode, 'UTF-8');
+                 $echo = '';
+           }
+           $timeline_putted = TRUE;
+         }
+         if (isset($spam) && $spam > 0) $echo = "<p>{$spam} スパムっぽいのを表示しませんでした。</p>";
+         if ($entries_mode  == 'users' || $entries_mode == 'keyword_users' || $entries_mode == 'favours') {
+           $echo = $echo . "</dl>\n";
+  //   var_dump($dict);
+           $echo = $echo . '<p>' . count($ustock) . '/' . count($contents['contents']) . 
+             ' unique</p>' . "\n";
+         }
+    }
   }
+} else {
+//   $json = getJson($request_url, FALSE);
+  $echo = $echo . '<p>内容を読むには<a href="./login.php?return='.rawurlencode(rawurldecode($self_anchor_with_imagemode)).'" class="navigation-link">ログイン</a>してください。</p>';
 }
 echo mb_convert_encoding($echo, $charcode, 'UTF-8');
 $echo = '';

diff --git a/entry.php b/entry.php
index 4beb50f..bc41151 100644 (file)
--- a/entry.php
+++ b/entry.php
@@ -1,6 +1,6 @@
 <?php
 //YANMAH2 - Yet ANother Mobile Accelerated HatenaHaiku
-//(c) 2012 YANMAH2 project
+//(c) 2014 YANMAH2 project
 //This program is freesoftware. you can redistribute it and/or modify it under the terms of the [GNU Affero GPL v3](http://www.gnu.org/licenses/agpl.html).
 ?>
 <?php
@@ -178,41 +178,44 @@ $echo = $echo . '<div class="contents">'."\n";
 if (isset($_GET['image'])){
        $_SESSION['image'] = $_GET['image'];
 }
-$request_url = $json_url;
-  $json = getJson($request_url, FALSE);
-if ($json['stat'] !== TRUE){
-  $contents = strip_tags($json['stat']);
-  $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
-  $echo = $echo . "<blockquote>{$contents}</blockquote>\n";
-} else {
-  $json_body = $json['body'];
-  $contents = simplexml_load_string($json['body']);
-  if (preg_match("/^oauth_problem=token_rejected$/", $json_body)){
-    $echo = $echo . "<p>認証情報が無効です。<a href=\"{$relogin}\">再認証</a>を行なってください。</p>";
-  } elseif (libxml_get_last_error() !== FALSE){
-       $contents = strip_tags($contents);
-       $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
-       $echo = $echo . "<blockquote>{$contents}</blockquote>\n";
-  } elseif (isset($contents['error'])){
-       $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
-       $echo = $echo . "<blockquote>{$contents['error']}</blockquote>\n";      
+if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){
+  $request_url = $json_url;
+    $json = getJson($request_url, FALSE);
+  if ($json['stat'] !== TRUE){
+    $contents = strip_tags($json['stat']);
+    $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
+    $echo = $echo . "<blockquote>{$contents}</blockquote>\n";
   } else {
-       $entry_processor_mode = "entry";
-       $val = $contents;
-       require 'entry_processor.php';
-         if (isset($contents->replies) && $contents->replies[0]->id != ''){
-               $echo = $echo . '<dl><dt>リプライ</dt>';
-               $echo = $echo . '<dd>';
-               foreach($contents->replies as $val){
-                       $val->keyword = $_GET['keyword'];
-                       require 'entry_processor.php';
-               }
-               $echo = $echo . '</dd>';
-               $echo = $echo . '</dl>';
-         }
+    $json_body = $json['body'];
+    $contents = simplexml_load_string($json['body']);
+    if (preg_match("/^oauth_problem=token_rejected$/", $json_body)){
+      $echo = $echo . "<p>認証情報が無効です。<a href=\"{$relogin}\">再認証</a>を行なってください。</p>";
+    } elseif (libxml_get_last_error() !== FALSE){
+         $contents = strip_tags($contents);
+         $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
+         $echo = $echo . "<blockquote>{$contents}</blockquote>\n";
+    } elseif (isset($contents['error'])){
+         $echo = $echo . "<p>はてなハイク API からデータを取得できなかったような気がします。</p>\n";
+         $echo = $echo . "<blockquote>{$contents['error']}</blockquote>\n";    
+    } else {
+         $entry_processor_mode = "entry";
+         $val = $contents;
+         require 'entry_processor.php';
+           if (isset($contents->replies) && $contents->replies[0]->id != ''){
+                 $echo = $echo . '<dl><dt>リプライ</dt>';
+                 $echo = $echo . '<dd>';
+                 foreach($contents->replies as $val){
+                         $val->keyword = $_GET['keyword'];
+                         require 'entry_processor.php';
+                 }
+                 $echo = $echo . '</dd>';
+                 $echo = $echo . '</dl>';
+           }
+    }
   }
+} else {
+  $echo = $echo . '<p>内容を読むには<a href="./login.php?return='.rawurlencode(rawurldecode($self_anchor_with_imagemode)).'" class="navigation-link">ログイン</a>してください。</p>';
 }
-
 ?>
 <?php
 if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){

diff --git a/index.php b/index.php
index 8561072..02ef175 100644 (file)
--- a/index.php
+++ b/index.php
@@ -74,79 +74,80 @@ if (isset($_SESSION['oauth_stat'])){
   }
   $echo = $echo . '</div>'."\n";
 }
-$echo = $echo . <<<EOL
-<div class="index-content">
-<h2 id="users-index-head">ユーザーのページ</h2>
-<ul>
-EOL;
 if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){
-  $echo = $echo . "<li><a href=\"./entries.php?following={$_SESSION['hatenaid']}\n";
-//   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
-  $echo = $echo . "\" class=\"user\">{$_SESSION['hatenaid']} のアンテナ</a></li>\n";
-  $echo = $echo . "<li><a href=\"./entries.php?user={$_SESSION['hatenaid']}";
-//   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
-  $echo = $echo . "\" class=\"user\">{$_SESSION['hatenaid']} のエントリー</a></li>\n";
-  $echo = $echo . "<li><a href=\"./entries.php?favours={$_SESSION['hatenaid']}";
-//   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . "&amp;image=on";
-  $echo = $echo . "\" class=\"user\">{$_SESSION['hatenaid']} のお気に入り</a></li>\n";
-  $echo = $echo . "<li><a href=\"{$relogin}\" class=\"user\">再認証</a></li>";
-} else {
-  $echo = $echo . '<li><form method="get" action="./entries.php">';
-  $echo = $echo . '<label for="userflw">id:</label><input type="text" name="following" maxlength="32" id="userflw"/><label for="userflw">のアンテナを</label><input type="submit" value="表示" />';
-//   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
-  $echo = $echo . '</form></li>'."\n";
-  $echo = $echo . '<li><form method="get" action="./entries.php">';
-  $echo = $echo . '<label for="username">id:</label><input type="text" name="user" maxlength="32" id="username"/><label for="username">のエントリーを</label><input type="submit" value="表示" />';
-  if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
-  $echo = $echo . '</form></li>'."\n";
-}
+  $echo = $echo . <<<EOL
+  <div class="index-content">
+  <h2 id="users-index-head">ユーザーのページ</h2>
+  <ul>
+EOL;
+//   if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){
+    $echo = $echo . "<li><a href=\"./entries.php?following={$_SESSION['hatenaid']}\n";
+  //   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
+    $echo = $echo . "\" class=\"user\">{$_SESSION['hatenaid']} のアンテナ</a></li>\n";
+    $echo = $echo . "<li><a href=\"./entries.php?user={$_SESSION['hatenaid']}";
+  //   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
+    $echo = $echo . "\" class=\"user\">{$_SESSION['hatenaid']} のエントリー</a></li>\n";
+    $echo = $echo . "<li><a href=\"./entries.php?favours={$_SESSION['hatenaid']}";
+  //   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . "&amp;image=on";
+    $echo = $echo . "\" class=\"user\">{$_SESSION['hatenaid']} のお気に入り</a></li>\n";
+    $echo = $echo . "<li><a href=\"{$relogin}\" class=\"user\">再認証</a></li>";
+//   } else {
+//     $echo = $echo . '<li><form method="get" action="./entries.php">';
+//     $echo = $echo . '<label for="userflw">id:</label><input type="text" name="following" maxlength="32" id="userflw"/><label for="userflw">のアンテナを</label><input type="submit" value="表示" />';
+//   //   if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
+//     $echo = $echo . '</form></li>'."\n";
+//     $echo = $echo . '<li><form method="get" action="./entries.php">';
+//     $echo = $echo . '<label for="username">id:</label><input type="text" name="user" maxlength="32" id="username"/><label for="username">のエントリーを</label><input type="submit" value="表示" />';
+//     if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
+//     $echo = $echo . '</form></li>'."\n";
+//   }
 
-// $echo = $echo . "<li><a href=\"./config.php";
-// if (isset($get_image) && $get_image == 'on') $echo = $echo . '?image=on';
-// $echo = $echo . "\" class=\"user\">YANMAH2 の設定</a></li>\n";
-$echo = $echo . "</ul>\n</div>\n";
-?>
-<?php
-$echo = $echo . <<<EOL
-<div class="index-content content">
-<h2 id="entries-index-head">みんなのページ</h2>
-<ul>
+  // $echo = $echo . "<li><a href=\"./config.php";
+  // if (isset($get_image) && $get_image == 'on') $echo = $echo . '?image=on';
+  // $echo = $echo . "\" class=\"user\">YANMAH2 の設定</a></li>\n";
+  $echo = $echo . "</ul>\n</div>\n";
+  $echo = $echo . <<<EOL
+  <div class="index-content content">
+  <h2 id="entries-index-head">みんなのページ</h2>
+  <ul>
 EOL;
-$echo = $echo . '<li><a href="./entries.php';
-// if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '?image=on';
-$echo = $echo . '" class="entries">みんなのエントリー</a></li>';
-$echo = $echo . '<li><a href="./entries.php?album=public';
-// if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
-$echo = $echo . '" class="entries">みんなのアルバム</a></li>';
-$echo = $echo . '<li><a href="./entries.php?users=public';
-// if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
-$echo = $echo . '" class="entries">ユーザー一覧</a></li>';
-$echo = $echo . "</ul>\n</div>\n";
-?>
-<?php
-$echo = $echo . <<<EOL
-<div class="index-content">
-<h2 id="keywords-index-head">キーワード</h2>
-<ul>
-<li><form method="get" action="./keywords.php" accept-charset="{$meta_charset}">
-<label for="go2keyword">キーワード</label><input type="text" name="word" maxlength="170" id="go2keyword" /><label for="go2keyword">を</label>
-<input type="submit" value="検索" />
+  $echo = $echo . '<li><a href="./entries.php';
+  // if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '?image=on';
+  $echo = $echo . '" class="entries">みんなのエントリー</a></li>';
+  $echo = $echo . '<li><a href="./entries.php?album=public';
+  // if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
+  $echo = $echo . '" class="entries">みんなのアルバム</a></li>';
+  $echo = $echo . '<li><a href="./entries.php?users=public';
+  // if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '&amp;image=on';
+  $echo = $echo . '" class="entries">ユーザー一覧</a></li>';
+  $echo = $echo . "</ul>\n</div>\n";
+  $echo = $echo . <<<EOL
+  <div class="index-content">
+  <h2 id="keywords-index-head">キーワード</h2>
+  <ul>
+  <li><form method="get" action="./keywords.php" accept-charset="{$meta_charset}">
+  <label for="go2keyword">キーワード</label><input type="text" name="word" maxlength="170" id="go2keyword" /><label for="go2keyword">を</label>
+  <input type="submit" value="検索" />
 EOL;
-// if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
-$echo = $echo . '</form></li>';
-// $request_url = "{$api_base_url}keywords/hot.xml".'?without_related_keywords=1';
-// $use_cache = FALSE;
-// require_once 'keywords_processor.php';
-?>
-<?php
-if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){
-       $echo = $echo . '<li><a href="./keywords.php?user=' . $_SESSION['hatenaid'];
-       $echo = $echo . '" class="keyword">' . $_SESSION['hatenaid'] . ' のお気に入りキーワード</a></li>' . "\n";
+  // if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
+  $echo = $echo . '</form></li>';
+  // $request_url = "{$api_base_url}keywords/hot.xml".'?without_related_keywords=1';
+  // $use_cache = FALSE;
+  // require_once 'keywords_processor.php';
+//   if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){
+         $echo = $echo . '<li><a href="./keywords.php?user=' . $_SESSION['hatenaid'];
+         $echo = $echo . '" class="keyword">' . $_SESSION['hatenaid'] . ' のお気に入りキーワード</a></li>' . "\n";
+//   }
+  $echo = $echo . '<li><a href="./keywords.php';
+  // if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '?image=on';
+  $echo = $echo . '" class="keyword">キーワード一覧</a></li>';
+  $echo = $echo . "</ul>\n</div>\n";
+} else {
+  $echo = $echo . "<div class=\"index-content\">\n<ul>";
+  $echo = $echo . '<li><a href="./login.php?return='.rawurlencode(rawurldecode($self_anchor_with_imagemode)).'" class="navigation-link">ログイン</a></li>'."\n";
+  $echo = $echo . "</ul>\n</div>\n";
 }
-$echo = $echo . '<li><a href="./keywords.php';
-// if(isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '?image=on';
-$echo = $echo . '" class="keyword">キーワード一覧</a></li>';
-$echo = $echo . "</ul>\n</div>\n</div>\n<hr />\n";
+$echo = $echo . "</div>\n<hr />\n";
 ?>
 <?php
 $echo = $echo . echoCommonFooter('#com-hdr');

diff --git a/keywords.php b/keywords.php
index 9764723..5fac4b4 100644 (file)
--- a/keywords.php
+++ b/keywords.php
@@ -75,7 +75,12 @@ if (isset($_GET['page']) && $_GET['page'] != ''){
        $relog_back = $self_anchor_possibly_with_pagenum . '&log=try';
        $relogin = $self_anchor_possibly_with_pagenum . '&with=haiku&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 . '&with=haiku&callback='.rawurlencode($relog_back);
@@ -118,31 +123,35 @@ $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>
+  ';
+  // if (isset($_GET['image']) && $_GET['image'] == 'on') $echo = $echo . '<input type="hidden" name="image" value="on" />';
+  $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'){

diff --git a/product_definitions.php b/product_definitions.php
index 114aa54..3d5c8c8 100644 (file)
--- a/product_definitions.php
+++ b/product_definitions.php
@@ -7,7 +7,7 @@
 <?php
 $product_name_abbr = "YANMAH2 -season 2-";
 $product_name_full = "Yet ANother Mobile Accelerated HatenaHaiku";
-$product_version = "1.9901-beta";
+$product_version = "1.9905-beta";
 $project_name = "YANMAH2 project";
 $project_url = "http://yanmah2.sourceforge.jp/";
 $user_agent = $product_name_abbr . '/' . $product_version . ' ' . $_SERVER['SERVER_NAME'];