Fix line endings (autocrlf is your friend, use it)

5 files changed, 451 insertions, 451 deletions

diff --git a/config/zebedee/zebedee_del_key.php b/config/zebedee/zebedee_del_key.php
index ae9522b7..e6cfa955 100644
--- a/config/zebedee/zebedee_del_key.php
+++ b/config/zebedee/zebedee_del_key.php
@@ -1,54 +1,54 @@
-<?php

-/*

-	zebedee_del_key.php

-	part of pfSense (http://www.pfsense.com/)

-	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>

-	Copyright (C) 2010 Marcello Coutinho

-	Copyright (C) 2010 Jorge Lustosa

-	

-	All rights reserved.

-

-	Redistribution and use in source and binary forms, with or without

-	modification, are permitted provided that the following conditions are met:

-

-	1. Redistributions of source code must retain the above copyright notice,

-	   this list of conditions and the following disclaimer.

-

-	2. Redistributions in binary form must reproduce the above copyright

-	   notice, this list of conditions and the following disclaimer in the

-	   documentation and/or other materials provided with the distribution.

-

-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-	POSSIBILITY OF SUCH DAMAGE.

-*/

-

-require("guiconfig.inc");

-

-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));

-if(strstr($pfSversion, "1.2"))

-	$one_two = true;

-

-$zebede_keys = $config['installedpackages']['zebedeekeys']['config'] ; 

-

-// remove item 

-unset($zebede_keys[$_REQUEST['id']]) ;  

-

-$config['installedpackages']['zebedeekeys']['config'] =  $zebede_keys ;  

-write_config()  ; 

-

-

-// redirect 

-header("Location: zebedee_keys.php");

-

-

-?> 

-	

-	

+<?php
+/*
+	zebedee_del_key.php
+	part of pfSense (http://www.pfsense.com/)
+	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
+	Copyright (C) 2010 Marcello Coutinho
+	Copyright (C) 2010 Jorge Lustosa
+	
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+	$one_two = true;
+
+$zebede_keys = $config['installedpackages']['zebedeekeys']['config'] ; 
+
+// remove item 
+unset($zebede_keys[$_REQUEST['id']]) ;  
+
+$config['installedpackages']['zebedeekeys']['config'] =  $zebede_keys ;  
+write_config()  ; 
+
+
+// redirect 
+header("Location: zebedee_keys.php");
+
+
+?> 
+	
+	
diff --git a/config/zebedee/zebedee_get_key.php b/config/zebedee/zebedee_get_key.php
index f0af0b8a..ce54f954 100644
--- a/config/zebedee/zebedee_get_key.php
+++ b/config/zebedee/zebedee_get_key.php
@@ -1,44 +1,44 @@
-<?

-

-require_once("pkg-utils.inc");

-

-$id= $_REQUEST['id'] ; 

-//echo "<pre>" ; 

-$external = $config['installedpackages']['zebedee']['config'][0]['external_address'] ; 

-$chave = $config['installedpackages']['zebedeekeys']["config"][$id] ; 

-

-//print_r($chave['row']) ; 

-

-

-

-foreach ($chave['row'] as $k => $v) 

-{

-		// especify only one port for this host 

-//		if($v['port']=="") $end=" " ; else $end = ":".$v['port'] ; 

-		$tunnels .= "tunnel ".$v['loc_port'].":".$v['ipaddress'].":".$v['rmt_port']."\r\n" ; 

-}

-

-

-header('Content-Type: application/download');

-header('Content-Disposition: filename=client.txt');

-

-$chave_result = <<<EOF

-verbosity 2	

-server false   

-message {$chave["ident"]}

-detached true	

-privatekey "{$chave["private_key"]}"

-ipmode both

-compression zlib:9

-

-serverhost {$external}

-

-{$tunnels}

-

-EOF;

-

-

-echo $chave_result ; 

-

-

+<?
+
+require_once("pkg-utils.inc");
+
+$id= $_REQUEST['id'] ; 
+//echo "<pre>" ; 
+$external = $config['installedpackages']['zebedee']['config'][0]['external_address'] ; 
+$chave = $config['installedpackages']['zebedeekeys']["config"][$id] ; 
+
+//print_r($chave['row']) ; 
+
+
+
+foreach ($chave['row'] as $k => $v) 
+{
+		// especify only one port for this host 
+//		if($v['port']=="") $end=" " ; else $end = ":".$v['port'] ; 
+		$tunnels .= "tunnel ".$v['loc_port'].":".$v['ipaddress'].":".$v['rmt_port']."\r\n" ; 
+}
+
+
+header('Content-Type: application/download');
+header('Content-Disposition: filename=client.txt');
+
+$chave_result = <<<EOF
+verbosity 2	
+server false   
+message {$chave["ident"]}
+detached true	
+privatekey "{$chave["private_key"]}"
+ipmode both
+compression zlib:9
+
+serverhost {$external}
+
+{$tunnels}
+
+EOF;
+
+
+echo $chave_result ; 
+
+
 ?>  
\ No newline at end of file
diff --git a/config/zebedee/zebedee_keys.php b/config/zebedee/zebedee_keys.php
index f762c7cc..14b39078 100644
--- a/config/zebedee/zebedee_keys.php
+++ b/config/zebedee/zebedee_keys.php
@@ -1,145 +1,145 @@
-<?php

-/*

-	zebedee_keys.php

-	part of pfSense (http://www.pfsense.com/)

-	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>

-	Copyright (C) 2010 Marcello Coutinho

-	Copyright (C) 2010 Jorge Lustosa

-	

-	All rights reserved.

-

-	Redistribution and use in source and binary forms, with or without

-	modification, are permitted provided that the following conditions are met:

-

-	1. Redistributions of source code must retain the above copyright notice,

-	   this list of conditions and the following disclaimer.

-

-	2. Redistributions in binary form must reproduce the above copyright

-	   notice, this list of conditions and the following disclaimer in the

-	   documentation and/or other materials provided with the distribution.

-

-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-	POSSIBILITY OF SUCH DAMAGE.

-*/

