Replaced 'show_header' with 'show_disable_header' && 'show_enable_header'

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

diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index a0d33319675a97f906e344ddce52e5650d5c50ca..4b85ff9bf3f49a1496f6fabc25b3637482db9790 100644 (file)
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -359,7 +359,6 @@ class aclManagement extends plugin
   function save() { } 
   function adapt_from_template($dn) { } 
   function password_change_needed() { } 
-  function show_header($button_text, $text, $disabled= FALSE) { }
 
 } 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 4cb3ccd04b8c9c39f39132ede58b5342fc3bce90..7f6ee679e333b7b4fb72da9599bfbd1d25b543f0 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -492,7 +492,6 @@ class applicationManagement extends plugin
   function check() {}
   function adapt_from_template($dn) {}
   function password_change_needed() {}
-  function show_header($button_text, $text, $disabled= FALSE) {}
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc
index c803aff4d3d823cf88993cd080a1a6cb0be0beff..0de0560404742f56211a64a9b378e3ba35a9c239 100644 (file)
--- a/plugins/admin/applications/class_applicationParameters.inc
+++ b/plugins/admin/applications/class_applicationParameters.inc
@@ -49,10 +49,10 @@ class applicationParameters extends plugin
        $display= "";
        if ($this->parent != NULL){
                if ($this->is_account){
-                       $display= $this->show_header(_("Remove options"),
+                       $display= $this->show_disable_header(_("Remove options"),
                                _("This application has options. You can disable them by clicking below."));
                } else {
-                       $display= $this->show_header(_("Create options"),
+                       $display= $this->show_enable_header(_("Create options"),
                                _("This application has options disabled. You can enable them by clicking below."));
                        $this->parent->by_object['application']->generateTemplate();
                        return ($display);

diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 9fffda8799547a9a141185054c1bd35c70885cd4..7228642498e8f6bdf906022a05d5d3e5662fb8af 100644 (file)
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -398,10 +398,10 @@ class appgroup extends plugin
     $display= "";
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove applications"),
+        $display= $this->show_disable_header(_("Remove applications"),
             _("This group has application features enabled. You can disable them by clicking below."));
       } else {
-        $display.= $this->show_header(_("Create applications"),
+        $display.= $this->show_enable_header(_("Create applications"),
             _("This group has application features disabled. You can enable them by clicking below."));
         return ($display);
       }

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index c78710ef292bc64bcf15bbbd4374c4232f4b6a60..233f112036d3fc267ecd88ac6822f4afa26bc519 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -317,10 +317,10 @@ class mailgroup extends plugin
     $display= "";
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove mail account"),
+        $display= $this->show_disable_header(_("Remove mail account"),
             _("This account has mail features enabled. You can disable them by clicking below."));
       } else {
-        $display= $this->show_header(_("Create mail account"),
+        $display= $this->show_enable_header(_("Create mail account"),
             _("This account has mail features disabled. You can enable them by clicking below."));
         return ($display);
       }

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 2d2bc5248012c18dd0ae9282a4e354ab381505c7..637abae5b9309b5a85f151b73377625fdc7b912a 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -567,7 +567,6 @@ class groupManagement extends plugin
   function check()  { }
   function adapt_from_template($dn) { }
   function password_change_needed()  { }
-  function show_header($button_text, $text, $disabled= FALSE)  { }
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index f503455d9738d0c3bd10dc56541c1a3dbd719d3c..52f91ddc8e5c432894c47db5942878dd280a8f0a 100755 (executable)
--- a/plugins/admin/mimetypes/class_mimetypeManagement.inc
+++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc
@@ -501,7 +501,6 @@ class mimetypeManagement extends plugin
   function check() {}
   function adapt_from_template($dn) {}
   function password_change_needed() {}
-  function show_header($button_text, $text, $disabled= FALSE) {}
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc
index b111909422cd8d26f39e86327aed189c067b218a..0fb270913057afc88941844345b8bfd3fc5d3a52 100644 (file)
--- a/plugins/admin/ogroups/class_mailogroup.inc
+++ b/plugins/admin/ogroups/class_mailogroup.inc
@@ -37,10 +37,10 @@ class mailogroup extends plugin
     /* Show tab dialog headers */
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove mail account"),
+        $display= $this->show_disable_header(_("Remove mail account"),
             _("This group has mail features enabled. You can disable them by clicking below."));
       } else {
-        $display= $this->show_header(_("Create mail account"), _("This group has mail features disabled. You can enable them by clicking below."));
+        $display= $this->show_enable_header(_("Create mail account"), _("This group has mail features disabled. You can enable them by clicking below."));
         return ($display);
       }
     }

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index f194328ba219c3b813501264935f57686e67e7a0..22f235db27b7cf2230bc8f12a62727f2f42ceded 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -110,10 +110,10 @@ class phonequeue extends plugin
     /* Show tab dialog headers */
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove the phone queue from this Account"),
+        $display= $this->show_disable_header(_("Remove the phone queue from this Account"),
             _("Phone queue is enabled for this group. You can disable it by clicking below."));
       } else {
-        $display= $this->show_header(_("Create phone queue"), 
+        $display= $this->show_enable_header(_("Create phone queue"), 
                   _("For this group the phone queues are disabled. You can enable them by clicking below."));
         return ($display);
       }

diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index fc967d3b14a8755f5dfe23200f99d65b4c975c53..65a9b760907e7f54d4646c51fa87e2be2cf3fb21 100644 (file)
--- a/plugins/admin/systems/class_glpiAccount.inc
+++ b/plugins/admin/systems/class_glpiAccount.inc
@@ -562,10 +562,10 @@ class glpiAccount extends plugin
 
     /* Show tab dialog headers */
     if ($this->is_account){
-      $display= $this->show_header(_("Remove inventory"),
+      $display= $this->show_disable_header(_("Remove inventory"),
           _("This device has inventory informations enabled. You can disable them by clicking below."));
     } else {
-      $display= $this->show_header(_("Add inventory"),
+      $display= $this->show_enable_header(_("Add inventory"),
           _("This device has inventory informations disabled. You can enable them by clicking below."));
       return ($display);
     }

diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc
index f9b0348ffec6fe62acbefbde155014018af459d1..5af98b686c62eef30c23c5fa26c8530a1e4aba1a 100644 (file)
--- a/plugins/admin/systems/class_glpiPrinterAccount.inc
+++ b/plugins/admin/systems/class_glpiPrinterAccount.inc
@@ -196,10 +196,10 @@ class glpiPrinterAccount extends plugin
 
     /* Show tab dialog headers */
     if ($this->is_account){
-      $display= $this->show_header(_("Remove inventory"),
+      $display= $this->show_disable_header(_("Remove inventory"),
           _("This server has inventory features enabled. You can disable them by clicking below."));
     } else {
-      $display= $this->show_header(_("Add inventory"),
+      $display= $this->show_enable_header(_("Add inventory"),
           _("This server has inventory features disabled. You can enable them by clicking below."));
       return ($display);
     }

diff --git a/plugins/admin/systems/class_inventory.inc b/plugins/admin/systems/class_inventory.inc
index be90e46e18e9c544f3b8b3281298630c3ec8bc71..e23eeddd288a3b4a6ee360a489e03587ed08f6d2 100644 (file)
--- a/plugins/admin/systems/class_inventory.inc
+++ b/plugins/admin/systems/class_inventory.inc
@@ -33,10 +33,10 @@ class inventory extends plugin
 
     /* Show tab dialog headers */
     if ($this->is_account){
-      $display= $this->show_header(_("Remove DNS service"),
+      $display= $this->show_disable_header(_("Remove DNS service"),
           _("This server has DNS features enabled. You can disable them by clicking below."));
     } else {
-      $display= $this->show_header(_("Add DNS service"),
+      $display= $this->show_enable_header(_("Add DNS service"),
           _("This server has DNS features disabled. You can enable them by clicking below."));
       return ($display);
     }

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 770cf15cc609a3aeec548529498a9edd63591381..7361720217fe22686595c7a00094a3fd880e9266 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -229,7 +229,7 @@ class printgeneric extends plugin
      * hide this tab.
      */
     if($this->BelongsTo == "unknown"){
-      $display= $this->show_header(_("Add printer extension"),
+      $display= $this->show_enable_header(_("Add printer extension"),
           _("Could not intialize printer tab, parameter parent was missing while construction."),TRUE,TRUE);
       return($display);
     }
@@ -237,12 +237,12 @@ class printgeneric extends plugin
     /* Templates can't have printer extensions 
      */
     if($this->BelongsTo == "WorkstationTemplate"){
-      $display= $this->show_header(_("Add printer extension"),
+      $display= $this->show_enable_header(_("Add printer extension"),
           _("This is a workstation template, printer tab is disabled."),TRUE,TRUE);
       return($display);
     }
     if($this->BelongsTo == "TerminalTemplate"){
-      $display= $this->show_header(_("Add printer extension"),
+      $display= $this->show_enable_header(_("Add printer extension"),
           _("This is a terminal template, printer tab is disabled."),TRUE,TRUE);
       return($display);
     }
@@ -281,7 +281,7 @@ class printgeneric extends plugin
     /* If this is a WS / Terminal depending printer, display account state button */
     if($this->BelongsTo != "Printer"){
       if((empty($this->cn)) && ($this->dn != "new")){
-        $display= $this->show_header(_("Add printer extension"),
+        $display= $this->show_enable_header(_("Add printer extension"),
             _("This object has printer extension disabled. You can't enable it while 'cn' is not present in entry. Possibly you are currently creating a new terminal template"),TRUE,TRUE);
         $this->is_account= false;
         return $display;
@@ -289,18 +289,18 @@ class printgeneric extends plugin
 
       if (($this->is_account)){
         if($this->BelongsTo=="Workstation"){
-          $display= $this->show_header(_("Remove printer extension"),
+          $display= $this->show_disable_header(_("Remove printer extension"),
               _("This workstation has printer extension enabled.You can disable it by clicking below."));
         }elseif($this->BelongsTo=="Terminal"){
-          $display= $this->show_header(_("Remove printer extension"),
+          $display= $this->show_disable_header(_("Remove printer extension"),
               _("This terminal has printer extension enabled. You can disable it by clicking below."));
         }
       }else{
         if($this->BelongsTo=="Workstation"){
-          $display= $this->show_header(_("Add printer extension"),
+          $display= $this->show_disable_header(_("Add printer extension"),
               _("This workstation has printer extension disabled. You can enable it by clicking below."));
         }elseif($this->BelongsTo=="Terminal"){
-          $display= $this->show_header(_("Add printer extension"),
+          $display= $this->show_enable_header(_("Add printer extension"),
               _("This terminal has printer extension disabled. You can enable it by clicking below."));
         }  
         return ($display);

diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc
index 8d468f948641e4c4d327ef79e33f9df9ae7019c2..8b4e9a878f59c41dd2a5f7f8937c2206a35308f1 100644 (file)
--- a/plugins/admin/systems/class_servDHCP.inc
+++ b/plugins/admin/systems/class_servDHCP.inc
@@ -33,10 +33,10 @@ class servdhcp extends plugin
 
     /* Show tab dialog headers */
     if ($this->is_account){
-      $display= $this->show_header(_("Remove DHCP service"),
+      $display= $this->show_disable_header(_("Remove DHCP service"),
           _("This server has DHCP features enabled. You can disable them by clicking below."));
     } else {
-      $display= $this->show_header(_("Add DHCP service"),
+      $display= $this->show_enable_header(_("Add DHCP service"),
           _("This server has DHCP features disabled. You can enable them by clicking below."));
       return ($display);
     }

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 6c1307d256162f37800e9f738d5c87a6491a8013..f44efc0301f8bff96ea7e2d29dbfcb86587ad76c 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -70,10 +70,10 @@ class servdns extends plugin
     }
 
     if ($this->is_account){
-      $display= $this->show_header(_("Remove DNS service"),
+      $display= $this->show_disable_header(_("Remove DNS service"),
           _("This server has DNS features enabled. You can disable them by clicking below."));
     } else {
-      $display= $this->show_header(_("Add DNS service"),
+      $display= $this->show_enable_header(_("Add DNS service"),
           _("This server has DNS features disabled. You can enable them by clicking below."));
       return ($display);
     }

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index fada1c85379a8d2310317732d3174f078e0f1d53..361586706b5f5fb1b723c28d83effe1e38f87ebc 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -833,7 +833,6 @@ class userManagement extends plugin
   function save() { } 
   function adapt_from_template($dn) { } 
   function password_change_needed() { } 
-  function show_header($button_text, $text, $disabled= FALSE) { }
 
 } /* ... class userManagement */
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 5c4c8749afcde77e29273a8ca1f211c585732a85..d106b88cd4b4e1ad0ab477314e72078a72f3cd40 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -143,10 +143,10 @@ class gofaxAccount extends plugin
     $display= "";
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove fax account"),
+        $display= $this->show_disable_header(_("Remove fax account"),
             _("This account has fax features enabled. You can disable them by clicking below."));
       } else {
-        $display= $this->show_header(_("Create fax account"),
+        $display= $this->show_enable_header(_("Create fax account"),
             _("This account has fax features disabled. You can enable them by clicking below."));
         return ($display);
       }

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 275a1b44bd46ed94f2aa34deea845bb3ba54f28c..5b70424b812920c3a01c825ae4ca4ecd1dee5484 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -748,14 +748,14 @@ class phoneAccount extends plugin
     /* Show tab dialog headers */
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove phone account"),
+        $display= $this->show_disable_header(_("Remove phone account"),
             _("This account has phone features enabled. You can disable them by clicking below."));
       } else {
         if(empty($this->uid)){
-          $display= $this->show_header(_("Create phone account"),
+          $display= $this->show_enable_header(_("Create phone account"),
               _("This account has phone features disabled. You can't enable them while no uid is set."),TRUE,TRUE);
         }else{
-          $display= $this->show_header(_("Create phone account"),
+          $display= $this->show_enable_header(_("Create phone account"),
               _("This account has phone features disabled. You can enable them by clicking below."));
         }
         return ($display);

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 574b16ea44cb2e79edd9b946558b92de5432277e..ecda1e744bae965f294dbe888bdc307a167f9ebb 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -255,10 +255,10 @@ class mailAccount extends plugin
     /* Show tab dialog headers */
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove mail account"),
+        $display= $this->show_disable_header(_("Remove mail account"),
             _("This account has mail features enabled. You can disable them by clicking below."));
       } else {
-        $display= $this->show_header(_("Create mail account"), _("This account has mail features disabled. You can enable them by clicking below."));
+        $display= $this->show_enable_header(_("Create mail account"), _("This account has mail features disabled. You can enable them by clicking below."));
         return ($display);
       }
     }

diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc
index e2ea3aa0e4c20e292d3444735da1c5e0115c1806..3809cb58a33b5c18751fe490a7facab21e47b587 100644 (file)
--- a/plugins/personal/nagios/class_nagiosAccount.inc
+++ b/plugins/personal/nagios/class_nagiosAccount.inc
@@ -98,10 +98,10 @@ class nagiosAccount extends plugin
     /* Show tab dialog headers */
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove nagios account"),
+        $display= $this->show_disable_header(_("Remove nagios account"),
             _("This account has nagios features enabled. You can disable them by clicking below."));
       } else {
-        $display= $this->show_header(_("Create nagios account"), _("This account has nagios features disabled. You can enable them by clicking below."));
+        $display= $this->show_enable_header(_("Create nagios account"), _("This account has nagios features disabled. You can enable them by clicking below."));
         return($display);
       }
     }

diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc
index 9b3e3db36d88f06dbc256fd82ef4b52c60cc2837..177ec4daf809bbad7396de6dd238ea87296ca56f 100644 (file)
--- a/plugins/personal/netatalk/class_netatalk.inc
+++ b/plugins/personal/netatalk/class_netatalk.inc
@@ -130,7 +130,7 @@ class netatalk extends plugin {
     /* Show tab dialog headers */
     if ($this->parent != NULL) {
       if ($this->is_account) {
-        $display = $this->show_header(_("Remove netatalk account"), _("This account has netatalk features enabled. You can disable them by clicking below."));
+        $display = $this->show_disable_header(_("Remove netatalk account"), _("This account has netatalk features enabled. You can disable them by clicking below."));
       } else {
         $errmsg="";
         $obj = $this->parent->by_object['posixAccount'];
@@ -141,9 +141,9 @@ class netatalk extends plugin {
           $errmsg.="At least one share with netatalk or NFS mount entry needed.";
         }
         if($errmsg==""){
-          $display = $this->show_header(_("Create netatalk account"), _("This account has netatalk features disabled. You can enable them by clicking below."));
+          $display = $this->show_enable_header(_("Create netatalk account"), _("This account has netatalk features disabled. You can enable them by clicking below."));
         } else {
-          $display = $this->show_header(_("Create netatalk account"), _($errmsg), TRUE);  
+          $display = $this->show_enable_header(_("Create netatalk account"), _($errmsg), TRUE);  
         }
         return ($display);
       }

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index 7f548f72ad144addb2a30e1a13394385c411aedf..e06123a0c40b53876409e3471a87ade29c155607 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -204,7 +204,7 @@ class sambaAccount extends plugin
     $display= "";
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove samba account"),
+        $display= $this->show_disable_header(_("Remove samba account"),
             _("This account has samba features enabled. You can disable them by clicking below."));
       } else {
         $obj= $this->parent->by_object['posixAccount'];
@@ -215,10 +215,10 @@ class sambaAccount extends plugin
            on. */
         if ($obj->is_account){
 
-          $display= $this->show_header(_("Create samba account"),
+          $display= $this->show_enable_header(_("Create samba account"),
               _("This account has samba features disabled. You can enable them by clicking below."));
         } else {
-          $display= $this->show_header(_("Create samba account"),
+          $display= $this->show_enable_header(_("Create samba account"),
               _("This account has samba features disabled. Posix features are needed for samba accounts, enable them first."), TRUE);
         }
         return ($display);