Merge pull request #3745 from stilez/patch-64

1 files changed, 15 insertions, 27 deletions

diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php
index ef02c8f..51adbae 100644
--- a/src/usr/local/www/index.php
+++ b/src/usr/local/www/index.php
@@ -85,24 +85,16 @@ if ($g['disablecrashreporter'] != true) {
 	}
 }
 
-##build list of php include files
-$phpincludefiles = array();
+## Include each widget php include file.
+## These define vars that specify the widget title and title link.
+
 $directory = "/usr/local/www/widgets/include/";
 $dirhandle = opendir($directory);
 $filename = "";
 
-while (false !== ($filename = readdir($dirhandle))) {
-	if (!stristr($filename, ".inc")) {
-		continue;
-	}
-	$phpincludefiles[] = $filename;
-}
-
-## Include each widget include file.
-## These define vars that specify the widget title and title link.
-foreach ($phpincludefiles as $includename) {
-	if (file_exists($directory . $includename)) {
-		include_once($directory . $includename);
+while (($filename = readdir($dirhandle)) !== false) {
+	if (strtolower(substr($filename, -4)) == ".inc" && file_exists($directory . $filename)) {
+		include_once($directory . $filename);
 	}
 }
 
@@ -393,8 +385,11 @@ foreach ($available as $widgetkey => $widgetconfig):
 ?>
 		<div class="col-sm-3"><a href="#" id="btnadd-<?=$widgetconfig['basename']?>"><i class="fa fa-plus"></i> <?=$widgetconfig['title']?></a></div>
 	<?php endif; ?>
-<?php endforeach; ?>
+<?php 
+endforeach;
+?>
 			</div>
+<p style="text-align:center"><?=sprintf(gettext('Other dashboard settings are available from the <a href="%s">General Setup</a> page.'), '/system.php')?></p>
 		</div>
 	</div>
 </div>
@@ -408,19 +403,12 @@ foreach ($available as $widgetkey => $widgetconfig):
 <?php
 $widgetColumns = array();
 foreach ($widgets as $widgetkey => $widgetconfig) {
-	if ($widgetconfig['display'] == 'none') {
-		continue;
-	}
-
-	if (!file_exists('/usr/local/www/widgets/widgets/'. $widgetconfig['basename'].'.widget.php')) {
-		continue;
-	}
-
-	if (!isset($widgetColumns[$widgetconfig['col']])) {
-		$widgetColumns[$widgetconfig['col']] = array();
+	if ($widgetconfig['display'] != 'none' && file_exists("/usr/local/www/widgets/widgets/{$widgetconfig['basename']}.widget.php")) {
+		if (!isset($widgetColumns[$widgetconfig['col']])) {
+			$widgetColumns[$widgetconfig['col']] = array();
+		}
+		$widgetColumns[$widgetconfig['col']][$widgetkey] = $widgetconfig;
 	}
-
-	$widgetColumns[$widgetconfig['col']][$widgetkey] = $widgetconfig;
 }
 ?>