webinterface.git

@@ -14,7 +14,7 @@ $config['use_cracklib'] = true;

 $config['cracklib_dict'] = 'inc/cracklib_dict';

 $config['enable_debug'] = true;

-$config['logging'] = true;

+$config['logging'] = LOG_ERR;

 $config['mime_type'] = 'application/xhtml+xml';

@@ -9,7 +9,7 @@ function config($key)

   if (array_key_exists($key, $config))

     return $config[$key];

   else

-    logger("inc/base", "config", "Request to read nonexistant config option »{$key}«.");

+    logger(LOG_ERR, "inc/base", "config", "Request to read nonexistant config option »{$key}«.");

     return NULL;

 }

@@ -21,7 +21,7 @@ function db_query($query)

   if (mysql_error())

   {

     $error = mysql_error();

-    logger("inc/base", "dberror", "mysql error: {$error}");

+    logger(LOG_ERR, "inc/base", "dberror", "mysql error: {$error}");

     system_failure('Interner Datenbankfehler: »'.iconv('ISO-8859-1', 'UTF-8', $error).'«.');

   }

   $count = @mysql_num_rows($result);

@@ -44,11 +44,13 @@ function maybe_null($value)

     return 'NULL';

 }

+#define('LOG_ERR', 3);

+#define('LOG_WARNING', 4);

+#define('LOG_INFO', 6);

-

-function logger($scriptname, $scope, $message)

+function logger($severity, $scriptname, $scope, $message)

 {

-  if (config('logging') == false)

+  if (config('logging') <= $severity)

     return;

   $user = 'NULL';

@@ -12,7 +12,7 @@ function strong_password($password)

   DEBUG("Öffne Wörterbuch: ".config('cracklib_dict'));

   if (! ($dict = crack_opendict(config('cracklib_dict'))))

   {

-    logger("inc/security", "cracklib", "could not open cracklib-dictionary »".config('cracklib_dict')."«");

+    logger(LOG_ERR, "inc/security", "cracklib", "could not open cracklib-dictionary »".config('cracklib_dict')."«");

     system_failure("Kann Crack-Lib-Wörterbuch nicht öffnen: ".config('cracklib_dict'));

   }

   // Führe eine Überprüfung des Passworts durch

@@ -44,7 +44,7 @@ function verify_input_general( $input )

 {

   if (filter_input_general($input) != $input) {

     system_failure("Ihre Daten enthielten ungültige Zeichen!");

-    logger('inc/security', 'verify_input_general', 'Ungültige Daten: '.$input);

+    logger(LOG_WARNING, 'inc/security', 'verify_input_general', 'Ungültige Daten: '.$input);

   }

 }

@@ -57,7 +57,7 @@ function filter_input_username( $input )

 function verify_input_username( $input )

 {

   if (filter_input_username( $input ) != $input) {

-    logger('inc/security', 'verify_input_username', 'Ungültige Daten: '.$input);

+    logger(LOG_WARNING, 'inc/security', 'verify_input_username', 'Ungültige Daten: '.$input);

     system_failure("Ihre Daten enthielten ungültige Zeichen!");

   }

 }

@@ -83,7 +83,7 @@ function filter_input_hostname( $input, $wildcard=false )

 function verify_input_hostname( $input, $wildcard=false )

 {

   if (filter_input_hostname( $input, $wildcard ) != $input) {

-    logger('inc/security', 'verify_input_hostname', 'Ungültige Daten: '.$input);

+    logger(LOG_WARNING, 'inc/security', 'verify_input_hostname', 'Ungültige Daten: '.$input);

     system_failure("Ihre Daten enthielten ungültige Zeichen!");

   }

 }

@@ -129,7 +129,7 @@ function check_path( $input )

   DEBUG("checking {$input} for valid path name");

   if ($input != filter_input_general($input))

   {

-    logger('inc/security', 'check_path', 'HTML-Krams im Pfad: '.$input);

+    logger(LOG_WARNING, 'inc/security', 'check_path', 'HTML-Krams im Pfad: '.$input);

     DEBUG("HTML-Krams im Pfad");

     return False;

   }

@@ -138,7 +138,7 @@ function check_path( $input )

   {

     if ($item == '..')

     {

-      logger('inc/security', 'check_path', '»..« im Pfad: '.$input);

+      logger(LOG_WARNING, 'inc/security', 'check_path', '»..« im Pfad: '.$input);

       DEBUG("»..« im Pfad");

       return False;

     }

@@ -27,7 +27,7 @@ function get_dyndns_account($id)

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

   $result = db_query("SELECT * FROM dns.dyndns WHERE id={$id} AND uid={$uid}");

   if (mysql_num_rows($result) != 1) {

-    logger("modules/dns/include/dnsinclude", "dyndns", "account »{$id}« invalid for uid »{$uid}«.");

+    logger(LOG_WARNING, "modules/dns/include/dnsinclude", "dyndns", "account »{$id}« invalid for uid »{$uid}«.");

     system_failure("Account ungültig");

   }

   $item = mysql_fetch_assoc($result);

@@ -47,7 +47,7 @@ function create_dyndns_account($handle, $password_http, $sshkey)

     $pwhash = "'{SHA}".base64_encode(sha1($password_http, true))."'";

   db_query("INSERT INTO dns.dyndns (uid, handle, password, sshkey) VALUES ({$uid}, {$handle}, {$pwhash}, {$sshkey})");

-  logger("modules/dns/include/dnsinclude", "dyndns", "inserted account");

+  logger(LOG_INFO, "modules/dns/include/dnsinclude", "dyndns", "inserted account");

 }

@@ -67,7 +67,7 @@ function edit_dyndns_account($id, $handle, $password_http, $sshkey)

   }

   db_query("UPDATE dns.dyndns SET handle={$handle}, password={$pwhash}, sshkey={$sshkey} WHERE id={$id} LIMIT 1");

