From 9d488ea4fab1003178d17e9dd791872fc78b2a49 Mon Sep 17 00:00:00 2001
From: Scott Dale <sdale@pfsense.org>
Date: Sun, 30 Dec 2007 21:14:37 +0000
Subject: include required files for when widget is being loaded by AJAX calls.

---
 .../www/widgets/widgets/carp_status.widget.php     |  5 ++
 .../www/widgets/widgets/cpu_graphs.widget.php      |  4 +
 .../widgets/widgets/installed_packages.widget.php  |  5 ++
 .../widgets/interface_statistics.widget.php        | 79 ++++++++++++++-----
 .../www/widgets/widgets/interfaces.widget.php      | 48 ++++++-----
 usr/local/www/widgets/widgets/ipsec.widget.php     | 92 ++++++++++++++--------
 .../widgets/load_balancer_status.widget.php        |  4 +
 usr/local/www/widgets/widgets/log.widget.php       |  5 ++
 .../www/widgets/widgets/services_status.widget.php |  5 ++
 .../widgets/widgets/system_information.widget.php  | 14 +++-
 .../www/widgets/widgets/traffic_graphs.widget.php  |  6 +-
 11 files changed, 192 insertions(+), 75 deletions(-)

(limited to 'usr/local/www/widgets/widgets')

diff --git a/usr/local/www/widgets/widgets/carp_status.widget.php b/usr/local/www/widgets/widgets/carp_status.widget.php
index 5a355d7..7c98946 100644
--- a/usr/local/www/widgets/widgets/carp_status.widget.php
+++ b/usr/local/www/widgets/widgets/carp_status.widget.php
@@ -26,6 +26,11 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once("/usr/local/www/widgets/include/carp_status.inc");
 ?>
 <table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0">
 <?php
diff --git a/usr/local/www/widgets/widgets/cpu_graphs.widget.php b/usr/local/www/widgets/widgets/cpu_graphs.widget.php
index b54a7e7..f9dcfca 100644
--- a/usr/local/www/widgets/widgets/cpu_graphs.widget.php
+++ b/usr/local/www/widgets/widgets/cpu_graphs.widget.php
@@ -30,6 +30,10 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
 ?>
 
 <div style="float:left;width:49%">
diff --git a/usr/local/www/widgets/widgets/installed_packages.widget.php b/usr/local/www/widgets/widgets/installed_packages.widget.php
index 00d5de3..8ffcdc5 100644
--- a/usr/local/www/widgets/widgets/installed_packages.widget.php
+++ b/usr/local/www/widgets/widgets/installed_packages.widget.php
@@ -31,6 +31,11 @@
         POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once("/usr/local/www/widgets/include/installed_packages.inc");
