webinterface.git

@@ -68,3 +68,15 @@ function icon_delete($title = '')

+function other_icon($filename, $title = '')

+{

+  global $prefix;

+  return "<img src=\"{$prefix}images/{$filename}\" style=\"height: 16px; width: 16px;\" alt=\"{$title}\" title=\"{$title}\" />";

+}

+

+

+

+

+

+

+

@@ -199,9 +199,10 @@ $form .= "

         <option value=\"anonymous\" ".($vhost['logtype'] == 'anonymous' ? 'selected="selected"' : '')." >anonymisiert</option>

         <option value=\"default\" ".($vhost['logtype'] == 'default' ? 'selected="selected"' : '')." >vollständige Logfile</option>

       </select><br />

-      <input type=\"checkbox\" id=\"errorlog\" name=\"errorlog\" value=\"1\" ".($vhost['errorlog'] == 1 ? ' checked="checked" ' : '')." />&#160;<label for=\"errorlog\">Fehlerprotokoll (error_log) einschalten</label>

+      <input type=\"checkbox\" id=\"errorlog\" name=\"errorlog\" value=\"1\" ".($vhost['errorlog'] == 1 ? ' checked="checked" ' : '')." />&#160;<label for=\"errorlog\">Fehlerprotokoll (error_log) einschalten</label><br />

+      <input type=\"checkbox\" id=\"stats\" name=\"stats\" value=\"1\" ".($vhost['stats'] != NULL ? ' checked="checked" ' : '')." />&#160;<label for=\"stats\">Statistiken/Auswertungen erzeugen</label>

     </div>

-    <p>Logfiles werden unter <b>/var/log/apache2/".$_SESSION[userinfo][username]."</b> abgelegt.</p>

+    <p>Logfiles werden unter <b>/var/log/apache2/".$_SESSION['userinfo']['username']."</b> abgelegt.</p>

 </div>

     ";

@@ -12,7 +12,7 @@ require_once("certs.php");

 function list_vhosts()

 {

   $uid = (int) $_SESSION['userinfo']['uid'];

-  $result = db_query("SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid={$uid} ORDER BY domain,hostname");

+  $result = db_query("SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp, stats FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid={$uid} ORDER BY domain,hostname");

   $ret = array();

   while ($item = mysql_fetch_assoc($result))

     array_push($ret, $item);

@@ -43,6 +43,7 @@ function empty_vhost()

   $vhost['ipv4'] = NULL;

   $vhost['options'] = '';

+  $vhost['stats'] = NULL;

   return $vhost;

 }

@@ -200,10 +201,10 @@ function save_vhost($vhost)

     system_failure('$vhost kein array!');

   $id = (int) $vhost['id'];

   $hostname = maybe_null($vhost['hostname']);

-  $domain = (int) $vhost['domainid'];

+  $domain = (int) $vhost['domain_id'];

   if ($domain == 0)

     system_failure('$domain == 0');

-  if ($vhost['domainid'] == -1)

+  if ($vhost['domain_id'] == -1)

     $domain = 'NULL';

   $docroot = maybe_null($vhost['docroot']);

   $php = maybe_null($vhost['php']);

@@ -230,14 +231,15 @@ function save_vhost($vhost)

   {

     $ipv4 = maybe_null($vhost['ipv4']);

   }

+  $stats = maybe_null($vhost['stats']);

   if ($id != 0) {

     logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Updating vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');

-    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, `ssl`={$ssl}, logtype={$logtype}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, options='{$options}' WHERE id={$id} LIMIT 1");

+    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, `ssl`={$ssl}, logtype={$logtype}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, options='{$options}', stats={$stats} WHERE id={$id} LIMIT 1");

   }

   else {

     logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Creating vhost '.$vhost['hostname'].'.'.$vhost['domain'].'');

-    $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, `ssl`, logtype, errorlog, certid, ipv4, options) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$ssl}, {$logtype}, {$errorlog}, {$cert}, {$ipv4}, '{$options}')");

+    $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, `ssl`, logtype, errorlog, certid, ipv4, options, stats) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$ssl}, {$logtype}, {$errorlog}, {$cert}, {$ipv4}, '{$options}', {$stats})");

     $id = mysql_insert_id();

   }

   $oldvhost = get_vhost_details($id);

@@ -293,10 +295,10 @@ function save_alias($alias)

     system_failure('$alias kein array!');

   $id = (isset($alias['id']) ? (int) $alias['id'] : 0);

   $hostname = maybe_null($alias['hostname']);

-  $domain = (int) $alias['domainid'];

+  $domain = (int) $alias['domain_id'];

   if ($domain == 0)

     system_failure('$domain == 0');

-  if ($alias['domainid'] == -1)

+  if ($alias['domain_id'] == -1)

     $domain = 'NULL';

   $vhost = get_vhost_details( (int) $alias['vhost']);

   $options = mysql_real_escape_string( $alias['options'] );