-  logger("modules/dns/include/dnsinclude", "dyndns", "edited account »{$id}«");

+  logger(LOG_INFO, "modules/dns/include/dnsinclude", "dyndns", "edited account »{$id}«");

 }

@@ -76,7 +76,7 @@ function delete_dyndns_account($id)

   $id = (int) $id;

   db_query("DELETE FROM dns.dyndns WHERE id={$id} LIMIT 1");

-  logger("modules/dns/include/dnsinclude", "dyndns", "deleted account »{$id}«");

+  logger(LOG_INFO, "modules/dns/include/dnsinclude", "dyndns", "deleted account »{$id}«");

 }

@@ -76,7 +76,7 @@ function change_mailaccount($id, $arr)

   db_query("UPDATE mail.mailaccounts SET ".implode(",", $conditions)." WHERE id='$id' LIMIT 1");

-  logger("modules/imap/include/mailaccounts", "imap", "updated account »{$arr['account']}«");

+  logger(LOG_INFO, "modules/imap/include/mailaccounts", "imap", "updated account »{$arr['account']}«");

 }

@@ -124,7 +124,7 @@ function create_mailaccount($arr)

   db_query("INSERT INTO mail.mailaccounts (".implode(',', array_keys($values)).") VALUES (".implode(",", array_values($values)).")");

-  logger("modules/imap/include/mailaccounts", "imap", "created account »{$arr['account']}«");

+  logger(LOG_INFO, "modules/imap/include/mailaccounts", "imap", "created account »{$arr['account']}«");

 }

@@ -148,7 +148,7 @@ function delete_mailaccount($id)

 {

   $id = (int) $id;

   db_query("DELETE FROM mail.mailaccounts WHERE id=".$id." LIMIT 1");

-  logger("modules/imap/include/mailaccounts", "imap", "deleted account »{$id}«");

+  logger(LOG_INFO, "modules/imap/include/mailaccounts", "imap", "deleted account »{$id}«");

 }

