webinterface.git

@@ -100,10 +100,10 @@ function autoipv6_address($vhost_id, $mode = 1)

 function list_vhosts($filter=null)

 {

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

-    $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,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";

+    $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,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";

     $params = array(":uid" => $uid);

     if ($filter) {

-        $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,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 (vh.fqdn LIKE :filter OR vh.id IN (SELECT vhost FROM vhosts.v_alias WHERE fqdn LIKE :filter)) AND uid=:uid ORDER BY hostname";

+        $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,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 (vh.fqdn LIKE :filter OR vh.id IN (SELECT vhost FROM vhosts.v_alias WHERE fqdn LIKE :filter)) AND uid=:uid ORDER BY hostname";

         $params[":filter"] = "%$filter%";

     }

     $result = db_query($query, $params);

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

     $vhost['autoipv6'] = 2; // 1 => Eine IP pro User, 2 => Eine IP pro VHost

     $vhost['options'] = 'forwardwww';

-    $vhost['stats'] = null;

     return $vhost;

 }

@@ -494,17 +493,16 @@ function save_vhost($vhost)

                 ":ipv4" => $ipv4,

                 ":autoipv6" => $autoipv6,

                 ":options" => $vhost['options'],

-                ":stats" => ($vhost['stats'] ? $vhost['stats'] : null),

                 ":id" => $id);

     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, cgi=:cgi, `ssl`=:ssl, hsts=:hsts, `suexec_user`=:suexec_user, `server`=:server, logtype=:logtype, errorlog=:errorlog, certid=:cert, ipv4=:ipv4, autoipv6=:autoipv6, options=:options, stats=:stats WHERE id=:id", $args);

+        db_query("UPDATE vhosts.vhost SET hostname=:hostname, domain=:domain, docroot=:docroot, php=:php, cgi=:cgi, `ssl`=:ssl, hsts=:hsts, `suexec_user`=:suexec_user, `server`=:server, logtype=:logtype, errorlog=:errorlog, certid=:cert, ipv4=:ipv4, autoipv6=:autoipv6, options=:options WHERE id=:id", $args);

     } else {

         $args[":user"] = $_SESSION['userinfo']['uid'];

         unset($args[":id"]);

         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, cgi, `ssl`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options, stats) VALUES ".

-                       "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options, :stats)", $args, true);

+        $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, cgi, `ssl`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options) VALUES ".

+                       "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options)", $args, true);

         $id = db_insert_id();

     }

     $oldvhost = get_vhost_details($id);

@@ -20,7 +20,6 @@ $role = $_SESSION['role'];

 if ($role & ROLE_SYSTEMUSER) {

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

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

     if (user_has_manual_certs() or ($section == 'vhosts_certs')) {

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

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

     }

-    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']);

@@ -1,86 +0,0 @@

-<?php

-/*

-This file belongs to the Webinterface of schokokeks.org Hosting

-

-Written 2008-2018 by schokokeks.org Hosting, namely

-  Bernd Wurst <bernd@schokokeks.org>

-  Hanno Böck <hanno@schokokeks.org>

-

-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

-http://creativecommons.org/publicdomain/zero/1.0/

-

-Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

-*/

-

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

-require_once("vhosts.php");

-

-require_role(ROLE_SYSTEMUSER);

-

-$section = 'vhosts_stats';

-

-warning('Diese Statistiken werden in Kürze abgeschafft. Wenn Sie eine solche Funktion weiterhin nutzen möchten, können Sie mit dem Programm "webalizer" selbst solche Statistiken erstellen lassen. Auf Anfrage können wir Ihnen die bestehenden Daten verfügbar machen um die rückblickenden Auswertungen zu erhalten.');

-

-// 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/' . idn_to_ascii($vhost['fqdn'], 0, INTL_IDNA_VARIANT_UTS46);

-$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);

-

-    // <BR> rewriten

-    $html = preg_replace('/<BR>/', '<BR />', $html);

-    // <HR> rewriten

-    $html = preg_replace('/<HR>/', '<HR />', $html);

-    // <P> rewriten

-    $html = preg_replace('/<P>/', '<BR />', $html);

-    // NOWRAP rewriten

-    $html = preg_replace('/NOWRAP/', 'nowrap="nowrap"', $html);

-    // lowercase tag names and keys

-    $html = preg_replace_callback('/(<[^ >]+[ >])/', function ($s) {

-        return strtolower($s[0]);

-    }, $html);

-    $html = preg_replace_callback('/( [A-Z]+=)/', function ($s) {

-        return strtolower($s[0]);

-    }, $html);

-    // xml-values mit anführungszeichen

-    $html = preg_replace('/=([-0-9a-zA-Z]+)([ >])/', '="$1"$2', $html);

-    // Bilder rewriten

-    $html = preg_replace('_<img ([^>]+[^/])>_', '<img $1 />', $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.");

-}

@@ -1,86 +0,0 @@

-<?php

-/*

-This file belongs to the Webinterface of schokokeks.org Hosting

-

-Written 2008-2018 by schokokeks.org Hosting, namely

-  Bernd Wurst <bernd@schokokeks.org>

-  Hanno Böck <hanno@schokokeks.org>

-

-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

-http://creativecommons.org/publicdomain/zero/1.0/

-

-Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

-*/

-

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

-

-require_once("vhosts.php");

-

-require_role(ROLE_SYSTEMUSER);

-

-title("Zugriffs-Statistiken");

-

-warning('Diese Statistiken werden in Kürze abgeschafft. Wenn Sie eine solche Funktion weiterhin nutzen möchten, können Sie mit dem Programm "webalizer" selbst solche Statistiken erstellen lassen. Auf Anfrage können wir Ihnen die bestehenden Daten verfügbar machen um die rückblickenden Auswertungen zu erhalten.');

-

-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;

-        }

-    }

-

-

-    output('<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://".config('stats_hostname')."/{$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>');

-    }

-}

@@ -109,8 +109,6 @@ if (count($vhosts) > 0) {

                 $logfiles .= ' + Fehler';

             }

         }

-        $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') {

             output("<td>".icon_disabled('HTTPS ausgeschaltet')."</td>");