webinterface.git

@@ -23,8 +23,9 @@ if (count($ftpusers) > 0)

   foreach ($ftpusers AS $f)

   {

+    $sslwarning = ($f['forcessl'] == 0 ? icon_warning('Unverschlüsselte Verbindungen werden erlaubt') : '');

     $active = ($f['active'] == 1 ? icon_enabled('Ja') : '-');

-    output("<tr><td>".internal_link("edit?id={$f['id']}", $f['username'])."</td><td>{$f['homedir']}</td><td style=\"text-align: center;\">{$active}</td><td>".internal_link("save?delete={$f['id']}", icon_delete("{$f['username']} löschen"))."</td></tr>");

+    output("<tr><td>".internal_link("edit?id={$f['id']}", $f['username'])."</td><td>{$f['homedir']}</td><td style=\"text-align: center;\">{$active} {$sslwarning}</td><td>".internal_link("save?delete={$f['id']}", icon_delete("{$f['username']} löschen"))."</td></tr>");

   }

   output('</table>');

 }

@@ -26,7 +26,8 @@ $user_home = $_SESSION['userinfo']['homedir'];

 $homedir = substr($ftpuser['homedir'], strlen($user_home)+1);

 DEBUG($user_home.' / '.$homedir.' / '.$ftpuser['homedir']);

-$checked = ($ftpuser['active'] == 1 ? 'checked="checked" ' : '');

+$active = ($ftpuser['active'] == 1 ? 'checked="checked" ' : '');

+$forcessl = ($ftpuser['forcessl'] == 1 ? 'checked="checked" ' : '');

 $servers = server_names();

 $available_servers = array_merge(array(my_server_id()), additional_servers());

@@ -58,10 +59,12 @@ output(html_form('ftpusers_edit', 'save', 'id='.$ftpuser['id'], '

   </tr>

   <tr>

     <td>Zugang aktivieren:</td>

-    <td><input type="checkbox" id="active" name="active" value="1" '.$checked.'/> auf Server '.$whichserver.'</td>

+    <td><input type="checkbox" id="active" name="active" value="1" '.$active.'/> auf Server '.$whichserver.'<br/><input type="checkbox" id="forcessl" name="forcessl" value="1" '.$forcessl.'/>&#160;<label for="forcessl">SSL-Verschlüsselung erforderlich<sup>*</sup></label></td>

   </tr>

   </table>

   <p><input type="submit" name="save" value="Speichern" /></p>

+  

+  <p><sup>*</sup>) Wenn die Verschlüsselung nicht erforderlich ist, können Sie mit diesen Zugangsdaten eine ungesicherte Verbindung auf TCP-port 1021 aufbauen. Auf dem Standard-Port 21 wird grundsätzlich eine Verschlüsselung benötigt.</p>

 '));

@@ -5,7 +5,7 @@ require_once('inc/base.php');

 function list_ftpusers()

 {

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

-  $result = db_query("SELECT id, username, homedir, active FROM system.ftpusers WHERE uid=$uid");

+  $result = db_query("SELECT id, username, homedir, active, forcessl FROM system.ftpusers WHERE uid=$uid");

   $ftpusers = array();

   while ($u = mysql_fetch_assoc($result)) {

     $ftpusers[] = $u;

@@ -16,7 +16,7 @@ function list_ftpusers()

 function empty_ftpuser()

 {

   $myserver = my_server_id();

-  return array("id" => "0", "username" => "", "password" => "", "homedir" => "", "active" => "1", "server" => $myserver);

+  return array("id" => "0", "username" => "", "password" => "", "homedir" => "", "active" => "1", "forcessl" => "1", "server" => $myserver);

 }

 function load_ftpuser($id)

@@ -25,7 +25,7 @@ function load_ftpuser($id)

     return empty_ftpuser();

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

   $id = (int) $id;

-  $result = db_query("SELECT id, username, password, homedir, active, server FROM system.ftpusers WHERE uid={$uid} AND id='{$id}' LIMIT 1");

+  $result = db_query("SELECT id, username, password, homedir, active, forcessl, server FROM system.ftpusers WHERE uid={$uid} AND id='{$id}' LIMIT 1");

   if (mysql_num_rows($result) != 1)

     system_failure("Fehler beim auslesen des Accounts");

   $account = mysql_fetch_assoc($result);

@@ -50,6 +50,8 @@ function save_ftpuser($data)

     system_failure('Pfad scheint nicht in Ihrem Home zu sein oder enthielt ungültige Zeichen.');

   $active = ($data['active'] == 1 ? '1' : '0');

+  $forcessl = ($data['forcessl'] == 0 ? '0' : '1');

+

   $server = NULL;

   if ($data['server'] == my_server_id())

   {

@@ -85,9 +87,9 @@ function save_ftpuser($data)

   if ($id)

-    db_query("UPDATE system.ftpusers SET username='{$username}', {$password_query} homedir='{$homedir}', active='{$active}', server={$server} WHERE id={$id} AND uid={$uid} LIMIT 1");

+    db_query("UPDATE system.ftpusers SET username='{$username}', {$password_query} homedir='{$homedir}', active='{$active}', forcessl='{$forcessl}', server={$server} WHERE id={$id} AND uid={$uid} LIMIT 1");

   else

-    db_query("INSERT INTO system.ftpusers (username, password, homedir, uid, active, server) VALUES ('{$username}', '{$password_hash}', '{$homedir}', '{$uid}', '{$active}', {$server})");

+    db_query("INSERT INTO system.ftpusers (username, password, homedir, uid, active, forcessl, server) VALUES ('{$username}', '{$password_hash}', '{$homedir}', '{$uid}', '{$active}', '{$forcessl}', {$server})");

 }

@@ -48,6 +48,11 @@ if (isset($_REQUEST['active']))

 else

   $ftpuser['active'] = 0;

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

+  $ftpuser['forcessl'] = $_REQUEST['forcessl'];

+else

+  $ftpuser['forcessl'] = 0;

+

 if (isset($_REQUEST['server']))

   $ftpuser['server'] = $_REQUEST['server'];