@@ -27,7 +27,7 @@ if (isset($_REQUEST['uid']) and isset($_REQUEST['token']))

       {

         require_once('session/checkuser.php');

         require_once('inc/base.php');

-        logger("modules/index/initialize_useraccount", "initialize", "uid »{$uid}« set a new password");

+        logger(LOG_INFO, "modules/index/initialize_useraccount", "initialize", "uid »{$uid}« set a new password");

         set_systemuser_password($uid, $_POST['password']);

         success_msg('Das Passwort wurde gesetzt!');

         invalidate_systemuser_token($uid);

@@ -6,12 +6,12 @@ require_once('inc/error.php');

 if (!session_destroy())

 {

-  logger("modules/index/logout", "logout", "session timed out.");

+  logger(LOG_INFO, "modules/index/logout", "logout", "session timed out.");

 	system_failure('Die Sitzung konnte nicht geschlossen werden, eventuell ist die Wartezeit abgelaufen und die Sitzung wurde daher schon beendet.');

 }

 unset($_SESSION['role']);

-logger("modules/index/logout", "logout", "logged out");

+logger(LOG_INFO, "modules/index/logout", "logout", "logged out");

 output('

@@ -14,7 +14,7 @@ if (isset($_POST['customerno']))

       require_once('mail.php');

       require_once('inc/base.php');

       send_customer_token($_POST['customerno']);

-      logger("modules/index/new_password", "pwrecovery", "token sent for customer »{$_POST['customerno']}«");

+      logger(LOG_INFO, "modules/index/new_password", "pwrecovery", "token sent for customer »{$_POST['customerno']}«");

       success_msg('Die angegebenen Daten waren korrekt, Sie sollten umgehend eine E-Mail erhalten.');

     }

   }

@@ -25,7 +25,7 @@ if (isset($_REQUEST['customerno']) and isset($_REQUEST['token']))

       {

         require_once('session/checkuser.php');

         require_once('inc/base.php');

-        logger("modules/index/validate_token", "pwrecovery", "customer »{$customerno}« set a new password");

+        logger(LOG_INFO, "modules/index/validate_token", "pwrecovery", "customer »{$customerno}« set a new password");

         set_customer_password($customerno, $_POST['password']);

         success_msg('Das Passwort wurde gesetzt!');

         set_customer_verified($customerno);

@@ -72,7 +72,7 @@ function create_jabber_account($local, $domain, $password)

     $result = db_query("SELECT id FROM kundendaten.domains WHERE kunde={$customerno} AND jabber=1 AND id={$domain};");

     if (mysql_num_rows($result) == 0)

     {

-      logger("modules/jabber/include/jabberaccounts", "jabber", "attempt to create account for invalid domain »{$domain}«");

+      logger(LOG_WARNING, "modules/jabber/include/jabberaccounts", "jabber", "attempt to create account for invalid domain »{$domain}«");

       system_failure("Invalid domain!");

     }

   }

@@ -86,12 +86,12 @@ function create_jabber_account($local, $domain, $password)

   $result = db_query("SELECT id FROM jabber.accounts WHERE local='{$local}' AND {$domainquery}");

   if (mysql_num_rows($result) > 0)

   {

-    logger("modules/jabber/include/jabberaccounts", "jabber", "attempt to create already existing account »{$local}@{$domain}«");

+    logger(LOG_WARNING, "modules/jabber/include/jabberaccounts", "jabber", "attempt to create already existing account »{$local}@{$domain}«");

     system_failure("Diesen Account gibt es bereits!");

   }

   db_query("INSERT INTO jabber.accounts (customerno,local,domain,password) VALUES ({$customerno}, '{$local}', {$domain}, '{$password}');");

-  logger("modules/jabber/include/jabberaccounts", "jabber", "created account »{$local}@{$domain}«");

+  logger(LOG_INFO, "modules/jabber/include/jabberaccounts", "jabber", "created account »{$local}@{$domain}«");

 }

@@ -109,7 +109,7 @@ function change_jabber_password($id, $password)

   $password = mysql_real_escape_string( $password );

   db_query("UPDATE jabber.accounts SET password='{$password}' WHERE customerno={$customerno} AND id={$id} LIMIT 1");

-  logger("modules/jabber/include/jabberaccounts", "jabber", "changed password for account  »{$id}«");

+  logger(LOG_INFO, "modules/jabber/include/jabberaccounts", "jabber", "changed password for account  »{$id}«");

 }

@@ -122,7 +122,7 @@ function delete_jabber_account($id)

   $id = (int) $id;

   db_query("UPDATE jabber.accounts SET `delete`=1 WHERE customerno={$customerno} AND id={$id} LIMIT 1");

-  logger("modules/jabber/include/jabberaccounts", "jabber", "deleted account »{$id}«");

+  logger(LOG_INFO, "modules/jabber/include/jabberaccounts", "jabber", "deleted account »{$id}«");

 }

 ?>

