Merge branch 'master' into devel

findit

@@ -0,0 +1,12 @@
+#!/bin/sh
+find . \
+	-path ./html/images -prune -o \
+	-path ./patches -prune -o \
+	-path ./html/includes/geshi -prune -o \
+	-path ./html/includes/jpgraph -prune -o \
+	-path ./html/js/jqplot -prune -o \
+	-path ./logs -prune -o \
+	-path ./mibs -prune -o \
+	-path ./rrd -prune -o \
+	-name .svn -prune -o \
+		-type f -print|xargs grep "$@"

html/includes/header.inc.php

@@ -1,3 +1,8 @@
+
+<?php
+if ($config['title_image'])
+{
+?>
 <div id="gumax-header">
   <div id="gumax-p-logo">
     <div id="p-logo">
@@ -11,6 +16,7 @@
   <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 .= '?'; }

html/includes/print-menubar.php

@@ -532,19 +532,15 @@ if(is_file("includes/print-menubar-custom.inc.php"))
                 Copyright (C) 2013-<?php echo date("Y"); ?> LibreNMS Contributors
             </div>
 
+<!-- Old donation stuff
             <div class="col_1">
               <p>
-                <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=W2ZJ3JRZR72Z6" class="external text" rel="nofollow">
-                <img src="images/btn_donate_LG.gif" alt="btn_donateCC_LG.gif" />
-                </a>
               </p>
             </div>
 
             <div class="col_3">
-              <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=W2ZJ3JRZR72Z6" class="external text" rel="nofollow">
-                Please donate to support continued development!
-              </a>
             </div>
+-->
 
             <div class="col_2">
                 <h2>The Team</h2>

html/index.php

@@ -119,7 +119,9 @@ if ($config['page_title']) { $config['page_title_prefix'] = $config['page_title'
 if ($config['page_refresh']) { echo('  <meta http-equiv="refresh" content="'.$config['page_refresh'].'" />' . "\n"); }
 ?>
   <link href="<?php echo($config['stylesheet']);  ?>" rel="stylesheet" type="text/css" />
-  <link rel="shortcut icon" href="<?php echo($config['favicon']);  ?>" />
+<?php
+if ($config['favicon']) { echo('  <link rel="shortcut icon" href="'.$config['favicon'].'" />' . "\n"); }
+?>
   <link rel="stylesheet" href="css/mktree.css" type="text/css" />
 <?php
 if ($_SESSION['widescreen']) { echo('<link rel="stylesheet" href="css/styles-wide.css" type="text/css" />'); }

html/pages/logon.inc.php

@@ -2,7 +2,7 @@
     <div style="margin: auto; width:650px; padding:5px;">
       <table border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <td><img src="images/login-hamster.png" alt="Login required" /></td>
+          <td><img alt="Login required" /></td>		<!-- FIXME: add logo -->
           <td>
             <form action="" method="post" name="logonform">
               <h3>Please log in:</h3>

includes/defaults.inc.php

@@ -98,14 +98,16 @@ if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["SERVER_PORT"]))
   }
 }
 
-$config['title_image']      = "images/observium-logo.png";
+$config['project_name']     = "LibreNMS";
+$config['title_image']      = "";
 $config['stylesheet']       = "css/styles.css";
 $config['mono_font']        = "DejaVuSansMono";
-$config['favicon']          = "images/observium-icon.png";
+$config['favicon']          = "";
 $config['header_color']     = "#1F334E";
 $config['page_refresh']     = "300";  // Refresh the page every xx seconds, 0 to disable
 $config['front_page']       = "pages/front/default.php";
-$config['page_title_prefix'] = "Observium :: Network Observation and Monitoring";
+$config['page_title_prefix'] = "";
+$config['page_title_suffix'] = $config['project_name'];
 $config['timestamp_format'] = 'd-m-Y H:i:s';
 $config['page_gen']         = 1;
 $config['web_header']       = "header.inc.php";  # in html/includes

includes/functions.php

@@ -647,7 +647,7 @@ function notify($device,$title,$message)
       $emails = parse_email($email);
       if ($emails)
       {
-        $message_header = $config['page_title_prefix']."\n\n";
+        $message_header = $config['page_title_prefix']."\n\n";		// FIXME: use different config element
         $message_footer = "\n\nE-mail sent to: ";
         $i = 0;
         $count = count($emails);