Meerged revisions 2265-2278 from stable branch.

tbrehm

2011-04-05 f5d9544164b039001906db98b59c92f7250553fb

 interface/web/client/client_edit.php

@@ -150,6 +150,15 @@
      $active = 1;
      $language = $app->db->quote($this->dataRecord["language"]);
      
      $salt="$1$";
      $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
      for ($n=0;$n<8;$n++) {
         $salt.=$base64_alphabet[mt_rand(0,63)];
      }
      $salt.="$";
      $password = crypt(stripslashes($password),$salt);
		
      // Create the controlpaneluser for the client
      //Generate ssh-rsa-keys
      exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
      $app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$this->id;
@@ -157,7 +166,7 @@
      
      // Create the controlpaneluser for the client
      $sql = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id)
      VALUES ('$username',md5('$password'),'$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,".$this->id.")";
      VALUES ('$username','$password','$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,".$this->id.")";
      $app->db->query($sql);
      
      //* If the user who inserted the client is a reseller (not admin), we will have to add this new client group 
@@ -198,8 +207,15 @@
      // password changed
      if($conf['demo_mode'] != true && isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
         $password = $app->db->quote($this->dataRecord["password"]);
         $salt="$1$";
         $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
         for ($n=0;$n<8;$n++) {
            $salt.=$base64_alphabet[mt_rand(0,63)];
         }
         $salt.="$";
         $password = crypt(stripslashes($password),$salt);
         $client_id = $this->id;
         $sql = "UPDATE sys_user SET passwort = md5('$password') WHERE client_id = $client_id";
         $sql = "UPDATE sys_user SET passwort = '$password' WHERE client_id = $client_id";
         $app->db->query($sql);
      }
      
@@ -232,4 +248,4 @@
$page = new page_action;
$page->onLoad();

?>
?>