Merge remote-tracking branch 'upstream/master'

dashboard/changes.txt

@@ -1,3 +1,10 @@
+xlx db v2.4.1
+
+you can now hide the liveircddb menu button, if you are running your db in https.
+
+- "config.inc.php
+- "index.php"
+
 xlx db v2.4.0
 
 - "config.inc.php"
@@ -91,7 +98,7 @@ xlx db v2.2.2
 
 This version is a major release with voluntary self-registration feature build in.
 You need to edit the conf.inc.php to your needs.
-On the first run your personal hash to access the database is place in the server’s /tmp folder.
+On the first run your personal hash to access the database is place in the server’s /tmp folder.
 Take care to make a backup of this file because this folder is cleaned up after a server reboot.
 
 This version is a major release
@@ -119,7 +126,7 @@ xlx db v2.1.4
 
 - "class.reflector.php" improved the flag search
 - "country.csv" added serveral prefixes
-- "flags" added Puerto Ricco and Åland Islands
+- "flags" added Puerto Ricco and Åland Islands
 
 xlx db v2.1.3
 

dashboard/index.php

@@ -139,7 +139,6 @@ else {
                <td><a href="./index.php?show=repeaters" class="menulink<?php if ($_GET['show'] == 'repeaters') { echo 'active'; } ?>">Repeaters / Nodes (<?php echo $Reflector->NodeCount(); ?>)</a></td>
                <td><a href="./index.php?show=peers" class="menulink<?php if ($_GET['show'] == 'peers') { echo 'active'; } ?>">Peers (<?php echo $Reflector->PeerCount(); ?>)</a></td>
                <td><a href="./index.php?show=reflectors" class="menulink<?php if ($_GET['show'] == 'reflectors') { echo 'active'; } ?>">Reflectorlist</a></td>
-               <td><a href="./index.php?show=liveircddb" class="menulink<?php if ($_GET['show'] == 'liveircddb') { echo 'active'; } ?>">D-Star live</a></td>
                <?php
                
                if ($PageOptions['Traffic']['Show']) {
@@ -148,6 +147,12 @@ else {
                    if ($_GET['show'] == 'traffic') { echo 'active'; }
                    echo '">Traffic statistics</a></td>';
                }
+		     if ($PageOptions['IRCDDB']['Show']) {
+                   echo '
+               <td><a href="./index.php?show=liveircddb" class="menulink';
+                   if ($_GET['show'] == 'liveircddb') { echo 'active'; }
+                   echo '">D-Star live</a></td>';
+              }
                
                ?>
             </tr>

dashboard/pgs/config.inc.php

@@ -17,7 +17,7 @@ $VNStat      = array();
 
 $PageOptions['ContactEmail']                         = 'your_email';	// Support E-Mail address
 
-$PageOptions['DashboardVersion']                     = '2.4.0';		// Dashboard Version
+$PageOptions['DashboardVersion']                     = '2.4.1';		// Dashboard Version
 
 $PageOptions['PageRefreshActive']                    = true;		// Activate automatic refresh
 $PageOptions['PageRefreshDelay']                     = '10000';		// Page refresh time in miliseconds
@@ -48,6 +48,7 @@ $PageOptions['MetaRobots']                           = 'index,follow';							//
 
 $PageOptions['UserPage']['ShowFilter']               = true;								// Show Filter on Users page
 $PageOptions['Traffic']['Show']                      = false;								// Enable vnstat traffic statistics
+$PageOptions['IRCDDB']['Show']                       = true;        // Show liveircddb, set it to false if you are running your db in https 
 
 $PageOptions['CustomTXT']                            = '';					// custom text in your header