テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 9 年前差分は期限切れになりません

0 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

431 行

1 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

431 行

# INCLUDE forum_top #

<h2>

• <a href="index.php" title="{FORUM_NAME}">{FORUM_NAME}</a> » <a href="moderation_forum.php" title="{L_MODERATION_FORUM}">{L_MODERATION_FORUM}</a> {U_MODERATION_FORUM_ACTION}

</h2>

</header>

<tbody>

<tr>

<span class="forum-display-block">{L_USERS_WARNING}</span>

</a>

</td>

<span class="forum-display-block">{L_USERS_PUNISHMENT}</span>

</a>

</td>

<span class="forum-display-block">{L_ALERT_MANAGEMENT}</span>

</a>

</td>

</tr>

</tbody>

</table>

# IF C_FORUM_MODO_MAIN #

<!--

function Confirm_history()

{

return confirm("{L_DEL_HISTORY}");

}

-->

</script>

{L_HISTORY}

</caption>

<thead>

<tr>

<th>

{L_MODO}

</th>

<th>

{L_ACTION}

</th>

<th>

{L_USER_CONCERN}

</th>

{L_DATE}

</th>

</tr>

</thead>

<tfoot>

<tr>

# IF C_FORUM_ADMIN #

<span class="float-left"><button type="submit" name="valid" value="true" class="submit">{L_DELETE}</button></span>

# ENDIF #

# IF C_DISPLAY_LINK_MORE_ACTION #

<a href="moderation_forum{U_MORE_ACTION}" title="{L_MORE_ACTION}">{L_MORE_ACTION}</a>

# ENDIF #

</th>

</tr>

</tfoot>

<tbody>

# START action_list #

<tr>

<a href="{action_list.U_USER_PROFILE}" class="{action_list.LEVEL_CLASS}" # IF action_list.C_GROUP_COLOR # style="color:{action_list.GROUP_COLOR}" # ENDIF # title="{action_list.LOGIN}">{action_list.LOGIN}</a>

</td>

<td>

{action_list.U_ACTION}

</td>

{action_list.U_USER_CONCERN}

</td>

{action_list.DATE}

</td>

</tr>

# END action_list #

# IF C_FORUM_NO_ACTION #

<tr>

{L_NO_ACTION}

</td>

</tr>

# ENDIF #

</tbody>

</table>

</form>

# ENDIF #

# IF C_FORUM_ALERTS #

<!--

function check_alert(status)

{

for (i = 0; i < document.alert.length; i++)

document.alert.elements[i].checked = status;

}

-->

</script>

<thead>

<tr>

<th class="td20P">{L_TITLE}</th>

<th class="td20P">{L_TOPIC}</th>

<th class="td100">{L_STATUS}</th>

<th class="td70">{L_LOGIN}</th>

</tr>

</thead>

<tfoot>

<tr>

<button type="submit" name="" value="true" class="submit">{L_DELETE}</button>

</th>

</tr>

</tfoot>

<tbody>

# START alert_list #

<tr>

</td>

{alert_list.TITLE} {alert_list.EDIT}

</td>

{alert_list.TOPIC}

</td>

{alert_list.STATUS}

</td>

{alert_list.LOGIN}

</td>

{alert_list.TIME}

</td>

</tr>

# END alert_list #

# IF C_FORUM_NO_ALERT #

<tr>

{L_NO_ALERT}

</td>

</tr>

# ENDIF #

</tbody>

</table>

</form>

# ENDIF #

# IF C_FORUM_ALERT_LIST #

<thead>

<tr>

{TOPIC}

</th>

</tr>

</thead>

<tbody>

<tr>

<td class="td25P">{L_TITLE}</td>

<td>{TITLE}</td>

</tr>

<tr>

<td>{L_TOPIC}</td>

<td>{TOPIC}</td>

</tr>

<tr>

</tr>

<tr>

<td>{L_CONTENTS}</td>

<td>{CONTENTS}</td>

</tr>

<tr>

<td>{L_STATUS}</td>

<td>{STATUS}</td>

</tr>

<tr>

<td>{L_LOGIN}</td>

<td>{LOGIN}</td>

</tr>

<tr>

</tr>

</tbody>

</table>

<button type="submit" name="valid" value="true" class="submit">{L_CHANGE_STATUS}</button>

</fieldset>

</form>

# ENDIF #

# IF C_FORUM_ALERT_NOT_AUTH #

