X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=classes%2Frrdstat.php-class;h=74e2012e6eb2370e9063d54b00300c0cfef0b7ac;hp=1443ec6fa427929d064fc6d1571d4520442f6949;hb=1a4ee0f0263c463f59bfb272435ef9f83fdffaa7;hpb=7b9ebce7d25e4eaa557e8a64f8b1ed15aad1a9bb

diff --git a/classes/rrdstat.php-class b/classes/rrdstat.php-class
index 1443ec6..74e2012 100644
--- a/classes/rrdstat.php-class
+++ b/classes/rrdstat.php-class
@@ -1,23 +1,7 @@
 <?php
-/* ***** BEGIN LICENSE BLOCK *****
- *
- * The contents of this file are subject to Austrian copyright reegulations
- * ("Urheberrecht"); you may not use this file except in compliance with
- * those laws.
- * This contents and any derived work, if it gets distributed in any way,
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
- * either express or implied.
- *
- * The Original Code is KaiRo's RRD statistics class.
- *
- * The Initial Developer of the Original Code is
- * KaiRo - Robert Kaiser.
- * Portions created by the Initial Developer are Copyright (C) 2005-2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Robert Kaiser <kairo@kairo.at>
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 class rrdstat {
   // rrdstat PHP class
@@ -884,7 +868,8 @@ class rrdstat {
     $td = $this->mod_textdomain;
     $ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics index');
 
-    $out = '<html><head>'."\n";
+    $out = '<!DOCTYPE html>'."\n";
+    $out .= '<html><head>'."\n";
     $out .= '<title>'.$ptitle.'</title>'."\n";
     $out .= '<style type="text/css">'."\n";
     if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
@@ -912,7 +897,7 @@ class rrdstat {
     else { $sURL_base = '?stat=%i%a'; }
 
     if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
-    else { $sURL_add = '&sub=%s'; }
+    else { $sURL_add = '&amp;sub=%s'; }
 
     $out .= '<ul class="indexlist">'."\n";
     foreach ($stats as $stat) {
@@ -929,7 +914,7 @@ class rrdstat {
           $sURL = str_replace('%s', $ssub, $sURL);
           $sprt[] = '<a href="'.$sURL.'">'.$ssub.'</a>';
         }
-        $out .= ' <span="subs">('.implode(', ', $sprt).')</span>';
+        $out .= ' <span class="subs">('.implode(', ', $sprt).')</span>';
       }
       $out .= '</li>'."\n";
     }
@@ -945,7 +930,8 @@ class rrdstat {
     $td = $this->mod_textdomain;
     $ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics overview');
 
-    $out = '<html><head>'."\n";
+    $out = '<!DOCTYPE html>'."\n";
+    $out .= '<html><head>'."\n";
     $out .= '<title>'.$ptitle.'</title>'."\n";
     $out .= '<style type="text/css">'."\n";
     if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
@@ -971,7 +957,7 @@ class rrdstat {
     else { $sURL_base = '?stat=%i%a'; }
 
     if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
-    else { $sURL_add = '&sub=%s'; }
+    else { $sURL_add = '&amp;sub=%s'; }
 
     $default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
     $num_cols = is_numeric(@$pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
@@ -1057,7 +1043,8 @@ class rrdstat {
     $gtitle['year'] = isset($pconf['title_year'])?$pconf['title_year']:dgettext($td, 'Year overview (scaling 1 day)');
     $ltitle = isset($pconf['title_legend'])?$pconf['title_legend']:dgettext($td, 'Legend:');
 
-    $out = '<html><head>'."\n";
+    $out = '<!DOCTYPE html>'."\n";
+    $out .= '<html><head>'."\n";
     $out .= '<title>'.$ptitle.'</title>'."\n";
     $out .= '<style type="text/css">'."\n";
     if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