@@ -6,6 +6,7 @@ if ($role & ROLE_SYSTEMUSER)

 {

     $menu["vhosts_vhosts"] = array("label" => "Webserver", "file" => "vhosts", "weight" => 1);

     $menu["vhosts_certs"] = array("label" => "SSL-Zertifikate", "file" => "certs", "weight" => 10, "submenu" => "vhosts_vhosts");

+    $menu["vhosts_stats"] = array("label" => "Zugriffs-Statistiken", "file" => "stats", "weight" => 12, "submenu" => "vhosts_vhosts");

 }

 ?>

@@ -24,11 +24,11 @@ if ($_GET['action'] == 'edit')

   $hostname = filter_input_hostname($_POST['hostname']);

-  $domainid = (int) $_POST['domain'];

-  if ($domainid != -1) {

+  $domain_id = (int) $_POST['domain'];

+  if ($domain_id != -1) {

     $domain = new Domain( (int) $_POST['domain'] );

     $domain->ensure_userdomain();

-    $domainid = $domain->id;

+    $domain_id = $domain->id;

   }

   if (! (isset($_POST['options']) && is_array($_POST['options'])))

@@ -126,6 +127,18 @@ if ($_GET['action'] == 'edit')

   if (isset($_POST['errorlog']) and ($_POST['errorlog'] == 1))

     $errorlog = 1;

+

+  if (isset($_POST['stats']) && $_POST['stats'] == 1)

+  {

+    if ($vhost['stats'] == NULL)

+      $vhost['stats'] = 'private';

+  }

+  else

+    $vhost['stats'] = NULL;

+

+  if ($logtype == '')

+    $vhost['stats'] = NULL;

+  

   DEBUG("PHP: {$php} / Logging: {$logtype}");

   $old_options = explode(',', $vhost['options']);

@@ -144,7 +157,7 @@ if ($_GET['action'] == 'edit')

   DEBUG('New options: '.$options);

   $vhost['hostname'] = $hostname;

-  $vhost['domainid'] = $domainid;

+  $vhost['domain_id'] = $domain_id;

   $vhost['docroot'] = $docroot;

   $vhost['php'] = $php;

   $vhost['ssl'] = $ssl;

@@ -0,0 +1,59 @@

+<?php

+

+require_once("inc/base.php");

+require_once("vhosts.php");

+

+require_role(ROLE_SYSTEMUSER);

+

+$section = 'vhosts_stats';

+

+// Stellt sicher, dass der angegebene VHost dem User gehört

+$vhost = get_vhost_details($_REQUEST['vhost']);

+

+if (! isset($_REQUEST['file']))

+{

+  $_REQUEST['file'] = 'index.html';

+}

+

+if (!preg_match('/((daily_|hourly_|ctry_)?(usage|agent|search|ref|url|site)(_[0-9]+)?|index)\.(png|html)/', $_REQUEST['file']))

+{

+  system_failure("Ungültiger Dateiname: »".filter_input_general($_REQUEST['file'])."«");

+}

+

+$path = '/home/stats/webalizer/data/' . $vhost['fqdn'];

+$file = $path . '/' . $_REQUEST['file'];

+

+if ( is_file($file) )

+{

+  DEBUG("opening file ".$file);

+  if (preg_match('/\.png/', $file))

+  {

+    //Binärdateien

+    header("Content-Type: image/png");

+    header("Content-Length: " . filesize($file));

+    header("Content-Transfer-Encoding: binary\n");

+    

+    $fp = fopen($file, "r");

+    fpassthru($fp);

+    die();

+  }

+

+  $html = iconv('latin9', 'utf8', file_get_contents($file));

+  DEBUG($html);

+  // Nur content vom HTML

+  $html = preg_replace(':^.*?<BODY[^>]*>(.*)</BODY>.*$:si', '$1', $html);

+  DEBUG($html);

+

+  // Bilder rewriten

+  $html = preg_replace('/SRC="((daily_|hourly_|ctry_)?usage(_[0-9]+)?\.png)"/', 'SRC="showstats?vhost='.$vhost['id'].'&file=$1"', $html);

+  // Interne Links rewriten

+  $html = preg_replace('!HREF="(./)?((usage|agent|search|ref|url|site|index)(_[0-9]+)?\.html)"!', 'HREF="showstats?vhost='.$vhost['id'].'&file=$2"', $html);

+  output($html);

+}

+else

+{

+  system_failure("Die Statistiken konnten nicht gefunden werden. Beachten Sie bitte, dass die Erstellung regelmäßig nachts geschieht. Neu in Auftrag gegebene Statistiken können Sie erst am darauffolgenden Tag betrachten.");

+}

+

+

+

@@ -0,0 +1,108 @@

+<?php

+

+require_once("inc/icons.php");

+

+require_once("vhosts.php");

+

+require_role(ROLE_SYSTEMUSER);

+

+

+

+if (isset($_REQUEST['vhost']))

+{

+  $v = get_vhost_details($_REQUEST['vhost']);

+

+  if (isset($_REQUEST['public']))

+  {

+    $v['stats'] = ($_REQUEST['public'] == 1) ? 'public' : 'private';

+  }

+  if (isset($_REQUEST['action']))

+  {

+    if ($_REQUEST['action'] == 'delete')

+      $v['stats'] = NULL;

+    elseif ($_REQUEST['action'] == 'new')

+      check_form_token('stats_new');

+  }

+  save_vhost($v);

+  redirect('stats');

+}

+else

+{

+

+$all_vhosts = list_vhosts();

+$stats_vhosts = array();

+

+foreach ($all_vhosts AS $v)

+  if ($v['stats'])

+    $stats_vhosts[] = $v;

+

+

+$title = "Zugriffs-Statistiken";

+

+output('<h3>Zugriffs-Statistiken</h3>

+<p>Um die Reichweite und das Publikum Ihrer Internet-Seiten besser einschätzen zu können, besteht die Möglichkeit aus den ggf. vorhandenen Webserver-Logfiles grafisch aufbereitete Statistiken erstellen zu lassen.</p>

+

+<h3>Statistiken für Ihre Seiten</h3>

+');

+

+if (count($stats_vhosts) > 0)

+{

+  output('

+  <table><tr><th>Für Website</th><th>Öffentlich abrufbar?</th><th>Operationen</th></tr>

+  ');

+

+  foreach ($stats_vhosts AS $v)

+  {

+    output("<tr>");

+    output("<td>".internal_link('showstats', $v['fqdn'], "vhost={$v['id']}")."</td>");

+

+    if ($v['stats'] == 'public')

+      output("<td><a href=\"http://stats.schokokeks.org/{$v['fqdn']}\">".icon_enabled("Diese Statistiken können von jedermann aufgerufen werden. Klicken Sie hier um die öffentliche Version zu sehen.")."</a></td>");

+    else

+      output("<td>".icon_disabled("Diese Statistiken können nur hier im Webinterface betrachtet werden.")."</td>");

+    

+    output("<td>");

+    if ($v['stats'] == 'public')

+      output(internal_link("", other_icon("lock.png", "Statistiken nicht mehr öffentlich anzeigen"), "vhost={$v['id']}&public=0"));

+    else

+      output(internal_link("", other_icon("world.png", "Statistiken veröffentlichen"), "vhost={$v['id']}&public=1"));

+    output(" &#160; ".internal_link("", icon_delete("Diese Statistiken löschen"), "vhost={$v['id']}&action=delete")."</td>");

+    output("</tr>");

+  

+  }

+  output('</table');

+}

+else

+  output('<em>Für Ihre Seiten werden bisher keine Statistiken erzeugt</em>');

+

+

+output("<h3>Weitere Statistiken</h3>");

+

+$sel = array();

+foreach ($all_vhosts AS $v)

+{

+  if ($v['logtype'])

+  {

+    $found = False;

+    foreach ($stats_vhosts AS $s)

+      if ($s['id'] == $v['id'])

+        $found = True;

+    if (! $found)

+      $sel[$v['id']] = $v['fqdn'];

+  }

+}

+

+

+output(html_form('stats_new', '', 'action=new', "<p>".html_select("vhost", $sel).'<br/>

+<input type="radio" name="public" id="public_0" value="0" checked="checked" /><label for="public_0"> Statistiken hier im Webinterface anzeigen</label><br />

+<input type="radio" name="public" id="public_1" value="1" /><label for="public_1"> Statistiken unter stats.schokokeks.org veröffentlichen (Ohne Passwortschutz)</label><br />

+<input type="submit" value="Neue Statistiken erzeugen" /></p>

+'));

+

+

+output('

+

+<p><strong>Hinweis:</strong> Die Statistiken werden mindestens täglich erzeugt. Bis zum ersten Durchlauf nach der Aktivierung der Statistik wird der obige Link eine Fehlermeldung erzeugen. Bitte warten Sie mindestens einen Tag ab bevor Sie die Statistik zum ersten Mal aufrufen.</p>

+');

+

+}

@@ -58,7 +58,8 @@ if (count($vhosts) > 0)

       else

         $logfiles .= ' und Fehler';

     }

-    output("<td>{$logfiles}</td>");

+    $stats = $vhost['stats'] ? internal_link("showstats", other_icon("chart_bar.png", "Statistiken anzeigen"), "vhost={$vhost['id']}").' ' : '';

+    output("<td>{$stats}{$logfiles}</td>");

     if ($vhost['ssl'] == 'http')

     {