-

-

-

-require("guiconfig.inc");

-

-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));

-if(strstr($pfSversion, "1.2"))

-	$one_two = true;

-

-$pgtitle = "Zebedee Tunneling";

-include("head.inc");

-

-error_reporting(0); 

-?>

-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">

-<?php include("fbegin.inc"); ?>

-

-<?php if($one_two): ?>

-<p class="pgtitle"><?=$pgtitle?></font></p>

-<?php endif; ?>

-

-<?php if ($savemsg) print_info_box($savemsg); ?>

-

-<form action="varnishstat_view_config.php" method="post">

-	

-<div id="mainlevel">

-	<table width="100%" border="0" cellpadding="0" cellspacing="0">

-		<tr><td>

-		

-		

-		

-<?php

-	$tab_array = array();

-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=zebedee.xml&amp;id=0");

-	$tab_array[] = array(gettext("Tunnels"), false, "/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0");

-	$tab_array[] = array(gettext("Keys"), true, "/zebedee_keys.php");

-	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0");

-	$tab_array[] = array(gettext("View Configuration"), false, "/zebedee_view_config.php");

-	$tab_array[] = array(gettext("View log files"), false, "/zebedee_log.php");

-	display_top_tabs($tab_array);

-	

-	$zebede_keys = $config['installedpackages']['zebedeekeys']['config'] ; 

-	$next_row = sizeof($zebede_keys) ;

-	if($next_row == 1 && !array_key_exists("config", $config['installedpackages']["zebedeekeys"]))$next_row =0 ;

-	

-	//echo "<pre>" ;  

-	//print_r($config['installedpackages']); 

-?>

-		</td>

-		</tr>

- 		<tr>

-    		<td>

-				<div id="mainarea">

-				

-				<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">

-                <tr> 

-                  <td class="listhdrr"><?=gettext("Identifier"); ?></td>

-                  <td class="listhdr"><?=gettext("Public key"); ?></td>

-                  <td class="list">

-			<table border="0" cellspacing="0" cellpadding="1">

-			    <tr>

-			    	<td width="20" heigth="17"></td>

-			        <td width="20" heigth="17"></td>

-			        <td width="20" heigth="17"></td>

-			    

