webinterface.git

@@ -80,6 +80,7 @@ if (isset($_POST['accesseditor']))

     {

       $_POST['access'][$_POST['new_db']] = array();

       foreach ($users as $user)

+        $user = $user['username'];

         if (in_array($user, $_POST['access']['new']))

           array_push($_POST['access'][$_POST['new_db']], $user);

       if (($_POST['new_user'] != '') and (in_array('new', $_POST['access']['new'])))

@@ -92,6 +93,7 @@ if (isset($_POST['accesseditor']))

   {

     create_mysql_account($_POST['new_user']);

     foreach ($dbs as $db)

+      $db = $db['name'];

       if (isset($_POST['access'][$db]) and (in_array('new', $_POST['access'][$db])))

         array_push($_POST['access'][$db], $_POST['new_user']);

   }

@@ -103,11 +105,17 @@ if (isset($_POST['accesseditor']))

   }

   foreach ($dbs as $db)

+  {

+    $db = $db['name'];

     foreach ($users as $user)

+    {

+      $user = $user['username'];

       if (! isset($_POST['access'][$db]))

         set_mysql_access($db, $user, false);

       else

         set_mysql_access($db, $user, in_array($user, $_POST['access'][$db]));

+    }

+  }

   $mysql_access = NULL;

 }

@@ -125,7 +133,10 @@ if ($output_something)

   <tr><th style="background-color: #729bb3; color: #fff;padding: 0.2em; text-align: left;">Datenbanken</th>';

   foreach ($users as $user)

-    $form .= "<th>{$user}<br />".internal_link("", "<img src=\"{$prefix}images/delete.png\" title=\"Benutzer »{$user}« löschen\" alt=\"löschen\" />", "action=delete_user&user={$user}")."</th>";

+  {

+    $desc = ($user['description'] ? $user['description'] : '');

+    $form .= "<th><span title=\"{$desc}\">{$user['username']}</span><br />".internal_link("", "<img src=\"{$prefix}images/delete.png\" title=\"Benutzer »{$user['username']}« löschen\" alt=\"löschen\" />", "action=delete_user&user={$user['username']}")."</th>";

+  }

   $form .= '<th><input type="text" name="new_user" size="10" value="" /></th></tr>

 ';

@@ -133,9 +144,10 @@ if ($output_something)

   foreach($dbs as $db)

   {

-    $form .= "<tr><td style=\"border: 0px; font-weight: bold; text-align: right;\">{$db}&#160;".internal_link("", "<img src=\"{$prefix}images/delete.png\" title=\"Datenbank »{$db}« löschen\" alt=\"löschen\" />", "action=delete_db&db={$db}")."</td>";

+    $desc = ($db['description'] ? $db['description'] : '');

+    $form .= "<tr><td style=\"border: 0px; font-weight: bold; text-align: right;\"><span title=\"{$desc}\">{$db['name']}</span>&#160;".internal_link("", "<img src=\"{$prefix}images/delete.png\" title=\"Datenbank »{$db['name']}« löschen\" alt=\"löschen\" />", "action=delete_db&db={$db['name']}")."</td>";

     foreach ($users as $user)

-      $form .= '<td style="text-align: center;"><input type="checkbox" id="'.$db.'_'.$user.'" name="access['.$db.'][]" value="'.$user.'" '.(get_mysql_access($db, $user) ? 'checked="checked" ' : '')." /></td>";

+      $form .= '<td style="text-align: center;"><input type="checkbox" id="'.$db.'_'.$user.'" name="access['.$db.'][]" value="'.$user.'" '.(get_mysql_access($db['name'], $user['username']) ? 'checked="checked" ' : '')." /></td>";

     $form .= "</tr>\n";

   }

@@ -157,7 +169,7 @@ if ($output_something)

   $my_users = array();

   foreach ($users as $u)

   {

-    $my_users[$u] = $u;

+    $my_users[$u['username']] = $u['username'];

   }

   $form = '<div>

   <label for="mysql_username">Benutzername:</label>&#160;'.html_select('mysql_username', $my_users).'

@@ -3,13 +3,13 @@

 function get_mysql_accounts($UID)

 {

   $UID = (int) $UID;

-  $result = db_query("SELECT username FROM misc.mysql_accounts WHERE useraccount=$UID");

+  $result = db_query("SELECT username, description FROM misc.mysql_accounts WHERE useraccount=$UID");

   if (mysql_num_rows($result) == 0)

     return array();

   $list = array();

-  while ($item = mysql_fetch_object($result))

+  while ($item = mysql_fetch_assoc($result))

   {

-    array_push($list, $item->username);

+    $list[] = $item;

   }

   return $list;

 }

@@ -17,13 +17,13 @@ function get_mysql_accounts($UID)

 function get_mysql_databases($UID)

 {

   $UID = (int) $UID;

-  $result = db_query("SELECT name FROM misc.mysql_database WHERE useraccount=$UID");

+  $result = db_query("SELECT name, description FROM misc.mysql_database WHERE useraccount=$UID");

   if (mysql_num_rows($result) == 0)

     return array();

   $list = array();

-  while ($item = mysql_fetch_object($result))

+  while ($item = mysql_fetch_assoc($result))

   {

-    array_push($list, $item->name);

+    $list[] = $item;

   }

   return $list;

 }

@@ -70,22 +70,19 @@ function set_mysql_access($db, $account, $status)

 }

-function create_mysql_account($username)

+function create_mysql_account($username, $description = '')

 {

-  if (! validate_mysql_dbname($username))

+  if (! validate_mysql_username($username))

   {

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

   }

-  if (strlen($username) > 16)

-  {

-    warning('Der eingegebene MySQL-Benutzername wurde abgeschnitten. Systemseitig begrenzt MySQL einen Benutzernamen auf 16 Zeichen.');

-  }

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

   $username = mysql_real_escape_string($username);

+  $description = maybe_null($description);

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

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

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

 }

@@ -98,7 +95,7 @@ function delete_mysql_account($username)

 }

-function create_mysql_database($dbname)

+function create_mysql_database($dbname, $description = '')

 {

   if (! validate_mysql_dbname($dbname))

   {

@@ -108,8 +105,9 @@ function create_mysql_database($dbname)

   }

   $dbname = mysql_real_escape_string($dbname);

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

+  $description = maybe_null($description);

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

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

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

 }

@@ -122,17 +120,16 @@ function delete_mysql_database($dbname)

 }

-function validate_mysql_username($username)

+function validate_mysql_dbname($dbname)

 {

   $sys_username = $_SESSION['userinfo']['username'];

-  return preg_match("/^{$sys_username}(_[a-zA-Z0-9_-]+)?$/", $username);

+  return preg_match("/^{$sys_username}(_[a-zA-Z0-9_-]+)?$/", $dbname);

 }

-function validate_mysql_dbname($dbname)

+function validate_mysql_username($username)

 {

-  // Funktioniert! ;-)

-  return validate_mysql_username($dbname);

+  return validate_mysql_dbname($username) && (count($username) <= 16);

 }