From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 18 Jul 2006 11:21:02 +0000 (+0000)
Subject: Added first pluign state update and some fixes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d0e1eeef9f002902d5db32e8ef47ad039490ede;p=gosa.git

Added first pluign state update and some fixes


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4204 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/html/index.php b/html/index.php
index 3cd6509f0..c5bea796f 100644
--- a/html/index.php
+++ b/html/index.php
@@ -299,7 +299,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
               if (preg_match("/\bpassword\b/i",$value)){
                 $plug=$key;
                 gosa_log ("User \"$username\" password forced to change");
-                header ("Location: main.php?plug=$plug&reset=1");
+                header ("Location: main.php?plug=$plug&amp;reset=1");
                 exit;
               }
             }
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index cf8682f84..670fa16f2 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -289,6 +289,9 @@ class plugin
           $data = "";  
         }
         $this->$val= $data;
+        echo "<font color='blue'>".$val."</font><br>";
+      }else{
+        echo "<font color='red'>".$val."</font><br>";
       }
     }
   }
@@ -1413,14 +1416,14 @@ echo "FIXME: remove_snapshot uses old acl's<br>";
   function acl_is_createable()
   {
     $ui= get_userinfo();
-    return preg_match('/c/', $ui->get_permissions($this->dn, get_class($this), 'dummy'));
+    return preg_match('/c/', $ui->get_permissions($this->dn, get_class($this), '0'));
   }
 
 
-  function acl_is_removable()
+  function acl_is_removeable()
   {
     $ui= get_userinfo();
-    return preg_match('/d/', $ui->get_permissions($this->dn, get_class($this), 'dummy'));
+    return preg_match('/d/', $ui->get_permissions($this->dn, get_class($this), '0'));
   }
 
 }
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 70ccf42cf..f5caade65 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -259,14 +259,14 @@ class posixAccount extends plugin
              in the moment, because I need to rely on unique
              uidNumbers. There'll be a better solution later
              on. */
-          $display= $this->show_header(_("Remove posix account"),
+          $display= $this->show_disable_header(_("Remove posix account"),
               _("This account has unix features enabled. To disable them, you'll need to remove the samba / environment account first."), TRUE);
         } else {
-          $display= $this->show_header(_("Remove posix account"),
+          $display= $this->show_disable_header(_("Remove posix account"),
               _("This account has posix features enabled. You can disable them by clicking below."));
         }
       } else {
-        $display= $this->show_header(_("Create posix account"),
+        $display= $this->show_enable_header(_("Create posix account"),
             _("This account has posix features disabled. You can enable them by clicking below."));
         return($display);
       }