<table>

<thead>

<tr>

{L_MODERATION_FORUM} : {L_ALERT_MANAGEMENT}

</th>

</tr>

</thead>

<tbody>

<tr>

{L_NO_ALERT}

</td>

</tr>

</tbody>

</table>

# ENDIF #

# IF C_FORUM_USER_LIST #

<!--

function XMLHttpRequest_search()

{

var login = document.getElementById('login').value;

if( login != '' )

{

if( document.getElementById('search_img') )

document.getElementById('search_img').innerHTML = '<i class="fa fa-spinner fa-spin"></i>';

data = 'login=' + login;

var xhr_object = xmlhttprequest_init('xmlhttprequest.php?token={TOKEN}&{U_XMLHTTPREQUEST}=1');

xhr_object.onreadystatechange = function()

{

if( xhr_object.readyState == 4 && xhr_object.status == 200 )

{

document.getElementById('xmlhttprequest-result-search').innerHTML = xhr_object.responseText;

hide_div('xmlhttprequest-result-search');

if( document.getElementById('search_img') )

document.getElementById('search_img').innerHTML = '';

}

else if( xhr_object.readyState == 4 )

{

if( document.getElementById('search_img') )

document.getElementById('search_img').innerHTML = '';

}

xmlhttprequest_sender(xhr_object, data);

}

else

alert("{L_REQUIRE_LOGIN}");

}

function hide_div(divID)

{

if( document.getElementById(divID) )

document.getElementById(divID).style.display = 'block';

}

-->

</script>

<table>

<tr>

<td>

<span>

{L_SEARCH_USER}: <input type="text" maxlength="25" id="login" name="login">

</span>

<span>

<button type="submit" id="search_member" name="search_member" class="submit">{L_SEARCH}</button>

<!--

document.getElementById('search_member').style.display = 'none';

document.write('<button onclick="XMLHttpRequest_search();" type="button">{L_SEARCH}</button>');

-->

</script>

</span>

</td>

</tr>

</table>

<thead>

<tr>

<th class="td25P">{L_LOGIN}</th>

<th class="td25P">{L_ACTION_USER}</th>

</tr>

</thead>

<tbody>

# START user_list #

<tr>

<a href="{user_list.U_PROFILE}" class="{user_list.LEVEL_CLASS}" # IF user_list.C_GROUP_COLOR # style="color:{user_list.GROUP_COLOR}" # ENDIF # title="{user_list.LOGIN}">{user_list.LOGIN}</a>

</td>

{user_list.INFO}

</td>

{user_list.U_ACTION_USER}

</td>

</td>

</tr>

# END user_list #

# IF C_FORUM_NO_USER #

<tr>

{L_NO_USER}

</td>

</tr>

# ENDIF #

</tbody>

</table>

</form>

# ENDIF #

# IF C_FORUM_USER_INFO #

<!--

function change_textarea_level(replace_value, regex)

{

var contents = document.getElementById('action_contents').value;

{REPLACE_VALUE}

document.getElementById('action_contents').value = contents;

# IF C_TINYMCE_EDITOR # setTinyMceContent(contents); # ENDIF #

}

-->

</script>

<thead>

<tr>

<th>

${LangLoader::get_message('description', 'main')}

</th>

<th>

${LangLoader::get_message('display_name', 'user-common')}

</th>

</tr>

</thead>

<tbody>

<tr>

{L_LOGIN}

</td>

<td>

{LOGIN}

</td>

</tr>

<tr>

{L_PM}

</td>

<td>

</td>

</tr>

<tr>

<div class="question">{L_ALTERNATIVE_PM}</div>

</td>

<td>

{KERNEL_EDITOR}

<textarea class="forum-textarea" name="action_contents" id="action_contents">{ALTERNATIVE_PM}</textarea>

</td>

</tr>

<tr>

<label for="new_info">{L_INFO_EXPLAIN}</label>

</td>

<td>

{SELECT}

</select></label>

<button type="submit" name="valid_user" value="true" class="submit">{L_CHANGE_INFO}</button>

</td>

</tr>

</tbody>

</table>

</form>

# ENDIF #

</div>

• <a href="index.php" title="{FORUM_NAME}">{FORUM_NAME}</a> » <a href="moderation_forum.php" title="{L_MODERATION_FORUM}">{L_MODERATION_FORUM}</a> {U_MODERATION_FORUM_ACTION}

</footer>

</article>

# INCLUDE forum_bottom #

保存された差分

原文

ファイルを開く

# INCLUDE forum_top #
		
		<article itemscope="itemscope" itemtype="http://schema.org/Creativework" id="article-forum-moderation-panel">
			<header>
				<h2>
					&bull; <a href="index.php" title="{FORUM_NAME}">{FORUM_NAME}</a> &raquo; <a href="moderation_forum.php" title="{L_MODERATION_FORUM}">{L_MODERATION_FORUM}</a> {U_MODERATION_FORUM_ACTION}
				</h2>
			</header>
			<div class="content">
				<table id="table">
					<tbody>
						<tr>
							<td class="td33P">
								<a href="moderation_forum.php?action=warning" title="{L_USERS_WARNING}">
									<i class="fa fa-warning fa-2x"></i>
									<span class="forum-display-block">{L_USERS_WARNING}</span>
								</a>
							</td>
							<td class="td33P">
								<a href="moderation_forum.php?action=punish" title="{L_USERS_PUNISHMENT}">
									<i class="fa fa-error fa-2x"></i>
									<span class="forum-display-block">{L_USERS_PUNISHMENT}</span>
								</a>
							</td>
							<td class="td33P">
								<a href="moderation_forum.php?action=alert" title="{L_ALERT_MANAGEMENT}">
									<i class="fa fa-forbidden fa-2x"></i>
									<span class="forum-display-block">{L_ALERT_MANAGEMENT}</span>
								</a>
							</td>
						</tr>
					</tbody>
				</table>
				<br /><br />
				
				
				# IF C_FORUM_MODO_MAIN #
				<script>
				<!--

function Confirm_history()
				{
					return confirm("{L_DEL_HISTORY}");
				}
				-->
				</script>
				<form action="moderation_forum{U_ACTION_HISTORY}" method="post" onsubmit="javascript:return Confirm_history();">
					<table id="table2">
						<caption>
							{L_HISTORY}
						</caption>
						<thead>
							<tr>
								<th>
									{L_MODO}
								</th>
								<th>
									{L_ACTION}
								</th>
								<th>
									{L_USER_CONCERN}
								</th>
								<th class="forum-last-topic">
									{L_DATE}
								</th>
							</tr>
						</thead>
						<tfoot>
							<tr>
								<th colspan="4">
									# IF C_FORUM_ADMIN #
									<span class="float-left"><button type="submit" name="valid" value="true" class="submit">{L_DELETE}</button></span> 
									# ENDIF #
									# IF C_DISPLAY_LINK_MORE_ACTION #
									<a href="moderation_forum{U_MORE_ACTION}" title="{L_MORE_ACTION}">{L_MORE_ACTION}</a>
									# ENDIF #
								</th>
							</tr>
						</tfoot>
						<tbody>
						# START action_list # 
						<tr>
							<td class="forum-last-topic">
								<a href="{action_list.U_USER_PROFILE}" class="{action_list.LEVEL_CLASS}" # IF action_list.C_GROUP_COLOR # style="color:{action_list.GROUP_COLOR}" # ENDIF # title="{action_list.LOGIN}">{action_list.LOGIN}</a>
							</td>
							<td>
								{action_list.U_ACTION}
							</td>
							<td class="forum-last-topic">
								{action_list.U_USER_CONCERN}
							</td>
							<td class="forum-last-topic">
								{action_list.DATE}
							</td>
						</tr>
						# END action_list #
						# IF C_FORUM_NO_ACTION #
						<tr>
							<td colspan="4">
								{L_NO_ACTION}
							</td>
						</tr>
						# ENDIF #
						</tbody>
					</table>
					<input type="hidden" name="token" value="{TOKEN}">
				</form>
				# ENDIF #

# IF C_FORUM_ALERTS #
				<script>
				
				</script>
		
				<form name="alert" action="moderation_forum{U_ACTION_ALERT}" method="post" onsubmit="javascript:return Confirm_alert();">
					<table id="table2">
						<thead>
							<tr>
								<th class="td25"><input type="checkbox" onclick="if(this.checked) {check_alert(true)} else {check_alert(false)};"></th>
								<th class="td20P">{L_TITLE}</th>
								<th class="td20P">{L_TOPIC}</th>
								<th class="td100">{L_STATUS}</th>
								<th class="td70">{L_LOGIN}</th>
								<th class="td70">{L_TIME}</th>
							</tr>
						</thead>
						<tfoot>
							<tr>
								<th colspan="6">
									<button type="submit" name="" value="true" class="submit">{L_DELETE}</button>
								</th>
							</tr>
						</tfoot>
						<tbody>
							# START alert_list #
							<tr>
								<td class="td25">
									<input type="checkbox" name="a{alert_list.ID}">
								</td>
								<td class="td20P">
									{alert_list.TITLE} {alert_list.EDIT}
								</td>
								<td class="td20P">
									{alert_list.TOPIC}
								</td>
								<td class="td100" style="{alert_list.BACKGROUND_COLOR}">
									{alert_list.STATUS}
								</td>
								<td class="td70">
									{alert_list.LOGIN}
								</td>
								<td class="td70">
									{alert_list.TIME}
								</td>
							</tr>
							# END alert_list #
							
							# IF C_FORUM_NO_ALERT #
							<tr>
								<td colspan="6">
									{L_NO_ALERT}
								</td>
							</tr>
							# ENDIF #
						</tbody>
					</table>
					<input type="hidden" name="token" value="{TOKEN}">
				</form>
				# ENDIF #

# IF C_FORUM_ALERT_LIST #
				<table id="table2">
					<thead>
						<tr>
							<th colspan="2">
								{TOPIC}
							</th>
						</tr>
					</thead>
					<tbody>
						<tr>
							<td class="td25P">{L_TITLE}</td>
							<td>{TITLE}</td>
						</tr>
						<tr>
							<td>{L_TOPIC}</td>
							<td>{TOPIC}</td>
						</tr>
						<tr>
							<td>{L_CAT}</td>
							<td>{CAT}</td>
						</tr>
						<tr>
							<td>{L_CONTENTS}</td>
							<td>{CONTENTS}</td>
						</tr>
						<tr>
							<td>{L_STATUS}</td>
							<td>{STATUS}</td>
						</tr>
						<tr>
							<td>{L_LOGIN}</td>
							<td>{LOGIN}</td>
						</tr>
						<tr>
							<td>{L_TIME}</td>
							<td>{TIME}</td>
						</tr>
					</tbody>
				</table>

<form action="{U_CHANGE_STATUS}" method="post">
					<fieldset class="fieldset-submit">
						<legend></legend>
						<button type="submit" name="valid" value="true" class="submit">{L_CHANGE_STATUS}</button>
						<input type="hidden" name="token" value="{TOKEN}">
					</fieldset>
				</form>
				# ENDIF #

# IF C_FORUM_ALERT_NOT_AUTH #
				<table>
					<thead>
						<tr>
							<th colspan="2">
								{L_MODERATION_FORUM} : {L_ALERT_MANAGEMENT} 
							</th>
						</tr>
					</thead>
					<tbody>
						<tr>
							<td colspan="2">
								{L_NO_ALERT}
							</td>
						</tr>
					</tbody>
				</table>
				# ENDIF #

# IF C_FORUM_USER_LIST #
				<script>
				
				</script>

<form action="moderation_forum{U_ACTION}" method="post">
					<table>
						<tr>
							<td>
								<span>
									{L_SEARCH_USER}: <input type="text" maxlength="25" id="login" name="login">
									<span id="search_img"></span>
								</span>
								<span>
									<button type="submit" id="search_member" name="search_member" class="submit">{L_SEARCH}</button>
									<script>
									
									</script>
									<div id="xmlhttprequest-result-search" style="display:none;" class="xmlhttprequest-result-search"></div>
								</span>
							</td>
						</tr>
					</table>
					
					<table id="table2">
						<thead>
							<tr>
								<th class="td25P">{L_LOGIN}</th>
								<th class="td25P">{L_INFO}</th>
								<th class="td25P">{L_ACTION_USER}</th>
								<th class="td25P">{L_PM}</th>
							</tr>
						</thead>
						<tbody>
							# START user_list #
							<tr>
								<td class="td25P">
									<a href="{user_list.U_PROFILE}" class="{user_list.LEVEL_CLASS}" # IF user_list.C_GROUP_COLOR # style="color:{user_list.GROUP_COLOR}" # ENDIF # title="{user_list.LOGIN}">{user_list.LOGIN}</a>
								</td>
								<td class="td25P">
									{user_list.INFO}
								</td>
								<td class="td25P">
									{user_list.U_ACTION_USER}
								</td>
								<td class="td25P">
									<a href="{user_list.U_PM}" class="basic-button smaller" title="MP">MP</a>
								</td>
							</tr>
							# END user_list #
							
							# IF C_FORUM_NO_USER #
							<tr>
								<td colspan="4">
									{L_NO_USER}
								</td>
							</tr>
							# ENDIF #
						</tbody>
					</table>
					<input type="hidden" name="token" value="{TOKEN}">
				</form>
				# ENDIF #

# IF C_FORUM_USER_INFO #
				<script>
				
				</script>
				<form action="moderation_forum{U_ACTION_INFO}" method="post">
					<table id="table2">
						<thead>
							<tr>
								<th>
									${LangLoader::get_message('description', 'main')}
								</th>
								<th>
									${LangLoader::get_message('display_name', 'user-common')}
								</th>
							</tr>
						</thead>
						<tbody>
							<tr>
								<td class="td33P">
									{L_LOGIN}
								</td>
								<td>
									{LOGIN}
								</td>
							</tr>
							<tr>
								<td class="td33P">
									{L_PM}
								</td>
								<td>
									<a href="{U_PM}" class="basic-button smaller" title="MP">MP</a>
								</td>
							</tr>
							<tr>
								<td class="td33P">
									<div class="question">{L_ALTERNATIVE_PM}</div>
								</td>
								<td>
									{KERNEL_EDITOR}
									<textarea class="forum-textarea" name="action_contents" id="action_contents">{ALTERNATIVE_PM}</textarea>
								</td>
							</tr>
							<tr>
								<td class="td33P">
									<label for="new_info">{L_INFO_EXPLAIN}</label>
								</td>
								<td>
									<span class="forum-display-block" id="action_info">{INFO}</span>
									<label><select name="new_info" id="new_info" onchange="change_textarea_level(this.options[this.selectedIndex].value, {REGEX})">
										{SELECT}
									</select></label>
									<button type="submit" name="valid_user" value="true" class="submit">{L_CHANGE_INFO}</button>
									<input type="hidden" name="token" value="{TOKEN}">
								</td>
							</tr>
						</tbody>
					</table>
				</form>
				# ENDIF #

</div>
			<footer>
				&bull; <a href="index.php" title="{FORUM_NAME}">{FORUM_NAME}</a> &raquo; <a href="moderation_forum.php" title="{L_MODERATION_FORUM}">{L_MODERATION_FORUM}</a> {U_MODERATION_FORUM_ACTION}
			</footer>
		</article>

# INCLUDE forum_bottom #

変更されたテキスト

ファイルを開く

<form action="moderation_forum{U_ACTION}" method="post">
					<table>
						<tr>
							<td>
								<span>
									{L_SEARCH_USER}: <input type="text" maxlength="25" id="login" name="login">
									<span id="search_img"></span>
								</span>
								<span>
									<button type="submit" id="search_member" name="search_member" class="submit">{L_SEARCH}</button>
									<script>
									
									</script>
									<div id="xmlhttprequest-result-search" style="display: none;" class="xmlhttprequest-result-search"></div>
								</span>
							</td>
						</tr>
					</table>
					
					<table id="table2">
						<thead>
							<tr>
								<th class="td25P">{L_LOGIN}</th>
								<th class="td25P">{L_INFO}</th>
								<th class="td25P">{L_ACTION_USER}</th>
								<th class="td25P">{L_PM}</th>
							</tr>
						</thead>
						<tbody>
							# START user_list #
							<tr>
								<td class="td25P">
									<a href="{user_list.U_PROFILE}" class="{user_list.LEVEL_CLASS}" # IF user_list.C_GROUP_COLOR # style="color:{user_list.GROUP_COLOR}" # ENDIF # title="{user_list.LOGIN}">{user_list.LOGIN}</a>
								</td>
								<td class="td25P">
									{user_list.INFO}
								</td>
								<td class="td25P">
									{user_list.U_ACTION_USER}
								</td>
								<td class="td25P">
									<a href="{user_list.U_PM}" class="basic-button smaller" title="MP">MP</a>
								</td>
							</tr>
							# END user_list #
							
							# IF C_FORUM_NO_USER #
							<tr>
								<td colspan="4">
									{L_NO_USER}
								</td>
							</tr>
							# ENDIF #
						</tbody>
					</table>
					<input type="hidden" name="token" value="{TOKEN}">
				</form>
				# ENDIF #

# INCLUDE forum_bottom #