+
 if(is_array($config['installedpackages']['package'])) {
 	foreach($config['installedpackages']['package'] as $instpkg) {
 		$tocheck[] = $instpkg['name'];
diff --git a/usr/local/www/widgets/widgets/interface_statistics.widget.php b/usr/local/www/widgets/widgets/interface_statistics.widget.php
index b91dbcc..ad3f201 100644
--- a/usr/local/www/widgets/widgets/interface_statistics.widget.php
+++ b/usr/local/www/widgets/widgets/interface_statistics.widget.php
@@ -30,8 +30,13 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
-?>
-              <?php $i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
+
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once("/usr/local/www/widgets/include/interface_statistics.inc");
+
+		$i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
 		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
 			$ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr'];
 		}
@@ -44,10 +49,12 @@
 		$array_out_errors = array();
 		$array_collisions = array();
 		$array_interrupt = array();
+		$interfacecounter = 0;
 		
 		//build data arrays
 		foreach ($ifdescrs as $ifdescr => $ifname){
 			$ifinfo = get_interface_info($ifdescr);
+			$interfacecounter++;
 			if ($ifinfo['status'] != "down"){ 		
 				$array_in_packets[] = $ifinfo['inpkts'];
 				$array_out_packets[] = $ifinfo['outpkts'];
@@ -102,77 +109,107 @@
 	              </table>
 	          </div>
 	          <div id="interfacestats" style="float:right;overflow: auto; width:68%">
+	                   
 	          <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	              <tr>
 		                <tr>
 		                <?php 
+		               		$interface_names = array();
 		                	foreach ($ifdescrs as $ifdescr => $ifname): 
 		                	$ifinfo = get_interface_info($ifdescr);
 		                	if ($ifinfo['status'] != "down"){ ?>
 			                	<td class="widgetsubheader" nowrap  style="height:25px">
 			                  		<?=htmlspecialchars($ifname);?>
 								</td>
-							<?php } 
+							<?php 							
+							//build array of interface names
+							$interface_names[] = $ifname;
+							} 
 							endforeach; ?>
 		              </tr>
 		              
 		              <tr>
-			                <?php foreach ($array_in_packets as $data): ?>
-							<td class="listr" nowrap style="height:25px">
+			                <?php 
+			                $counter = 1;
+			                foreach ($array_in_packets as $data): ?>
+							<td class="listr" id="stat<?php echo $counter?>" nowrap style="height:25px">
 								<?=htmlspecialchars($data);?>
 			                </td>
-			                <?php endforeach; ?>
+			                <?php 
+			                $counter = $counter + 7;
+			                endforeach; ?>
 	              		</tr>
 	              		
 	              		<tr>
-			                <?php foreach ($array_out_packets as $data): ?>
-							<td class="listr" nowrap style="height:25px">
+			                <?php 
+			                $counter = 2;
+			                foreach ($array_out_packets as $data): ?>
+							<td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px">
 								<?=htmlspecialchars($data);?>
 			                </td>
-			                <?php endforeach; ?>
+			                <?php 
+			                $counter = $counter + 7;
+			                endforeach; ?>
 	              		</tr>
 			               
 			            <tr>
-			                <?php foreach ($array_in_bytes as $data): ?>
-							<td class="listr" nowrap style="height:25px">
+			                <?php 
+			                $counter = 3;
+			                foreach ($array_in_bytes as $data): ?>
+							<td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px">
 								<?=htmlspecialchars($data);?>
 			                </td>
-			                <?php endforeach; ?>
+			                <?php 
+			                $counter = $counter + 7;
+			                endforeach; ?>
 	          			</tr>
 	          			
 	          			<tr>
-			                <?php foreach ($array_out_bytes as $data): ?>
-							<td class="listr" nowrap style="height:25px">
+			                <?php 
+			                $counter = 4;
+			                foreach ($array_out_bytes as $data): ?>
+							<td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px">
 								<?=htmlspecialchars($data);?>
 			                </td>
-			                <?php endforeach; ?>
+			                <?php 
+			                $counter = $counter + 7;
+			                endforeach; ?>
 	            		</tr>
 	            		
 	            		<tr>
 			                <?php
+			                $counter = 5;
 				               foreach ($array_in_errors as $data): ?>
-									<td class="listr" nowrap style="height:25px">
+									<td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px">
 										<?=htmlspecialchars($data);?>
 					                </td>
-				                <?php endforeach; ?>
+				                <?php 
+				                $counter = $counter + 7;
+				                endforeach; ?>
 	              		</tr>
 		                	
 		                <tr>
 		                	<?php 
+		                	$counter = 6;
 			               foreach ($array_out_errors as $data): ?>
-								<td class="listr" nowrap style="height:25px">
+								<td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px">
 									<?=htmlspecialchars($data);?>
 				                </td>
-			                <?php endforeach; ?>
+			                <?php 
+			                $counter = $counter + 7;
+			                endforeach; ?>
 	             		</tr>
 		                	
 		                <tr>	
 		                	<?php  
+		                	$counter = 7;
 				                foreach ($array_collisions as $data): ?>
-								<td class="listr" nowrap style="height:25px">
+								<td class="listr" id="stat<?php echo $counter;?>" nowrap style="height:25px">
 									<?=htmlspecialchars($data);?>
 				                </td>
-			                <?php endforeach; ?>
+			                <?php 
+			                $counter = $counter + 7;
+			                endforeach; ?>
 						</tr>
 	             </table>
 			</div>
diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php
index e31e1c1..e411504 100644
--- a/usr/local/www/widgets/widgets/interfaces.widget.php
+++ b/usr/local/www/widgets/widgets/interfaces.widget.php
@@ -30,9 +30,12 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
-?>
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once("/usr/local/www/widgets/include/interfaces.inc");
 
-<?php $i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
+		$i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
 					for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
 						$ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr'];
 					}?>
@@ -69,24 +72,33 @@
 				
 				
 				<?=htmlspecialchars($ifname);?></span></u></strong>
+				
 				</td>
 				<td width="70%"  class="listr">
-				
-				  <?php if ($ifinfo['dhcplink'] != "down" && $ifinfo['pppoelink'] != "down" && $ifinfo['pptplink'] != "down"){ ?>
-	                 <?php if($ifinfo['status'] == "up") { ?> 
-		                  <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" />&nbsp; 
-		                  <? } else if ($ifinfo['status'] == "no carrier") { ?>
-		                  <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" />&nbsp; 
-		                  <? }  else if ($ifinfo['status'] == "down") { ?>
-		                  <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" />&nbsp; 
-		                  <? } else if ($ifinfo['status'] == "associated") { ?>
-		                  <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is associated" />&nbsp; 
-		                  <? } else { ?><?=htmlspecialchars($ifinfo['status']);
-				}?>				
+	                 <?php if($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") { ?> 
+	                 		<div id="<?php echo $ifname;?>-up" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" /></div>
+	                 		<div id="<?php echo $ifname;?>-down" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" /></div>
+	                 		<div id="<?php echo $ifname;?>-block" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" /></div>
+	                 		&nbsp; 
+		                <? } else if ($ifinfo['status'] == "no carrier") { ?>
+		                  	<div id="<?php echo $ifname;?>-down" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" /></div>
+		                  	<div id="<?php echo $ifname;?>-block" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" /></div>
+	                 		<div id="<?php echo $ifname;?>-up" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" /></div>
+	                 		&nbsp;
+						<? }  else if ($ifinfo['status'] == "down") { ?>
+		                	<div id="<?php echo $ifname;?>-block" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" title="<?=$ifname;?> is disabled" /></div>
+		                	<div id="<?php echo $ifname;?>-up" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" /></div>
+	                 		<div id="<?php echo $ifname;?>-down" style="display:none" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_down.gif" title="<?=$ifname;?> is down" /></div>
+	                 		 &nbsp;
+		                <? } else { ?><?=htmlspecialchars($ifinfo['status']); }?>				
 				  <?php if ($ifinfo['ipaddr']){ ?>
-	                 <?=htmlspecialchars($ifinfo['ipaddr']);}?>&nbsp;                 
-		              <?=htmlspecialchars($ifinfo['media']);?>
-	            </tr><?php }
-			}
+	                 <div id="<?php echo $ifname;?>-ip" style="display:inline"><?=htmlspecialchars($ifinfo['ipaddr']);}?>&nbsp; 
+	                 <?php if ($ifinfo['dhcplink']) { ?>
+						(DHCP)<br>
+					 <? } ?></div>
+					 	               
+		             <div id="<?php echo $ifname;?>-media" style="display:inline"><?=htmlspecialchars($ifinfo['media']);?></div>
+		          </td></tr><?php 
+			}//end for each
 			?> 
 			</table>
