WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated connect() method

This commit is contained in:
Roland Gruber 2019-10-23 21:25:33 +02:00
parent eef69a7a35
commit 624c94bff0
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lam/lib/modules/quota.inc
View File

@ -174,11 +174,15 @@ class quota extends baseModule {
$userName = '+'; $userName = '+';
if (($this->getAccountContainer() != null) && !$this->getAccountContainer()->isNewAccount) { if (($this->getAccountContainer() != null) && !$this->getAccountContainer()->isNewAccount) {
if ($this->get_scope() == 'user') { if ($this->get_scope() == 'user') {
if (!isset($this->attributes['uid'][0])) return; if (!isset($this->attributes['uid'][0])) {
return;
}
$userName = $this->attributes['uid'][0]; $userName = $this->attributes['uid'][0];
} }
else if ($this->get_scope() == 'group') { else if ($this->get_scope() == 'group') {
if (!isset($this->attributes['cn'][0])) return; if (!isset($this->attributes['cn'][0])) {
return;
}
$userName = $this->attributes['cn'][0]; $userName = $this->attributes['cn'][0];
} }
} }
@ -188,7 +192,7 @@ class quota extends baseModule {
$server = $lamdaemonServer->getServer(); $server = $lamdaemonServer->getServer();
// get quotas // get quotas
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remote->connect($lamdaemonServer);
$quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array($userName, "quota", "get", $this->get_scope()))); $quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array($userName, "quota", "get", $this->get_scope())));
$remote->disconnect(); $remote->disconnect();
if (empty($quotas)) { if (empty($quotas)) {
@ -289,7 +293,8 @@ class quota extends baseModule {
$quotastring .= ',' . $this->getQuotaNumber($this->quota[$server][$i][7]) . ':'; $quotastring .= ',' . $this->getQuotaNumber($this->quota[$server][$i][7]) . ':';
} }
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remoteServer = $_SESSION['config']->getScriptServerByName($server);
$remote->connect($remoteServer);
$remote->execute(implode(quota::$SPLIT_DELIMITER, array($id, "quota", "set", $this->get_scope(), "$quotastring\n"))); $remote->execute(implode(quota::$SPLIT_DELIMITER, array($id, "quota", "set", $this->get_scope(), "$quotastring\n")));
$remote->disconnect(); $remote->disconnect();
} }
@ -367,7 +372,8 @@ class quota extends baseModule {
$i++; $i++;
} }
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remoteServer = $_SESSION['config']->getScriptServerByName($server);
$remote->connect($remoteServer);
$remote->execute(implode(quota::$SPLIT_DELIMITER, array($id, "quota", "set", $this->get_scope(), "$quotastring\n"))); $remote->execute(implode(quota::$SPLIT_DELIMITER, array($id, "quota", "set", $this->get_scope(), "$quotastring\n")));
$remote->disconnect(); $remote->disconnect();
} }
@ -528,7 +534,7 @@ class quota extends baseModule {
} }
// Get quotas // Get quotas
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remote->connect($lamdaemonServer);
$quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope()))); $quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope())));
$remote->disconnect(); $remote->disconnect();
if (empty($quotas)) { if (empty($quotas)) {
@ -592,7 +598,7 @@ class quota extends baseModule {
$id = $this->replaceSpecialChars($server); $id = $this->replaceSpecialChars($server);
// Get quotas // Get quotas
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remote->connect($lamdaemonServer);
$quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope()))); $quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope())));
$remote->disconnect(); $remote->disconnect();
$dirs = explode(":", $quotas); $dirs = explode(":", $quotas);
@ -753,7 +759,7 @@ class quota extends baseModule {
$server = $lamdaemonServer->getServer(); $server = $lamdaemonServer->getServer();
// Get quotas // Get quotas
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remote->connect($lamdaemonServer);
$quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope()))); $quotas = $remote->execute(implode(quota::$SPLIT_DELIMITER, array("+", "quota", "get", $this->get_scope())));
$remote->disconnect(); $remote->disconnect();
$dirs = explode(":", $quotas); $dirs = explode(":", $quotas);
@ -883,7 +889,8 @@ class quota extends baseModule {
$quotaString = implode(quota::$SPLIT_DELIMITER, array($name, "quota", "set", $this->get_scope(), $dir . ',' . $quotaString = implode(quota::$SPLIT_DELIMITER, array($name, "quota", "set", $this->get_scope(), $dir . ',' .
implode(',', $temp['accounts'][$name][$mountPoints[$m]]) . "\n")); implode(',', $temp['accounts'][$name][$mountPoints[$m]]) . "\n"));
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remoteServer = $_SESSION['config']->getScriptServerByName($server);
$remote->connect($remoteServer);
$result = $remote->execute($quotaString); $result = $remote->execute($quotaString);
$remote->disconnect(); $remote->disconnect();
if (!empty($result)) { if (!empty($result)) {

8
lam/lib/modules/sambaSamAccount.inc
View File

@ -1545,10 +1545,9 @@ class sambaSamAccount extends baseModule implements passwordService {
$remoteServers = $_SESSION['config']->getConfiguredScriptServers(); $remoteServers = $_SESSION['config']->getConfiguredScriptServers();
for ($i = 0; $i < sizeof($remoteServers); $i++) { for ($i = 0; $i < sizeof($remoteServers); $i++) {
$remoteServer = $remoteServers[$i]; $remoteServer = $remoteServers[$i];
$server = $remoteServer->getServer();
$label = $remoteServer->getLabel(); $label = $remoteServer->getLabel();
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remote->connect($remoteServer);
$result = $remote->execute( $result = $remote->execute(
implode( implode(
self::$SPLIT_DELIMITER, self::$SPLIT_DELIMITER,
@ -1617,10 +1616,9 @@ class sambaSamAccount extends baseModule implements passwordService {
$remoteServers = $_SESSION['config']->getConfiguredScriptServers(); $remoteServers = $_SESSION['config']->getConfiguredScriptServers();
for ($i = 0; $i < sizeof($remoteServers); $i++) { for ($i = 0; $i < sizeof($remoteServers); $i++) {
$remoteServer = $remoteServers[$i]; $remoteServer = $remoteServers[$i];
$server = $remoteServer->getServer();
if (isset($_POST['form_subpage_' . get_class($this) . '_homedir_create_' . $i])) { if (isset($_POST['form_subpage_' . get_class($this) . '_homedir_create_' . $i])) {
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remote->connect($remoteServer);
$result = $remote->execute( $result = $remote->execute(
implode( implode(
self::$SPLIT_DELIMITER, self::$SPLIT_DELIMITER,
@ -1645,7 +1643,7 @@ class sambaSamAccount extends baseModule implements passwordService {
} }
elseif (isset($_POST['form_subpage_' . get_class($this) . '_homedir_delete_' . $i])) { elseif (isset($_POST['form_subpage_' . get_class($this) . '_homedir_delete_' . $i])) {
$remote = new \LAM\REMOTE\Remote(); $remote = new \LAM\REMOTE\Remote();
$remote->connect($server); $remote->connect($remoteServer);
$result = $remote->execute( $result = $remote->execute(
implode( implode(
self::$SPLIT_DELIMITER, self::$SPLIT_DELIMITER,