Updated table summary

[gosa.git] / gosa-plugins / goto / addons / goto / main.inc

diff --git a/gosa-plugins/goto/addons/goto/main.inc b/gosa-plugins/goto/addons/goto/main.inc
index e61909a9761ae8f931eb87f98b8edf6622d79f3c..a63d2106e0f03cfea5e93a25a20a3c3fdc9c7414 100644 (file)
--- a/gosa-plugins/goto/addons/goto/main.inc
+++ b/gosa-plugins/goto/addons/goto/main.inc
@@ -20,44 +20,37 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* Remove classes and variables from session
- */
+/* Remove locks created by this plugin
+*/
+if ($remove_lock){
+  if(session::is_set('gotomasses')){
+      $macl = session::get('gotomasses');
+      $macl->remove_lock();
+  }
+}
+
+/* Remove this plugin from session
+*/
 if ( $cleanup ){
   session::un_set('gotomasses');
+}else{
+
+  /* Create gotomasses object on demand */
+  if (!session::is_set('gotomasses')){
+    $gotomasses= new gotomasses ($config, $ui);
+    session::set('gotomasses',$gotomasses);
+  }
+  $gotomasses = session::get('gotomasses');
+  $display= $gotomasses->execute();
+
+  /* Reset requested? */
+  if (isset($_GET['reset']) && $_GET['reset'] == 1){
+    session::un_set ('gotomasses');
+  }
+
+  /* Show and save dialog */
+  session::set('gotomasses',$gotomasses);
 }
 
-
-if (!$remove_lock){
-
-       /* Create gotomasses object on demand */
-       if (!session::is_set('gotomasses') || (isset($_GET['reset']) && $_GET['reset'] == 1) || isset($_POST['reload_gotomass_data'])){
-               $gotomasses= new gotomasses ($config);
-               $gotomasses->set_acl_category("gotomasses");
-
-        /* Check root dn and user dn for acl informations */
-        $gotomasses->set_acl_base($config->current['BASE']);
-        if($gotomasses->getacl("") == ""){
-            $gotomasses->set_acl_base($ui->dn);
-        }
-               
-               /* Check if we have acl on our own base */
-        if($gotomasses->getacl("") == ""){
-            $gotomasses->set_acl_base(dn2base($ui->dn));
-        }
-               session::set("gotomasses",$gotomasses);
-       }
-       $gotomasses = session::get('gotomasses');
-
-       /* Execute formular */
-       $display= $gotomasses->save_object();
-       if(isset($_POST['save_gotomass_changes'])){
-               $gotomasses->save();
-       }
-       $display= $gotomasses->execute ();
-
-       /* Page header*/
-       $display= print_header(get_template_path('plugins/goto/images/goto.png'), _("System deployment status")).$display;
-
-       /* Store changes  in session */
-       session::set('gotomasses',$gotomasses);
-}
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>