Update for __autoload()

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

diff --git a/html/TreeMenu.php b/html/TreeMenu.php
index 1123a859edbeb32ff9c7019e12416c412f26ec9e..ec81418a274381d895b01651b6e90218185e6e80 100755 (executable)
--- a/html/TreeMenu.php
+++ b/html/TreeMenu.php
@@ -176,7 +176,7 @@ class HTML_TreeMenu
             case 'heyes_array':
                 // Need to create a HTML_TreeMenu object ?
                 if (!isset($params['treeMenu'])) {
-                    $treeMenu = &new HTML_TreeMenu();
+                    $treeMenu = new HTML_TreeMenu();
                     $parentID = 0;
                 } else {
                     $treeMenu = &$params['treeMenu'];
@@ -208,7 +208,7 @@ class HTML_TreeMenu
             default:
                 // Need to create a HTML_TreeMenu object ?
                 if (!isset($params['treeMenu'])) {
-                    $treeMenu = &new HTML_TreeMenu();
+                    $treeMenu = new HTML_TreeMenu();
                 } else {
                     $treeMenu = &$params['treeMenu'];
                 }
@@ -265,7 +265,7 @@ class HTML_TreeMenu
         // Supplied $xml is a string
         if (is_string($xml)) {
             require_once('XML/Tree.php');
-            $xmlTree = &new XML_Tree();
+            $xmlTree = new XML_Tree();
             $xmlTree->getTreeFromString($xml);
 
         // Supplied $xml is an XML_Tree object

diff --git a/html/main.php b/html/main.php
index f95af8a5a5cadbc6fa57652cc15030dee7c128d1..f9c2cc6e7d93e4517ce3ad36fb592389b0ad034e 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -29,9 +29,6 @@ require_once ("functions_FAI.inc");
 /* Set header */
 header("Content-type: text/html; charset=UTF-8");
 
-/* Find all class files and include them */
-get_dir_list("$BASE_DIR/plugins");
-
 /* Set the text domain as 'messages' */
 $domain = 'messages';
 bindtextdomain($domain, "$BASE_DIR/locale");
@@ -153,8 +150,16 @@ textdomain($domain);
 
 /* Prepare plugin list */
 if (!isset($_SESSION['plist'])){
-  $_SESSION['plist']= new pluglist($config, $ui);
+  /* Initially load all classes */
+  $class_list= get_declared_classes();
+  foreach ($class_mapping as $class => $path){
+    if (!in_array($class, $class_list)){
+        require_once("$BASE_DIR/$path");
+    }
+  }
   
+  $_SESSION['plist']= new pluglist($config, $ui);
+
   /* Load ocMapping into userinfo */
   $tmp= new acl($config, NULL, $ui->dn);
   $ui->ocMapping= $tmp->ocMapping;

diff --git a/include/class_location.inc b/include/class_location.inc
new file mode 100644 (file)
index 0000000..6fb05bc
--- /dev/null
+++ b/include/class_location.inc
@@ -0,0 +1,292 @@
+<?php
+$class_mapping= array(
+                "Step_Schema" => "setup/class_setupStep_Schema.inc",
+                "Step_Ldap" => "setup/class_setupStep_Ldap.inc",
+                "Step_License" => "setup/class_setupStep_License.inc",
+                "Step_Config2" => "setup/class_setupStep_Config2.inc",
+                "Step_Config1" => "setup/class_setupStep_Config1.inc",
+                "Step_Welcome" => "setup/class_setupStep_Welcome.inc",
+                "Step_Checks" => "setup/class_setupStep_Checks.inc",
+                "Step_Language" => "setup/class_setupStep_Language.inc",
+                "Step_Finish" => "setup/class_setupStep_Finish.inc",
+                "Step_Migrate" => "setup/class_setupStep_Migrate.inc",
+                "Step_Feedback" => "setup/class_setupStep_Feedback.inc",
+                "setup_step" => "setup/class_setupStep.inc",
+                "setup" => "setup/class_setup.inc",
+                "Step_Config3" => "setup/class_setupStep_Config3.inc",
+                "tabs" => "include/class_tabs.inc",
+                "parseXml" => "include/functions_helpviewer.inc",
+                "Des" => "include/heimdal/deslib.php",
+                "stream" => "include/heimdal/asnencode.php",
+                "asnEncode" => "include/heimdal/asnencode.php",
+                "entry" => "include/heimdal/mkey.php",
+                "principal" => "include/heimdal/mkey.php",
+                "mkey" => "include/heimdal/mkey.php",
+                "genkey" => "include/heimdal/genkey.php",
+                "mailMethodSendmailCyrus" => "include/class_mail-methods-sendmail-cyrus.inc",
+                "CopyPasteHandler" => "include/class_CopyPasteHandler.inc",
+                "certificate" => "include/class_certificate.inc",
+                "sambaMungedDial" => "include/class_sambaMungedDial.inc",
+                "MultiSelectWindow" => "include/class_MultiSelectWindow.inc",
+                "mailMethodKolab" => "include/class_mail-methods-kolab.inc",
+                "ogw" => "include/class_opengw.inc",
+                "config" => "include/class_config.inc",
+                "passwordMethodMd5" => "include/class_password-methods-md5.inc",
+                "divlist" => "include/class_divlist.inc",
+                "My_Parser" => "include/sieve/class_My_Parser.inc",
+                "sieve_comment" => "include/sieve/class_sieveElement_Comment.inc",
+                "sieveManagement" => "include/sieve/class_sieveManagement.inc",
+                "sieve_block_end" => "include/sieve/class_sieveElement_Block_End.inc",
+                "sieve_block_start" => "include/sieve/class_sieveElement_Block_Start.inc",
+                "sieve_require" => "include/sieve/class_sieveElement_Require.inc",
+                "sieve_redirect" => "include/sieve/class_sieveElement_Redirect.inc",
+                "Tree" => "include/sieve/class_tree.inc",
+                "sieve_keep" => "include/sieve/class_sieveElement_Keep.inc",
+                "My_Tree" => "include/sieve/class_My_Tree.inc",
+                "sieve_elsif" => "include/sieve/class_sieveElement_Else_Elsif.inc",
+                "sieve_else" => "include/sieve/class_sieveElement_Else_Elsif.inc",
+                "sieve" => "include/sieve/class_sieve.inc",
+                "sieve_reject" => "include/sieve/class_sieveElement_Reject.inc",
+                "sieve_vacation" => "include/sieve/class_sieveElement_Vacation.inc",
+                "Semantics" => "include/sieve/class_semantics.inc",
+                "sieve_stop" => "include/sieve/class_sieveElement_Stop.inc",
+                "Scanner" => "include/sieve/class_scanner.inc",
+                "sieve_fileinto" => "include/sieve/class_sieveElement_Fileinto.inc",
+                "sieve_discard" => "include/sieve/class_sieveElement_Discard.inc",
+                "sieve_if" => "include/sieve/class_sieveElement_If.inc",
+                "My_Scanner" => "include/sieve/class_My_Scanner.inc",
+                "Parser" => "include/sieve/class_parser.inc",
+                "passwordMethodsmd5" => "include/class_password-methods-smd5.inc",
+                "mailMethod" => "include/class_mail-methods.inc",
+                "HTML_TreeMenu" => "html/TreeMenu.php",
+                "HTML_TreeNode" => "html/TreeMenu.php",
+                "HTML_TreeMenu_Presentation" => "html/TreeMenu.php",
+                "HTML_TreeMenu_DHTML" => "html/TreeMenu.php",
+                "HTML_TreeMenu_Listbox" => "html/TreeMenu.php",
+                "passwordMethodkerberos" => "include/class_password-methods-kerberos.inc",
+                "passwordMethodsasl" => "include/class_password-methods-kerberos.inc",
+                "passwordMethodsha" => "include/class_password-methods-sha.inc",
+                "Print_a_class" => "include/functions_debug.inc",
+                "plugin" => "include/class_plugin.inc",
+                "userinfo" => "include/class_userinfo.inc",
+                "mailMethodCyrus" => "include/class_mail-methods-cyrus.inc",
+                "msg_dialog" => "include/class_msg_dialog.inc",
+                "mailMethodGolab" => "include/class_mail-methods-golab.inc",
+                "gosa_cache" => "include/class_cache_handler.inc",
+                "SnapShotDialog" => "include/class_SnapShotDialog.inc",
+                "passwordMethod" => "include/class_password-methods.inc",
+                "passwordMethodCrypt" => "include/class_password-methods-crypt.inc",
+                "glpiDB" => "include/class_glpi.inc",
+                "ppdManager" => "include/class_ppdManager.inc",
+                "passwordMethodClear" => "include/class_password-methods-clear.inc",
+                "writeexcel_format" => "include/php_writeexcel/class.writeexcel_format.inc.php",
+                "writeexcel_biffwriter" => "include/php_writeexcel/class.writeexcel_biffwriter.inc.php",
+                "writeexcel_formula" => "include/php_writeexcel/class.writeexcel_formula.inc.php",
+                "writeexcel_olewriter" => "include/php_writeexcel/class.writeexcel_olewriter.inc.php",
+                "writeexcel_workbook" => "include/php_writeexcel/class.writeexcel_workbook.inc.php",
+                "writeexcel_worksheet" => "include/php_writeexcel/class.writeexcel_worksheet.inc.php",
+                "acl" => "include/class_acl.inc",
+                "divSelectBox" => "include/class_divSelectBox.inc",
+                "debconf" => "include/class_debconfTemplate.inc",
+                "passwordMethodssha" => "include/class_password-methods-ssha.inc",
+                "pgre_sql" => "include/class_pgsql_opengw.inc",
+                "pluglist" => "include/class_pluglist.inc",
+                "log" => "include/class_log.inc",
+                "LDAP" => "include/class_ldap.inc",
+                "dhcpPlugin" => "include/class_dhcpPlugin.inc",
+                "addressbook" => "plugins/addons/addressbook/class_addressbook.inc",
+                "csvimport" => "plugins/addons/ldapmanager/class_csvimport.inc",
+                "ldif" => "plugins/addons/ldapmanager/class_ldif.inc",
+                "ldifexport" => "plugins/addons/ldapmanager/class_export.inc",
+                "ldifimport" => "plugins/addons/ldapmanager/class_import.inc",
+                "xlsexport" => "plugins/addons/ldapmanager/class_exportxls.inc",
+                "ldiftab" => "plugins/addons/ldapmanager/tabs_ldif.inc",
+                "target_list" => "plugins/addons/gotomasses/class_target_list.inc",
+                "gotomasses" => "plugins/addons/gotomasses/class_gotomasses.inc",
+                "goto_task" => "plugins/addons/gotomasses/class_goto_task.inc",
+                "dfstabs" => "plugins/addons/godfs/tabs_dfs.inc",
+                "contains" => "plugins/addons/godfs/class_dfsManagment.inc",
+                "dfsManagment" => "plugins/addons/godfs/class_dfsManagment.inc",
+                "dfsgeneric" => "plugins/addons/godfs/class_dfsgeneric.inc",
+                "gosa_logview" => "plugins/addons/logview/class_gosa_logview.inc",
+                "logview" => "plugins/addons/logview/class_logview.inc",
+                "log_tabs" => "plugins/addons/logview/tabs_log.inc",
+                "mailqueue" => "plugins/addons/mailqueue/class_mailqueue.inc",
+                "parseMailQueue" => "plugins/addons/mailqueue/class_parseMailQueue.inc",
+                "msgplug" => "plugins/addons/notifications/class_msgplug.inc",
+                "blocklist" => "plugins/gofax/blocklists/class_blocklistManagement.inc",
+                "divListBlocklist" => "plugins/gofax/blocklists/class_divListBlocklists.inc",
+                "gofaxAccount" => "plugins/gofax/faxaccount/class_gofaxAccount.inc",
+                "faxreport" => "plugins/gofax/faxreports/class_faxreport.inc",
+                "fonreport" => "plugins/gofon/fonreports/class_fonreport.inc",
+                "macro" => "plugins/gofon/macro/class_gofonMacro.inc",
+                "macrotabs" => "plugins/gofon/macro/tabs_macros.inc",
+                "divListMacro" => "plugins/gofon/macro/class_divListMacros.inc",
+                "gofonMacro" => "plugins/gofon/macro/class_gofonMacroManagement.inc",
+                "macroParameter" => "plugins/gofon/macro/class_gofonMacroParameters.inc",
+                "phoneAccount" => "plugins/gofon/phoneaccount/class_phoneAccount.inc",
+                "conferencetabs" => "plugins/gofon/conference/tabs_conference.inc",
+                "phoneConferenceManagment" => "plugins/gofon/conference/class_phoneConferenceManagment.inc",
+                "divListConference" => "plugins/gofon/conference/class_divListConferences.inc",
+                "conference" => "plugins/gofon/conference/class_phoneConferenceGeneric.inc",
+                "password" => "plugins/personal/password/class_password.inc",
+                "sambaAccount" => "plugins/personal/samba/class_sambaAccount.inc",
+                "sambaLogonHours" => "plugins/personal/samba/class_sambaLogonHours.inc",
+                "posixAccount" => "plugins/personal/posix/class_posixAccount.inc",
+                "mailAccount" => "plugins/personal/mail/class_mailAccount.inc",
+                "nagiosAccount" => "plugins/personal/nagios/class_nagiosAccount.inc",
+                "hotplugDialog" => "plugins/personal/environment/class_hotplugDialog.inc",
+                "environment" => "plugins/personal/environment/class_environment.inc",
+                "kioskManagementDialog" => "plugins/personal/environment/class_kioskManagementDialog.inc",
+                "logonManagementDialog" => "plugins/personal/environment/class_logonManagementDialog.inc",
+                "selectPrinterDialog" => "plugins/personal/environment/class_selectPrinterDialog.inc",
+                "user" => "plugins/personal/generic/class_user.inc",
+                "scalixAccount" => "plugins/personal/scalix/class_scalixAccount.inc",
+                "connectivity" => "plugins/personal/connectivity/class_connectivity.inc",
+                "kolabAccount" => "plugins/personal/connectivity/class_kolabAccount.inc",
+                "oxchangeAccount" => "plugins/personal/connectivity/class_oxchangeAccount.inc",
+                "phpgwAccount" => "plugins/personal/connectivity/class_phpgwAccount.inc",
+                "opengwAccount" => "plugins/personal/connectivity/class_opengwAccount.inc",
+                "webdavAccount" => "plugins/personal/connectivity/class_webdavAccount.inc",
+                "pureftpdAccount" => "plugins/personal/connectivity/class_pureftpdAccount.inc",
+                "pptpAccount" => "plugins/personal/connectivity/class_pptpAccount.inc",
+                "proxyAccount" => "plugins/personal/connectivity/class_proxyAccount.inc",
+                "intranetAccount" => "plugins/personal/connectivity/class_intranetAccount.inc",
+                "phpscheduleitAccount" => "plugins/personal/connectivity/class_phpscheduleitAccount.inc",
+                "netatalk" => "plugins/personal/netatalk/class_netatalk.inc",
+                "reference" => "plugins/generic/references/class_reference.inc",
+                "dhcpAdvanced" => "plugins/admin/systems/class_dhcpAdvanced.inc",
+                "dhcpService" => "plugins/admin/systems/class_dhcpService.inc",
+                "servgeneric" => "plugins/admin/systems/class_servGeneric.inc",
+                "printerPPDDialog" => "plugins/admin/systems/class_printerPPDDialog.inc",
+                "goLogDBServer" => "plugins/admin/systems/class_goLogDBServer.inc",
+                "goShareServer" => "plugins/admin/systems/class_goShareServer.inc",
+                "servDNSeditZoneEntries" => "plugins/admin/systems/class_servDNSeditZoneEntries.inc",
+                "worktabs" => "plugins/admin/systems/tabs_workstation.inc",
+                "glpiPrinterAccount" => "plugins/admin/systems/class_glpiPrinterAccount.inc",
+                "termDNS" => "plugins/admin/systems/class_termDNS.inc",
+                "servnfs" => "plugins/admin/systems/class_servNfs.inc",
+                "goTerminalServer" => "plugins/admin/systems/class_goTerminalServer.inc",
+                "glpiManufacturer" => "plugins/admin/systems/class_glpiManufacturer.inc",
+                "goFonServer" => "plugins/admin/systems/class_goFonServer.inc",
+                "dhcpHost" => "plugins/admin/systems/class_dhcpHost.inc",
+                "phoneGeneric" => "plugins/admin/systems/class_phoneGeneric.inc",
+                "gospamserver" => "plugins/admin/systems/class_goSpamServer.inc",
+                "ServiceAddDialog" => "plugins/admin/systems/class_ServiceAddDialog.inc",
+                "goSyslogServer" => "plugins/admin/systems/class_goSyslogServer.inc",
+                "goService" => "plugins/admin/systems/class_goService.inc",
+                "servdnseditZone" => "plugins/admin/systems/class_servDNSeditZone.inc",
+                "govirusserver" => "plugins/admin/systems/class_goVirusServer.inc",
+                "dhcpSubnet" => "plugins/admin/systems/class_dhcpSubnet.inc",
+                "servkolab" => "plugins/admin/systems/class_servKolab.inc",
+                "goGlpiServer" => "plugins/admin/systems/class_goGlpiServer.inc",
+                "selectUserToPrinterDialog" => "plugins/admin/systems/class_selectUserToPrinterDialog.inc",
+                "termstartup" => "plugins/admin/systems/class_terminalStartup.inc",
+                "servrepository" => "plugins/admin/systems/class_servRepository.inc",
+                "terminfo" => "plugins/admin/systems/class_terminalInfo.inc",
+                "printtabs" => "plugins/admin/systems/tabs_printers.inc",
+                "glpiAccount" => "plugins/admin/systems/class_glpiAccount.inc",
+                "phonetabs" => "plugins/admin/systems/tabs_phone.inc",
+                "goNtpServer" => "plugins/admin/systems/class_goNtpServer.inc",
+                "goSpamServerRule" => "plugins/admin/systems/class_goSpamServerRule.inc",
+                "componenttabs" => "plugins/admin/systems/tabs_component.inc",
+                "systems" => "plugins/admin/systems/class_systemManagement.inc",
+                "dhcpNewSectionDialog" => "plugins/admin/systems/class_dhcpNewSectionDialog.inc",
+                "termtabs" => "plugins/admin/systems/tabs_terminal.inc",
+                "glpiDeviceManagement" => "plugins/admin/systems/class_glpiDeviceManagement.inc",
+                "dhcpNetwork" => "plugins/admin/systems/class_dhcpNetwork.inc",
+                "goCupsServer" => "plugins/admin/systems/class_goCupsServer.inc",
+                "SelectDeviceType" => "plugins/admin/systems/class_SelectDeviceType.inc",
+                "goImapServer" => "plugins/admin/systems/class_goImapServer.inc",
+                "goMailServer" => "plugins/admin/systems/class_goMailServer.inc",
+                "gosaLogServer" => "plugins/admin/systems/class_gosaLogServer.inc",
+                "workgeneric" => "plugins/admin/systems/class_workstationGeneric.inc",
+                "glpiSelectUser" => "plugins/admin/systems/class_glpiSelectUser.inc",
+                "dhcpSharedNetwork" => "plugins/admin/systems/class_dhcpSharedNetwork.inc",
+                "printerPPDSelectionDialog" => "plugins/admin/systems/class_printerPPDSelectionDialog.inc",
+                "termservice" => "plugins/admin/systems/class_terminalService.inc",
+                "goLdapServer" => "plugins/admin/systems/class_goLdapServer.inc",
+                "componentGeneric" => "plugins/admin/systems/class_componentGeneric.inc",
+                "baseSelectDialog" => "plugins/admin/systems/class_baseSelectDialog.inc",
+                "servRepositorySetup" => "plugins/admin/systems/class_servRepositorySetup.inc",
+                "servdhcp" => "plugins/admin/systems/class_servDHCP.inc",
+                "wingeneric" => "plugins/admin/systems/class_winGeneric.inc",
+                "dhcpGroup" => "plugins/admin/systems/class_dhcpGroup.inc",
+                "termgeneric" => "plugins/admin/systems/class_terminalGeneric.inc",
+                "printgeneric" => "plugins/admin/systems/class_printGeneric.inc",
+                "glpiPrinterCartridgesEdit" => "plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc",
+                "dhcpPool" => "plugins/admin/systems/class_dhcpPool.inc",
+                "divListSystemService" => "plugins/admin/systems/class_divListSystemService.inc",
+                "ServerService" => "plugins/admin/systems/class_serverService.inc",
+                "divListSystem" => "plugins/admin/systems/class_divListSystem.inc",
+                "glpiPrinterCartridges" => "plugins/admin/systems/class_glpiPrinterCartridges.inc",
+                "goKrbServer" => "plugins/admin/systems/class_goKrbServer.inc",
+                "servtabs" => "plugins/admin/systems/tabs_server.inc",
+                "wintabs" => "plugins/admin/systems/tabs_winstation.inc",
+                "glpiAttachmentPool" => "plugins/admin/systems/class_glpiAttachmentPool.inc",
+                "workstartup" => "plugins/admin/systems/class_workstationStartup.inc",
+                "workservice" => "plugins/admin/systems/class_workstationService.inc",
+                "servdns" => "plugins/admin/systems/class_servDNS.inc",
+                "goFaxServer" => "plugins/admin/systems/class_goFaxServer.inc",
+                "application" => "plugins/admin/applications/class_applicationGeneric.inc",
+                "applicationParameters" => "plugins/admin/applications/class_applicationParameters.inc",
+                "applicationManagement" => "plugins/admin/applications/class_applicationManagement.inc",
+                "divListApplication" => "plugins/admin/applications/class_divListApplication.inc",
+                "apptabs" => "plugins/admin/applications/tabs_application.inc",
+                "aclrole" => "plugins/admin/acl/class_aclRole.inc",
+                "divListACL" => "plugins/admin/acl/class_divListACL.inc",
+                "aclManagement" => "plugins/admin/acl/class_aclManagement.inc",
+                "acltab" => "plugins/admin/acl/tabs_acl.inc",
+                "aclroletab" => "plugins/admin/acl/tabs_acl_role.inc",
+                "grouptabs" => "plugins/admin/groups/tabs_group.inc",
+                "group" => "plugins/admin/groups/class_groupGeneric.inc",
+                "divListGroup" => "plugins/admin/groups/class_divListGroup.inc",
+                "groupManagement" => "plugins/admin/groups/class_groupManagement.inc",
+                "appgroup" => "plugins/admin/groups/class_groupApplication.inc",
+                "mailgroup" => "plugins/admin/groups/class_groupMail.inc",
+                "faiScriptEntry" => "plugins/admin/fai/class_faiScriptEntry.inc",
+                "faiPackage" => "plugins/admin/fai/class_faiPackage.inc",
+                "faiScript" => "plugins/admin/fai/class_faiScript.inc",
+                "tabsPartition" => "plugins/admin/fai/tabsPartition.inc",
+                "faiHookEntry" => "plugins/admin/fai/class_faiHookEntry.inc",
+                "tabsTemplate" => "plugins/admin/fai/tabsTemplate.inc",
+                "faiProfileEntry" => "plugins/admin/fai/class_faiProfileEntry.inc",
+                "faiPackageConfiguration" => "plugins/admin/fai/class_faiPackageConfiguration.inc",
+                "tabsVariable" => "plugins/admin/fai/tabsVariable.inc",
+                "faiPackageEntry" => "plugins/admin/fai/class_faiPackageEntry.inc",
+                "tabsProfile" => "plugins/admin/fai/tabsProfile.inc",
+                "faiManagement" => "plugins/admin/fai/class_faiManagement.inc",
+                "faiProfile" => "plugins/admin/fai/class_faiProfile.inc",
+                "askClassName" => "plugins/admin/fai/class_askClassName.inc",
+                "faiVariable" => "plugins/admin/fai/class_faiVariable.inc",
+                "faiPartitionTableEntry" => "plugins/admin/fai/class_faiPartitionTableEntry.inc",
+                "faiTemplate" => "plugins/admin/fai/class_faiTemplate.inc",
+                "divListFai" => "plugins/admin/fai/class_divListFai.inc",
+                "tabsScript" => "plugins/admin/fai/tabsScript.inc",
+                "faiPartitionTable" => "plugins/admin/fai/class_faiPartitionTable.inc",
+                "faiSummaryTab" => "plugins/admin/fai/class_faiSummaryTab.inc",
+                "faiVariableEntry" => "plugins/admin/fai/class_faiVariableEntry.inc",
+                "tabsHook" => "plugins/admin/fai/tabsHook.inc",
+                "tabsPackage" => "plugins/admin/fai/tabsPackage.inc",
+                "faiTemplateEntry" => "plugins/admin/fai/class_faiTemplateEntry.inc",
+                "faiHook" => "plugins/admin/fai/class_faiHook.inc",
+                "usertabs" => "plugins/admin/users/tabs_user.inc",
+                "divListUsers" => "plugins/admin/users/class_divListUsers.inc",
+                "userManagement" => "plugins/admin/users/class_userManagement.inc",
+                "ogroupManagement" => "plugins/admin/ogroups/class_ogroupManagement.inc",
+                "termgroup" => "plugins/admin/ogroups/class_termgroup.inc",
+                "mailogroup" => "plugins/admin/ogroups/class_mailogroup.inc",
+                "ogroup" => "plugins/admin/ogroups/class_ogroup.inc",
+                "ogrouptabs" => "plugins/admin/ogroups/tabs_ogroups.inc",
+                "divListOGroup" => "plugins/admin/ogroups/class_divListOGroup.inc",
+                "phonequeue" => "plugins/admin/ogroups/class_phonequeue.inc",
+                "department" => "plugins/admin/departments/class_departmentGeneric.inc",
+                "departmentManagement" => "plugins/admin/departments/class_departmentManagement.inc",
+                "deptabs" => "plugins/admin/departments/tabs_department.inc",
+                "divListDepartment" => "plugins/admin/departments/class_divListDepartment.inc",
+                "mimetype" => "plugins/admin/mimetypes/class_mimetypeGeneric.inc",
+                "mimetabs" => "plugins/admin/mimetypes/tabs_mimetypes.inc",
+                "mimetypeManagement" => "plugins/admin/mimetypes/class_mimetypeManagement.inc",
+                "divListMimeTypes" => "plugins/admin/mimetypes/class_divListMimeTypes.inc",
+ );
+?>
\ No newline at end of file

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 1327a6350c4517e37dba3e75388edbbabebc563c..50e0c0f191a29158c58fd8df71453925b8992bf7 100644 (file)
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -79,7 +79,7 @@ class pluglist {
 
        function check_access($aclname)
        {
-               $deps = $this->ui->get_module_departments($aclname);
+               $deps= $this->ui->get_module_departments($aclname);
 
                $acls_to_check = array();
                if(preg_match("/,/",$aclname)){

diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 8ac07ad71fbc2e2264d559f36f7d6172d6d9ab9f..f2aa91d85dd4d1d0800962910d337dd14150e30f 100644 (file)
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -170,12 +170,6 @@ class userinfo
       foreach($this->ocMapping[$category] as $oc){
         $acl.= $this->get_permissions($dn, $category."/".$oc);
       }
-    } else {
-      if (isset($this->ocMapping['all'])){
-        foreach($this->ocMapping['all'] as $oc){
-          $acl.= $this->get_permissions($dn, $category."/".$oc);
-        }
-      }
     }
 
     return ($acl);

diff --git a/include/functions.inc b/include/functions.inc
index 5f31e35bda9b34809f796c730760e97b7eaf0da4..6dc1e5f861674fd3ade6c4d691e54566f537c0ad 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -30,24 +30,34 @@ define("GL_SUBSEARCH", 1);
 define("GL_SIZELIMIT", 2);
 define("GL_CONVERT"  , 4);
 
+/* Heimdal stuff */
+define('UNIVERSAL',0x00);
+define('INTEGER',0x02);
+define('OCTET_STRING',0x04);
+define('NULL',0x05);
+define('OBJECT_IDENTIFIER ',0x06);
+define('SEQUENCE',0x10);
+define('SEQUENCE_OF',0x10);
+define('SET',0x11);
+define('SET_OF',0x11);
+define('DEBUG',false);
+define('HDB_KU_MKEY',0x484442);
+define('TWO_BIT_SHIFTS',0x7efc);
+define('DES_CBC_CRC',1);
+define('DES_CBC_MD4',2);
+define('DES_CBC_MD5',3);
+define('DES3_CBC_MD5',5);
+define('DES3_CBC_SHA1',16);
+
 /* Define globals for revision comparing */
 $svn_path = '$HeadURL$';
 $svn_revision = '$Revision$';
 
 /* Include required files */
-require_once ("class_ldap.inc");
-require_once ("class_config.inc");
-require_once ("class_plugin.inc");
-require_once ("class_acl.inc");
-require_once ("class_pluglist.inc");
-require_once ("class_userinfo.inc");
-require_once ("class_tabs.inc");
-require_once ("class_mail-methods.inc");
-require_once ("class_password-methods.inc");
+require_once("class_location.inc");
 require_once ("functions_debug.inc");
 require_once ("functions_dns.inc");
 require_once ("accept-to-gettext.inc");
-require_once ("class_MultiSelectWindow.inc");
 
 /* Define constants for debugging */
 define ("DEBUG_TRACE",   1);
@@ -82,6 +92,17 @@ $REWRITE= array( "ä" => "ae",
     "Ñ" => "Ny" );
 
 
+/* Class autoloader */
+function __autoload($class_name) {
+    global $class_mapping, $BASE_DIR;
+    if (isset($class_mapping[$class_name])){
+      require_once($BASE_DIR."/".$class_mapping[$class_name]);
+    } else {
+      echo _("Fatal: cannot load class \"$class_name\" - execution aborted");
+    }
+}
+
+
 /* Function to include all class_ files starting at a
    given directory base */
 function get_dir_list($folder= ".")

diff --git a/include/heimdal/asnencode.php b/include/heimdal/asnencode.php
index e41443b1be253fc216d905e0d422d7eb081c8722..d83c169d118494df85593ed9ba0828bce6a7ce48 100644 (file)
--- a/include/heimdal/asnencode.php
+++ b/include/heimdal/asnencode.php
@@ -70,20 +70,6 @@ class stream{
        }
 };
 
-       define('UNIVERSAL',0x00);
-       
-       define('INTEGER',0x02);
-       //define('INTEGER',0x80);
-       define('OCTET_STRING',0x04);
-       //define('OCTET_STRING',0x81);
-       define('NULL',0x05);
-       define('OBJECT_IDENTIFIER ',0x06);
-       define('SEQUENCE',0x10);
-       define('SEQUENCE_OF',0x10);
-       define('SET',0x11);
-       define('SET_OF',0x11);
-
-
 
 class asnEncode{
 

diff --git a/include/heimdal/deslib.php b/include/heimdal/deslib.php
index 55a806ef2015c341c903cff89cb46b78155dc4fd..9b839387707b0ec2541993087f75a0ae365920de 100644 (file)
--- a/include/heimdal/deslib.php
+++ b/include/heimdal/deslib.php
@@ -9,9 +9,6 @@
  */
 
 
-define(DEBUG,false);
-define(HDB_KU_MKEY,0x484442);
-
 class Des{
 
        var $in;
@@ -674,7 +671,6 @@ class Des{
                        | ($PC1_DR[($tmp >>  9) & 0x7] << 2)
                        | ($PC1_DR[($tmp >>  1) & 0x7] << 3);
                
-                       define(TWO_BIT_SHIFTS,0x7efc);
                        $two_bit_shifts = TWO_BIT_SHIFTS;
                        $lix=0;
                        for ($i = 16; $i > 0; $i--) {
@@ -1129,4 +1125,4 @@ class Des{
 
 
 
-?>
\ No newline at end of file
+?>

diff --git a/include/heimdal/genkey.php b/include/heimdal/genkey.php
index 0a6531d8a8c47c4a0a100ca8c5a14e73e03eddbd..918a96fe38cdd98b5a12de415b60f480f655d509 100644 (file)
--- a/include/heimdal/genkey.php
+++ b/include/heimdal/genkey.php
@@ -8,15 +8,9 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
-define(DES_CBC_CRC,1);
-define(DES_CBC_MD4,2);
-define(DES_CBC_MD5,3);
-define(DES3_CBC_MD5,5);
-define(DES3_CBC_SHA1,16);
-
-include("deslib.php");
-include("mkey.php");
-include("asnencode.php");
+require_once("deslib.php");
+require_once("mkey.php");
+require_once("asnencode.php");
 
 class genkey{
 
@@ -173,4 +167,4 @@ class genkey{
        }
 
 };
-?>
\ No newline at end of file
+?>

diff --git a/include/php_setup.inc b/include/php_setup.inc
index cbc0d1f870146fee1fbec6b12fe74d0215281787..096518f0934abd527f04e7ce8f68b1442bf33cda 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -237,7 +237,7 @@ ini_set("register_globals",0);
 ini_set("track_vars",1);
 ini_set("display_errors",1);
 ini_set("report_memleaks",1);
-ini_set("include_path",".:$BASE_DIR/include");
+ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/php_writeexcel");
 
 /* Do smarty setup */
 require("smarty/Smarty.class.php");

diff --git a/include/php_writeexcel/class.excel.php b/include/php_writeexcel/class.excel.php
deleted file mode 100644 (file)
index bce7356..0000000
--- a/include/php_writeexcel/class.excel.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?PHP
-require_once "Excel/class.writeexcel_workbook.inc.php";
-require_once "Excel/class.writeexcel_worksheet.inc.php";
-require_once "Excel/functions.writeexcel_utility.inc.php";
-
-class Excel_Workbook extends writeexcel_workbook {
-    /**
-    * The constructor. It just creates a Workbook
-    *
-    * @param string $filename The optional filename for the Workbook.
-    * @return Spreadsheet_Excel_Writer_Workbook The Workbook created
-    */
-    
-    function Excel_Workbook($filename = '') {
-        $this->_filename = $filename;
-        $this->writeexcel_workbook($filename);
-    }
-                                                   
-    /**
-    * Send HTTP headers for the Excel file.
-    *
-    * @param string $filename The filename to use for HTTP headers
-    * @access public
-    */
-    function send($filename) { // attachment
-               global $pref_lang;
-               $this->_tmpfilename = $filename;
-/*             if ($pref_lang == "ru") {
-                   header ('<meta http-equiv="Content-Type" content="text/html; charset=windows-1251">');
-               } else {
-                   header ('<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">');
-               }
-*/      header("Content-type: application/x-msexcel");
-        header("Content-Disposition: inline; filename=$filename");
-        header("Expires: 0");
-        header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
-        header("Pragma: public");
-    }
-}
-?>

diff --git a/include/php_writeexcel/class.writeexcel_workbookbig.inc.php b/include/php_writeexcel/class.writeexcel_workbookbig.inc.php
deleted file mode 100644 (file)
index 8f0c752..0000000
--- a/include/php_writeexcel/class.writeexcel_workbookbig.inc.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * Copyleft 2002 Johann Hanne
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place,
- * Suite 330, Boston, MA  02111-1307 USA
- */
-
-/*
- * This is the Spreadsheet::WriteExcel Perl package ported to PHP
- * Spreadsheet::WriteExcel was written by John McNamara, jmcnamara@cpan.org
- */
-
-require_once "class.writeexcel_workbook.inc.php";
-require_once "class.ole_pps_root.php";
-require_once "class.ole_pps_file.php";
-
-class writeexcel_workbookbig extends writeexcel_workbook {
-
-    function writeexcel_workbookbig($filename) {
-        $this->writeexcel_workbook($filename);
-    }
-
-    function _store_OLE_file() {
-        $file=new ole_pps_file(asc2ucs("Book"));
-        $file->append($this->_data);
-
-        for ($c=0;$c<sizeof($this->_worksheets);$c++) {
-            $worksheet=$this->_worksheets[$c];
-            while ($data=$worksheet->get_data()) {
-                $file->append($data);
-            }
-        }
-
-        $ole=new ole_pps_root(false, false, array($file));
-        $ole->save($this->_filename);
-    }
-
-}
-
-?>

diff --git a/plugins/addons/godfs/class_dfsManagment.inc b/plugins/addons/godfs/class_dfsManagment.inc
index f1f9b04d83409da135438db7cf5c24014f5f1ac6..4b527643eb14349413eab352234e8769378a3275 100644 (file)
--- a/plugins/addons/godfs/class_dfsManagment.inc
+++ b/plugins/addons/godfs/class_dfsManagment.inc
@@ -1,7 +1,5 @@
 <?php
 
-require "tabs_dfs.inc";
-
 /* Create a class (name must be unique inside GOsa) which extends plugin. The plugin base
     class contains all methods that are used by GOsa and it provides the mechanism to load data
     from LDAP to local variables and prepare the save to ldap routine for you. */
@@ -27,9 +25,7 @@ class dfsManagment extends plugin {
   /* Execute is the function all plugins need. It fills the plugin with life and produces the output. */
   function execute() {
        
-    require_once('TreeMenu.inc');
     /* Normally you would react to user input here. */
-
     plugin::execute();    
 
     $action = "";

diff --git a/plugins/addons/ldapmanager/class_ldif.inc b/plugins/addons/ldapmanager/class_ldif.inc
index d24e208fbcde11358cde34ffffb368e2abc13470..2b914c552e52bccf2f60fa87f2d3c691c8b1a884 100644 (file)
--- a/plugins/addons/ldapmanager/class_ldif.inc
+++ b/plugins/addons/ldapmanager/class_ldif.inc
@@ -1,5 +1,4 @@
 <?php
-require_once("tabs_ldif.inc");
 
 class ldif extends plugin
 {

diff --git a/plugins/addons/logview/class_gosa_logview.inc b/plugins/addons/logview/class_gosa_logview.inc
index 6bd5d940fc10ac5fac6287d8134066df14c3146c..b71b05c88f9171a6713cb63eabc3467730146dab 100644 (file)
--- a/plugins/addons/logview/class_gosa_logview.inc
+++ b/plugins/addons/logview/class_gosa_logview.inc
@@ -1,6 +1,5 @@
 <?php
 
-require_once("tabs_log.inc");
 class gosa_logview extends plugin
 {
   /* Definitions */

diff --git a/plugins/addons/logview/class_logview.inc b/plugins/addons/logview/class_logview.inc
index b5eb5bdd375941d08328d53cad9d6137b08cbc01..3c436b7fb848430a5753f2e45dbb017fad95783f 100644 (file)
--- a/plugins/addons/logview/class_logview.inc
+++ b/plugins/addons/logview/class_logview.inc
@@ -1,6 +1,5 @@
 <?php
 
-require_once("tabs_log.inc");
 class logview extends plugin
 {
   /* Definitions */

diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index 99457bc347a4a91fd0340507d13a1101a12526b0..a9b9183ea03443c2f47ec56e042a7d89339b87c5 100644 (file)
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -18,9 +18,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-require_once("tabs_acl_role.inc");
-require_once("tabs_acl.inc");
-
 class aclManagement extends plugin
 {
   /* Plugin definitions */

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index fd0104482c33dfb9b362c1b016859abefebee0c7..5fc43bc3a3f18b92cb94c5ab0e90fa053d5f1648 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.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 "tabs_application.inc";
 
 class applicationManagement extends plugin
 {

diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index db43a0544fa1bcd8c949a06f2e4bb01600bdee47..4e426394adb4e9b4c72b50b0954ea574b5fae1a0 100644 (file)
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.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 "tabs_department.inc";
 
 class departmentManagement extends plugin
 {

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index d2d7756d388ab9d4beb923928e45c9a53390d494..8ea8a9028031d8c8ea516aef59c911022434de00 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -18,15 +18,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-require "tabsPartition.inc";
-require "tabsVariable.inc";
-require "tabsHook.inc";
-require "tabsTemplate.inc";
-require "tabsScript.inc";
-require "tabsProfile.inc";
-require "tabsPackage.inc";
-
-
 class faiManagement extends plugin
 {
        /* Definitions */

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index ae158df8050ec759485baaba6dc11b4157409003..f202fa5e36ea4442d6bf7d8d65a5ad8efda3151d 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.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 "tabs_group.inc";
 
 class groupManagement extends plugin
 {

diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index d6e8f79275c1c136916a8cae3025fda1438e9561..25b84307c6ddd77bdf25c17919cc4646d879b1c3 100755 (executable)
--- a/plugins/admin/mimetypes/class_mimetypeManagement.inc
+++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc
@@ -18,8 +18,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-require "tabs_mimetypes.inc";
-
 class mimetypeManagement extends plugin
 {
   /* Definitions */

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 5cd51a38797d6a32410ccce86ee424a6a5e3c341..29a0734eb6454f15023e45afdcaeb0a4662fa346 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.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 "tabs_ogroups.inc";
 
 class ogroupManagement extends plugin
 {

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index ce5e1a52382e5bcf40754ec670885ee7a1ca8ed8..7676a718f1b9d96f2cb84f0373aa3eed08b300f0 100644 (file)
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -65,7 +65,6 @@ class ogrouptabs extends tabs
   
         if(isset($obj['objectClass'])){
           if(in_array("goFonAccount",$obj['objectClass'])){
-            require_once("class_phonequeue.inc");
             $this->by_name['phonequeue']= _("Phone queue");
             $this->by_object['phonequeue']= new phonequeue($this->config, $this->dn);
             $this->by_object['phonequeue']->parent= &$this;
@@ -79,7 +78,6 @@ class ogrouptabs extends tabs
     if((preg_match("/U/",$objects))&&(!isset($this->by_object['mailogroup']))){
       if(isset($this->config->current['MAILMETHOD'])){
         if (preg_match('/kolab/i', $this->config->current['MAILMETHOD'])){
-          require_once("class_mailogroup.inc");
           $this->by_name['mailogroup']= _("Mail");
           $this->by_object['mailogroup']= new mailogroup($this->config, $this->dn);
           $this->by_object['mailogroup']->parent= &$this;
@@ -89,7 +87,6 @@ class ogrouptabs extends tabs
 
     /* Add Terminal tab */
     if(((preg_match("/T/",$objects)) || (preg_match("/W/",$objects)))&&(!isset($this->by_object['termgroup']))){
-      require_once("class_termgroup.inc");
       if(!isset($this->by_object['termgroup'])){
         $this->by_name['termgroup']= _("System");
         $this->by_object['termgroup']= new termgroup($this->config, $this->dn);
@@ -187,7 +184,6 @@ class ogrouptabs extends tabs
       switch ($objects[$n]){
         case "T":
           /* Add a terminal tab */
-          require_once("class_termgroup.inc");
           $this->by_name['termgroup']= _("Terminals");
           $this->by_object['termgroup']= new termgroup($this->config, $this->dn);
           $this->by_object['termgroup']->parent= &$this;
@@ -210,7 +206,6 @@ class ogrouptabs extends tabs
 
           /* We found goFonAccount in users objectClasses*/
           if($use){
-            require_once("class_phonequeue.inc");
             $this->by_name['phonequeue']= _("Phone queue");
             $this->by_object['phonequeue']= new phonequeue($this->config, $this->dn);
             $this->by_object['phonequeue']->parent= &$this;
@@ -219,7 +214,6 @@ class ogrouptabs extends tabs
           /* Add a user tab used for mail distribution lists */
           if(isset($this->config->current['MAILMETHOD'])){
             if (preg_match('/kolab/i', $this->config->current['MAILMETHOD'])){
-              require_once("class_mailogroup.inc");
               $this->by_name['mailogroup']= _("Mail");
               $this->by_object['mailogroup']= new mailogroup($this->config, $this->dn);
               $this->by_object['mailogroup']->parent= &$this;

diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index a21271c5b30364f2de06809ecdfd0cff738277b6..94f6d7fa43e69be336514eb0c370f8252c3d85be 100644 (file)
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goCupsServer extends goService{
        
   var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server supports cups management.";

diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index deb02580e347732e370ee98b23904df88340c77d..de98a645f3b00535e9bcbc1441c38f6151fa1676 100644 (file)
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goFaxServer extends goService {
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports fax informations.";

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 9d3b3624d43230f0215d006472160e108d83a39d..8f5fd0eabc99bef02385346f15f5b802cc59ad35 100644 (file)
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goFonServer extends goService{
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports asterisk management.";

diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index f126d6bb379eb1213993c4b82c6325fcf5188899..3ab952904f96b368458cb829d39cd8c843d52145 100644 (file)
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goGlpiServer extends goService {
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports asterisk management.";

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index 41f39fab81d9ec7cd19ee1c407b61f6ea639b022..f8d9f7c26f9ea5850a522e14139d4d34a2aa79bb 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once ("class_goService.inc");
-
 class goImapServer extends goService {
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports mailqueue listings and so on.";

diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc
index f3b1150f742d639fcdff6a2c2d34a711678abc99..62bd889bea2de00411b179a8f64adb560e86e3b8 100644 (file)
--- a/plugins/admin/systems/class_goKrbServer.inc
+++ b/plugins/admin/systems/class_goKrbServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goKrbServer extends goService{
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports NTP service.";

diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc
index f5abb6d2436beb6e45efb26d50e1530989cc66d2..4629410d45bbaca5e15321ce73321d475c0e1dba 100644 (file)
--- a/plugins/admin/systems/class_goLdapServer.inc
+++ b/plugins/admin/systems/class_goLdapServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goLdapServer extends goService{
 
   var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server has goLdapServer defined.";

diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index 974240dcf9845ac38510e202a249e03118dd04b3..bcef1caae3980ebe9d44ac5598435cb1e20e1291 100644 (file)
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -1,5 +1,4 @@
 <?php
-require_once("class_goService.inc");
 
 class goLogDBServer extends goService{
        

diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index 55d3f5845ca05532e1b43c5e687779070fc561f3..99ee887fe91b7ee7e8dae2f074b5744383a4552c 100644 (file)
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goMailServer extends goService{
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports mailqueue listings and so on.";

diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index 234a06b96278ede28f421b0adb641b3f6541fe5a..5a4f40f8240d39131c15534c873e6e37114f40ca 100644 (file)
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goNtpServer extends goService{
 
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports NTP service.";

diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc
index 8e5981bdd881d661a94b9469c252ca0df5a2b119..e865a960e99ae858fffde0054f85f7733c3197ec 100644 (file)
--- a/plugins/admin/systems/class_goShareServer.inc
+++ b/plugins/admin/systems/class_goShareServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goShareServer extends goService{
 
   var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server supports shares.";

diff --git a/plugins/admin/systems/class_goSpamServer.inc b/plugins/admin/systems/class_goSpamServer.inc
index a0945699f7448dd8c180a170d935040134377cba..174ef5a9b31ae21c7bc6a3759ce34a3ef036d007 100644 (file)
--- a/plugins/admin/systems/class_goSpamServer.inc
+++ b/plugins/admin/systems/class_goSpamServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class gospamserver extends goService{
 
   /* CLI vars */

diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc
index 81f15bab0c82f4a8bfb869ed6ebb8b52b66f64aa..5231600b59c553a5816320be33b0a122cebeadad 100644 (file)
--- a/plugins/admin/systems/class_goSyslogServer.inc
+++ b/plugins/admin/systems/class_goSyslogServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goSyslogServer extends goService{
        
   var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server has syslog server enabled.";

diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index 5fa4184baffb5d54d79d7ad241d87cda3e6c7ee2..a6dbcd5e6a6afa6fac1c84cbf1dafddea03a9bc2 100644 (file)
--- a/plugins/admin/systems/class_goTerminalServer.inc
+++ b/plugins/admin/systems/class_goTerminalServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class goTerminalServer extends goService{
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports asterisk management.";

diff --git a/plugins/admin/systems/class_goVirusServer.inc b/plugins/admin/systems/class_goVirusServer.inc
index dd76a6a126624f0e8eec32f7ac07e5faf8e050e4..7c7f94fb61db0b612be29f1afde95101db03eb0a 100644 (file)
--- a/plugins/admin/systems/class_goVirusServer.inc
+++ b/plugins/admin/systems/class_goVirusServer.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class govirusserver extends goService{
        
   /* This plugin only writes its objectClass */

diff --git a/plugins/admin/systems/class_gosaLogServer.inc b/plugins/admin/systems/class_gosaLogServer.inc
index bcfffeb52737af67f9d17e2f7c7d1864491433b2..880d90fc6d03d1fb1fd1feb03ec9e726b41e3792 100644 (file)
--- a/plugins/admin/systems/class_gosaLogServer.inc
+++ b/plugins/admin/systems/class_gosaLogServer.inc
@@ -1,5 +1,4 @@
 <?php
-require_once("class_goService.inc");
 
 class gosaLogServer extends goService{
        

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 590a59a5e17973e0d6396b37b7f5fb41619ca429..57685ac96bad2a2ffc671cd9815d8681d3392ce8 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -504,7 +504,6 @@ class printgeneric extends plugin
     }
 
     /* Parse selected ppd file */
-    require_once ("class_ppdManager.inc");
     if((isset($_SESSION['config']->data['MAIN']['PPD_PATH']))&&(is_dir($_SESSION['config']->data['MAIN']['PPD_PATH']))){
 
       $path = $_SESSION['config']->data['MAIN']['PPD_PATH'];

diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc
index ec5a99bb2193749e11faa19e09d28a3a412226bb..c3d503b69136eae5475e57d2350241bc7c3053f1 100644 (file)
--- a/plugins/admin/systems/class_printerPPDDialog.inc
+++ b/plugins/admin/systems/class_printerPPDDialog.inc
@@ -47,7 +47,6 @@ class printerPPDDialog extends plugin
     if(!((!is_dir($this->pathToPPD))||(empty($this->pathToPPD)))){ 
 
       /* Load all available PPD files and sort them into an array */
-      require_once ("class_ppdManager.inc");
       $this->ppdManager= new ppdManager($this->pathToPPD);
       $this->getPrinterReload ();
 

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 4662a0d170f9426fb1beb4a600af0eda9faa8bf0..b7cb873a44329cc68a4cb523b57ccd21848d96eb 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class servdns extends goService
 {
   /* CLI vars */

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 4bb67203e03328a03c7b48a7e67a3902b6019120..7768f2563998017301e02eb4e41fc2663ae54574 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class servkolab extends goService {
   /* CLI vars */
   var $cli_summary = "Manage server basic objects";

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index aa370c1ab7b6e7081f738be256c1b85e3949ab9e..03d23140584799c5bd59a09d7d61c88424ecd4c8 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -1,7 +1,5 @@
 <?php
 
-require_once("class_goService.inc");
-
 class servrepository extends goService
 {
   /* CLI vars */

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 4812f8d97e091812ca4373d2eb3a54370a29c2e7..5d0cb04aa875e34f2fcaac06afc74ac175a87bcf 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -17,14 +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 "tabs_terminal.inc";
-require "tabs_workstation.inc";
-require "tabs_printers.inc";
-require "tabs_phone.inc";
-require "tabs_server.inc";
-require "tabs_component.inc";
-require "tabs_winstation.inc";
-
 
 class systems extends plugin
 {

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 4a4ec5aea60a54cefaf2e1503f7e79d9e5184ae5..e2bfe961ddc881e8d798f309cd91a677894013e1 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -18,10 +18,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* Include user tab class */
-require "tabs_user.inc";
-
-
 class userManagement extends plugin
 {
   /* Plugin definitions */

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index ff67ff17dc81ede2afc7ce2341a64fdea2bed5fa..c10b37a08721564eab1e91c1a502ea6cd88b2ce1 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.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 "tabs_conference.inc";
 
 class phoneConferenceManagment extends plugin
 {

diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index fc40f41a54d2d11df54cde37d1381080b9c9b629..b24dc5dc7a03d0b0e0f313737c40c3b59b66a391 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroManagement.inc
+++ b/plugins/gofon/macro/class_gofonMacroManagement.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 "tabs_macros.inc";
 
 class gofonMacro extends plugin
 {

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 601f400854c489f5db0667fc5fe58d2a11b96ade..2dfe3c5d4aa2221dfe3da7579ec0aa82bcea3a09 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -9,9 +9,6 @@
   and displays the formulars required.
  */
 
-/* Load sieve support */
-require_once ("sieve/libsieve.inc");
-
 /* Load mail methods */
 global $BASE_DIR;
 get_dir_list("$BASE_DIR/include");

diff --git a/update-gosa b/update-gosa
index a09bbd74128a17dfde2ca409c355c865691092cd..4c63d13e00ddaec329ec737ec539872f78859477 100755 (executable)
--- a/update-gosa
+++ b/update-gosa
@@ -4,8 +4,13 @@
 /* Function to include all class_ files starting at a given directory base */
 function get_classes($folder= ".")
 {
+  static $base_dir= "";
   static $result= array();
 
+  if ($base_dir == ""){
+    $base_dir= getcwd();
+  }
+
   $currdir=getcwd();
   if ($folder){
     chdir("$folder");
@@ -27,10 +32,19 @@ function get_classes($folder= ".")
       continue;
     }
 
+    /* Only take care about .inc and .php files... */
+    if (!(preg_match('/\.php$/', $file) || preg_match('/\.inc$/', $file))){
+      continue;
+    }
+
     /* Include existing class_ files */
-    if (preg_match("/^class_.*\.inc$/", $file)) {
-      
-      $result[]= "$currdir/$folder/$file";
+    $contents= file($file);
+    foreach($contents as $line){
+      $line= chop($line);
+      if (preg_match('/^\s*class\s*\w.*$/', $line)){
+        $class= preg_replace('/^\s*class\s*(\w+).*$/', '\1', $line);
+        $result[$class]= preg_replace("%$base_dir/%", "", "$currdir/$folder/$file");
+      }
     }
   }
 
@@ -40,11 +54,28 @@ function get_classes($folder= ".")
   return ($result);
 }
 
-print_r(get_declared_classes());
-exit (0);
 $class_mapping= get_classes();
+$filename= "include/class_location.inc";
+
+/* Sanity checks */
+if (is_writable($filename)) {
+
+    if (!$handle= fopen($filename, 'w')) {
+         echo "Cannot open file \"$filename\" - aborted\n";
+         exit (1);
+    }
+
+} else {
+    echo "File \"$filename\" is not writable - aborted\n";
+    exit (2);
+}
+
+fwrite ($handle, "<?php\n\$class_mapping= array(\n");
 foreach ($class_mapping as $key => $value){
-  echo "$key located in $value\n";
+  fwrite ($handle, "                \"$key\" => \"$value\",\n");
 }
+fwrite ($handle, " );\n?>");
+
+fclose($handle);
 
 ?>