From a5a93dd6396ac8d327ee75c1a1c2f354d44b1485 Mon Sep 17 00:00:00 2001
From: Trevor Slocum <tslocum@gmail.com>
Date: Mon, 15 Apr 2013 18:53:16 -0700
Subject: [PATCH] Add ability to update via Git from the management panel
 (Administrators only)

---
 imgboard.php | 13 +++++++++++++
 inc/html.php | 26 +++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/imgboard.php b/imgboard.php
index 116fb0d..bab9525 100644
--- a/imgboard.php
+++ b/imgboard.php
@@ -237,6 +237,19 @@ if (isset($_POST['message']) || isset($_POST['file'])) {
 				$onload = manageOnLoad('bans');
 				$text .= manageBanForm();
 				$text .= manageBansTable();
+			} else if (isset($_GET['update'])) {
+				if (is_dir('.git')) {
+					$git_output = shell_exec('git pull 2>&1');
+					$text .= '<blockquote class="reply" style="padding: 7px;font-size: 1.25em;">
+					<pre>Attempting update...' . "\n\n" . $git_output . '</pre>
+					</blockquote>
+					<p><b>Note:</b> If TinyIB updates and you have made custom modifications, <a href="https://github.com/tslocum/TinyIB/commits/master">review the changes</a> which have been merged into your installation.
+					Ensure that your modifications do not interfere with any new/modified files.
+					See the <a href="https://github.com/tslocum/TinyIB#readme">README</a> for more information.</p>';
+				} else {
+					$text .= '<p><b>TinyIB was not installed via Git.</b></p>
+					<p>If you installed TinyIB without Git, you must <a href="https://github.com/tslocum/TinyIB">update manually</a>.  If you did install with Git, ensure the script has read and write access to the <b>.git</b> folder.</p>';
+				}
 			}
 		}
 		
diff --git a/inc/html.php b/inc/html.php
index 3c5c659..cb6c333 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -561,7 +561,7 @@ function manageStatus() {
 	$i = 0;
 	foreach ($posts as $post) {
 		if ($post_html != '') { $post_html .= '<tr><td colspan="2"><hr></td></tr>'; }
-		$post_html .= '<tr><td>' . buildPost($post, TINYIB_INDEXPAGE) . '</td><td valign="top"><form method="get" action="?"><input type="hidden" name="manage" value=""><input type="hidden" name="moderate" value="' . $post['id'] . '"><input type="submit" value="Moderate" class="managebutton"></form></td></tr>';
+		$post_html .= '<tr><td>' . buildPost($post, TINYIB_INDEXPAGE) . '</td><td valign="top" align="right"><form method="get" action="?"><input type="hidden" name="manage" value=""><input type="hidden" name="moderate" value="' . $post['id'] . '"><input type="submit" value="Moderate" class="managebutton"></form></td></tr>';
 	}
 	
 	return <<<EOF
@@ -570,7 +570,27 @@ function manageStatus() {
 	
 	<fieldset>
 	<legend>Info</legend>
-	$info
+	<table border="0" cellspacing="0" cellpadding="0" width="100%">
+	<tbody>
+	<tr><td>
+		$info
+	</td>
+EOF;
+	if ($isadmin) {
+		$output .= <<<EOF
+	<td valign="top" align="right">
+		<form method="get" action="?">
+			<input type="hidden" name="manage">
+			<input type="hidden" name="update">
+			<input type="submit" value="Update TinyIB" class="managebutton">
+		</form>
+	</td>
+EOF;
+	}
+	$output .= <<<EOF
+	</tr>
+	</tbody>
+	</table>
 	</fieldset>
 	
 	<fieldset>
@@ -588,4 +608,4 @@ EOF;
 function manageInfo($text) {
 	return '<div class="manageinfo">' . $text . '</div>';
 }
-?>
+?>
\ No newline at end of file