From 47a91f7becd0c6c44b20f3b73a69e2669e11fbd3 Mon Sep 17 00:00:00 2001 From: Kana Koda Date: Tue, 30 Dec 2014 21:03:15 +0900 Subject: [PATCH] =?utf8?q?=E3=81=AF=E3=81=A6=E3=83=96=E6=8A=95=E7=A8=BF?= =?utf8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E5=BB=83=E6=AD=A2=EF=BC=8F=E3=83=88?= =?utf8?q?=E3=83=93=E3=83=A9=E3=81=AB=E3=82=AD=E3=83=BC=E3=83=AF=E3=83=BC?= =?utf8?q?=E3=83=89=E4=B8=80=E8=A6=A7=E3=82=92=E6=88=BB=E3=81=99=EF=BC=8F?= =?utf8?q?=E3=82=B9=E3=83=91=E3=83=A0=E5=AF=BE=E7=AD=96=E3=81=AE=E8=AA=BF?= =?utf8?q?=E6=95=B4=EF=BC=8F=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9=E3=81=AE?= =?utf8?q?=E6=BA=96=E5=82=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- README | 2 +- configurable_variables.php | 1 - entries.php | 44 ++++++++++++++++++++++---------------------- entry.php | 26 +++++++++++++------------- entry_processor.php | 4 ++-- index.php | 10 ++++++---- login_processor.php | 2 +- product_definitions.php | 4 ++-- 8 files changed, 47 insertions(+), 46 deletions(-) diff --git a/README b/README index 30732ae..e945f4a 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ This document is written in Japanese(UTF-8). #YANMAH2:Yet ANother Mobile Accelerated HatenaHaiku -　(c)2012 YANMAH2 project: http://yanmah2.sourceforge.jp/ +　(c)2014 YANMAH2 project: http://yanmah2.sourceforge.jp/ ##これは何か diff --git a/configurable_variables.php b/configurable_variables.php index cef4776..f22b3b7 100644 --- a/configurable_variables.php +++ b/configurable_variables.php @@ -68,7 +68,6 @@ $login_notice = <<
read_public
タイムラインの読み込みに使用します。
write_public
投稿と星を付けるために使用します。
-
write_private
はてなブックマークがプライベートに設定されている場合、{$product_name_abbr} からの追加機能を使うときに必要です。
  • セッション Cookie / サーバ側セッションデータの有効期間は {$session_cookie_expire} / {$session_file_lifetime} 秒に設定されています。
    • diff --git a/entries.php b/entries.php index c7b1e99..24c1425 100644 --- a/entries.php +++ b/entries.php @@ -425,34 +425,34 @@ if ($entries_mode == 'keyword_timeline' || $entries_mode == 'keyword_users'){ } // var_dump($status_0); if (preg_match("/^{$http_url_regexp}$/u", $object_key)){ - if (preg_match("/&/u", $object_key)){ - $echo = $echo . '

    URL: '.htmlspecialchars($object_title,ENT_QUOTES).' をメールではてなブックマークに追加する。

    '; - } else { - $echo = $echo . '
    '."\n"; - $echo = $echo . '
    '; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . '
    '; +// if (preg_match("/&/u", $object_key)){ +// $echo = $echo . '

    URL: '.htmlspecialchars($object_title,ENT_QUOTES).' をメールではてなブックマークに追加する。

    '; +// } else { +// $echo = $echo . '
    '."\n"; +// $echo = $echo . '
    '; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . '
    '; // echo "..."; - } +// } } elseif (preg_match("/^(asin:)([[:alnum:]])+$/u", $object_key)){ $asin = preg_replace("/^(asin:)([[:alnum:]]+)$/u", "\${2}", $object_key); $echo = $echo . '

    '.$object_title.' を Amazon.co.jp で見る。

    '; } elseif (preg_match("/^id:[a-zA-Z1234567890]{1}[-_a-zA-Z1234567890@]{1,30}[a-zA-Z1234567890]{1} *$/u", $object_key)){ } else { - $echo = $echo . '
    '."\n"; - $echo = $echo . '
    '; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . '
    '; +// $echo = $echo . '
    '."\n"; +// $echo = $echo . '
    '; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . '
    '; } } } diff --git a/entry.php b/entry.php index 1dddbb4..1569c49 100644 --- a/entry.php +++ b/entry.php @@ -256,19 +256,19 @@ EOL; $echo = $echo . ''; } $echo = $echo . "\n"; -if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){ - if (isset($get_entry) && isset($get_user)){ - $echo = $echo . '
    '."\n"; - $echo = $echo . '
    '; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . ''; - $echo = $echo . '
    '; - } -} +// if (isset($_SESSION['auth']) && $_SESSION['auth'] === TRUE){ +// if (isset($get_entry) && isset($get_user)){ +// $echo = $echo . '
    '."\n"; +// $echo = $echo . '
    '; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . ''; +// $echo = $echo . '
    '; +// } +// } ?> user->id}" => "{$entry_body}"); } - if (($entries_mode == 'default' || $entries_mode == 'album') && - preg_match("/(^{$http_url_regexp}$)/u", "{$val->keyword}")){ $spam = $spam + 1; return; } +// if (($entries_mode == 'default' || $entries_mode == 'album') && +// preg_match("/(^{$http_url_regexp}$)/u", "{$val->keyword}")){ $spam = $spam + 1; return; } if (preg_match("/^(id:{1})([[:alpha:]]{1}[-_a-zA-Z1234567890]{1,30}[[:alnum:]]{1})$/u", $val->keyword)) { $keyword_title = $val->keyword; } else { diff --git a/index.php b/index.php index 938d313..b46ccef 100644 --- a/index.php +++ b/index.php @@ -83,7 +83,7 @@ EOL; $echo = $echo . "
  • {$_SESSION['hatenaid']} のエントリー
    • \n"; $echo = $echo . "
  • {$_SESSION['hatenaid']} のお気に入り
    • \n"; + $echo = $echo . "\" class=\"user\">{$_SESSION['hatenaid']} の一覧\n"; $echo = $echo . "
  • 再認証
    • "; $echo = $echo . "\n\n"; $echo = $echo . << EOL; $echo = $echo . ''; - $echo = $echo . '
  • ' . $_SESSION['hatenaid'] . ' のお気に入りキーワード
    • ' . "\n"; + $echo = $echo . '
  • ' . $_SESSION['hatenaid'] . ' のお気に入りキーワード
    • ' . "\n"; + $request_url = "{$api_base_url}keywords/hot.xml".'?without_related_keywords=1'; + require_once 'keywords_processor.php'; $echo = $echo . '
  • キーワード一覧
    • '; + $echo = $echo . '" class="keyword">キーワード一覧'."\n"; $echo = $echo . "\n\n"; } else { $echo = $echo . "
    \n
      "; diff --git a/login_processor.php b/login_processor.php index 31502fe..d978976 100644 --- a/login_processor.php +++ b/login_processor.php @@ -12,7 +12,7 @@ if (isset($_GET['with'])){ } elseif ($_GET['with'] == 'haiku') { $authorize = 'http://www.hatena.ne.jp/mobile/oauth/authorize'; // $myjson = 'http://n.hatena.com/applications/my.json'; - $reqtoken = getRequest('https://www.hatena.com/oauth/initiate', $callback, 'read_public,write_public,write_private', $conkey, $conkey_sec); + $reqtoken = getRequest('https://www.hatena.com/oauth/initiate', $callback, 'read_public,write_public', $conkey, $conkey_sec); // var_dump($reqtoken); if (isset($reqtoken['stat']) && $reqtoken['stat'] !== TRUE){ $error = "

      ログインの初期処理に失敗しました。

      \n
      {$reqtoken['error']}
      "; diff --git a/product_definitions.php b/product_definitions.php index 42e8525..7f7c331 100644 --- a/product_definitions.php +++ b/product_definitions.php @@ -5,9 +5,9 @@ ?>