-				<td align="left"><a href="pkg_edit.php?xml=zebedee_key_details.xml&id=<?php echo $next_row?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0"></a></td>

-			    </tr>

-			</table>

-		  </td>

-		</tr>

-			  <?php $i = 0; foreach ($zebede_keys as $key): ?>

-		<tr>

-		<td class="listlr">

-			<?=htmlspecialchars($key['ident']);?>

-		</td>

-		<td class="listr">

-			<?=htmlspecialchars($key['public_key']);?>

-		</td>

-		<td class="list" nowrap>

-		<a href="pkg_edit.php?xml=zebedee_key_details.xml&id=<?php echo $i?>">

-		<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" width="17" height="17" border="0"></a>

-		<a href="/zebedee_del_key.php?id=<?php echo $i?>"><img height="17" border="0" width="17" src="./themes/pfsense_ng/images/icons/icon_x.gif"></a>

-		<a alt="Download client.zbd file"  href="/zebedee_get_key.php?id=<?php echo $i?>" target="_blank"><img height="17" border="0" width="17" src="./themes/pfsense_ng/images/icons/icon_right.gif" alt="Download client.zbd file"></a>

-		</td>

-				</tr>

-			  <?php $i++; endforeach; ?>

-

-			  

-                <tr> 

-                  <td class="list" colspan="2"></td>

-                  <td class="list">

-			<table border="0" cellspacing="0" cellpadding="1">

-			    <tr>

-			        <td width="20" heigth="17"></td>

-			        <td width="20" heigth="17"></td>

-			        <td width="20" heigth="17"></td>

-			        

-				<td><a href="pkg_edit.php?xml=zebedee_key_details.xml&id=<?php echo $next_row?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0"></a></td>

-			    </tr>

-			</table>

-		  </td>

-		</tr>

-              </table>

-				

-

-				</div>

-			</td>

-		</tr>

-	</table>

-</div>

-</form>

-<?php include("fend.inc"); ?>

-</body>

-</html>

