From 94d68eb9485c81c703340d41121d629a4d05ce9a Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Sat, 13 Dec 2014 18:40:59 +0000 Subject: [PATCH] --- inc/commons/class.common.ajax.php | 46 +++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php index 9b90efbc8..d9e7159ac 100644 --- a/inc/commons/class.common.ajax.php +++ b/inc/commons/class.common.ajax.php @@ -326,7 +326,7 @@ class commonAjax { } public static function createDevSpace($args, &$x) { - + commonDroits::min(1); global $core; $domain = $_POST['domain']; @@ -362,16 +362,34 @@ Mot de passe : $password"; $body.="\n\nSVN : svn+ssh://svn@svn.cubedesigners.com/projects/$svn"; } - $mail = new cubeMail(); - $mail->charset = 'UTF-8'; - $mail->from = 'extranet@cubedesigners.com'; - $mail->to = $core->user->email; - foreach ($_POST['users'] as $e) { - $mail->cc = $e; + $users = array(); + if ($zend && isset($_POST['users']) && count($_POST['users'])) { + + foreach ($_POST['users'] as $u) { + $userpassword = CubeIT_Crypt::generateRandomString(10); + $users[$u] = $userpassword; + $b = $body . "\n\n"; + $b.='Admin : http://' . $domain . '.dev.cubedesigners.com/admin/' . "\n"; + $b.='Nom d\'utilisateur : ' . $u . "\n"; + $b.='Mot de passe : ' . $userpassword . "\n"; + + $mail = new cubeMail(); + $mail->charset = 'UTF-8'; + $mail->from = 'extranet@cubedesigners.com'; + $mail->to = $u; + $mail->subject = 'Création de l\'espace de développement "' . $domain . '"'; + $mail->body = $b; + $mail->send(); + } + } else { + $mail = new cubeMail(); + $mail->charset = 'UTF-8'; + $mail->from = 'extranet@cubedesigners.com'; + $mail->to = $core->user->email; + $mail->subject = 'Création de l\'espace de développement "' . $domain . '"'; + $mail->body = $body; + $mail->send(); } - $mail->subject = 'Création de l\'espace de développement "' . $domain . '"'; - $mail->body = $body; - $mail->send(); $args = "-l $user -o $domain -u $user -p $password"; if ($zend) { @@ -380,9 +398,13 @@ Mot de passe : $password"; if ($svn) { $args.=" -d $svn"; } + if (count($users)) { + $args.=' -e ' . base64_encode(json_encode($users)); + } - `ssh root@chihiro.cubedesigners.com /usr/local/bin/tools/projectcreator/make.php $args`; - + $cmd = "ssh root@chihiro.cubedesigners.com /usr/local/bin/tools/projectcreator/make.php $args"; + `$cmd`; + fb($cmd); $x->addAlert('Espace de développement crée. Vous allez recevoir un mail récapitulant les identifiants de l\'espace crée'); } -- 2.39.5