From 838f59fe8f774d17e0d283a78ac24dce72f81aad Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 10 Dec 2007 13:12:09 +0000 Subject: [PATCH] Updated directory layout git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8073 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/class_location.inc | 96 +++++++++---------- .../{ => ppd}/class_printerPPDDialog.inc | 0 .../class_printerPPDSelectionDialog.inc | 0 .../systems/{ => ppd}/printerPPDDialog.tpl | 0 .../{ => ppd}/printerPPDSelectionDialog.tpl | 0 .../admin/systems/{ => ppd}/remove_ppd.tpl | 0 .../{ => services}/ServiceAddDialog.tpl | 0 .../{ => services}/class_ServiceAddDialog.inc | 0 .../{ => services}/class_goService.inc | 0 .../cups}/class_goCupsServer.inc | 0 .../{ => services/cups}/goCupsServer.tpl | 0 .../dhcp}/class_dhcpAdvanced.inc | 0 .../{ => services/dhcp}/class_dhcpGroup.inc | 0 .../{ => services/dhcp}/class_dhcpHost.inc | 0 .../{ => services/dhcp}/class_dhcpNetwork.inc | 0 .../dhcp}/class_dhcpNewSectionDialog.inc | 0 .../{ => services/dhcp}/class_dhcpPool.inc | 0 .../{ => services/dhcp}/class_dhcpService.inc | 0 .../dhcp}/class_dhcpSharedNetwork.inc | 0 .../{ => services/dhcp}/class_dhcpSubnet.inc | 0 .../{ => services/dhcp}/class_servDHCP.inc | 0 .../{ => services/dhcp}/dhcpNewSection.tpl | 0 .../{ => services/dhcp}/dhcp_advanced.tpl | 0 .../{ => services/dhcp}/dhcp_group.tpl | 0 .../systems/{ => services/dhcp}/dhcp_host.tpl | 0 .../{ => services/dhcp}/dhcp_network.tpl | 0 .../systems/{ => services/dhcp}/dhcp_pool.tpl | 0 .../{ => services/dhcp}/dhcp_service.tpl | 0 .../dhcp}/dhcp_sharedNetwork.tpl | 0 .../{ => services/dhcp}/dhcp_subnet.tpl | 0 .../{ => services/dhcp}/remove_dhcp.tpl | 0 .../systems/{ => services/dhcp}/servdhcp.tpl | 0 .../{ => services/dns}/class_servDNS.inc | 0 .../dns}/class_servDNSeditZone.inc | 0 .../dns}/class_servDNSeditZoneEntries.inc | 0 .../{ => services/dns}/class_termDNS.inc | 0 .../dns}/servDNSeditZoneEntries.tpl | 0 .../systems/{ => services/dns}/servdns.tpl | 0 .../{ => services/dns}/servdnseditzone.tpl | 0 .../{ => services/glpi}/class_glpiAccount.inc | 0 .../glpi}/class_glpiAttachmentPool.inc | 0 .../glpi}/class_glpiDeviceManagement.inc | 0 .../glpi}/class_glpiManufacturer.inc | 0 .../glpi}/class_glpiPrinterAccount.inc | 0 .../glpi}/class_glpiPrinterCartridges.inc | 0 .../glpi}/class_glpiPrinterCartridgesEdit.inc | 0 .../glpi}/class_glpiSelectUser.inc | 0 .../glpi}/class_goGlpiServer.inc | 0 .../systems/{ => services/glpi}/glpi.tpl | 0 .../glpi}/glpiAttachmentEdit.tpl | 0 .../glpi}/glpiAttachmentPool.tpl | 0 .../glpi}/glpiDeviceManagement.tpl | 0 .../{ => services/glpi}/glpiManufacturer.tpl | 0 .../glpi}/glpiManufacturerAdd.tpl | 0 .../{ => services/glpi}/glpiPrinter.tpl | 0 .../glpi}/glpiPrinterCartridges.tpl | 0 .../glpi}/glpiPrinterCartridgesEdit.tpl | 0 .../{ => services/glpi}/glpiSelectUser.tpl | 0 .../{ => services/glpi}/glpi_devices.tpl | 0 .../glpi}/glpi_edit_cartridge_type.tpl | 0 .../{ => services/glpi}/glpi_edit_os.tpl | 0 .../glpi}/glpi_edit_printer_type.tpl | 0 .../{ => services/glpi}/glpi_edit_type.tpl | 0 .../{ => services/glpi}/goGlpiServer.tpl | 0 .../{ => services/glpi}/remove_glpi.tpl | 0 .../gofax}/class_goFaxServer.inc | 0 .../{ => services/gofax}/goFaxServer.tpl | 0 .../gofon}/class_goFonServer.inc | 0 .../{ => services/gofon}/goFonServer.tpl | 0 .../imap}/class_goImapServer.inc | 0 .../{ => services/imap}/goImapServer.tpl | 0 .../kerberos}/class_goKrbServer.inc | 0 .../{ => services/kerberos}/goKrbServer.tpl | 0 .../kiosk}/class_goKioskService.inc | 0 .../{ => services/kiosk}/goKioskService.tpl | 0 .../{ => services/kolab}/class_servKolab.inc | 0 .../{ => services/kolab}/servkolab.tpl | 0 .../ldap}/class_goLdapServer.inc | 0 .../{ => services/ldap}/goLdapServer.tpl | 0 .../log}/class_gosaLogServer.inc | 0 .../{ => services/log}/gosaLogServer.tpl | 0 .../mail}/class_goMailServer.inc | 0 .../{ => services/mail}/goMailServer.tpl | 0 .../{ => services/nfs}/class_servNfs.inc | 0 .../systems/{ => services/nfs}/servnfs.tpl | 0 .../{ => services/ntp}/class_goNtpServer.inc | 0 .../{ => services/ntp}/goNtpServer.tpl | 0 .../repository}/class_servRepository.inc | 0 .../repository}/class_servRepositorySetup.inc | 0 .../repository}/servRepository.tpl | 0 .../repository}/servRepositorySetup.tpl | 0 .../shares}/class_goShareServer.inc | 0 .../{ => services/shares}/goShareServer.tpl | 0 .../spam}/class_goSpamServer.inc | 0 .../spam}/class_goSpamServerRule.inc | 0 .../{ => services/spam}/goSpamServer.tpl | 0 .../{ => services/spam}/goSpamServerRule.tpl | 0 .../syslog}/class_goLogDBServer.inc | 0 .../syslog}/class_goSyslogServer.inc | 0 .../{ => services/syslog}/goLogDBServer.tpl | 0 .../{ => services/syslog}/goSyslogServer.tpl | 0 .../terminal}/class_goTerminalServer.inc | 0 .../terminal}/goTerminalServer.tpl | 0 .../virus}/class_goVirusServer.inc | 0 .../{ => services/virus}/goVirusServer.tpl | 0 105 files changed, 48 insertions(+), 48 deletions(-) rename plugins/admin/systems/{ => ppd}/class_printerPPDDialog.inc (100%) rename plugins/admin/systems/{ => ppd}/class_printerPPDSelectionDialog.inc (100%) rename plugins/admin/systems/{ => ppd}/printerPPDDialog.tpl (100%) rename plugins/admin/systems/{ => ppd}/printerPPDSelectionDialog.tpl (100%) rename plugins/admin/systems/{ => ppd}/remove_ppd.tpl (100%) rename plugins/admin/systems/{ => services}/ServiceAddDialog.tpl (100%) mode change 100755 => 100644 rename plugins/admin/systems/{ => services}/class_ServiceAddDialog.inc (100%) rename plugins/admin/systems/{ => services}/class_goService.inc (100%) rename plugins/admin/systems/{ => services/cups}/class_goCupsServer.inc (100%) rename plugins/admin/systems/{ => services/cups}/goCupsServer.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpAdvanced.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpGroup.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpHost.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpNetwork.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpNewSectionDialog.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpPool.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpService.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpSharedNetwork.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_dhcpSubnet.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/class_servDHCP.inc (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcpNewSection.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_advanced.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_group.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_host.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_network.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_pool.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_service.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_sharedNetwork.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/dhcp_subnet.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/remove_dhcp.tpl (100%) rename plugins/admin/systems/{ => services/dhcp}/servdhcp.tpl (100%) rename plugins/admin/systems/{ => services/dns}/class_servDNS.inc (100%) rename plugins/admin/systems/{ => services/dns}/class_servDNSeditZone.inc (100%) rename plugins/admin/systems/{ => services/dns}/class_servDNSeditZoneEntries.inc (100%) rename plugins/admin/systems/{ => services/dns}/class_termDNS.inc (100%) rename plugins/admin/systems/{ => services/dns}/servDNSeditZoneEntries.tpl (100%) rename plugins/admin/systems/{ => services/dns}/servdns.tpl (100%) rename plugins/admin/systems/{ => services/dns}/servdnseditzone.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiAccount.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiAttachmentPool.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiDeviceManagement.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiManufacturer.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiPrinterAccount.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiPrinterCartridges.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiPrinterCartridgesEdit.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_glpiSelectUser.inc (100%) rename plugins/admin/systems/{ => services/glpi}/class_goGlpiServer.inc (100%) rename plugins/admin/systems/{ => services/glpi}/glpi.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiAttachmentEdit.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiAttachmentPool.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiDeviceManagement.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiManufacturer.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiManufacturerAdd.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiPrinter.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiPrinterCartridges.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiPrinterCartridgesEdit.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpiSelectUser.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpi_devices.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpi_edit_cartridge_type.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpi_edit_os.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpi_edit_printer_type.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/glpi_edit_type.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/goGlpiServer.tpl (100%) rename plugins/admin/systems/{ => services/glpi}/remove_glpi.tpl (100%) rename plugins/admin/systems/{ => services/gofax}/class_goFaxServer.inc (100%) rename plugins/admin/systems/{ => services/gofax}/goFaxServer.tpl (100%) rename plugins/admin/systems/{ => services/gofon}/class_goFonServer.inc (100%) rename plugins/admin/systems/{ => services/gofon}/goFonServer.tpl (100%) rename plugins/admin/systems/{ => services/imap}/class_goImapServer.inc (100%) rename plugins/admin/systems/{ => services/imap}/goImapServer.tpl (100%) rename plugins/admin/systems/{ => services/kerberos}/class_goKrbServer.inc (100%) rename plugins/admin/systems/{ => services/kerberos}/goKrbServer.tpl (100%) rename plugins/admin/systems/{ => services/kiosk}/class_goKioskService.inc (100%) rename plugins/admin/systems/{ => services/kiosk}/goKioskService.tpl (100%) rename plugins/admin/systems/{ => services/kolab}/class_servKolab.inc (100%) rename plugins/admin/systems/{ => services/kolab}/servkolab.tpl (100%) rename plugins/admin/systems/{ => services/ldap}/class_goLdapServer.inc (100%) rename plugins/admin/systems/{ => services/ldap}/goLdapServer.tpl (100%) rename plugins/admin/systems/{ => services/log}/class_gosaLogServer.inc (100%) rename plugins/admin/systems/{ => services/log}/gosaLogServer.tpl (100%) rename plugins/admin/systems/{ => services/mail}/class_goMailServer.inc (100%) rename plugins/admin/systems/{ => services/mail}/goMailServer.tpl (100%) rename plugins/admin/systems/{ => services/nfs}/class_servNfs.inc (100%) rename plugins/admin/systems/{ => services/nfs}/servnfs.tpl (100%) rename plugins/admin/systems/{ => services/ntp}/class_goNtpServer.inc (100%) rename plugins/admin/systems/{ => services/ntp}/goNtpServer.tpl (100%) rename plugins/admin/systems/{ => services/repository}/class_servRepository.inc (100%) rename plugins/admin/systems/{ => services/repository}/class_servRepositorySetup.inc (100%) rename plugins/admin/systems/{ => services/repository}/servRepository.tpl (100%) rename plugins/admin/systems/{ => services/repository}/servRepositorySetup.tpl (100%) rename plugins/admin/systems/{ => services/shares}/class_goShareServer.inc (100%) rename plugins/admin/systems/{ => services/shares}/goShareServer.tpl (100%) rename plugins/admin/systems/{ => services/spam}/class_goSpamServer.inc (100%) rename plugins/admin/systems/{ => services/spam}/class_goSpamServerRule.inc (100%) rename plugins/admin/systems/{ => services/spam}/goSpamServer.tpl (100%) rename plugins/admin/systems/{ => services/spam}/goSpamServerRule.tpl (100%) rename plugins/admin/systems/{ => services/syslog}/class_goLogDBServer.inc (100%) rename plugins/admin/systems/{ => services/syslog}/class_goSyslogServer.inc (100%) rename plugins/admin/systems/{ => services/syslog}/goLogDBServer.tpl (100%) rename plugins/admin/systems/{ => services/syslog}/goSyslogServer.tpl (100%) rename plugins/admin/systems/{ => services/terminal}/class_goTerminalServer.inc (100%) rename plugins/admin/systems/{ => services/terminal}/goTerminalServer.tpl (100%) rename plugins/admin/systems/{ => services/virus}/class_goVirusServer.inc (100%) rename plugins/admin/systems/{ => services/virus}/goVirusServer.tpl (100%) diff --git a/include/class_location.inc b/include/class_location.inc index 4d6383443..dc17ec0be 100644 --- a/include/class_location.inc +++ b/include/class_location.inc @@ -172,83 +172,83 @@ $class_mapping= array( "divListGroup" => "plugins/admin/groups/class_divListGroup.inc", "groupManagement" => "plugins/admin/groups/class_groupManagement.inc", "appgroup" => "plugins/admin/groups/class_groupApplication.inc", - "glpiAttachmentPool" => "plugins/admin/systems/class_glpiAttachmentPool.inc", - "gosaLogServer" => "plugins/admin/systems/class_gosaLogServer.inc", - "servdnseditZone" => "plugins/admin/systems/class_servDNSeditZone.inc", - "goTerminalServer" => "plugins/admin/systems/class_goTerminalServer.inc", - "goService" => "plugins/admin/systems/class_goService.inc", "workstartup" => "plugins/admin/systems/class_workstationStartup.inc", - "dhcpSharedNetwork" => "plugins/admin/systems/class_dhcpSharedNetwork.inc", - "govirusserver" => "plugins/admin/systems/class_goVirusServer.inc", "termtabs" => "plugins/admin/systems/tabs_terminal.inc", "phonetabs" => "plugins/admin/systems/tabs_phone.inc", "servtabs" => "plugins/admin/systems/tabs_server.inc", - "dhcpAdvanced" => "plugins/admin/systems/class_dhcpAdvanced.inc", - "servdns" => "plugins/admin/systems/class_servDNS.inc", "workgeneric" => "plugins/admin/systems/class_workstationGeneric.inc", - "gospamserver" => "plugins/admin/systems/class_goSpamServer.inc", - "dhcpNetwork" => "plugins/admin/systems/class_dhcpNetwork.inc", - "dhcpPool" => "plugins/admin/systems/class_dhcpPool.inc", "selectUserToPrinterDialog" => "plugins/admin/systems/class_selectUserToPrinterDialog.inc", "wintabs" => "plugins/admin/systems/tabs_winstation.inc", - "goCupsServer" => "plugins/admin/systems/class_goCupsServer.inc", "phoneGeneric" => "plugins/admin/systems/class_phoneGeneric.inc", - "glpiPrinterAccount" => "plugins/admin/systems/class_glpiPrinterAccount.inc", - "goMailServer" => "plugins/admin/systems/class_goMailServer.inc", "ArpNewDevice" => "plugins/admin/systems/class_ArpNewDevice.inc", - "dhcpSubnet" => "plugins/admin/systems/class_dhcpSubnet.inc", - "goLogDBServer" => "plugins/admin/systems/class_goLogDBServer.inc", + "gosaLogServer" => "plugins/admin/systems/services/log/class_gosaLogServer.inc", + "servdnseditZone" => "plugins/admin/systems/services/dns/class_servDNSeditZone.inc", + "servdns" => "plugins/admin/systems/services/dns/class_servDNS.inc", + "termDNS" => "plugins/admin/systems/services/dns/class_termDNS.inc", + "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", + "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", + "glpiPrinterCartridges" => "plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc", + "glpiManufacturer" => "plugins/admin/systems/services/glpi/class_glpiManufacturer.inc", + "glpiAccount" => "plugins/admin/systems/services/glpi/class_glpiAccount.inc", + "glpiPrinterCartridgesEdit" => "plugins/admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc", + "goLdapServer" => "plugins/admin/systems/services/ldap/class_goLdapServer.inc", + "servnfs" => "plugins/admin/systems/services/nfs/class_servNfs.inc", + "goService" => "plugins/admin/systems/services/class_goService.inc", + "goMailServer" => "plugins/admin/systems/services/mail/class_goMailServer.inc", + "goFonServer" => "plugins/admin/systems/services/gofon/class_goFonServer.inc", + "gospamserver" => "plugins/admin/systems/services/spam/class_goSpamServer.inc", + "goSpamServerRule" => "plugins/admin/systems/services/spam/class_goSpamServerRule.inc", + "goImapServer" => "plugins/admin/systems/services/imap/class_goImapServer.inc", + "goNtpServer" => "plugins/admin/systems/services/ntp/class_goNtpServer.inc", + "goShareServer" => "plugins/admin/systems/services/shares/class_goShareServer.inc", + "goFaxServer" => "plugins/admin/systems/services/gofax/class_goFaxServer.inc", + "govirusserver" => "plugins/admin/systems/services/virus/class_goVirusServer.inc", + "dhcpSharedNetwork" => "plugins/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc", + "dhcpAdvanced" => "plugins/admin/systems/services/dhcp/class_dhcpAdvanced.inc", + "dhcpNetwork" => "plugins/admin/systems/services/dhcp/class_dhcpNetwork.inc", + "dhcpPool" => "plugins/admin/systems/services/dhcp/class_dhcpPool.inc", + "dhcpSubnet" => "plugins/admin/systems/services/dhcp/class_dhcpSubnet.inc", + "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", + "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", + "goLogDBServer" => "plugins/admin/systems/services/syslog/class_goLogDBServer.inc", + "goSyslogServer" => "plugins/admin/systems/services/syslog/class_goSyslogServer.inc", + "servkolab" => "plugins/admin/systems/services/kolab/class_servKolab.inc", + "goCupsServer" => "plugins/admin/systems/services/cups/class_goCupsServer.inc", + "goTerminalServer" => "plugins/admin/systems/services/terminal/class_goTerminalServer.inc", + "goKioskService" => "plugins/admin/systems/services/kiosk/class_goKioskService.inc", + "servRepositorySetup" => "plugins/admin/systems/services/repository/class_servRepositorySetup.inc", + "servrepository" => "plugins/admin/systems/services/repository/class_servRepository.inc", + "goKrbServer" => "plugins/admin/systems/services/kerberos/class_goKrbServer.inc", "baseSelectDialog" => "plugins/admin/systems/class_baseSelectDialog.inc", - "dhcpGroup" => "plugins/admin/systems/class_dhcpGroup.inc", - "glpiDeviceManagement" => "plugins/admin/systems/class_glpiDeviceManagement.inc", "systems" => "plugins/admin/systems/class_systemManagement.inc", - "goNtpServer" => "plugins/admin/systems/class_goNtpServer.inc", - "goKrbServer" => "plugins/admin/systems/class_goKrbServer.inc", - "ServiceAddDialog" => "plugins/admin/systems/class_ServiceAddDialog.inc", - "goSyslogServer" => "plugins/admin/systems/class_goSyslogServer.inc", - "servRepositorySetup" => "plugins/admin/systems/class_servRepositorySetup.inc", - "goLdapServer" => "plugins/admin/systems/class_goLdapServer.inc", - "dhcpHost" => "plugins/admin/systems/class_dhcpHost.inc", "divListSystem" => "plugins/admin/systems/class_divListSystem.inc", "servgeneric" => "plugins/admin/systems/class_servGeneric.inc", "worktabs" => "plugins/admin/systems/tabs_workstation.inc", - "goKioskService" => "plugins/admin/systems/class_goKioskService.inc", "termservice" => "plugins/admin/systems/class_terminalService.inc", "divListSystemService" => "plugins/admin/systems/class_divListSystemService.inc", - "goShareServer" => "plugins/admin/systems/class_goShareServer.inc", "componentGeneric" => "plugins/admin/systems/class_componentGeneric.inc", - "goImapServer" => "plugins/admin/systems/class_goImapServer.inc", - "glpiSelectUser" => "plugins/admin/systems/class_glpiSelectUser.inc", "workservice" => "plugins/admin/systems/class_workstationService.inc", "termgeneric" => "plugins/admin/systems/class_terminalGeneric.inc", - "servrepository" => "plugins/admin/systems/class_servRepository.inc", "printtabs" => "plugins/admin/systems/tabs_printers.inc", "ArpNewDeviceTabs" => "plugins/admin/systems/tabs_arpnewdevice.inc", - "printerPPDDialog" => "plugins/admin/systems/class_printerPPDDialog.inc", - "dhcpNewSectionDialog" => "plugins/admin/systems/class_dhcpNewSectionDialog.inc", "componenttabs" => "plugins/admin/systems/tabs_component.inc", - "goGlpiServer" => "plugins/admin/systems/class_goGlpiServer.inc", - "servkolab" => "plugins/admin/systems/class_servKolab.inc", "divListRepository" => "plugins/admin/systems/class_divListRepositories.inc", - "goFonServer" => "plugins/admin/systems/class_goFonServer.inc", - "servnfs" => "plugins/admin/systems/class_servNfs.inc", + "printerPPDDialog" => "plugins/admin/systems/ppd/class_printerPPDDialog.inc", + "printerPPDSelectionDialog" => "plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc", "wingeneric" => "plugins/admin/systems/class_winGeneric.inc", - "glpiPrinterCartridges" => "plugins/admin/systems/class_glpiPrinterCartridges.inc", - "glpiManufacturer" => "plugins/admin/systems/class_glpiManufacturer.inc", - "termDNS" => "plugins/admin/systems/class_termDNS.inc", "termstartup" => "plugins/admin/systems/class_terminalStartup.inc", "terminfo" => "plugins/admin/systems/class_terminalInfo.inc", "printgeneric" => "plugins/admin/systems/class_printGeneric.inc", - "goFaxServer" => "plugins/admin/systems/class_goFaxServer.inc", - "printerPPDSelectionDialog" => "plugins/admin/systems/class_printerPPDSelectionDialog.inc", - "dhcpService" => "plugins/admin/systems/class_dhcpService.inc", - "servdhcp" => "plugins/admin/systems/class_servDHCP.inc", - "glpiAccount" => "plugins/admin/systems/class_glpiAccount.inc", "ServerService" => "plugins/admin/systems/class_serverService.inc", "SelectDeviceType" => "plugins/admin/systems/class_SelectDeviceType.inc", - "glpiPrinterCartridgesEdit" => "plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc", - "servDNSeditZoneEntries" => "plugins/admin/systems/class_servDNSeditZoneEntries.inc", - "goSpamServerRule" => "plugins/admin/systems/class_goSpamServerRule.inc", "aclroletab" => "plugins/admin/acl/tabs_acl_role.inc", "acltab" => "plugins/admin/acl/tabs_acl.inc", "aclManagement" => "plugins/admin/acl/class_aclManagement.inc", diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/ppd/class_printerPPDDialog.inc similarity index 100% rename from plugins/admin/systems/class_printerPPDDialog.inc rename to plugins/admin/systems/ppd/class_printerPPDDialog.inc diff --git a/plugins/admin/systems/class_printerPPDSelectionDialog.inc b/plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc similarity index 100% rename from plugins/admin/systems/class_printerPPDSelectionDialog.inc rename to plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc diff --git a/plugins/admin/systems/printerPPDDialog.tpl b/plugins/admin/systems/ppd/printerPPDDialog.tpl similarity index 100% rename from plugins/admin/systems/printerPPDDialog.tpl rename to plugins/admin/systems/ppd/printerPPDDialog.tpl diff --git a/plugins/admin/systems/printerPPDSelectionDialog.tpl b/plugins/admin/systems/ppd/printerPPDSelectionDialog.tpl similarity index 100% rename from plugins/admin/systems/printerPPDSelectionDialog.tpl rename to plugins/admin/systems/ppd/printerPPDSelectionDialog.tpl diff --git a/plugins/admin/systems/remove_ppd.tpl b/plugins/admin/systems/ppd/remove_ppd.tpl similarity index 100% rename from plugins/admin/systems/remove_ppd.tpl rename to plugins/admin/systems/ppd/remove_ppd.tpl diff --git a/plugins/admin/systems/ServiceAddDialog.tpl b/plugins/admin/systems/services/ServiceAddDialog.tpl old mode 100755 new mode 100644 similarity index 100% rename from plugins/admin/systems/ServiceAddDialog.tpl rename to plugins/admin/systems/services/ServiceAddDialog.tpl diff --git a/plugins/admin/systems/class_ServiceAddDialog.inc b/plugins/admin/systems/services/class_ServiceAddDialog.inc similarity index 100% rename from plugins/admin/systems/class_ServiceAddDialog.inc rename to plugins/admin/systems/services/class_ServiceAddDialog.inc diff --git a/plugins/admin/systems/class_goService.inc b/plugins/admin/systems/services/class_goService.inc similarity index 100% rename from plugins/admin/systems/class_goService.inc rename to plugins/admin/systems/services/class_goService.inc diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/services/cups/class_goCupsServer.inc similarity index 100% rename from plugins/admin/systems/class_goCupsServer.inc rename to plugins/admin/systems/services/cups/class_goCupsServer.inc diff --git a/plugins/admin/systems/goCupsServer.tpl b/plugins/admin/systems/services/cups/goCupsServer.tpl similarity index 100% rename from plugins/admin/systems/goCupsServer.tpl rename to plugins/admin/systems/services/cups/goCupsServer.tpl diff --git a/plugins/admin/systems/class_dhcpAdvanced.inc b/plugins/admin/systems/services/dhcp/class_dhcpAdvanced.inc similarity index 100% rename from plugins/admin/systems/class_dhcpAdvanced.inc rename to plugins/admin/systems/services/dhcp/class_dhcpAdvanced.inc diff --git a/plugins/admin/systems/class_dhcpGroup.inc b/plugins/admin/systems/services/dhcp/class_dhcpGroup.inc similarity index 100% rename from plugins/admin/systems/class_dhcpGroup.inc rename to plugins/admin/systems/services/dhcp/class_dhcpGroup.inc diff --git a/plugins/admin/systems/class_dhcpHost.inc b/plugins/admin/systems/services/dhcp/class_dhcpHost.inc similarity index 100% rename from plugins/admin/systems/class_dhcpHost.inc rename to plugins/admin/systems/services/dhcp/class_dhcpHost.inc diff --git a/plugins/admin/systems/class_dhcpNetwork.inc b/plugins/admin/systems/services/dhcp/class_dhcpNetwork.inc similarity index 100% rename from plugins/admin/systems/class_dhcpNetwork.inc rename to plugins/admin/systems/services/dhcp/class_dhcpNetwork.inc diff --git a/plugins/admin/systems/class_dhcpNewSectionDialog.inc b/plugins/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc similarity index 100% rename from plugins/admin/systems/class_dhcpNewSectionDialog.inc rename to plugins/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc diff --git a/plugins/admin/systems/class_dhcpPool.inc b/plugins/admin/systems/services/dhcp/class_dhcpPool.inc similarity index 100% rename from plugins/admin/systems/class_dhcpPool.inc rename to plugins/admin/systems/services/dhcp/class_dhcpPool.inc diff --git a/plugins/admin/systems/class_dhcpService.inc b/plugins/admin/systems/services/dhcp/class_dhcpService.inc similarity index 100% rename from plugins/admin/systems/class_dhcpService.inc rename to plugins/admin/systems/services/dhcp/class_dhcpService.inc diff --git a/plugins/admin/systems/class_dhcpSharedNetwork.inc b/plugins/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc similarity index 100% rename from plugins/admin/systems/class_dhcpSharedNetwork.inc rename to plugins/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc diff --git a/plugins/admin/systems/class_dhcpSubnet.inc b/plugins/admin/systems/services/dhcp/class_dhcpSubnet.inc similarity index 100% rename from plugins/admin/systems/class_dhcpSubnet.inc rename to plugins/admin/systems/services/dhcp/class_dhcpSubnet.inc diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/services/dhcp/class_servDHCP.inc similarity index 100% rename from plugins/admin/systems/class_servDHCP.inc rename to plugins/admin/systems/services/dhcp/class_servDHCP.inc diff --git a/plugins/admin/systems/dhcpNewSection.tpl b/plugins/admin/systems/services/dhcp/dhcpNewSection.tpl similarity index 100% rename from plugins/admin/systems/dhcpNewSection.tpl rename to plugins/admin/systems/services/dhcp/dhcpNewSection.tpl diff --git a/plugins/admin/systems/dhcp_advanced.tpl b/plugins/admin/systems/services/dhcp/dhcp_advanced.tpl similarity index 100% rename from plugins/admin/systems/dhcp_advanced.tpl rename to plugins/admin/systems/services/dhcp/dhcp_advanced.tpl diff --git a/plugins/admin/systems/dhcp_group.tpl b/plugins/admin/systems/services/dhcp/dhcp_group.tpl similarity index 100% rename from plugins/admin/systems/dhcp_group.tpl rename to plugins/admin/systems/services/dhcp/dhcp_group.tpl diff --git a/plugins/admin/systems/dhcp_host.tpl b/plugins/admin/systems/services/dhcp/dhcp_host.tpl similarity index 100% rename from plugins/admin/systems/dhcp_host.tpl rename to plugins/admin/systems/services/dhcp/dhcp_host.tpl diff --git a/plugins/admin/systems/dhcp_network.tpl b/plugins/admin/systems/services/dhcp/dhcp_network.tpl similarity index 100% rename from plugins/admin/systems/dhcp_network.tpl rename to plugins/admin/systems/services/dhcp/dhcp_network.tpl diff --git a/plugins/admin/systems/dhcp_pool.tpl b/plugins/admin/systems/services/dhcp/dhcp_pool.tpl similarity index 100% rename from plugins/admin/systems/dhcp_pool.tpl rename to plugins/admin/systems/services/dhcp/dhcp_pool.tpl diff --git a/plugins/admin/systems/dhcp_service.tpl b/plugins/admin/systems/services/dhcp/dhcp_service.tpl similarity index 100% rename from plugins/admin/systems/dhcp_service.tpl rename to plugins/admin/systems/services/dhcp/dhcp_service.tpl diff --git a/plugins/admin/systems/dhcp_sharedNetwork.tpl b/plugins/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl similarity index 100% rename from plugins/admin/systems/dhcp_sharedNetwork.tpl rename to plugins/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl diff --git a/plugins/admin/systems/dhcp_subnet.tpl b/plugins/admin/systems/services/dhcp/dhcp_subnet.tpl similarity index 100% rename from plugins/admin/systems/dhcp_subnet.tpl rename to plugins/admin/systems/services/dhcp/dhcp_subnet.tpl diff --git a/plugins/admin/systems/remove_dhcp.tpl b/plugins/admin/systems/services/dhcp/remove_dhcp.tpl similarity index 100% rename from plugins/admin/systems/remove_dhcp.tpl rename to plugins/admin/systems/services/dhcp/remove_dhcp.tpl diff --git a/plugins/admin/systems/servdhcp.tpl b/plugins/admin/systems/services/dhcp/servdhcp.tpl similarity index 100% rename from plugins/admin/systems/servdhcp.tpl rename to plugins/admin/systems/services/dhcp/servdhcp.tpl diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/services/dns/class_servDNS.inc similarity index 100% rename from plugins/admin/systems/class_servDNS.inc rename to plugins/admin/systems/services/dns/class_servDNS.inc diff --git a/plugins/admin/systems/class_servDNSeditZone.inc b/plugins/admin/systems/services/dns/class_servDNSeditZone.inc similarity index 100% rename from plugins/admin/systems/class_servDNSeditZone.inc rename to plugins/admin/systems/services/dns/class_servDNSeditZone.inc diff --git a/plugins/admin/systems/class_servDNSeditZoneEntries.inc b/plugins/admin/systems/services/dns/class_servDNSeditZoneEntries.inc similarity index 100% rename from plugins/admin/systems/class_servDNSeditZoneEntries.inc rename to plugins/admin/systems/services/dns/class_servDNSeditZoneEntries.inc diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/services/dns/class_termDNS.inc similarity index 100% rename from plugins/admin/systems/class_termDNS.inc rename to plugins/admin/systems/services/dns/class_termDNS.inc diff --git a/plugins/admin/systems/servDNSeditZoneEntries.tpl b/plugins/admin/systems/services/dns/servDNSeditZoneEntries.tpl similarity index 100% rename from plugins/admin/systems/servDNSeditZoneEntries.tpl rename to plugins/admin/systems/services/dns/servDNSeditZoneEntries.tpl diff --git a/plugins/admin/systems/servdns.tpl b/plugins/admin/systems/services/dns/servdns.tpl similarity index 100% rename from plugins/admin/systems/servdns.tpl rename to plugins/admin/systems/services/dns/servdns.tpl diff --git a/plugins/admin/systems/servdnseditzone.tpl b/plugins/admin/systems/services/dns/servdnseditzone.tpl similarity index 100% rename from plugins/admin/systems/servdnseditzone.tpl rename to plugins/admin/systems/services/dns/servdnseditzone.tpl diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/services/glpi/class_glpiAccount.inc similarity index 100% rename from plugins/admin/systems/class_glpiAccount.inc rename to plugins/admin/systems/services/glpi/class_glpiAccount.inc diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc similarity index 100% rename from plugins/admin/systems/class_glpiAttachmentPool.inc rename to plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc diff --git a/plugins/admin/systems/class_glpiDeviceManagement.inc b/plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc similarity index 100% rename from plugins/admin/systems/class_glpiDeviceManagement.inc rename to plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc diff --git a/plugins/admin/systems/class_glpiManufacturer.inc b/plugins/admin/systems/services/glpi/class_glpiManufacturer.inc similarity index 100% rename from plugins/admin/systems/class_glpiManufacturer.inc rename to plugins/admin/systems/services/glpi/class_glpiManufacturer.inc diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/services/glpi/class_glpiPrinterAccount.inc similarity index 100% rename from plugins/admin/systems/class_glpiPrinterAccount.inc rename to plugins/admin/systems/services/glpi/class_glpiPrinterAccount.inc diff --git a/plugins/admin/systems/class_glpiPrinterCartridges.inc b/plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc similarity index 100% rename from plugins/admin/systems/class_glpiPrinterCartridges.inc rename to plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc diff --git a/plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc b/plugins/admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc similarity index 100% rename from plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc rename to plugins/admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc diff --git a/plugins/admin/systems/class_glpiSelectUser.inc b/plugins/admin/systems/services/glpi/class_glpiSelectUser.inc similarity index 100% rename from plugins/admin/systems/class_glpiSelectUser.inc rename to plugins/admin/systems/services/glpi/class_glpiSelectUser.inc diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/services/glpi/class_goGlpiServer.inc similarity index 100% rename from plugins/admin/systems/class_goGlpiServer.inc rename to plugins/admin/systems/services/glpi/class_goGlpiServer.inc diff --git a/plugins/admin/systems/glpi.tpl b/plugins/admin/systems/services/glpi/glpi.tpl similarity index 100% rename from plugins/admin/systems/glpi.tpl rename to plugins/admin/systems/services/glpi/glpi.tpl diff --git a/plugins/admin/systems/glpiAttachmentEdit.tpl b/plugins/admin/systems/services/glpi/glpiAttachmentEdit.tpl similarity index 100% rename from plugins/admin/systems/glpiAttachmentEdit.tpl rename to plugins/admin/systems/services/glpi/glpiAttachmentEdit.tpl diff --git a/plugins/admin/systems/glpiAttachmentPool.tpl b/plugins/admin/systems/services/glpi/glpiAttachmentPool.tpl similarity index 100% rename from plugins/admin/systems/glpiAttachmentPool.tpl rename to plugins/admin/systems/services/glpi/glpiAttachmentPool.tpl diff --git a/plugins/admin/systems/glpiDeviceManagement.tpl b/plugins/admin/systems/services/glpi/glpiDeviceManagement.tpl similarity index 100% rename from plugins/admin/systems/glpiDeviceManagement.tpl rename to plugins/admin/systems/services/glpi/glpiDeviceManagement.tpl diff --git a/plugins/admin/systems/glpiManufacturer.tpl b/plugins/admin/systems/services/glpi/glpiManufacturer.tpl similarity index 100% rename from plugins/admin/systems/glpiManufacturer.tpl rename to plugins/admin/systems/services/glpi/glpiManufacturer.tpl diff --git a/plugins/admin/systems/glpiManufacturerAdd.tpl b/plugins/admin/systems/services/glpi/glpiManufacturerAdd.tpl similarity index 100% rename from plugins/admin/systems/glpiManufacturerAdd.tpl rename to plugins/admin/systems/services/glpi/glpiManufacturerAdd.tpl diff --git a/plugins/admin/systems/glpiPrinter.tpl b/plugins/admin/systems/services/glpi/glpiPrinter.tpl similarity index 100% rename from plugins/admin/systems/glpiPrinter.tpl rename to plugins/admin/systems/services/glpi/glpiPrinter.tpl diff --git a/plugins/admin/systems/glpiPrinterCartridges.tpl b/plugins/admin/systems/services/glpi/glpiPrinterCartridges.tpl similarity index 100% rename from plugins/admin/systems/glpiPrinterCartridges.tpl rename to plugins/admin/systems/services/glpi/glpiPrinterCartridges.tpl diff --git a/plugins/admin/systems/glpiPrinterCartridgesEdit.tpl b/plugins/admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl similarity index 100% rename from plugins/admin/systems/glpiPrinterCartridgesEdit.tpl rename to plugins/admin/systems/services/glpi/glpiPrinterCartridgesEdit.tpl diff --git a/plugins/admin/systems/glpiSelectUser.tpl b/plugins/admin/systems/services/glpi/glpiSelectUser.tpl similarity index 100% rename from plugins/admin/systems/glpiSelectUser.tpl rename to plugins/admin/systems/services/glpi/glpiSelectUser.tpl diff --git a/plugins/admin/systems/glpi_devices.tpl b/plugins/admin/systems/services/glpi/glpi_devices.tpl similarity index 100% rename from plugins/admin/systems/glpi_devices.tpl rename to plugins/admin/systems/services/glpi/glpi_devices.tpl diff --git a/plugins/admin/systems/glpi_edit_cartridge_type.tpl b/plugins/admin/systems/services/glpi/glpi_edit_cartridge_type.tpl similarity index 100% rename from plugins/admin/systems/glpi_edit_cartridge_type.tpl rename to plugins/admin/systems/services/glpi/glpi_edit_cartridge_type.tpl diff --git a/plugins/admin/systems/glpi_edit_os.tpl b/plugins/admin/systems/services/glpi/glpi_edit_os.tpl similarity index 100% rename from plugins/admin/systems/glpi_edit_os.tpl rename to plugins/admin/systems/services/glpi/glpi_edit_os.tpl diff --git a/plugins/admin/systems/glpi_edit_printer_type.tpl b/plugins/admin/systems/services/glpi/glpi_edit_printer_type.tpl similarity index 100% rename from plugins/admin/systems/glpi_edit_printer_type.tpl rename to plugins/admin/systems/services/glpi/glpi_edit_printer_type.tpl diff --git a/plugins/admin/systems/glpi_edit_type.tpl b/plugins/admin/systems/services/glpi/glpi_edit_type.tpl similarity index 100% rename from plugins/admin/systems/glpi_edit_type.tpl rename to plugins/admin/systems/services/glpi/glpi_edit_type.tpl diff --git a/plugins/admin/systems/goGlpiServer.tpl b/plugins/admin/systems/services/glpi/goGlpiServer.tpl similarity index 100% rename from plugins/admin/systems/goGlpiServer.tpl rename to plugins/admin/systems/services/glpi/goGlpiServer.tpl diff --git a/plugins/admin/systems/remove_glpi.tpl b/plugins/admin/systems/services/glpi/remove_glpi.tpl similarity index 100% rename from plugins/admin/systems/remove_glpi.tpl rename to plugins/admin/systems/services/glpi/remove_glpi.tpl diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/services/gofax/class_goFaxServer.inc similarity index 100% rename from plugins/admin/systems/class_goFaxServer.inc rename to plugins/admin/systems/services/gofax/class_goFaxServer.inc diff --git a/plugins/admin/systems/goFaxServer.tpl b/plugins/admin/systems/services/gofax/goFaxServer.tpl similarity index 100% rename from plugins/admin/systems/goFaxServer.tpl rename to plugins/admin/systems/services/gofax/goFaxServer.tpl diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/services/gofon/class_goFonServer.inc similarity index 100% rename from plugins/admin/systems/class_goFonServer.inc rename to plugins/admin/systems/services/gofon/class_goFonServer.inc diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/services/gofon/goFonServer.tpl similarity index 100% rename from plugins/admin/systems/goFonServer.tpl rename to plugins/admin/systems/services/gofon/goFonServer.tpl diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/services/imap/class_goImapServer.inc similarity index 100% rename from plugins/admin/systems/class_goImapServer.inc rename to plugins/admin/systems/services/imap/class_goImapServer.inc diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/services/imap/goImapServer.tpl similarity index 100% rename from plugins/admin/systems/goImapServer.tpl rename to plugins/admin/systems/services/imap/goImapServer.tpl diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/services/kerberos/class_goKrbServer.inc similarity index 100% rename from plugins/admin/systems/class_goKrbServer.inc rename to plugins/admin/systems/services/kerberos/class_goKrbServer.inc diff --git a/plugins/admin/systems/goKrbServer.tpl b/plugins/admin/systems/services/kerberos/goKrbServer.tpl similarity index 100% rename from plugins/admin/systems/goKrbServer.tpl rename to plugins/admin/systems/services/kerberos/goKrbServer.tpl diff --git a/plugins/admin/systems/class_goKioskService.inc b/plugins/admin/systems/services/kiosk/class_goKioskService.inc similarity index 100% rename from plugins/admin/systems/class_goKioskService.inc rename to plugins/admin/systems/services/kiosk/class_goKioskService.inc diff --git a/plugins/admin/systems/goKioskService.tpl b/plugins/admin/systems/services/kiosk/goKioskService.tpl similarity index 100% rename from plugins/admin/systems/goKioskService.tpl rename to plugins/admin/systems/services/kiosk/goKioskService.tpl diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/services/kolab/class_servKolab.inc similarity index 100% rename from plugins/admin/systems/class_servKolab.inc rename to plugins/admin/systems/services/kolab/class_servKolab.inc diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/services/kolab/servkolab.tpl similarity index 100% rename from plugins/admin/systems/servkolab.tpl rename to plugins/admin/systems/services/kolab/servkolab.tpl diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/services/ldap/class_goLdapServer.inc similarity index 100% rename from plugins/admin/systems/class_goLdapServer.inc rename to plugins/admin/systems/services/ldap/class_goLdapServer.inc diff --git a/plugins/admin/systems/goLdapServer.tpl b/plugins/admin/systems/services/ldap/goLdapServer.tpl similarity index 100% rename from plugins/admin/systems/goLdapServer.tpl rename to plugins/admin/systems/services/ldap/goLdapServer.tpl diff --git a/plugins/admin/systems/class_gosaLogServer.inc b/plugins/admin/systems/services/log/class_gosaLogServer.inc similarity index 100% rename from plugins/admin/systems/class_gosaLogServer.inc rename to plugins/admin/systems/services/log/class_gosaLogServer.inc diff --git a/plugins/admin/systems/gosaLogServer.tpl b/plugins/admin/systems/services/log/gosaLogServer.tpl similarity index 100% rename from plugins/admin/systems/gosaLogServer.tpl rename to plugins/admin/systems/services/log/gosaLogServer.tpl diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/services/mail/class_goMailServer.inc similarity index 100% rename from plugins/admin/systems/class_goMailServer.inc rename to plugins/admin/systems/services/mail/class_goMailServer.inc diff --git a/plugins/admin/systems/goMailServer.tpl b/plugins/admin/systems/services/mail/goMailServer.tpl similarity index 100% rename from plugins/admin/systems/goMailServer.tpl rename to plugins/admin/systems/services/mail/goMailServer.tpl diff --git a/plugins/admin/systems/class_servNfs.inc b/plugins/admin/systems/services/nfs/class_servNfs.inc similarity index 100% rename from plugins/admin/systems/class_servNfs.inc rename to plugins/admin/systems/services/nfs/class_servNfs.inc diff --git a/plugins/admin/systems/servnfs.tpl b/plugins/admin/systems/services/nfs/servnfs.tpl similarity index 100% rename from plugins/admin/systems/servnfs.tpl rename to plugins/admin/systems/services/nfs/servnfs.tpl diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/services/ntp/class_goNtpServer.inc similarity index 100% rename from plugins/admin/systems/class_goNtpServer.inc rename to plugins/admin/systems/services/ntp/class_goNtpServer.inc diff --git a/plugins/admin/systems/goNtpServer.tpl b/plugins/admin/systems/services/ntp/goNtpServer.tpl similarity index 100% rename from plugins/admin/systems/goNtpServer.tpl rename to plugins/admin/systems/services/ntp/goNtpServer.tpl diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/services/repository/class_servRepository.inc similarity index 100% rename from plugins/admin/systems/class_servRepository.inc rename to plugins/admin/systems/services/repository/class_servRepository.inc diff --git a/plugins/admin/systems/class_servRepositorySetup.inc b/plugins/admin/systems/services/repository/class_servRepositorySetup.inc similarity index 100% rename from plugins/admin/systems/class_servRepositorySetup.inc rename to plugins/admin/systems/services/repository/class_servRepositorySetup.inc diff --git a/plugins/admin/systems/servRepository.tpl b/plugins/admin/systems/services/repository/servRepository.tpl similarity index 100% rename from plugins/admin/systems/servRepository.tpl rename to plugins/admin/systems/services/repository/servRepository.tpl diff --git a/plugins/admin/systems/servRepositorySetup.tpl b/plugins/admin/systems/services/repository/servRepositorySetup.tpl similarity index 100% rename from plugins/admin/systems/servRepositorySetup.tpl rename to plugins/admin/systems/services/repository/servRepositorySetup.tpl diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/services/shares/class_goShareServer.inc similarity index 100% rename from plugins/admin/systems/class_goShareServer.inc rename to plugins/admin/systems/services/shares/class_goShareServer.inc diff --git a/plugins/admin/systems/goShareServer.tpl b/plugins/admin/systems/services/shares/goShareServer.tpl similarity index 100% rename from plugins/admin/systems/goShareServer.tpl rename to plugins/admin/systems/services/shares/goShareServer.tpl diff --git a/plugins/admin/systems/class_goSpamServer.inc b/plugins/admin/systems/services/spam/class_goSpamServer.inc similarity index 100% rename from plugins/admin/systems/class_goSpamServer.inc rename to plugins/admin/systems/services/spam/class_goSpamServer.inc diff --git a/plugins/admin/systems/class_goSpamServerRule.inc b/plugins/admin/systems/services/spam/class_goSpamServerRule.inc similarity index 100% rename from plugins/admin/systems/class_goSpamServerRule.inc rename to plugins/admin/systems/services/spam/class_goSpamServerRule.inc diff --git a/plugins/admin/systems/goSpamServer.tpl b/plugins/admin/systems/services/spam/goSpamServer.tpl similarity index 100% rename from plugins/admin/systems/goSpamServer.tpl rename to plugins/admin/systems/services/spam/goSpamServer.tpl diff --git a/plugins/admin/systems/goSpamServerRule.tpl b/plugins/admin/systems/services/spam/goSpamServerRule.tpl similarity index 100% rename from plugins/admin/systems/goSpamServerRule.tpl rename to plugins/admin/systems/services/spam/goSpamServerRule.tpl diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/services/syslog/class_goLogDBServer.inc similarity index 100% rename from plugins/admin/systems/class_goLogDBServer.inc rename to plugins/admin/systems/services/syslog/class_goLogDBServer.inc diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/services/syslog/class_goSyslogServer.inc similarity index 100% rename from plugins/admin/systems/class_goSyslogServer.inc rename to plugins/admin/systems/services/syslog/class_goSyslogServer.inc diff --git a/plugins/admin/systems/goLogDBServer.tpl b/plugins/admin/systems/services/syslog/goLogDBServer.tpl similarity index 100% rename from plugins/admin/systems/goLogDBServer.tpl rename to plugins/admin/systems/services/syslog/goLogDBServer.tpl diff --git a/plugins/admin/systems/goSyslogServer.tpl b/plugins/admin/systems/services/syslog/goSyslogServer.tpl similarity index 100% rename from plugins/admin/systems/goSyslogServer.tpl rename to plugins/admin/systems/services/syslog/goSyslogServer.tpl diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/services/terminal/class_goTerminalServer.inc similarity index 100% rename from plugins/admin/systems/class_goTerminalServer.inc rename to plugins/admin/systems/services/terminal/class_goTerminalServer.inc diff --git a/plugins/admin/systems/goTerminalServer.tpl b/plugins/admin/systems/services/terminal/goTerminalServer.tpl similarity index 100% rename from plugins/admin/systems/goTerminalServer.tpl rename to plugins/admin/systems/services/terminal/goTerminalServer.tpl diff --git a/plugins/admin/systems/class_goVirusServer.inc b/plugins/admin/systems/services/virus/class_goVirusServer.inc similarity index 100% rename from plugins/admin/systems/class_goVirusServer.inc rename to plugins/admin/systems/services/virus/class_goVirusServer.inc diff --git a/plugins/admin/systems/goVirusServer.tpl b/plugins/admin/systems/services/virus/goVirusServer.tpl similarity index 100% rename from plugins/admin/systems/goVirusServer.tpl rename to plugins/admin/systems/services/virus/goVirusServer.tpl -- 2.30.2