@@ -57,14 +57,14 @@ function set_mysql_access($db, $account, $status)

     if (get_mysql_access($db, $account))

       return NULL;

     $query = "INSERT INTO misc.mysql_access (`database`,user) VALUES ((SELECT id FROM misc.mysql_database WHERE name='{$db}' AND useraccount={$uid} LIMIT 1), (SELECT id FROM misc.mysql_accounts WHERE username='{$account}' AND useraccount={$uid}));";

-    logger("modules/mysql/include/mysql", "mysql", "granting access on »{$db}« to »{$account}«");

+    logger(LOG_INFO, "modules/mysql/include/mysql", "mysql", "granting access on »{$db}« to »{$account}«");

   }

   else

   {

     if (! get_mysql_access($db, $account))

       return NULL;

     $query = "DELETE FROM misc.mysql_access WHERE `database`=(SELECT id FROM misc.mysql_database WHERE name='{$db}' AND useraccount={$uid} LIMIT 1) AND user=(SELECT id FROM misc.mysql_accounts WHERE username='{$account}' AND useraccount={$uid});";

-    logger("modules/mysql/include/mysql", "mysql", "revoking access on »{$db}« from »{$account}«");

+    logger(LOG_INFO, "modules/mysql/include/mysql", "mysql", "revoking access on »{$db}« from »{$account}«");

   }

   db_query($query);

 }

@@ -74,14 +74,14 @@ function create_mysql_account($username, $description = '')

 {

   if (! validate_mysql_username($username))

   {

-    logger("modules/mysql/include/mysql", "mysql", "illegal username »{$username}«");

+    logger(LOG_WARNING, "modules/mysql/include/mysql", "mysql", "illegal username »{$username}«");

     input_error("Der eingegebene Benutzername entspricht leider nicht der Konvention. Bitte tragen Sie einen passenden Namen ein.");

     return NULL;

   }

   $uid = $_SESSION['userinfo']['uid'];

   $username = mysql_real_escape_string($username);

   $description = maybe_null($description);

-  logger("modules/mysql/include/mysql", "mysql", "creating user »{$username}«");

+  logger(LOG_INFO, "modules/mysql/include/mysql", "mysql", "creating user »{$username}«");

   db_query("INSERT INTO misc.mysql_accounts (username, password, useraccount, description) VALUES ('$username', '!', $uid, $description);");

 }

@@ -90,7 +90,7 @@ function delete_mysql_account($username)

 {

   $username = mysql_real_escape_string($username);

   $uid = $_SESSION['userinfo']['uid'];

-  logger("modules/mysql/include/mysql", "mysql", "deleting user »{$username}«");

+  logger(LOG_INFO, "modules/mysql/include/mysql", "mysql", "deleting user »{$username}«");

   db_query("DELETE FROM misc.mysql_accounts WHERE username='{$username}' AND useraccount='{$uid}' LIMIT 1;");

 }

@@ -99,14 +99,14 @@ function create_mysql_database($dbname, $description = '')

 {

   if (! validate_mysql_dbname($dbname))

   {

-    logger("modules/mysql/include/mysql", "mysql", "illegal db-name »{$dbname}«");

+    logger(LOG_WARNING, "modules/mysql/include/mysql", "mysql", "illegal db-name »{$dbname}«");

     input_error("Der eingegebene Datenbankname entspricht leider nicht der Konvention. Bitte tragen Sie einen passenden Namen ein.");

     return NULL;

   }

   $dbname = mysql_real_escape_string($dbname);

   $uid = $_SESSION['userinfo']['uid'];

   $description = maybe_null($description);

-  logger("modules/mysql/include/mysql", "mysql", "creating database »{$dbname}«");

+  logger(LOG_INFO, "modules/mysql/include/mysql", "mysql", "creating database »{$dbname}«");

   db_query("INSERT INTO misc.mysql_database (name, useraccount, description) VALUES ('$dbname', $uid, $description);");

 }

@@ -115,7 +115,7 @@ function delete_mysql_database($dbname)

 {

   $dbname = mysql_real_escape_string($dbname);

   $uid = $_SESSION['userinfo']['uid'];

-  logger("modules/mysql/include/mysql", "mysql", "removing database »{$dbname}«");

+  logger(LOG_INFO, "modules/mysql/include/mysql", "mysql", "removing database »{$dbname}«");

   db_query("DELETE FROM misc.mysql_database WHERE name='{$dbname}' AND useraccount='{$uid}' LIMIT 1;");

 }

