Merge branch 'master' of github.com:librenms/librenms

INSTALL.md

@@ -1,9 +1,12 @@
 NOTE: What follows is a very rough list of commands.  This works on a fresh install of Ubuntu 12.04.
+
 NOTE: These instructions assume you are using a separate server for your database.  You will need to adjust the instructions if you are running the database on the same server.
 
+NOTE: These instructions assume you are the root user.  If you are not, prepend `sudo` to all shell commands (the ones that aren't at `mysql>` prompts) or temporarily become a user with root privileges with `sudo -s`.
+
 ## On the DB Server ##
 
-    aptitude install mysql-server mysql-client snmpd
+    apt-get install mysql-server mysql-client snmpd
     mysql -uroot -p
 
 enter root mysql password
@@ -30,7 +33,7 @@ now restart MySQL
 
 ## On the NMS ##
 
-    aptitude install libapache2-mod-php5 php5-cli php5-mysql php5-gd php5-snmp php-pear snmp graphviz php5-mcrypt apache2 fping imagemagick whois mtr-tiny nmap python-mysqldb snmpd mysql-client php-net-ipv4 php-net-ipv6 rrdtool
+    apt-get install libapache2-mod-php5 php5-cli php5-mysql php5-gd php5-snmp php-pear snmp graphviz php5-mcrypt apache2 fping imagemagick whois mtr-tiny nmap python-mysqldb snmpd mysql-client php-net-ipv4 php-net-ipv6 rrdtool
     cd /opt
     git clone https://github.com/librenms/librenms.git librenms
     cd /opt/librenms

html/includes/header.inc.php

@@ -1,12 +1,17 @@
 
-<?php
-if ($config['title_image'])
-{
-?>
 <div id="gumax-header">
   <div id="gumax-p-logo">
     <div id="p-logo">
-      <a style="background-image: url('<?php echo($config['title_image']); ?>');" accesskey="z" href=""></a>
+<?php
+      if ($config['title_image'])
+      {
+        echo('<a style="background-image: ' . $config['title_image'] . '" accesskey="z" href=""></a>');
+      }
+      else
+      {
+        echo('<a href=""><h2>'.$config['project_name'].'</h2></a>');
+      }
+?>
     </div>
     <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
   </div>
@@ -16,7 +21,6 @@ if ($config['title_image'])
   <div id="gumax-p-login">
 
 <?php
-}
 
 $toggle_url = preg_replace('/(\?|\&)widescreen=(yes|no)/', '', $_SERVER['REQUEST_URI']);
 if (strstr($toggle_url,'?')) { $toggle_url .= '&amp;'; } else { $toggle_url .= '?'; }