webinterface.git

@@ -51,8 +51,8 @@ if ($role & ROLE_CUSTOMER) {

     $customer = $_SESSION['customerinfo'];

 }

-$form = '

-

+$form = '';

+$form .= '

 <h5>Name (E-Mail-Absender, ...)</h5>

 <div style="margin-left: 2em;"> 

   <p><input type="radio" name="defaultname" id="defaultname" value="1" '.$defaultname.'/> <label for="defaultname">Kundenname: <strong>'.$customer['name'].'</strong></label></p>

@@ -60,6 +60,22 @@ $form = '

 </div>

 ';

+$defaultpwlogin = 'checked';

+$defaultnopwlogin = '';

+

+if ($account['passwordlogin'] == 0) {

+    $defaultpwlogin = '';

+    $defaultnopwlogin = 'checked';

+}

+

+$form .= '

+<h5>Passwort-Login</h5>

+<div style="margin-left: 2em;"> 

+  <p><input type="radio" name="passwordlogin" id="passwordlogin_ja" value="1" '.$defaultpwlogin.'/> <label for="passwordlogin_ja">SSH-Login mit Passwort erlauben</label></p>

+  <p><input type="radio" name="passwordlogin" id="passwordlogin_nein" value="0" '.$defaultnopwlogin.'/> <label for="passwordlogin_nein">SSH-Login nur mit SSH-Key ermglichen</label></p>

+</div>

+';

+

 if ($role & ROLE_CUSTOMER) {

     $form .= '

 <h5>Speicherplatz</h5>

@@ -78,7 +78,7 @@ function get_account_details($uid, $customerno=0)

         $customerno = $_SESSION['customerinfo']['customerno'];

     }

     $args = array(":uid" => $uid, ":customerno" => $customerno);

-    $result = db_query("SELECT uid,username,name,shell,server,quota,erstellungsdatum FROM system.useraccounts WHERE kunde=:customerno AND uid=:uid", $args);

+    $result = db_query("SELECT uid,username,name,shell,server,quota,erstellungsdatum,passwordlogin FROM system.useraccounts WHERE kunde=:customerno AND uid=:uid", $args);

     if ($result->rowCount() == 0) {

         system_failure("Cannot find the requestes useraccount (for this customer).");

     }

@@ -114,9 +114,10 @@ function set_account_details($account)

                 ":shell" => filter_input_oneline($account['shell']),

                 ":quota" => $account['quota'],

                 ":uid" => $account['uid'],

-                ":customerno" => $customerno);

+                ":customerno" => $customerno,

+                ":passwordlogin" => $account['passwordlogin']);

-    db_query("UPDATE system.useraccounts SET name=:fullname, quota=:quota, shell=:shell WHERE kunde=:customerno AND uid=:uid", $args);

+    db_query("UPDATE system.useraccounts SET name=:fullname, quota=:quota, shell=:shell, passwordlogin=:passwordlogin WHERE kunde=:customerno AND uid=:uid", $args);

     logger(LOG_INFO, "modules/systemuser/include/useraccounts", "systemuser", "updated details for uid {$args[":uid"]}");

 }

@@ -95,6 +95,10 @@ else

         $account['name'] = filter_input_oneline($_POST['fullname']);

     }

+    if (isset($_POST['passwordlogin'])) {

+        $account['passwordlogin'] = (int) $_POST['passwordlogin'];

+    }

+

     $shells = available_shells();

     if (isset($shells[$_POST['shell']])) {

         $account['shell'] = $_POST['shell'];