malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#229: Usernames and TS3 import

Browse Source
This commit is contained in:
Ulrich Block 2013-12-27 17:39:43 +01:00
parent dfb8ecf899
commit f7cdb13e32
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/stuff/voice_master.php
View File

@ -84,7 +84,6 @@ if ($ui->w('action',4, 'post') and !token(true)) {
$ip = $ui->ip('ip', 'post');
$user = $ui->username('user', 50, 'post');
$externalID = $ui->escaped('externalID', 'post');
$newuser = $ui->id('newuser', 1, 'post');
$ips = $ui->ips('ips', 'post');
$addtype = 2;
$addedby = 2;
@ -338,8 +337,6 @@ if ($ui->w('action',4, 'post') and !token(true)) {
if ($ui->st('d', 'get') == 'ri') {
$prefix1 = $rSA['prefix1'];
$newuser = ($prefix1 == 'Y') ? 1 : 2;
$masterid = $id;
$query = $sql->prepare("SELECT *,AES_DECRYPT(`querypassword`,:aeskey) AS `decryptedquerypassword`,AES_DECRYPT(`ssh2port`,:aeskey) AS `decryptedssh2port`,AES_DECRYPT(`ssh2user`,:aeskey) AS `decryptedssh2user`,AES_DECRYPT(`ssh2password`,:aeskey) AS `decryptedssh2password` FROM `voice_masterserver` WHERE `id`=:id AND `resellerid`=:reseller_id LIMIT 1");
@ -471,12 +468,9 @@ if ($ui->w('action',4, 'post') and !token(true)) {
$insertlog->execute();
$template_file = 'admin_voicemasterserver_add2.tpl';
} else {
}
} else if ($ui->w('action', 3, 'post') == 'md') {
$query = $sql->prepare("SELECT `active`,`type`,`rootid`,`addedby`,`ssh2ip`,`notified`,`usedns`,`publickey`,`keyname`,AES_DECRYPT(`ssh2port`,:aeskey) AS `decryptedssh2port`,AES_DECRYPT(`ssh2user`,:aeskey) AS `decryptedssh2user`,AES_DECRYPT(`ssh2password`,:aeskey) AS `decryptedssh2password`,`serverdir`,`bitversion` FROM `voice_masterserver` WHERE `id`=:id AND `resellerid`=:reseller_id");
@ -654,33 +648,33 @@ if ($ui->w('action',4, 'post') and !token(true)) {
$usernew = true;
if ($ui->username("$virtualserver_id-username",50, 'post') and $ui->ismail("$virtualserver_id-email", 'post')) {
if ($ui->username("$virtualserver_id-username", 50, 'post') and $ui->ismail("$virtualserver_id-email", 'post')) {
$query = $sql->prepare("SELECT `id` FROM `userdata` WHERE `cname`=? AND `mail`=? AND `resellerid`=? LIMIT 1");
$query->execute(array($ui->username("$virtualserver_id-username",50, 'post'), $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
$query->execute(array($ui->username("$virtualserver_id-username", 50, 'post'), $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
$usernew = false;
$customer = $row['id'];
$cnamenew = $ui->username("$virtualserver_id-username",50, 'post');
$cnamenew = $ui->username("$virtualserver_id-username", 50, 'post');
}
if ($usernew == true) {
$newHash = passwordCreate($ui->username("$virtualserver_id-username",50, 'post'), passwordgenerate(10));
$newHash = passwordCreate($ui->username("$virtualserver_id-username", 50, 'post'), passwordgenerate(10));
if (is_array($newHash)) {
$query = $sql->prepare("INSERT INTO `userdata` (`cname`,`security`,`salt`,`mail`,`accounttype`,`resellerid`) VALUES (?,?,?,?,'u',?)");
$query->execute(array($ui->username("$virtualserver_id-username",50, 'post'), $newHash['hash'], $newHash['salt'], $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
$query->execute(array($ui->username("$virtualserver_id-username", 50, 'post'), $newHash['hash'], $newHash['salt'], $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
} else {
$query = $sql->prepare("INSERT INTO `userdata` (`cname`,`security`,`mail`,`accounttype`,`resellerid`) VALUES (?,?,?,'u',?)");
$query->execute(array($ui->username("$virtualserver_id-username",50, 'post'), $newHash, $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
$query->execute(array($ui->username("$virtualserver_id-username", 50, 'post'), $newHash, $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
}
$query = $sql->prepare("SELECT `id` FROM `userdata` WHERE `cname`=? AND `mail`=? AND `resellerid`=? ORDER BY `id` DESC LIMIT 1");
$query->execute(array($ui->username("$virtualserver_id-username",50, 'post'), $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
$query->execute(array($ui->username("$virtualserver_id-username", 50, 'post'), $ui->ismail("$virtualserver_id-email", 'post'), $reseller_id));
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
$customer = $row['id'];
$cnamenew = $ui->username("$virtualserver_id-username",50, 'post');
$cnamenew = $ui->username("$virtualserver_id-username", 50, 'post');
sendmail('emailuseradd', $customer, $cnamenew, $initialpassword);
}
}

10
web/template/default/admin_voicemasterserver_add2.tpl
View File

@ -30,7 +30,7 @@
<div class="control-group">
<label class="control-label" for="inputUser"><?php echo $gsprache->user ;?>:</label>
<div class="controls">
<select id="inputUser" name="<?php echo $virtualserver_id;?>-customer">
<select id="inputUser" name="<?php echo $virtualserver_id;?>-customer" onchange="SwitchShowHideRows(this.value,'<?php echo $virtualserver_id;?>-customer');">
<option value="0"><?php echo $sprache->newuser;?></option>
<?php foreach ($table as $key=>$value) { ?>
<option value="<?php echo $key;?>"><?php echo $value;?></option>
@ -38,14 +38,14 @@
</select>
</div>
</div>
<?php if ($newuser==2) { ?>
<div class="control-group">
<?php if ($rSA['prefix1']=='N') { ?>
<div class="0 <?php echo $virtualserver_id;?>-customer control-group">
<label class="control-label" for="inputUserName"><?php echo $sprache->user;?></label>
<div class="controls"><input id="inputUserName" type="text" name="<?php echo $virtualserver_id;?>-username"></div>
</div>
<div class="control-group">
<div class="0 <?php echo $virtualserver_id;?>-customer control-group">
<label class="control-label" for="inputUserMail"><?php echo $usprache->email;?></label>
<div class="controls"><input id="inputUserMail" type="text" name="<?php echo $virtualserver_id;?>-email" value="ts3@import.mail"></div>
<div class="controls"><input id="inputUserMail" type="email" name="<?php echo $virtualserver_id;?>-email" value="ts3@import.mail"></div>
</div>
<?php } ?>
<div class="control-group">