+<?php
+/*
+	zebedee_keys.php
+	part of pfSense (http://www.pfsense.com/)
+	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
+	Copyright (C) 2010 Marcello Coutinho
+	Copyright (C) 2010 Jorge Lustosa
+	
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+
+require("guiconfig.inc");
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+	$one_two = true;
+
+$pgtitle = "Zebedee Tunneling";
+include("head.inc");
+
+error_reporting(0); 
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
+
+<?php if ($savemsg) print_info_box($savemsg); ?>
+
+<form action="varnishstat_view_config.php" method="post">
+	
+<div id="mainlevel">
+	<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<tr><td>
+		
+		
+		
+<?php
+	$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=zebedee.xml&amp;id=0");
+	$tab_array[] = array(gettext("Tunnels"), false, "/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0");
+	$tab_array[] = array(gettext("Keys"), true, "/zebedee_keys.php");
+	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0");
+	$tab_array[] = array(gettext("View Configuration"), false, "/zebedee_view_config.php");
+	$tab_array[] = array(gettext("View log files"), false, "/zebedee_log.php");
+	display_top_tabs($tab_array);
+	
+	$zebede_keys = $config['installedpackages']['zebedeekeys']['config'] ; 
+	$next_row = sizeof($zebede_keys) ;
+	if($next_row == 1 && !array_key_exists("config", $config['installedpackages']["zebedeekeys"]))$next_row =0 ;
+	
+	//echo "<pre>" ;  
+	//print_r($config['installedpackages']); 
+?>
+		</td>
+		</tr>
+ 		<tr>
+    		<td>
+				<div id="mainarea">
+				
+				<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+                <tr> 
+                  <td class="listhdrr"><?=gettext("Identifier"); ?></td>
+                  <td class="listhdr"><?=gettext("Public key"); ?></td>
+                  <td class="list">
+			<table border="0" cellspacing="0" cellpadding="1">
+			    <tr>
+			    	<td width="20" heigth="17"></td>
+			        <td width="20" heigth="17"></td>
+			        <td width="20" heigth="17"></td>
+			    
+				<td align="left"><a href="pkg_edit.php?xml=zebedee_key_details.xml&id=<?php echo $next_row?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0"></a></td>
+			    </tr>
+			</table>
+		  </td>
+		</tr>
+			  <?php $i = 0; foreach ($zebede_keys as $key): ?>
+		<tr>
+		<td class="listlr">
+			<?=htmlspecialchars($key['ident']);?>
+		</td>
+		<td class="listr">
+			<?=htmlspecialchars($key['public_key']);?>
+		</td>
+		<td class="list" nowrap>
+		<a href="pkg_edit.php?xml=zebedee_key_details.xml&id=<?php echo $i?>">
+		<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit key"); ?>" width="17" height="17" border="0"></a>
+		<a href="/zebedee_del_key.php?id=<?php echo $i?>"><img height="17" border="0" width="17" src="./themes/pfsense_ng/images/icons/icon_x.gif"></a>
+		<a alt="Download client.zbd file"  href="/zebedee_get_key.php?id=<?php echo $i?>" target="_blank"><img height="17" border="0" width="17" src="./themes/pfsense_ng/images/icons/icon_right.gif" alt="Download client.zbd file"></a>
+		</td>
+				</tr>
+			  <?php $i++; endforeach; ?>
+
+			  
+                <tr> 
+                  <td class="list" colspan="2"></td>
+                  <td class="list">
+			<table border="0" cellspacing="0" cellpadding="1">
+			    <tr>
+			        <td width="20" heigth="17"></td>
+			        <td width="20" heigth="17"></td>
+			        <td width="20" heigth="17"></td>
+			        
+				<td><a href="pkg_edit.php?xml=zebedee_key_details.xml&id=<?php echo $next_row?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add key"); ?>" width="17" height="17" border="0"></a></td>
+			    </tr>
+			</table>
+		  </td>
+		</tr>
+              </table>
+				
+
+				</div>
+			</td>
+		</tr>
+	</table>
+</div>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/zebedee/zebedee_log.php b/config/zebedee/zebedee_log.php
index 3e1ac98d..e397ca08 100644
--- a/config/zebedee/zebedee_log.php
+++ b/config/zebedee/zebedee_log.php
@@ -1,112 +1,112 @@
-<?php

-/*

-	varnishstat_view_logs.php

-	part of pfSense (http://www.pfsense.com/)

-	Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>

-	All rights reserved.

-

-	Redistribution and use in source and binary forms, with or without

-	modification, are permitted provided that the following conditions are met:

-

-	1. Redistributions of source code must retain the above copyright notice,

-	   this list of conditions and the following disclaimer.

-

-	2. Redistributions in binary form must reproduce the above copyright

-	   notice, this list of conditions and the following disclaimer in the

-	   documentation and/or other materials provided with the distribution.

-

-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-	POSSIBILITY OF SUCH DAMAGE.

-*/

-

-require("guiconfig.inc");

-

-if($_REQUEST['getactivity']) {

-	$varnishstatlogs = `tail -n 100  /var/log/zebedee.log`; 

-	echo "<h2>Zebedee Server logs as of " . date("D M j G:i:s T Y")  . "</h2>";

-	echo $varnishstatlogs;

-	exit;

-}

-

-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));

-if(strstr($pfSversion, "1.2"))

-	$one_two = true;

-

-$pgtitle = "Zebedee: Logs";

-include("head.inc");

-

-?>

-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">

-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>

-	<script type="text/javascript">

-		function getlogactivity() {

-			var url = "/zebedee_log.php";

-			var pars = 'getactivity=yes';

-			var myAjax = new Ajax.Request(

-				url,

-				{

-					method: 'post',

-					parameters: pars,

-					onComplete: activitycallback

-				});

-		}

-		function activitycallback(transport) {

-			$('varnishstatlogs').innerHTML = '<font face="Courier"><pre>' + transport.responseText  + '</pre></font>';

-			setTimeout('getlogactivity()', 2500);		

-		}

-		setTimeout('getlogactivity()', 1000);	

-	</script>

-<?php include("fbegin.inc"); ?>

-

-<?php if($one_two): ?>

-<p class="pgtitle"><?=$pgtitle?></font></p>

-<?php endif; ?>

-

-<?php if ($savemsg) print_info_box($savemsg); ?>

-

