Renamed for unification

[gosa.git] / gosa-core / plugins / admin / groups / main.inc

diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc
index fdb3a290766fb1c950cb61bdb6f8f695cd93b9fe..7b32b8f5e045dca9edd056fdd933b581a4a53fef 100644 (file)
--- a/gosa-core/plugins/admin/groups/main.inc
+++ b/gosa-core/plugins/admin/groups/main.inc
@@ -1,21 +1,23 @@
 <?php
 /*
-   This code is part of GOsa (https://gosa.gonicus.de)
-   Copyright (C) 2003  Cajus Pollmeier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 if ($remove_lock){
@@ -23,12 +25,12 @@ if ($remove_lock){
     $groupManagement = session::get('groupManagement');
     $groupManagement->remove_lock();
     del_lock ($ui->dn);
-    sess_del ('groupManagement');
+    session::un_set ('groupManagement');
   }
 } else {
   /* Create groupManagement object on demand */
   if (!session::is_set('groupManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    session::set('groupManagement',new groupManagement ($config, get_userinfo()));
+    session::set('groupManagement',new groupManagement ($config, $ui));
   }
   $groupManagement = session::get('groupManagement');
   $groupManagement->save_object();
@@ -36,12 +38,12 @@ if ($remove_lock){
 
   /* Page header*/
   if (session::is_set('objectinfo')){
-    $display= print_header(get_template_path('images/group.png'),
+    $display= print_header(get_template_path('plugins/groups/images/'),
                            _("Group administration"), "<img alt=\"\" align=\"middle\" src=\"".
-                            get_template_path('images/closedlock.png')."\"> ".
+                            get_template_path('images/lists/locked.png')."\"> ".
                             @LDAP::fix(session::get('objectinfo')));
   } else {
-    $display= print_header(get_template_path('images/group.png'), _("Group administration"));
+    $display= print_header(get_template_path('plugins/groups/images/plugin.png'), _("Group administration"));
   }
 
   $display.= $output;
@@ -49,7 +51,7 @@ if ($remove_lock){
   /* Reset requested? */
   if (isset($_GET['reset']) && $_GET['reset'] == 1){
     del_lock ($ui->dn);
-    sess_del ('groupManagement');
+    session::un_set ('groupManagement');
   }
 
   /* Show and save dialog */