From 3ce72c26d5c4ff00be77797327d8d1065374b11e Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 9 Jan 2008 16:22:31 +0000 Subject: [PATCH] More cleanup git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8272 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/main.php | 2 +- gosa-core/include/class_location.inc | 2 +- .../include/{ => password-methods}/class_password-methods.inc | 0 .../{include => plugins/admin/fai}/class_debconfTemplate.inc | 0 gosa-core/plugins/admin/fai/class_faiManagement.inc | 1 + .../{include => plugins/admin/systems/ppd}/class_ppdManager.inc | 0 .../admin/systems/services/dhcp}/class_dhcpPlugin.inc | 0 .../admin/systems/services/glpi}/class_glpi.inc | 0 .../{include => plugins/personal/connectivity}/class_opengw.inc | 0 .../personal/connectivity}/class_pgsql_opengw.inc | 0 .../personal/samba}/class_sambaMungedDial.inc | 0 11 files changed, 3 insertions(+), 2 deletions(-) rename gosa-core/include/{ => password-methods}/class_password-methods.inc (100%) rename gosa-core/{include => plugins/admin/fai}/class_debconfTemplate.inc (100%) rename gosa-core/{include => plugins/admin/systems/ppd}/class_ppdManager.inc (100%) rename gosa-core/{include => plugins/admin/systems/services/dhcp}/class_dhcpPlugin.inc (100%) rename gosa-core/{include => plugins/admin/systems/services/glpi}/class_glpi.inc (100%) rename gosa-core/{include => plugins/personal/connectivity}/class_opengw.inc (100%) rename gosa-core/{include => plugins/personal/connectivity}/class_pgsql_opengw.inc (100%) rename gosa-core/{include => plugins/personal/samba}/class_sambaMungedDial.inc (100%) diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index 33da67448..971f797dc 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -24,7 +24,7 @@ $start = microtime(); /* Basic setup, remove eventually registered sessions */ require_once ("../include/php_setup.inc"); require_once ("functions.inc"); -require_once ("functions_FAI.inc"); +#require_once ("functions_FAI.inc"); /* Set header */ header("Content-type: text/html; charset=UTF-8"); diff --git a/gosa-core/include/class_location.inc b/gosa-core/include/class_location.inc index 6d437276b..a8e6a4bb1 100644 --- a/gosa-core/include/class_location.inc +++ b/gosa-core/include/class_location.inc @@ -83,7 +83,6 @@ $class_mapping= array( "MultiSelectWindow" => "include/class_MultiSelectWindow.inc", "config" => "include/class_config.inc", "SnapShotDialog" => "include/class_SnapShotDialog.inc", - "dhcpPlugin" => "include/class_dhcpPlugin.inc", "passwordMethod" => "include/class_password-methods.inc", "Print_a_class" => "include/functions_debug.inc", "LDAP" => "include/class_ldap.inc", @@ -211,6 +210,7 @@ $class_mapping= array( "dhcpGroup" => "plugins/admin/systems/services/dhcp/class_dhcpGroup.inc", "dhcpHost" => "plugins/admin/systems/services/dhcp/class_dhcpHost.inc", "dhcpNewSectionDialog" => "plugins/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc", + "dhcpPlugin" => "plugins/admin/systems/services/dhcp/class_dhcpPlugin.inc", "dhcpService" => "plugins/admin/systems/services/dhcp/class_dhcpService.inc", "servdhcp" => "plugins/admin/systems/services/dhcp/class_servDHCP.inc", "ServiceAddDialog" => "plugins/admin/systems/services/class_ServiceAddDialog.inc", diff --git a/gosa-core/include/class_password-methods.inc b/gosa-core/include/password-methods/class_password-methods.inc similarity index 100% rename from gosa-core/include/class_password-methods.inc rename to gosa-core/include/password-methods/class_password-methods.inc diff --git a/gosa-core/include/class_debconfTemplate.inc b/gosa-core/plugins/admin/fai/class_debconfTemplate.inc similarity index 100% rename from gosa-core/include/class_debconfTemplate.inc rename to gosa-core/plugins/admin/fai/class_debconfTemplate.inc diff --git a/gosa-core/plugins/admin/fai/class_faiManagement.inc b/gosa-core/plugins/admin/fai/class_faiManagement.inc index 16ae87f73..218aae736 100644 --- a/gosa-core/plugins/admin/fai/class_faiManagement.inc +++ b/gosa-core/plugins/admin/fai/class_faiManagement.inc @@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +require_once (BASE_DIR."/include/functions_FAI.inc"); class faiManagement extends plugin { diff --git a/gosa-core/include/class_ppdManager.inc b/gosa-core/plugins/admin/systems/ppd/class_ppdManager.inc similarity index 100% rename from gosa-core/include/class_ppdManager.inc rename to gosa-core/plugins/admin/systems/ppd/class_ppdManager.inc diff --git a/gosa-core/include/class_dhcpPlugin.inc b/gosa-core/plugins/admin/systems/services/dhcp/class_dhcpPlugin.inc similarity index 100% rename from gosa-core/include/class_dhcpPlugin.inc rename to gosa-core/plugins/admin/systems/services/dhcp/class_dhcpPlugin.inc diff --git a/gosa-core/include/class_glpi.inc b/gosa-core/plugins/admin/systems/services/glpi/class_glpi.inc similarity index 100% rename from gosa-core/include/class_glpi.inc rename to gosa-core/plugins/admin/systems/services/glpi/class_glpi.inc diff --git a/gosa-core/include/class_opengw.inc b/gosa-core/plugins/personal/connectivity/class_opengw.inc similarity index 100% rename from gosa-core/include/class_opengw.inc rename to gosa-core/plugins/personal/connectivity/class_opengw.inc diff --git a/gosa-core/include/class_pgsql_opengw.inc b/gosa-core/plugins/personal/connectivity/class_pgsql_opengw.inc similarity index 100% rename from gosa-core/include/class_pgsql_opengw.inc rename to gosa-core/plugins/personal/connectivity/class_pgsql_opengw.inc diff --git a/gosa-core/include/class_sambaMungedDial.inc b/gosa-core/plugins/personal/samba/class_sambaMungedDial.inc similarity index 100% rename from gosa-core/include/class_sambaMungedDial.inc rename to gosa-core/plugins/personal/samba/class_sambaMungedDial.inc -- 2.30.2