ホスト切り替え設定を廃止。

diff --git a/config.php b/config.php
index e3f7c4e..c1ea59d 100644 (file)
--- a/config.php
+++ b/config.php
@@ -47,13 +47,13 @@ if (isset($_POST['elimit']) && preg_match("/^[0123456789]{1,3}$/", $_POST['elimi
   $pcount = '';
   $setck = 0;
 }
-if (isset($_POST['hdomain']) && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $_POST['hdomain'])){
-  $phdomain = $_POST['hdomain'];
-  $setck = 1;
-} else {
-  $phdomain = '';
-  $setck = 0;
-}
+// if (isset($_POST['hdomain']) && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $_POST['hdomain'])){
+//   $phdomain = $_POST['hdomain'];
+//   $setck = 1;
+// } else {
+//   $phdomain = '';
+//   $setck = 0;
+// }
 if (isset($_POST['iscale']) && preg_match("/^[[:digit:]]{1}\.{0,1}[[:digit:]]{0,1}$/", $_POST['iscale'])){
   $piscale = $_POST['iscale'];
   $setck = 1;
@@ -63,7 +63,7 @@ if (isset($_POST['iscale']) && preg_match("/^[[:digit:]]{1}\.{0,1}[[:digit:]]{0,
 }
 
 if ($setck == 1){
-  setcookie('y2config', 'count=' . $pcount . '&showicon=' . $pshowicon . '&disbr=' . $pdisbr . '&elimit=' . $pelimit . '&hdomain=' . $phdomain . '&iscale=' . $piscale . '&starisjs=' . $pstarisjs, time()+60*60*24*365);
+  setcookie('y2config', 'count=' . $pcount . '&showicon=' . $pshowicon . '&disbr=' . $pdisbr . '&elimit=' . $pelimit . '&iscale=' . $piscale . '&starisjs=' . $pstarisjs, time()+60*60*24*365);
 }
 ?>
 <?php
@@ -109,13 +109,13 @@ if (isset($_POST['elimit']) && preg_match("/^[0123456789]{1,3}$/", $_POST['elimi
 } else {
   $entry_limit = $entry_limit;
 }
-if (isset($_POST['hdomain']) && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $_POST['hdomain'])){
-  $hdomain = $_POST['hdomain'];
-} elseif (isset($y2config['hdomain']) && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $y2config['hdomain'])){
-  $hdomain = $y2config['hdomain'];
-} else {
-  $hdomain = 'default';
-}
+// if (isset($_POST['hdomain']) && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $_POST['hdomain'])){
+//   $hdomain = $_POST['hdomain'];
+// } elseif (isset($y2config['hdomain']) && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $y2config['hdomain'])){
+//   $hdomain = $y2config['hdomain'];
+// } else {
+//   $hdomain = 'default';
+// }
 if (isset($_POST['iscale']) && preg_match("/^[[:digit:]]{1}\.{0,1}[[:digit:]]{0,1}$/", $_POST['iscale'])){
   $iscale = $_POST['iscale'];
 } elseif (isset($y2config['iscale']) && $y2config['iscale'] != '' && preg_match("/^[[:digit:]]{1}\.{0,1}[[:digit:]]{0,1}$/", $y2config['iscale'])){
@@ -182,7 +182,6 @@ $echo = $echo . <<<EOL
   <li>タイムラインで改行を減らす：$disbr</li>
   <li>はてなスターを JavaScript で処理する：$star_is_js</li>
   <li>各エントリの表示文字数制限の基準幅：$entry_limit</li>
-  <li>はてなハイクのドメイン：$hdomain</li>
   <li>Viewport の initial-scale：$iscale</li>
 </ul>
 </div>
@@ -307,23 +306,23 @@ $echo = $echo . <<<EOL
 EOL;
 ?>
 <?php
-$echo = $echo . <<<EOL
-<div>
-<label for="haiku-domain">はてなハイクのドメイン：</label>
-  <select name="hdomain" id="haiku-domain">
-       <option value="h.hatena.ne.jp"
-EOL;
-if (isset($hdomain) && ($hdomain == 'h.hatena.ne.jp' || $hdomain == 'default')) $echo = $echo . ' selected="selected"';
-$echo = $echo . <<<EOL
->.ne.jp</option>
-       <option value="h.hatena.com"
-EOL;
-if (isset($hdomain) && $hdomain == 'h.hatena.com') $echo = $echo . ' selected="selected"';
-$echo = $echo . <<<EOL
->.com</option>
-  </select>
-</div>
-EOL;
+// $echo = $echo . <<<EOL
+// <div>
+// <label for="haiku-domain">はてなハイクのドメイン：</label>
+//   <select name="hdomain" id="haiku-domain">
+//     <option value="h.hatena.ne.jp"
+// EOL;
+// if (isset($hdomain) && ($hdomain == 'h.hatena.ne.jp' || $hdomain == 'default')) $echo = $echo . ' selected="selected"';
+// $echo = $echo . <<<EOL
+// >.ne.jp</option>
+//     <option value="h.hatena.com"
+// EOL;
+// if (isset($hdomain) && $hdomain == 'h.hatena.com') $echo = $echo . ' selected="selected"';
+// $echo = $echo . <<<EOL
+// >.com</option>
+//   </select>
+// </div>
+// EOL;
 //     <option value="h1beta.hatena.ne.jp"
 // EOL;
 // if (isset($hdomain) && $hdomain == 'h1beta.hatena.ne.jp') $echo = $echo . ' selected="selected"';

diff --git a/init_processor.php b/init_processor.php
index ecc558f..9b37310 100644 (file)
--- a/init_processor.php
+++ b/init_processor.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/ormodify it under the terms of the [GNU Affero GPL v3](http://www.gnu.org/licenses/agpl.html).
 ?>
 <?php defined("HELLO") or exit(); ?>
@@ -105,11 +105,11 @@ if (isset($y2config['starisjs']) && $y2config['starisjs'] != '' && preg_match("/
 if (isset($y2config['elimit']) && $y2config['elimit'] != '' && preg_match("/^[0123456789]{1,3}$/", $y2config['elimit'])){
   $entry_limit = $y2config['elimit'];
 }
-if (isset($y2config['hdomain']) && $y2config['hdomain'] != '' && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $y2config['hdomain'])){
-  $haiku_host = $y2config['hdomain'];
-  $haiku_official_url = preg_replace("/(http:\/\/)[^\/]+(\/.*)/u", "\${1}{$haiku_host}\${2}", $haiku_official_url);
-  $api_base_url = "http://{$haiku_host}/api/";
-}
+// if (isset($y2config['hdomain']) && $y2config['hdomain'] != '' && preg_match("/^(h|h1beta)(\.hatena\.ne\.jp|\.hatena\.com)$/", $y2config['hdomain'])){
+//   $haiku_host = $y2config['hdomain'];
+//   $haiku_official_url = preg_replace("/(http:\/\/)[^\/]+(\/.*)/u", "\${1}{$haiku_host}\${2}", $haiku_official_url);
+//   $api_base_url = "http://{$haiku_host}/api/";
+// }
 if (isset($y2config['iscale']) && $y2config['iscale'] != '' && preg_match("/^[[:digit:]]{1}\.{0,1}[[:digit:]]{0,1}$/", $y2config['iscale'])){
   $iscale = $y2config['iscale'];
 } else {