Updated dashBoard

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

diff --git a/gosa-core/plugins/generic/dashBoard/class_dashBoard.inc b/gosa-core/plugins/generic/dashBoard/class_dashBoard.inc
index 5e75d52bb0b7311e03b0af93e162f20a82af8426..6dce8e7faf17eaa25240531c6278669b75e1b742 100644 (file)
--- a/gosa-core/plugins/generic/dashBoard/class_dashBoard.inc
+++ b/gosa-core/plugins/generic/dashBoard/class_dashBoard.inc
@@ -7,6 +7,14 @@ class dashBoard extends plugin
    var $plShortIcon = 'dashBoard.png';
    var $plIcon = 'dashBoard.png';
 
+
+    function execute()
+    {
+        $smarty = get_smarty();
+
+        return($smarty->fetch(get_template_path('dashBoard.tpl', TRUE)));
+        
+    }
 }
 
 ?>

diff --git a/gosa-core/plugins/generic/dashBoard/dashBoard.tpl b/gosa-core/plugins/generic/dashBoard/dashBoard.tpl
new file mode 100644 (file)
index 0000000..345e6ae
--- /dev/null
+++ b/gosa-core/plugins/generic/dashBoard/dashBoard.tpl
@@ -0,0 +1 @@
+Test

diff --git a/gosa-core/plugins/generic/dashBoard/main.inc b/gosa-core/plugins/generic/dashBoard/main.inc
index f738eb671490223444905c1a5bb81a320ae5c384..9b2ee3b3ab1717513137e68c13309da9d53ea527 100644 (file)
--- a/gosa-core/plugins/generic/dashBoard/main.inc
+++ b/gosa-core/plugins/generic/dashBoard/main.inc
@@ -1,32 +1,51 @@
 <?php
 /*
- * This code is part of GOsa (http://www.gosa-project.org)
- * Copyright (C) 2003-2008 GONICUS GmbH
- *
- * ID: $$Id: main.inc 13287 2008-12-12 14:36:42Z hickert $$
- *
- * 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 (!$cleanup){
-       session::set('plugin_dir',dirname(__FILE__));
-       $smarty->assign("iconmenu", $plist->show_iconmenu());
-       $smarty->assign("header", print_header(get_template_path('images/welcome.png'), sprintf(_("Welcome %s!"), $ui->cn)));
-       $smarty->assign("year", date("Y"));
-       $smarty->assign("revision", get_gosa_version());
-       $display= $smarty->fetch(get_template_path('welcome.tpl', TRUE));
+  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
+*/
+
+
+/* Remove locks created by this plugin
+*/
+if ($remove_lock){
+  if(session::is_set('dashBoard')){
+       // Nothing to unlock here
+  }
 }
 
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('dashBoard');
+}else{
+
+
+       /* Create logview object on demand */
+       if (!session::is_set('dashBoard')){
+               session::set('dashBoard',new dashBoard($config));
+       }
+       $dashBoard = session::get('dashBoard');
+
+       /* Execute formular */
+       $display= $dashBoard->save_object();
+       $display= $dashBoard->execute ();
+       $display.= "<input type=\"hidden\" name=\"ignore\">\n";
+
+       /* Store changes  in session */
+       session::set('dashBoard',$dashBoard);
+}
 ?>

diff --git a/gosa-core/plugins/generic/dashBoard/welcome.tpl b/gosa-core/plugins/generic/dashBoard/welcome.tpl
deleted file mode 100644 (file)
index 345e6ae..0000000
--- a/gosa-core/plugins/generic/dashBoard/welcome.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Test