v6.11.5

satopian · Oct 29, 2023 · d7b8b32 · d7b8b32
1 parent 8785ab4
commit d7b8b32
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/potiboard5/potiboard.php b/potiboard5/potiboard.php
@@ -3,8 +3,8 @@
 
 // POTI-board EVO
 // バージョン :
-const POTI_VER = 'v6.11.2';
-const POTI_LOT = 'lot.20231028';
+const POTI_VER = 'v6.11.5';
+const POTI_LOT = 'lot.20231029';
 
 /*
   (C) 2018-2023 POTI改 POTI-board redevelopment team
@@ -529,7 +529,7 @@ function form($resno="",$tmp=""){
 	$dat['animechk'] = DEF_ANIME ? ' checked' : '';
 	$dat['resno'] = $resno ? $resno :'';
 	$dat['notres'] = $resno ? false : true;
-	$dat['paintform'] = USE_PAINT ? ($resno ? (RES_UPLOAD ? true :false) :true):false;
+	$dat['paintform'] = (USE_PAINT && !empty($count_arr_apps)) ? ($resno ? (RES_UPLOAD ? true :false) :true):false;
 	$dat['maxbyte'] = MAX_KB * 1024 * 2;//フォームのHTMLによるファイルサイズの制限 jpeG→png変換を考慮して2倍。
 	$dat['usename'] = USE_NAME ? ' *' : '';
 	$dat['usesub']  = USE_SUB ? ' *' : '';
@@ -3334,6 +3334,9 @@ function app_to_use(){
 		if(USE_PAINTBBS_NEO){
 			$arr_apps[]='neo';
 		}
+		if(USE_TEGAKI){
+			$arr_apps[]='tegaki';
+		}
 		if(USE_SHI_PAINTER){
 			$arr_apps[]='1';
 		}

diff --git a/potiboard5/templates/mono_en/mono_main.blade.php b/potiboard5/templates/mono_en/mono_main.blade.php
@@ -98,8 +98,8 @@ function add_to_com() {
 	@endif
 	@endif
 	@if($paintform)
-	@if($paint and ($resno or !$diary))
-		@if($resno)
+	@if($resno or !$diary)
+	@if($resno)
 			<p class="resm">Reply with oekaki</p>
 			<hr>
 		@endif
@@ -179,7 +179,7 @@ function add_to_com() {
 					<li>Attachable files type: GIF, JPG, PNG and WEBP. </li>
 					<li>Attached image larger than width {{$maxw_px}}px height {{$maxh_px}}px will be reduced size.</li>
 					@endif
-					@if(($paintform and $paint) or $upfile)
+					@if($paintform or $upfile)
 					<li>Images larger than width {{$maxw}}px height {{$maxh}}px will be  will be thumbnailed.</li>
 					<li>The maximum amount of posted data is {{$maxkb}}KB. With sage function.</li>
 					@endif