Fixed si function

[gosa.git] / gosa-core / include / class_pluglist.inc

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index 8f24af3399412b74debcef9f1c6a407b605cd248..9725b4b1486cbf06e5be7ae68b3eae9ea2f0e8aa 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -1,24 +1,25 @@
 <?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
  */
 
-
 class pluglist {
        var $index= 0;
        var $menu= "";
@@ -144,8 +145,11 @@ class pluglist {
 
                                        /* Read information from class variable */
                                        if (!isset($info['CLASS'])){
-                                               msg_dialog::display(_("Configuration error"), _("The configuration format has changed. Please re-run setup!"), ERROR_DIALOG);
-                                               display_error_page();
+                                               msg_dialog::display(
+                                                               _("Configuration error"), 
+                                                               _("The configuration format has changed. Please re-run setup!"), 
+                                                               FATAL_ERROR_DIALOG);
+                                               exit();
                                        }
                                        if (!plugin_available($info['CLASS'])){
                                                continue;
@@ -154,9 +158,7 @@ class pluglist {
                                        $plHeadline= $vars['plHeadline'];
                                        $plDescription= $vars['plDescription'];
 
-
                                        $index= $this->get_index($info['PATH'],$info['CLASS']);
-                                       $image= get_template_path('images/'.$info['ICON']);
                                        $href= "main.php?plug=$index&amp;reset=1";
 
                                        if(!$vars){
@@ -177,15 +179,6 @@ class pluglist {
                                                        _($plHeadline)."</a></p>\n";
                                                }
 
-                                               /* Generate icon entry with description */
-                                               $current= '<table summary=\"\" class="menuitem" onClick=\'location.href="'.$href.'"\'><tr><td style="background-color:#F0F0F0;"><a href="'.$href.'"><img alt=\"\" border=0 src="'.$image.'"></a></td><td style="width:100%; vertical-align:top; text-align:justify; padding-left:10px;">';
-                                               if(session::get('js')){
-                                                       $current.= '<b>'._($plHeadline).'</b><br>'._($plDescription);
-                                               } else {
-                                                       $current.= '<a href="'.$href.'"><b>'._($plHeadline).'</b></a><br><a href="'.$href.'">'._($plDescription).'</a>';
-                                               }
-                                               $current.= '</td></tr></table>';
-                                               $this->menuparts[_($headline)][]= $current;
                                                if(!session::is_set('maxC')){
                                                        session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP");
                                                }
@@ -283,8 +276,12 @@ class pluglist {
 
                                        if ($this->check_access($info['ACL'])){
 
-                                               /* Hm this looks doubled */
-                                               $image= get_template_path('images/'.$info['ICON']);
+                                               /* Load icon */
+                                               if (isset($info['ICON'])){
+                                                       $image= get_template_path('images/'.$info['ICON']);
+                                               } else {
+                                                       $image= get_template_path("plugins/".preg_replace("/^.*\//", "", $info['PATH'])."/images/plugin.png");
+                                               }
                                                if ($col > 5){
                                                        $entries= $entries."</tr><tr>";
                                                        $col = 1;