From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 25 Sep 2007 09:21:01 +0000 (+0000)
Subject: Updated handling for phoneGeneric, class name was used as lowercase ('phonegeneric... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=df384bd8592a7c55fff929f89594e17a69cabee3;p=gosa.git

Updated handling for phoneGeneric, class name was used as lowercase ('phonegeneric') several times and caused PHP5 to stop with an critical error.


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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 5268f15e6..58eac7530 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -217,7 +217,7 @@
 	</printtabs>
 
 	<phonetabs>
-		<tab class="phonegeneric" name="Generic" />
+		<tab class="phoneGeneric" name="Generic" />
 		<tab class="glpiAccount" name="Inventory" />
 	</phonetabs>
 
diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 1d8ff6c45..365aaf5af 100644
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -54,7 +54,7 @@ class phoneGeneric extends plugin
 
   var $objectclasses= array("top", "goFonHardware");
 
-  function phonegeneric (&$config, $dn= NULL, $parent= NULL)
+  function phoneGeneric (&$config, $dn= NULL, $parent= NULL)
   {
     plugin::plugin ($config, $dn, $parent);
     $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses, true);
@@ -468,7 +468,7 @@ class phoneGeneric extends plugin
       $this->netConfigDNS->ipHostNumber = $source['ipHostNumber'][0];
     }
 
-    $source_o = new phonegeneric($this->config, $source['dn']);
+    $source_o = new phoneGeneric($this->config, $source['dn']);
     $this->selected_categorie = $source_o->selected_categorie;
   }
 
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 3b2813f8c..bd4fe814a 100644
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -268,7 +268,7 @@ class systems extends plugin
           "workstation" => array("CLASS"=>"WORKTABS",     "TABNAME"=>"workgeneric",     "TABCLASS" =>"worktabs",      "ACL"=> "workstation"),
           "server"      => array("CLASS"=>"SERVTABS",     "TABNAME"=>"servgeneric",     "TABCLASS" =>"servtabs",      "ACL"=> "server"),
           "printer"     => array("CLASS"=>"PRINTTABS",    "TABNAME"=>"printgeneric",    "TABCLASS" =>"printtabs",     "ACL"=> "printer"),
-          "phone"       => array("CLASS"=>"PHONETABS",    "TABNAME"=>"phonegeneric",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone"),
+          "phone"       => array("CLASS"=>"PHONETABS",    "TABNAME"=>"phoneGeneric",    "TABCLASS" =>"phonetabs",     "ACL"=> "phone"),
           "component"   => array("CLASS"=>"COMPONENTTABS","TABNAME"=>"componentgeneric","TABCLASS" =>"componenttabs", "ACL"=> "component"));
 
       if(isset($tabs[$sw])){
@@ -531,7 +531,7 @@ class systems extends plugin
             if($tabtype=="phonetabs"){
               $this->systab= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $dn,$type);
               $this->systab->set_acl_base($dn);
-              $this->systab->by_object['phonegeneric']->remove_from_parent ();
+              $this->systab->by_object['phoneGeneric']->remove_from_parent ();
             }else{
               $this->systab= new $tabtype($this->config,$this->config->data['TABS'][$tabobj], $dn,$type);
               $this->systab->set_acl_base($dn);
@@ -663,7 +663,7 @@ class systems extends plugin
         if($tabtype=="phonetabs"){
           $this->systab= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $this->dn,$type);
           $this->systab->set_acl_base($this->dn);
-          $this->systab->by_object['phonegeneric']->remove_from_parent ();
+          $this->systab->by_object['phoneGeneric']->remove_from_parent ();
         }else{  
           $this->systab= new $tabtype($this->config,$this->config->data['TABS'][$tabobj], $this->dn,$type);
           $this->systab->set_acl_base($this->dn);
@@ -1160,7 +1160,7 @@ class systems extends plugin
           "TABCLASS"  =>"servtabs",     "ACL"     =>"server"),
         "printer"     => array( "CLASS"     =>"PRINTTABS",    "TABNAME" =>"printgeneric",    
           "TABCLASS"  =>"printtabs",    "ACL"     =>"printer"),
-        "phone"       => array( "CLASS"     =>"PHONETABS",    "TABNAME" =>"phonegeneric",    
+        "phone"       => array( "CLASS"     =>"PHONETABS",    "TABNAME" =>"phoneGeneric",    
           "TABCLASS"  =>"phonetabs",    "ACL"     =>"phone"),
         "component"   => array( "CLASS"     =>"COMPONENTTABS","TABNAME" =>"componentgeneric",
           "TABCLASS"  =>"componenttabs","ACL"     =>"component"));
diff --git a/plugins/admin/systems/tabs_phone.inc b/plugins/admin/systems/tabs_phone.inc
index 2c65e6385..13d5ac3c7 100644
--- a/plugins/admin/systems/tabs_phone.inc
+++ b/plugins/admin/systems/tabs_phone.inc
@@ -21,7 +21,7 @@ class phonetabs extends tabs
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
-    $baseobject= $this->by_object['phonegeneric'];
+    $baseobject= $this->by_object['phoneGeneric'];
     $this->dn= "cn=$baseobject->cn,ou=phones,ou=systems,".$baseobject->base;
     $baseobject->dn= $this->dn;