From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 21 Jan 2010 09:55:48 +0000 (+0000)
Subject: Reverted change of class name. May lead to problems when updating GOsa
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2d2717972623a0c5d8a852e6a23303d996c0deb7;p=gosa.git

Reverted change of class name. May lead to problems when updating GOsa


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

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index d04958a42..73d846a16 100644
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-class blocklistManagement extends management
+class blocklist extends management
 {
   var $plHeadline     = "Blocklists";
   var $plDescription  = "Blocklist management";
diff --git a/gosa-plugins/gofax/gofax/blocklists/main.inc b/gosa-plugins/gofax/gofax/blocklists/main.inc
index 17dc229d6..eac515c61 100644
--- a/gosa-plugins/gofax/gofax/blocklists/main.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/main.inc
@@ -23,8 +23,8 @@
 /* Remove locks created by this plugin
 */
 if ($remove_lock){
-  if(session::is_set('blocklistManagement')){
-      $macl = session::get('blocklistManagement');
+  if(session::is_set('blocklist')){
+      $macl = session::get('blocklist');
       $macl->remove_lock();
   }
 }
@@ -32,24 +32,24 @@ if ($remove_lock){
 /* Remove this plugin from session
 */
 if ( $cleanup ){
-  session::un_set('blocklistManagement');
+  session::un_set('blocklist');
 }else{
 
-  /* Create blocklistManagement object on demand */
-  if (!session::is_set('blocklistManagement')){
-    $blocklistManagement= new blocklistManagement ($config, $ui);
-    session::set('blocklistManagement',$blocklistManagement);
+  /* Create blocklist object on demand */
+  if (!session::is_set('blocklist')){
+    $blocklist= new blocklist ($config, $ui);
+    session::set('blocklist',$blocklist);
   }
-  $blocklistManagement = session::get('blocklistManagement');
-  $display= $blocklistManagement->execute();
+  $blocklist = session::get('blocklist');
+  $display= $blocklist->execute();
 
   /* Reset requested? */
   if (isset($_GET['reset']) && $_GET['reset'] == 1){
-    session::un_set ('blocklistManagement');
+    session::un_set ('blocklist');
   }
 
   /* Show and save dialog */
-  session::set('blocklistManagement',$blocklistManagement);
+  session::set('blocklist',$blocklist);
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: