Restored functions_FAI, because this will be worked over...

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

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 971f797dcb56aeca5cbbb16d7a06a633013cf375..33da6744814e1b0fbb3be9d18e4481188afb2a7d 100644 (file)
--- 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 a8e6a4bb1d09146bd933789b73e7218bf9f92109..d5a16b3d258b9938dfafeedd7e8b28d99a612dee 100644 (file)
--- a/gosa-core/include/class_location.inc
+++ b/gosa-core/include/class_location.inc
@@ -14,7 +14,6 @@ $class_mapping= array(
                 "Step_Config2" => "setup/class_setupStep_Config2.inc",
                 "Step_Config1" => "setup/class_setupStep_Config1.inc",
                 "setup_step" => "setup/class_setupStep.inc",
-                "debconf" => "include/class_debconfTemplate.inc",
                 "certificate" => "include/class_certificate.inc",
                 "writeexcel_biffwriter" => "include/utils/excel/class.writeexcel_biffwriter.inc.php",
                 "writeexcel_worksheet" => "include/utils/excel/class.writeexcel_worksheet.inc.php",
@@ -29,7 +28,6 @@ $class_mapping= array(
                 "LayersMenu" => "include/utils/layer-menu/lib/layersmenu.inc.php",
                 "LayersMenuCommon" => "include/utils/layer-menu/lib/layersmenu-common.inc.php",
                 "PlainMenu" => "include/utils/layer-menu/lib/plainmenu.inc.php",
-                "pgre_sql" => "include/class_pgsql_opengw.inc",
                 "divlist" => "include/class_divlist.inc",
                 "passwordMethodClear" => "include/password-methods/class_password-methods-clear.inc",
                 "passwordMethodMd5" => "include/password-methods/class_password-methods-md5.inc",
@@ -39,13 +37,12 @@ $class_mapping= array(
                 "passwordMethodsmd5" => "include/password-methods/class_password-methods-smd5.inc",
                 "passwordMethodCrypt" => "include/password-methods/class_password-methods-crypt.inc",
                 "passwordMethodsha" => "include/password-methods/class_password-methods-sha.inc",
-                "ppdManager" => "include/class_ppdManager.inc",
+                "passwordMethod" => "include/password-methods/class_password-methods.inc",
                 "divSelectBox" => "include/class_divSelectBox.inc",
                 "tabs" => "include/class_tabs.inc",
                 "hostActionQueue" => "include/class_hostActionQueue.inc",
                 "CopyPasteHandler" => "include/class_CopyPasteHandler.inc",
                 "plugin" => "include/class_plugin.inc",
-                "glpiDB" => "include/class_glpi.inc",
                 "acl" => "include/class_acl.inc",
                 "pluglist" => "include/class_pluglist.inc",
                 "sieve" => "include/sieve/class_sieve.inc",
@@ -71,7 +68,6 @@ $class_mapping= array(
                 "sieve_vacation" => "include/sieve/class_sieveElement_Vacation.inc",
                 "sieve_discard" => "include/sieve/class_sieveElement_Discard.inc",
                 "My_Scanner" => "include/sieve/class_My_Scanner.inc",
-                "ogw" => "include/class_opengw.inc",
                 "gosa_cache" => "include/class_cache_handler.inc",
                 "Socket_Client" => "include/class_socketClient.inc",
                 "log" => "include/class_log.inc",
@@ -79,11 +75,9 @@ $class_mapping= array(
                 "msg_dialog" => "include/class_msg_dialog.inc",
                 "parseXml" => "include/functions_helpviewer.inc",
                 "session" => "include/class_session.inc",
-                "sambaMungedDial" => "include/class_sambaMungedDial.inc",
                 "MultiSelectWindow" => "include/class_MultiSelectWindow.inc",
                 "config" => "include/class_config.inc",
                 "SnapShotDialog" => "include/class_SnapShotDialog.inc",
-                "passwordMethod" => "include/class_password-methods.inc",
                 "Print_a_class" => "include/functions_debug.inc",
                 "LDAP" => "include/class_ldap.inc",
                 "userinfo" => "include/class_userinfo.inc",
@@ -100,16 +94,19 @@ $class_mapping= array(
                 "mailMethod" => "plugins/personal/mail/class_mail-methods.inc",
                 "user" => "plugins/personal/generic/class_user.inc",
                 "sambaLogonHours" => "plugins/personal/samba/class_sambaLogonHours.inc",
+                "sambaMungedDial" => "plugins/personal/samba/class_sambaMungedDial.inc",
                 "sambaAccount" => "plugins/personal/samba/class_sambaAccount.inc",
                 "nagiosAccount" => "plugins/personal/nagios/class_nagiosAccount.inc",
                 "password" => "plugins/personal/password/class_password.inc",
                 "posixAccount" => "plugins/personal/posix/class_posixAccount.inc",
                 "pptpAccount" => "plugins/personal/connectivity/class_pptpAccount.inc",
+                "pgre_sql" => "plugins/personal/connectivity/class_pgsql_opengw.inc",
                 "proxyAccount" => "plugins/personal/connectivity/class_proxyAccount.inc",
                 "pureftpdAccount" => "plugins/personal/connectivity/class_pureftpdAccount.inc",
                 "connectivity" => "plugins/personal/connectivity/class_connectivity.inc",
                 "phpscheduleitAccount" => "plugins/personal/connectivity/class_phpscheduleitAccount.inc",
                 "oxchangeAccount" => "plugins/personal/connectivity/class_oxchangeAccount.inc",
+                "ogw" => "plugins/personal/connectivity/class_opengw.inc",
                 "webdavAccount" => "plugins/personal/connectivity/class_webdavAccount.inc",
                 "kolabAccount" => "plugins/personal/connectivity/class_kolabAccount.inc",
                 "intranetAccount" => "plugins/personal/connectivity/class_intranetAccount.inc",
@@ -135,6 +132,7 @@ $class_mapping= array(
                 "application" => "plugins/admin/applications/class_applicationGeneric.inc",
                 "applicationParameters" => "plugins/admin/applications/class_applicationParameters.inc",
                 "apptabs" => "plugins/admin/applications/tabs_application.inc",
+                "debconf" => "plugins/admin/fai/class_debconfTemplate.inc",
                 "faiScriptEntry" => "plugins/admin/fai/class_faiScriptEntry.inc",
                 "faiProfileEntry" => "plugins/admin/fai/class_faiProfileEntry.inc",
                 "faiManagement" => "plugins/admin/fai/class_faiManagement.inc",
@@ -183,6 +181,7 @@ $class_mapping= array(
                 "servDNSeditZoneEntries" => "plugins/admin/systems/services/dns/class_servDNSeditZoneEntries.inc",
                 "glpiAttachmentPool" => "plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc",
                 "glpiPrinterAccount" => "plugins/admin/systems/services/glpi/class_glpiPrinterAccount.inc",
+                "glpiDB" => "plugins/admin/systems/services/glpi/class_glpi.inc",
                 "glpiDeviceManagement" => "plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc",
                 "glpiSelectUser" => "plugins/admin/systems/services/glpi/class_glpiSelectUser.inc",
                 "goGlpiServer" => "plugins/admin/systems/services/glpi/class_goGlpiServer.inc",
@@ -237,6 +236,7 @@ $class_mapping= array(
                 "ArpNewDeviceTabs" => "plugins/admin/systems/tabs_arpnewdevice.inc",
                 "componenttabs" => "plugins/admin/systems/tabs_component.inc",
                 "divListRepository" => "plugins/admin/systems/class_divListRepositories.inc",
+                "ppdManager" => "plugins/admin/systems/ppd/class_ppdManager.inc",
                 "printerPPDDialog" => "plugins/admin/systems/ppd/class_printerPPDDialog.inc",
                 "printerPPDSelectionDialog" => "plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc",
                 "wingeneric" => "plugins/admin/systems/class_winGeneric.inc",

diff --git a/gosa-core/plugins/admin/fai/class_faiManagement.inc b/gosa-core/plugins/admin/fai/class_faiManagement.inc
index 218aae7361b7d277b7eea18c4d02748ff35dc5fa..16ae87f73f1bf39cb4424b83803e5c2ac06afb1f 100644 (file)
--- a/gosa-core/plugins/admin/fai/class_faiManagement.inc
+++ b/gosa-core/plugins/admin/fai/class_faiManagement.inc
@@ -17,7 +17,6 @@
    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
 {