From 0820facf60facff34c3e17224bf263a2081154f9 Mon Sep 17 00:00:00 2001
From: satopian <satopian@mia.eek.jp>
Date: Wed, 28 Jun 2023 20:25:11 +0900
Subject: [PATCH] =?UTF-8?q?v0.78.9=20Tegaki=E5=8B=95=E7=94=BB=E5=86=8D?=
 =?UTF-8?q?=E7=94=9F=E7=94=BB=E9=9D=A2=E3=81=AEviewport=E3=82=92=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 petitnote/index.php                        | 5 +++--
 petitnote/save.php                         | 2 +-
 petitnote/saveneo.php                      | 2 +-
 petitnote/template/basic/paint_klecks.html | 2 +-
 petitnote/template/basic/paint_tegaki.html | 3 ++-
 petitnote/template/basic/tgkr_view.html    | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/petitnote/index.php b/petitnote/index.php
index 3f9ca621..1d6a2bdb 100644
--- a/petitnote/index.php
+++ b/petitnote/index.php
@@ -1,8 +1,8 @@
 <?php
 //Petit Note (c)さとぴあ @satopian 2021-2023
 //1スレッド1ログファイル形式のスレッド式画像掲示板
-$petit_ver='v0.78.8';
-$petit_lot='lot.20230627';
+$petit_ver='v0.78.9';
+$petit_lot='lot.20230628';
 $lang = ($http_langs = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : '')
   ? explode( ',', $http_langs )[0] : '';
 $en= (stripos($lang,'ja')!==0);
@@ -2410,6 +2410,7 @@ function res (){
 		}
 		if (!$flag) {//見つからなければカウントを続ける
 			$j = $count_alllog;
+			//見つからなかった時の$iは初期値の0。
 		} 
 		$articles[$count_alllog]=$line;
 		if($j+20<$count_alllog){//+20件でbreak
diff --git a/petitnote/save.php b/petitnote/save.php
index 550b065b..cce70a95 100644
--- a/petitnote/save.php
+++ b/petitnote/save.php
@@ -55,7 +55,7 @@ function chibi_die($message) {
 $imgext='.png';
 /* ---------- 投稿者情報記録 ---------- */
 $userdata = "$u_ip\t$u_host\t$u_agent\t$imgext";
-$tool = 'chi';
+$tool = (string)filter_input(INPUT_GET, 'tool');
 $repcode = (string)filter_input(INPUT_GET, 'repcode');
 $stime = (string)filter_input(INPUT_GET, 'stime',FILTER_VALIDATE_INT);
 $resto = (string)filter_input(INPUT_GET, 'resto',FILTER_VALIDATE_INT);
diff --git a/petitnote/saveneo.php b/petitnote/saveneo.php
index 85359cca..958eae97 100644
--- a/petitnote/saveneo.php
+++ b/petitnote/saveneo.php
@@ -66,7 +66,7 @@
 if($sendheader){
 	$sendheader = str_replace("&amp;", "&", $sendheader);
 	parse_str($sendheader, $u);
-	$tool = 'neo';
+	$tool = isset($u['tool']) ? $u['tool'] : '';
 	$usercode = isset($u['usercode']) ? $u['usercode'] : '';
 	$resto = isset($u['resto']) ? $u['resto'] : '';
 	$repcode = isset($u['repcode']) ? $u['repcode'] : '';
diff --git a/petitnote/template/basic/paint_klecks.html b/petitnote/template/basic/paint_klecks.html
index 32075e95..97ab5903 100644
--- a/petitnote/template/basic/paint_klecks.html
+++ b/petitnote/template/basic/paint_klecks.html
@@ -6,7 +6,7 @@
 	<title><?=h($boardname)?></title> 
 
 	<!-- this is important -->
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+	<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0">
 
 	<style>
 		:not(input){
diff --git a/petitnote/template/basic/paint_tegaki.html b/petitnote/template/basic/paint_tegaki.html
index 6b8294ad..150b67ac 100644
--- a/petitnote/template/basic/paint_tegaki.html
+++ b/petitnote/template/basic/paint_tegaki.html
@@ -5,7 +5,8 @@
 <title><?=h($boardname)?></title> 
 <script src="app/tegaki/tegaki.js?<?=h($parameter_day)?><?=h($petit_lot)?>"></script>
 <link rel="stylesheet" href="app/tegaki/tegaki.css?<?=h($parameter_day)?><?=h($petit_lot)?>">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0,maximum-scale=1.0">
+<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0">
+
 <style>
 	:not(input){
 	-moz-user-select: none;
diff --git a/petitnote/template/basic/tgkr_view.html b/petitnote/template/basic/tgkr_view.html
index dfd82acb..fd9d3a35 100644
--- a/petitnote/template/basic/tgkr_view.html
+++ b/petitnote/template/basic/tgkr_view.html
@@ -5,7 +5,7 @@
 <title><?=h($boardname)?></title> 
 <script src="app/tegaki/tegaki.js?<?=h($parameter_day)?><?=h($petit_lot)?>"></script>
 <link rel="stylesheet" href="app/tegaki/tegaki.css?<?=h($parameter_day)?><?=h($petit_lot)?>">
-<meta name="viewport" content="width=<?=h($picw+100)?>, initial-scale=1">
+<meta name="viewport" content="width=<?=h($picw+100)?>, initial-scale=1.0,maximum-scale=1.0">
 <style>
 	:not(input){
 	-moz-user-select: none;