From f47e84672c40ed038340215d8ca07887523c40cf Mon Sep 17 00:00:00 2001
From: mbirth <mbirth>
Date: Fri, 4 Aug 2006 08:23:20 +0000
Subject: [PATCH] x changed setup code to automagically find Settings.php
 (hopefully) * rearranged stuff in template to use less room (set <form>-block
 margin to 0) + calculate /Sources/ directory dynamically from SMF setup

---
 sbox.template.php | 50 ++++++++++++++++++++++++++---------------------
 sbox_remove.php   |  2 +-
 sbox_setup.php    |  2 +-
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/sbox.template.php b/sbox.template.php
index 58495b5..a4fddaf 100644
--- a/sbox.template.php
+++ b/sbox.template.php
@@ -1,10 +1,12 @@
 <?php
 
 function template_shout_box() {
-	global $context, $settings, $options, $txt, $user_info, $scripturl, $modSettings, $forum_version, $sourcedir;
+	global $context, $settings, $options, $txt, $user_info, $scripturl, $modSettings,
+	       $forum_version, $sourcedir, $boarddir, $boardurl;
 	
 	$themedir = $settings['default_theme_url'];
 	$imgdir = $themedir."/images/";
+	$sourceurl = str_replace($boarddir, $boardurl, $sourcedir);
 
 	echo '
 	<script language="JavaScript" type="text/javascript"><!-- // --><![CDATA[
@@ -23,35 +25,39 @@ function template_shout_box() {
 			<table border="0" width="100%" cellspacing="1" cellpadding="4" class="bordercolor">
 				<tr class="windowbg" align="right" style="width:13%">
 					<td class="windowbg" style="width:87%">
-						<form name="sbox" action="Sources/sboxDB.php?action=write" method="post" target="sboxframe" onsubmit="setTimeout(\'clearSbox()\', 500);">
-						  <input type="hidden" name="ts" value="'.forum_time(true).'">
-							<table width="100%" border="0" cellspacing="1" cellpadding="0">
-								<tr>
-									<td align="right">
-     									<a href="Sources/sboxDB.php?" target="sboxframe"><img src="'.$imgdir.'sbox_refresh.gif" border="0" width="16" height="17" align="middle" alt="' . $txt['sbox_Refresh'] . '" /></a>';
-	if ((!$context['user']['is_guest']) || ($modSettings['sbox_GuestAllowed'] == "1"))
-	echo '
+						<table width="100%" border="0" cellspacing="1" cellpadding="0">
+							<tr>
+								<td align="right">
+     	  					<form name="sbox" action="' . $sourceurl . '/sboxDB.php?action=write" method="post" target="sboxframe" style="margin: 0;" onsubmit="setTimeout(\'clearSbox()\', 500);">
+   									<a href="' . $sourceurl . '/sboxDB.php?" target="sboxframe"><img src="'.$imgdir.'sbox_refresh.gif" border="0" width="16" height="17" align="middle" alt="' . $txt['sbox_Refresh'] . '" /></a>';
+	if ((!$context['user']['is_guest']) || ($modSettings['sbox_GuestAllowed'] == "1")) {
+	  echo '
+			      			  <input type="hidden" name="ts" value="'.forum_time(true).'">
 										<input class="windowbg2" type="text" name="sboxText" size="100" maxlength="320" />&nbsp;<input type="submit" class="input" value="&nbsp;shout&nbsp;" />';
-	echo '
-									</td>
-								</tr>';
+	}
+  echo '
+          				</form>
+								</td>
+							</tr>';
 
-	if (($modSettings['sbox_SmiliesVisible'] == "1") && ((!$context['user']['is_guest']) || ($modSettings['sbox_GuestAllowed'] == "1")))	{
+	if (($modSettings['sbox_SmiliesVisible'] == "1") && ((!$context['user']['is_guest']) || ($modSettings['sbox_GuestAllowed'] == "1")))	{
     sbox_loadSmileys();
     echo '
-                <tr>
-                  <td align="center">';
+              <tr>
+                <td align="center">';
     sbox_printSmileys();
+    echo '
+                </td>
+              </tr>';
 	}
 
   echo'
-								<tr>
-									<td>
-			     						<iframe name="sboxframe" src="Sources/sboxDB.php?" width="100%" height="'.$modSettings['sbox_Height'].'"></iframe>
-									</td>
-								</tr>
-							</table>
-    				</form>
+							<tr>
+								<td>
+	     						<iframe name="sboxframe" src="' . $sourceurl . '/sboxDB.php?" width="100%" height="'.$modSettings['sbox_Height'].'"></iframe>
+								</td>
+							</tr>
+						</table>
   				</td>
   			</tr>
   		</table>
diff --git a/sbox_remove.php b/sbox_remove.php
index d1ea449..babc2fb 100644
--- a/sbox_remove.php
+++ b/sbox_remove.php
@@ -47,7 +47,7 @@ else
 
 	if ((isset($_REQUEST['man'])) || (!isset($db_name)))
 	{
-		include_once ("Settings.php");
+		require_once (dirname(realpath($_SERVER['SCRIPT_FILENAME'])) . "/Settings.php");
 		$dbcon = mysql_connect($db_server, $db_user, $db_passwd);
 		mysql_select_db($db_name);
 	}
diff --git a/sbox_setup.php b/sbox_setup.php
index b4ac95f..7be67a9 100644
--- a/sbox_setup.php
+++ b/sbox_setup.php
@@ -47,7 +47,7 @@ else
 
 	if ((isset($_REQUEST['man'])) || (!isset($db_name)))
 	{
-		include_once ("Settings.php");
+		require_once (dirname(realpath($_SERVER['SCRIPT_FILENAME'])) . '/Settings.php');
 		$dbcon = mysql_connect($db_server, $db_user, $db_passwd);
 		mysql_select_db($db_name);
 	}