@@ -139,7 +139,7 @@ function set_mysql_password($username, $password)

   $username = mysql_real_escape_string($username);

   $password = mysql_real_escape_string($password);

   $uid = $_SESSION['userinfo']['uid'];

-  logger("modules/mysql/include/mysql", "mysql", "updating password for »{$username}«");

+  logger(LOG_INFO, "modules/mysql/include/mysql", "mysql", "updating password for »{$username}«");

   db_query("UPDATE misc.mysql_accounts SET password=PASSWORD('$password') WHERE username='$username' AND useraccount=$uid;");

 }

@@ -20,7 +20,7 @@ function create_customer($data)

   if (customer_with_email($data['email']) !== NULL)

   {

-    logger('modules/register/include/register', 'register', "Attempt to create customer with duplicate email »{$data['email']}«");

+    logger(LOG_WARNING, 'modules/register/include/register', 'register', "Attempt to create customer with duplicate email »{$data['email']}«");

     return NULL;

   }

@@ -30,7 +30,7 @@ function create_customer($data)

   $nachname = mysql_escape_string($data['nachname']);

   $email = mysql_escape_string($data['email']);

-  logger('modules/register/include/register', 'register', "Creating new account: {$anrede} / {$firma} / {$vorname} / {$nachname} / {$email}");

+  logger(LOG_INFO, 'modules/register/include/register', 'register', "Creating new account: {$anrede} / {$firma} / {$vorname} / {$nachname} / {$email}");

   $realname = maybe_null(chop($vorname.' '.$nachname));

@@ -46,7 +46,7 @@ if (count($_POST) > 0)

       require_once('inc/base.php');

       send_initial_customer_token($customerno);

       notify_admins_about_new_customer($customerno);

-      logger("modules/register/index", "register", "token sent for customer »{$customerno}«");

+      logger(LOG_INFO, "modules/register/index", "register", "token sent for customer »{$customerno}«");

       $success = true;

       #success_msg('Die angegebenen Daten wurden gespeichert, Sie sollten umgehend eine E-Mail erhalten.');

     }

@@ -67,7 +67,7 @@ function set_systemuser_details($uid, $fullname, $quota)

   $quota = (int) $quota;

   db_query("UPDATE system.useraccounts SET name={$fullname} WHERE kunde={$customerno} AND uid={$uid} LIMIT 1");

-  logger("modules/systemuser/include/useraccounts", "systemuser", "updated real name for uid {$uid}");

+  logger(LOG_INFO, "modules/systemuser/include/useraccounts", "systemuser", "updated real name for uid {$uid}");

 }

@@ -139,7 +139,7 @@ function delete_vhost($id)

   if ($id == 0)

     system_failure("id == 0");

   $vhost = get_vhost_details($id);

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

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

   db_query("DELETE FROM vhosts.vhost WHERE id={$vhost['id']} LIMIT 1");

 }

@@ -150,7 +150,7 @@ function make_svn_vhost($id)

   $id = (int) $id;

   if ($id == 0)

     system_failure("id == 0");

-  logger('modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to SVN');

+  logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to SVN');

   db_query("REPLACE INTO vhosts.dav (vhost, type) VALUES ({$id}, 'svn')");

   db_query("DELETE FROM vhosts.webapps WHERE vhost={$id}");

 }

@@ -160,7 +160,7 @@ function make_dav_vhost($id)

   $id = (int) $id;

   if ($id == 0)

     system_failure("id == 0");

-  logger('modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to WebDAV');

+  logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to WebDAV');

   db_query("REPLACE INTO vhosts.dav (vhost, type, options) VALUES ({$id}, 'dav', 'nouserfile')");

   db_query("DELETE FROM vhosts.webapps WHERE vhost={$id}");

 }

@@ -170,7 +170,7 @@ function make_regular_vhost($id)

   $id = (int) $id;

   if ($id == 0)

     system_failure("id == 0");

-  logger('modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to regular');

