www/dbq/dbq.php

diff --git a/lib/php/ldap.php b/lib/php/ldap.php
index 83c478d34efbaf3a72470567c7eadb600b2b073b..bf340d804a9e82680895dad90f3b2b0aced2f947 100644 (file)
--- a/lib/php/ldap.php
+++ b/lib/php/ldap.php
@@ -131,8 +131,7 @@ class Ldap {
                        } elseif ($v === '') {
                                unset($data[$k]);
                                #ldap_mod_del($this->connect(),$dn,[$k=>$v]);
-                               if (!ldap_mod_del($this->connect(),$dn,[$k=>[]])) bye(ldap_error($this->connect()));
-                               #$this->delete($dn,[$k=>$v]);
+                               if (!ldap_mod_del($this->connect(),$dn,[$k=>[]])) bye("$dn: $k: ".ldap_error($this->connect()));
 
                        }
                        #if ($data[$k] === null 
@@ -144,7 +143,7 @@ class Ldap {
                $dn = $this->dnBase($dn);
                #debug([$dn,$data]);
                #debug(ldap_error($this->connect()));
-               #$this->update_delete($dn,$data);
+               $this->update_delete($dn,$data);
                #unset($data['sn']);
                #bye($data);
                return ldap_mod_replace($this->connect(), $dn, $data);

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 6e597eebe12c7dc450a7e2d35b30a25337beba63..cc0943c1e828edca5fe5dda23c6fd960084ab362 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -789,6 +789,7 @@ class DbQ extends nb {
                if ($password=='') {
                        if ($password=='') $password = $this->params['table'];
                        if ($password=='' and !empty($_POST['password'])) $password = $_POST['password'];
+                       if ($password=='' and !empty($_GET['password'])) $password = $_GET['password'];
                        if ($this->is_html) echo <<<EOF
 <form action="$this->uri" method="post" class="block" style="padding:1.5em">
 <label>Password</label><input type="text" name="password" value="$password" />
@@ -796,13 +797,15 @@ class DbQ extends nb {
 </form>
 EOF;
                }
-               return $this->db->ssha512_password($password);
+               return ['password'=>$this->db->ssha512_password($password)];
+# NB 18.02.18          return $this->db->ssha512_password($password);
        }
 
        public function ssha_password($password='') {
                if ($password=='') {
                        if ($password=='') $password = $this->params['table'];
                        if ($password=='' and !empty($_POST['password'])) $password = $_POST['password'];
+                       if ($password=='' and !empty($_GET['password'])) $password = $_GET['password'];
                        if ($this->is_html) echo <<<EOF
 <form action="$this->uri" method="post" class="block" style="padding:1.5em">
 <label>Password</label><input type="text" name="password" value="$password" />
@@ -810,7 +813,8 @@ EOF;
 </form>
 EOF;
                }
-               return $this->db->ssha_password($password);
+               return ['password'=>$this->db->ssha_password($password)];
+# NB 18.02.18          return $this->db->ssha_password($password);
        }
 
        public function perm2h() {