webinterface.git

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

   if (mysql_error())

   {

     $error = mysql_error();

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

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

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

   }

   return $result; 

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

   DEBUG("Öffne Wörterbuch: {$config['cracklib_dict']}");

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

   {

-    logger("inc/security.php", "cracklib", "could not open cracklib-dictionary »{$config['cracklib_dict']}«");

+    logger("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

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

 {

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

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

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

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

   }

 }

@@ -59,7 +59,7 @@ function verify_input_username( $input )

 {

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

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

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

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

   }

 }

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

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

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

   {

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

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

     DEBUG("HTML-Krams im Pfad");

     return False;

   }

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

   {

     if ($item == '..')

     {

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

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

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

       return False;

     }

@@ -59,29 +59,6 @@ foreach ($submenu AS $weight => $data) {

 DEBUG($submenu);

-

-/*

-$menuitem["index"]["label"] = "Übersicht";

-$menuitem["index"]["file"] = "index.php";

-

-

-$menuitem["domains"]["label"] = "Domains";

-$menuitem["domains"]["file"] = "domains.php";

-

-

-$menuitem["mail"]["label"] = "E-Mail";

-$menuitem["mail"]["file"] = "mail.php";

-

-$menuitem["chpass"]["label"] = "Passwort ändern";

-$menuitem["chpass"]["file"] = "chpass.php";

-

-

-$menuitem["logout"]["label"] = "Abmelden";

-$menuitem["logout"]["file"] = "logout.php";

-

-*/

-

-

 header("Content-Type: {$config['mime_type']}");

 ?>

 <?php echo '<?xml version="1.0" encoding="utf-8"?>'."\n"; ?>

@@ -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.php", "login", "logged in systemuser »{$login}«.");

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

       return $role;

     }

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

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

   } else {

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

+    logger("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.php", "login", "logged in e-mail-account »{$account}«.");

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

       return ROLE_MAILACCOUNT;

     }

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

+    logger("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.php", "login", "logged in virtual e-mail-account »{$account}«.");

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

       return ROLE_VMAIL_ACCOUNT;

     }

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

+    logger("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.php", "login", "error reading user's data: »{$username}«");

+    logger("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.php", "register", "set customer's status to 0.");

+  logger("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.php", "pwchange", "changed customer's password.");

+  logger("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.php", "pwchange", "changed user's password.");

+  logger("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.php", "login", "logged in user »{$info['username']}«");

+    logger("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.php", "login", "logged in customer no »{$info['customerno']}«");

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

   }

   if ($role & ROLE_MAILACCOUNT)

   {

@@ -15,7 +15,7 @@ session_name('CONFIG_SCHOKOKEKS_ORG');

 if (!session_start())

 {

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

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

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

 }

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

   if ($role === NULL)

   {

     $_SESSION['role'] = ROLE_ANONYMOUS;

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

+    logger("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