-<div id="mainlevel">

-	<table width="100%" border="0" cellpadding="0" cellspacing="0">

-		<tr><td>

-<?php

-

-$tab_array = array();

-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=zebedee.xml&amp;id=0");

-	$tab_array[] = array(gettext("Tunnels"), false, "/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0");

-	$tab_array[] = array(gettext("Keys"), false, "/zebedee_keys.php");

-	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0");

-	$tab_array[] = array(gettext("View Configuration"), false, "/zebedee_view_config.php");

-	$tab_array[] = array(gettext("View log files"), true, "/zebedee_log.php");

-	display_top_tabs($tab_array);

-

-?>

-		</td></tr>

- 		<tr>

-    		<td>

-				<div id="mainarea">

-					<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">

-						<tr>

-     						<td class="tabcont" >

-      							<form action="zebedee_log.php" method="post">

-								<div id="varnishstatlogs">

-									<pre>One moment please, loading logs...</pre>

-								</div>

-     						</td>

-						</tr>

-					</table>

-				</div>

-			</td>

-		</tr>

-	</table>

-</div>

-</form>

-<?php include("fend.inc"); ?>

-</body>

-</html>

+<?php
+/*
+	varnishstat_view_logs.php
+	part of pfSense (http://www.pfsense.com/)
+	Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+if($_REQUEST['getactivity']) {
+	$varnishstatlogs = `tail -n 100  /var/log/zebedee.log`; 
+	echo "<h2>Zebedee Server logs as of " . date("D M j G:i:s T Y")  . "</h2>";
+	echo $varnishstatlogs;
+	exit;
+}
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+	$one_two = true;
+
+$pgtitle = "Zebedee: Logs";
+include("head.inc");
+
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
+	<script type="text/javascript">
+		function getlogactivity() {
+			var url = "/zebedee_log.php";
+			var pars = 'getactivity=yes';
+			var myAjax = new Ajax.Request(
+				url,
+				{
+					method: 'post',
+					parameters: pars,
+					onComplete: activitycallback
+				});
+		}
+		function activitycallback(transport) {
+			$('varnishstatlogs').innerHTML = '<font face="Courier"><pre>' + transport.responseText  + '</pre></font>';
+			setTimeout('getlogactivity()', 2500);		
+		}
+		setTimeout('getlogactivity()', 1000);	
+	</script>
+<?php include("fbegin.inc"); ?>
+
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
+
+<?php if ($savemsg) print_info_box($savemsg); ?>
+
+<div id="mainlevel">
+	<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<tr><td>
+<?php
+
+$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=zebedee.xml&amp;id=0");
+	$tab_array[] = array(gettext("Tunnels"), false, "/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0");
+	$tab_array[] = array(gettext("Keys"), false, "/zebedee_keys.php");
+	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0");
+	$tab_array[] = array(gettext("View Configuration"), false, "/zebedee_view_config.php");
+	$tab_array[] = array(gettext("View log files"), true, "/zebedee_log.php");
+	display_top_tabs($tab_array);
+
+?>
+		</td></tr>
+ 		<tr>
+    		<td>
+				<div id="mainarea">
+					<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+     						<td class="tabcont" >
+      							<form action="zebedee_log.php" method="post">
+								<div id="varnishstatlogs">
+									<pre>One moment please, loading logs...</pre>
+								</div>
+     						</td>
+						</tr>
+					</table>
+				</div>
+			</td>
+		</tr>
+	</table>
+</div>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/zebedee/zebedee_view_config.php b/config/zebedee/zebedee_view_config.php
index 57cecc7e..78a0bca9 100644
--- a/config/zebedee/zebedee_view_config.php
+++ b/config/zebedee/zebedee_view_config.php
@@ -1,97 +1,97 @@
-<?php

-/*

-	varnish_view_config.php

-	part of pfSense (http://www.pfsense.com/)

-	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>

-	All rights reserved.

-

-	Redistribution and use in source and binary forms, with or without

-	modification, are permitted provided that the following conditions are met:

-

-	1. Redistributions of source code must retain the above copyright notice,

-	   this list of conditions and the following disclaimer.

-

-	2. Redistributions in binary form must reproduce the above copyright

-	   notice, this list of conditions and the following disclaimer in the

-	   documentation and/or other materials provided with the distribution.

-

-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-	POSSIBILITY OF SUCH DAMAGE.

-*/