\ No newline at end of file
diff --git a/usr/local/www/widgets/widgets/ipsec.widget.php b/usr/local/www/widgets/widgets/ipsec.widget.php
index 540eab6..520a96f 100644
--- a/usr/local/www/widgets/widgets/ipsec.widget.php
+++ b/usr/local/www/widgets/widgets/ipsec.widget.php
@@ -30,11 +30,12 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once("/usr/local/www/widgets/include/ipsec.inc");
 
-?>
-
-<div>&nbsp;</div>
-<?php
+	if (isset($config['ipsec']['tunnel'])){
 	$tab_array = array();
 	$tab_array[0] = array("Overview", true, "ipsec-Overview");
 	$tab_array[1] = array("Tunnel Status", false, "ipsec-tunnel");
@@ -47,38 +48,40 @@
 	$inactivecounter = 0;
 	
 	$ipsec_detail_array = array();
+		foreach ($config['ipsec']['tunnel'] as $tunnel){ 
+			$ipsecstatus = false;
+			
+			$tun_disabled = "false";
+			$foundsrc = false;
+			$founddst = false; 
 	
-	foreach ($config['ipsec']['tunnel'] as $tunnel){ 
-		$ipsecstatus = false;
-		
-		$tun_disabled = "false";
-		$foundsrc = false;
-		$founddst = false; 
-
-		if (isset($tunnel['disabled'])) {
-			$tun_disabled = "true";
-			continue;
-		}		
-		
-		if(output_ipsec_tunnel_status($tunnel)) {
-			/* tunnel is up */
-			$iconfn = "true";
-			$activecounter++;
-		} else {
-			/* tunnel is down */
-			$iconfn = "false";
-			$inactivecounter++;
+			if (isset($tunnel['disabled'])) {
+				$tun_disabled = "true";
+				continue;
+			}		
+			
+			if(output_ipsec_tunnel_status($tunnel)) {
+				/* tunnel is up */
+				$iconfn = "true";
+				$activecounter++;
+			} else {
+				/* tunnel is down */
+				$iconfn = "false";
+				$inactivecounter++;
+			}
+			
+			$ipsec_detail_array[] = array('src' => $tunnel['interface'],
+						'dest' => $tunnel['remote-gateway'],
+						'remote-subnet' => $tunnel['remote-subnet'],
+						'descr' => $tunnel['descr'],
+						'status' => $iconfn,
+						'disabled' => $tun_disabled);
 		}
-		
-		$ipsec_detail_array[] = array('src' => $tunnel['interface'],
-					'dest' => $tunnel['remote-gateway'],
-					'remote-subnet' => $tunnel['remote-subnet'],
-					'descr' => $tunnel['descr'],
-					'status' => $iconfn,
-					'disabled' => $tun_disabled);
 	}
 	
-?>
+	if (isset($config['ipsec']['tunnel'])){ ?>
+
+<div>&nbsp;</div>
 <div id="ipsec-Overview" style="display:block;background-color:#EEEEEE;">
 	<div>
 	  <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">	
@@ -180,6 +183,29 @@
 	  </tr>
 	</table>
 	</div>
-	</div>
+ </div>
+</div><?php //end ipsec tunnel
+}//end if tunnels are configured, else show code below
+else { ?>
+<div style="display:block">
+	 <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+	  <tr>
+	    <td colspan="4">
+			  <p>
+	        <span class="vexpl">
+	          <span class="red">
+	            <strong>
+	              Note: There are no configured IPSec Tunnels<br />
+	            </strong>
+	          </span>
+	          You can configure your IPSEC 
+	          <a href="vpn_ipsec.php">here</a>.
+	        </span>
+	      </p>
+		</td>
+	  </tr>
+	</table>
 </div>
+<? } ?>
+
 
diff --git a/usr/local/www/widgets/widgets/load_balancer_status.widget.php b/usr/local/www/widgets/widgets/load_balancer_status.widget.php
index 1ede8ff..e1152fa 100644
--- a/usr/local/www/widgets/widgets/load_balancer_status.widget.php
+++ b/usr/local/www/widgets/widgets/load_balancer_status.widget.php
@@ -30,6 +30,10 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
 ?>
 <div>&nbsp;</div>
 <?php
diff --git a/usr/local/www/widgets/widgets/log.widget.php b/usr/local/www/widgets/widgets/log.widget.php
index e64309c..197d010 100644
--- a/usr/local/www/widgets/widgets/log.widget.php
+++ b/usr/local/www/widgets/widgets/log.widget.php
@@ -30,6 +30,11 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once("/usr/local/www/widgets/include/log.inc");
 ?>
 
 <div class="log-header">
diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php
index f1b2209..9370c0f 100644
--- a/usr/local/www/widgets/widgets/services_status.widget.php
+++ b/usr/local/www/widgets/widgets/services_status.widget.php
@@ -29,6 +29,11 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once("/usr/local/www/widgets/include/services_status.inc");
+
 function get_pkg_descr($package_name) {
 	global $config;
 	foreach($config['installedpackages']['package'] as $pkg) {
diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php
index 8379772..a631444 100644
--- a/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/usr/local/www/widgets/widgets/system_information.widget.php
@@ -30,6 +30,12 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
+require_once('notices.inc');
+
 ?>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -71,7 +77,13 @@
 		<tr>
 			<td width="25%" class="vncellt">Uptime</td>
 			<td width="75%" class="listr"><input style="border: 0px solid white;" size="30" name="uptime" id="uptime" value="<?= htmlspecialchars(get_uptime()); ?>" /></td>
-		</tr>			
+		</tr>
+        <tr>
+            <td width="25%" class="vncellt"><?=gettext("Current date/time");?></td>
+            <td width="75%" class="listr">
+                <div id="datetime"><?= date("D M j G:i:s T Y"); ?></div>
+            </td>
+        </tr>			
 		 <tr>
              <td width="30%" class="vncellt">DNS server(s)</td>
              <td width="70%" class="listr">
diff --git a/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/usr/local/www/widgets/widgets/traffic_graphs.widget.php
index 884e4a4..dbeb3fd 100644
--- a/usr/local/www/widgets/widgets/traffic_graphs.widget.php
+++ b/usr/local/www/widgets/widgets/traffic_graphs.widget.php
@@ -30,9 +30,11 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
-?>
+require_once("guiconfig.inc");
+require_once("pfsense-utils.inc");
+require_once("functions.inc");
 
-<?php $i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
+	$i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
 					for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
 						$ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr'];
 					}?>
-- 
cgit v1.1