+  logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Converting vhost #'.$id.' to regular');

   db_query("DELETE FROM vhosts.dav WHERE vhost={$id}");

   db_query("DELETE FROM vhosts.webapps WHERE vhost={$id}");

 }

@@ -186,7 +186,7 @@ function make_webapp_vhost($id, $webapp)

   if (mysql_num_rows($result) == 0)

     system_failure("webapp-id invalid");

   $webapp_name = mysql_fetch_object($result)->displayname;

-  logger('modules/vhosts/include/vhosts', 'vhosts', 'Setting up webapp '.$webapp_name.' on vhost #'.$id);

+  logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Setting up webapp '.$webapp_name.' on vhost #'.$id);

   db_query("REPLACE INTO vhosts.webapps (vhost, webapp) VALUES ({$id}, {$webapp})");

   mail('webapps-setup@schokokeks.org', 'setup', 'setup');

 }

@@ -230,11 +230,11 @@ function save_vhost($vhost)

   }

   if ($id != 0) {

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

+    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");

   }

   else {

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

+    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}')");

     $id = mysql_insert_id();

   }

@@ -281,7 +281,7 @@ function delete_alias($id)

   $id = (int) $id;

   $alias = get_alias_details($id);

-  logger('modules/vhosts/include/vhosts', 'aliases', 'Removing alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');

+  logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'aliases', 'Removing alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');

   db_query("DELETE FROM vhosts.alias WHERE id={$id}");

 }

@@ -299,11 +299,11 @@ function save_alias($alias)

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

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

   if ($id == 0) {

-    logger('modules/vhosts/include/vhosts', 'aliases', 'Creating alias '.$alias['hostname'].'.'.$alias['domain'].' for VHost '.$vhost['id']);

+    logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'aliases', 'Creating alias '.$alias['hostname'].'.'.$alias['domain'].' for VHost '.$vhost['id']);

     db_query("INSERT INTO vhosts.alias (hostname, domain, vhost, options) VALUES ({$hostname}, {$domain}, {$vhost['id']}, '{$options}')");

   }

   else {

-    logger('modules/vhosts/include/vhosts', 'aliases', 'Updating alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');

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

     db_query("UPDATE vhosts.alias SET hostname={$hostname}, domain={$domain}, options='{$options}' WHERE id={$id} LIMIT 1");

   }

 }

@@ -37,12 +37,12 @@ function find_role($login, $password, $i_am_admin = False)

         $role = $role | ROLE_CUSTOMER;

       if ($entry->admin)

         $role = $role | ROLE_SYSADMIN;

-      logger("session/checkuser", "login", "logged in systemuser »{$login}«.");

+      logger(LOG_INFO, "session/checkuser", "login", "logged in systemuser »{$login}«.");

       return $role;

     }

-    logger("session/checkuser", "login", "wrong password for existing useraccount »{$login}«.");

+    logger(LOG_WARNING, "session/checkuser", "login", "wrong password for existing useraccount »{$login}«.");

   } else {

-    logger("session/checkuser", "login", "did not find useraccount »{$login}«. trying other roles...");

+    logger(LOG_WARNING, "session/checkuser", "login", "did not find useraccount »{$login}«. trying other roles...");

   }

   // Customer?

@@ -69,10 +69,10 @@ function find_role($login, $password, $i_am_admin = False)

     $hash = crypt($password, $db_password);

     if ($hash == $db_password || $i_am_admin)

     {

-      logger("session/checkuser", "login", "logged in e-mail-account »{$account}«.");

+      logger(LOG_INFO, "session/checkuser", "login", "logged in e-mail-account »{$account}«.");

       return ROLE_MAILACCOUNT;

     }

-    logger("session/checkuser", "login", "wrong password for existing e-mail-account »{$account}«.");

+    logger(LOG_WARNING, "session/checkuser", "login", "wrong password for existing e-mail-account »{$account}«.");

   }

   // virtueller Mail-Account

@@ -85,10 +85,10 @@ function find_role($login, $password, $i_am_admin = False)

     $hash = crypt($password, $db_password);

     if ($hash == $db_password || $i_am_admin)

     {

-      logger("session/checkuser", "login", "logged in virtual e-mail-account »{$account}«.");

+      logger(LOG_INFO, "session/checkuser", "login", "logged in virtual e-mail-account »{$account}«.");

       return ROLE_VMAIL_ACCOUNT;

     }

