replace get_class() with __CLASS__;minor style updates

gosa-project · Sep 23, 2024 · 74ee015 · 74ee015
1 parent 5953585
commit 74ee015
Show file tree

Hide file tree

Showing 21 changed files with 121 additions and 124 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "gonicus/gosa2-plugin-mailaddress": "dev-composer",
         "gonicus/gosa2-plugin-rolemanagement": "dev-composer",
         "gonicus/gosa2-plugin-ldapmanager": "dev-composer",
-	"gonicus/gosa2-plugin-systems" : "dev-composer"
+        "gonicus/gosa2-plugin-systems": "dev-composer"
     },
     "authors": [
         {
@@ -23,4 +23,4 @@
     "support": {
         "issues": "https://github.com/gosa-project/gosa-core"
     }
-}
+}
diff --git a/html/index.php b/html/index.php
@@ -272,7 +272,7 @@ function displayLogin()
     /* Admin-logon and verify */
     $ldap = $config->get_ldap_link();
     if (is_null($ldap) || (is_int($ldap) && $ldap == 0)) {
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $_POST['login'], 0, __FILE__));
         displayLogin();
         exit();
     }

diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
@@ -120,7 +120,7 @@ class SnapshotHandler {
     $this->snapshotLdapBase= $this->config->get_cfg_value("core","snapshotBase");
     $snapshotLdap->cd($this->snapshotLdapBase);
     if (!$snapshotLdap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($snapshotLdap->get_error(), $this->snapshotLdapBase, "", get_class()));
+      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($snapshotLdap->get_error(), $this->snapshotLdapBase, "", __CLASS__));
     }
 
     return $snapshotLdap;
@@ -277,7 +277,7 @@ class SnapshotHandler {
       $ldap_to -> cd($snapldapbase);
 
       if (!$ldap_to->success()){
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", __CLASS__));
       }
 
     }
@@ -326,11 +326,11 @@ class SnapshotHandler {
       $ldap_to->cd($new_dn);
       $ldap_to->add($target);
       if (!$ldap_to->success()){
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $new_dn, LDAP_ADD, get_class()));
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $new_dn, LDAP_ADD, __CLASS__));
       }
 
       if (!$ldap->success()){
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $new_base, "", get_class()));
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $new_base, "", __CLASS__));
       }
 
     }
@@ -377,7 +377,7 @@ class SnapshotHandler {
       $ldap_to        = new ldapMultiplexer(new LDAP($user,$password, $server));
       $ldap_to -> cd($snapldapbase);
       if (!$ldap_to->success()){
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", __CLASS__));
       }
     }
     /* Prepare bases and some other infos */
@@ -432,7 +432,7 @@ class SnapshotHandler {
       $ldap_to        = new ldapMultiplexer(new LDAP($user,$password, $server));
       $ldap_to -> cd($snapldapbase);
       if (!$ldap_to->success()){
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", __CLASS__));
       }
     }
 
@@ -497,7 +497,7 @@ class SnapshotHandler {
       $ldap_to        = new ldapMultiplexer(new LDAP($user,$password, $server));
       $ldap_to -> cd($snapldapbase);
       if (!$ldap_to->success()){
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", __CLASS__));
       }
     }
 
@@ -512,7 +512,7 @@ class SnapshotHandler {
     $err = "";
     $ldap->import_complete_ldif($data,$err,false,false);
     if (!$ldap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, "", get_class()));
+      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, "", __CLASS__));
     }
   }
 

diff --git a/include/class_acl.inc b/include/class_acl.inc
@@ -1582,7 +1582,7 @@ class acl extends plugin
         }
 
         if (!$ldap->success()) {
-            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()), ERROR_DIALOG);
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, __CLASS__), ERROR_DIALOG);
         }
 
         /* Refresh users ACLs */
@@ -1676,7 +1676,7 @@ class acl extends plugin
             $new_attrs = array("gosaAclEntry" => $new_entries);
             $ldap->modify($new_attrs);
             if (!$ldap->success()) {
-                msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class()), ERROR_DIALOG);
+                msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, __CLASS__), ERROR_DIALOG);
             }
         }
     }

diff --git a/include/class_ldap.inc b/include/class_ldap.inc
@@ -993,7 +993,7 @@ class LDAP
 
                     print_a(array($cdn, $na));
 
-                    msg_dialog::display(_("LDAP error"), msgPool::ldaperror($this->get_error(), $cdn, LDAP_ADD, get_class()));
+                    msg_dialog::display(_("LDAP error"), msgPool::ldaperror($this->get_error(), $cdn, LDAP_ADD, __CLASS__));
                     return false;
                 }
             }
@@ -1497,7 +1497,7 @@ class LDAP
         }
 
         if (!$this->success()) {
-            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($this->get_error(), $dn, "", get_class()));
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($this->get_error(), $dn, "", __CLASS__));
         }
 
         return ($ret);