-

-require("guiconfig.inc");

-

-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));

-if(strstr($pfSversion, "1.2"))

-	$one_two = true;

-

-$pgtitle = "Zebedee: View Configuration";

-include("head.inc");

-

-?>

-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">

-<?php include("fbegin.inc"); ?>

-

-<?php if($one_two): ?>

-<p class="pgtitle"><?=$pgtitle?></font></p>

-<?php endif; ?>

-

-<?php if ($savemsg) print_info_box($savemsg); ?>

-

-<form action="zebedee_view_config.php" method="post">

-	

-<div id="mainlevel">

-	<table width="100%" border="0" cellpadding="0" cellspacing="0">

-		<tr><td>

-<?php

-		$tab_array = array();

-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=zebedee.xml&amp;id=0");

-	$tab_array[] = array(gettext("Tunnels"), false, "/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0");

-	$tab_array[] = array(gettext("Keys"), false, "/zebedee_keys.php");

-	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0");

-	$tab_array[] = array(gettext("View Configuration"), true, "/zebedee_view_config.php");

-	$tab_array[] = array(gettext("View log files"), false, "/zebedee_log.php");

-	display_top_tabs($tab_array);

-?>

-		</td></tr>

- 		<tr>

-    		<td>

-				<div id="mainarea">

-					<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">

-						<tr>

-     						<td class="tabcont" >

-     								<p class="pgtitle">/usr/local/etc/server.zbd</font></p>

-									<textarea id="zebedeetext" rows="20" cols="80">

-<?php 

-	$config_file = file_get_contents("/usr/local/etc/server.zbd");

-	echo $config_file;

-?>

-									</textarea>

-									<p class="pgtitle">/usr/local/etc/tunnels.zbd</font></p>

-									<textarea id="zebedeetext" rows="20" cols="80">

-<?php 

-	$config_file = file_get_contents("/usr/local/etc/tunnels.zbd");

-	echo $config_file;

-?>

-									</textarea>

-									

-							</td>

-						</tr>

-					</table>

-				</div>

-			</td>

-		</tr>

-	</table>

-</div>

-</form>

-<?php include("fend.inc"); ?>

-</body>

-</html>

+<?php
+/*
+	varnish_view_config.php
+	part of pfSense (http://www.pfsense.com/)
+	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+	$one_two = true;
+
+$pgtitle = "Zebedee: View Configuration";
+include("head.inc");
+
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
+
+<?php if ($savemsg) print_info_box($savemsg); ?>
+
+<form action="zebedee_view_config.php" method="post">
+	
+<div id="mainlevel">
+	<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<tr><td>
+<?php
+		$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=zebedee.xml&amp;id=0");
+	$tab_array[] = array(gettext("Tunnels"), false, "/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0");
+	$tab_array[] = array(gettext("Keys"), false, "/zebedee_keys.php");
+	$tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0");
+	$tab_array[] = array(gettext("View Configuration"), true, "/zebedee_view_config.php");
+	$tab_array[] = array(gettext("View log files"), false, "/zebedee_log.php");
+	display_top_tabs($tab_array);
+?>
+		</td></tr>
+ 		<tr>
+    		<td>
+				<div id="mainarea">
+					<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+     						<td class="tabcont" >
+     								<p class="pgtitle">/usr/local/etc/server.zbd</font></p>
+									<textarea id="zebedeetext" rows="20" cols="80">
+<?php 
+	$config_file = file_get_contents("/usr/local/etc/server.zbd");
+	echo $config_file;
+?>
+									</textarea>
+									<p class="pgtitle">/usr/local/etc/tunnels.zbd</font></p>
+									<textarea id="zebedeetext" rows="20" cols="80">
+<?php 
+	$config_file = file_get_contents("/usr/local/etc/tunnels.zbd");
+	echo $config_file;
+?>
+									</textarea>
+									
+							</td>
+						</tr>
+					</table>
+				</div>
+			</td>
+		</tr>
+	</table>
+</div>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>