-    logger("session/checkuser", "login", "wrong password for existing virtual e-mail-account »{$account}«.");

+    logger(LOG_WARNING, "session/checkuser", "login", "wrong password for existing virtual e-mail-account »{$account}«.");

   }

@@ -146,7 +146,7 @@ function get_user_info($username)

                       FROM system.v_useraccounts WHERE username='{$username}' OR uid='{$username}' LIMIT 1");

   if (mysql_num_rows($result) < 1)

   {

-    logger("session/checkuser", "login", "error reading user's data: »{$username}«");

+    logger(LOG_ERR, "session/checkuser", "login", "error reading user's data: »{$username}«");

     system_failure('Das Auslesen Ihrer Benutzerdaten ist fehlgeschlagen. Bitte melden Sie dies einem Administrator');

   }

   $val = @mysql_fetch_object($result);

@@ -163,7 +163,7 @@ function set_customer_verified($customerno)

 {

   $customerno = (int) $customerno;

   db_query("UPDATE kundendaten.kunden SET status=0 WHERE id={$customerno};");

-  logger("session/checkuser", "register", "set customer's status to 0.");

+  logger(LOG_INFO, "session/checkuser", "register", "set customer's status to 0.");

 }

 function set_customer_lastlogin($customerno)

@@ -177,7 +177,7 @@ function set_customer_password($customerno, $newpass)

   $customerno = (int) $customerno;

   $newpass = sha1($newpass);

   db_query("UPDATE kundendaten.kunden SET passwort='$newpass' WHERE id='".$customerno."' LIMIT 1");

-  logger("session/checkuser", "pwchange", "changed customer's password.");

+  logger(LOG_INFO, "session/checkuser", "pwchange", "changed customer's password.");

 }

@@ -188,7 +188,7 @@ function set_systemuser_password($uid, $newpass)

   $salt = random_string(8);

   $newpass = crypt($newpass, "\$1\${$salt}\$");

   db_query("UPDATE system.passwoerter SET passwort='$newpass' WHERE uid='".$uid."' LIMIT 1");

-  logger("session/checkuser", "pwchange", "changed user's password.");

+  logger(LOG_INFO, "session/checkuser", "pwchange", "changed user's password.");

 }

@@ -201,7 +201,7 @@ function setup_session($role, $useridentity)

     DEBUG("We are system user");

     $info = get_user_info($useridentity);

     $_SESSION['userinfo'] = $info;

-    logger("session/start", "login", "logged in user »{$info['username']}«");

+    logger(LOG_INFO, "session/start", "login", "logged in user »{$info['username']}«");

     $useridentity = $info['customerno'];

   }

   if ($role & ROLE_CUSTOMER)

@@ -209,7 +209,7 @@ function setup_session($role, $useridentity)

     $info = get_customer_info($useridentity);

     $_SESSION['customerinfo'] = $info;

     set_customer_lastlogin($info['customerno']);

-    logger("session/start", "login", "logged in customer no »{$info['customerno']}«");

+    logger(LOG_INFO, "session/start", "login", "logged in customer no »{$info['customerno']}«");

   }

   if ($role & ROLE_MAILACCOUNT)

   {

@@ -17,7 +17,7 @@ if ($_SERVER['HTTPS']) session_set_cookie_params( 0, '/', '', true, true );

 if (!session_start())

 {

-        logger("session/start", "session", "Die session konnte nicht gestartet werden!");

+        logger(LOG_ERR, "session/start", "session", "Die session konnte nicht gestartet werden!");

         system_failure('Die Sitzung konnte nicht gestartet werden, bitte benachrichtigen Sie den Administrator!');

 }

@@ -29,7 +29,7 @@ if (isset($_POST['username']) && isset($_POST['password']))

   if ($role === NULL)

   {

     $_SESSION['role'] = ROLE_ANONYMOUS;

-    logger("session/start", "login", "wrong user data (username: »{$_POST['username']}«)");

+    logger(LOG_WARNING, "session/start", "login", "wrong user data (username: »{$_POST['username']}«)");

     login_screen('Ihre Anmeldung konnte nicht durchgeführt werden. Vermutlich haben Sie falsche Zugangsdaten eingegeben.');

   }

   else