From: cajus Date: Wed, 19 Sep 2007 15:21:47 +0000 (+0000) Subject: Fixed a couple of == / === NULL occurencies X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e2910a734cd4c714bc7c92499877e606a6c13525;p=gosa.git Fixed a couple of == / === NULL occurencies git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7335 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/logout.php b/html/logout.php index 5421e0e17..b6d4b5531 100644 --- a/html/logout.php +++ b/html/logout.php @@ -22,7 +22,6 @@ require_once ("../include/php_setup.inc"); require_once ("functions.inc"); header("Content-type: text/html; charset=UTF-8"); -get_dir_list("$BASE_DIR/plugins"); /* try to start session, so we can remove userlocks, if the old session is still available */ diff --git a/include/class_acl.inc b/include/class_acl.inc index 4998df217..cdc6b9ffd 100644 --- a/include/class_acl.inc +++ b/include/class_acl.inc @@ -113,7 +113,7 @@ class acl extends plugin $tmp= get_global('plist'); $plist= $tmp->info; $cats = array(); - if (isset($this->parent) && $this->parent != NULL){ + if (isset($this->parent) && $this->parent !== NULL){ $oc= array(); foreach ($this->parent->by_object as $key => $obj){ $oc= array_merge($oc, $obj->objectclasses); diff --git a/include/class_location.inc b/include/class_location.inc index 40176c63b..2cae6f815 100644 --- a/include/class_location.inc +++ b/include/class_location.inc @@ -1,292 +1,292 @@ "plugins/personal/nagios/class_nagiosAccount.inc", - "mailAccount" => "plugins/personal/mail/class_mailAccount.inc", + "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", - "posixAccount" => "plugins/personal/posix/class_posixAccount.inc", - "netatalk" => "plugins/personal/netatalk/class_netatalk.inc", - "sambaLogonHours" => "plugins/personal/samba/class_sambaLogonHours.inc", "sambaAccount" => "plugins/personal/samba/class_sambaAccount.inc", - "scalixAccount" => "plugins/personal/scalix/class_scalixAccount.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", - "selectPrinterDialog" => "plugins/personal/environment/class_selectPrinterDialog.inc", "environment" => "plugins/personal/environment/class_environment.inc", - "logonManagementDialog" => "plugins/personal/environment/class_logonManagementDialog.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", - "webdavAccount" => "plugins/personal/connectivity/class_webdavAccount.inc", - "proxyAccount" => "plugins/personal/connectivity/class_proxyAccount.inc", - "pptpAccount" => "plugins/personal/connectivity/class_pptpAccount.inc", - "intranetAccount" => "plugins/personal/connectivity/class_intranetAccount.inc", - "phpgwAccount" => "plugins/personal/connectivity/class_phpgwAccount.inc", + "scalixAccount" => "plugins/personal/scalix/class_scalixAccount.inc", + "connectivity" => "plugins/personal/connectivity/class_connectivity.inc", "kolabAccount" => "plugins/personal/connectivity/class_kolabAccount.inc", - "pureftpdAccount" => "plugins/personal/connectivity/class_pureftpdAccount.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", - "connectivity" => "plugins/personal/connectivity/class_connectivity.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", - "addressbook" => "plugins/addons/addressbook/class_addressbook.inc", - "contains" => "plugins/addons/godfs/class_dfsManagment.inc", - "dfsManagment" => "plugins/addons/godfs/class_dfsManagment.inc", - "dfsgeneric" => "plugins/addons/godfs/class_dfsgeneric.inc", - "dfstabs" => "plugins/addons/godfs/tabs_dfs.inc", - "gotomasses" => "plugins/addons/gotomasses/class_gotomasses.inc", - "goto_task" => "plugins/addons/gotomasses/class_goto_task.inc", - "target_list" => "plugins/addons/gotomasses/class_target_list.inc", - "parseMailQueue" => "plugins/addons/mailqueue/class_parseMailQueue.inc", - "mailqueue" => "plugins/addons/mailqueue/class_mailqueue.inc", - "msgplug" => "plugins/addons/notifications/class_msgplug.inc", - "ldiftab" => "plugins/addons/ldapmanager/tabs_ldif.inc", - "csvimport" => "plugins/addons/ldapmanager/class_csvimport.inc", - "xlsexport" => "plugins/addons/ldapmanager/class_exportxls.inc", - "ldifimport" => "plugins/addons/ldapmanager/class_import.inc", - "ldif" => "plugins/addons/ldapmanager/class_ldif.inc", - "ldifexport" => "plugins/addons/ldapmanager/class_export.inc", - "gosa_logview" => "plugins/addons/logview/class_gosa_logview.inc", - "log_tabs" => "plugins/addons/logview/tabs_log.inc", - "logview" => "plugins/addons/logview/class_logview.inc", - "acltab" => "plugins/admin/acl/tabs_acl.inc", - "aclroletab" => "plugins/admin/acl/tabs_acl_role.inc", - "aclManagement" => "plugins/admin/acl/class_aclManagement.inc", - "divListACL" => "plugins/admin/acl/class_divListACL.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", - "tabsHook" => "plugins/admin/fai/tabsHook.inc", - "faiTemplate" => "plugins/admin/fai/class_faiTemplate.inc", - "faiManagement" => "plugins/admin/fai/class_faiManagement.inc", - "faiPackageEntry" => "plugins/admin/fai/class_faiPackageEntry.inc", "tabsPartition" => "plugins/admin/fai/tabsPartition.inc", - "faiSummaryTab" => "plugins/admin/fai/class_faiSummaryTab.inc", - "faiScriptEntry" => "plugins/admin/fai/class_faiScriptEntry.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", - "faiPackage" => "plugins/admin/fai/class_faiPackage.inc", - "faiHook" => "plugins/admin/fai/class_faiHook.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", - "tabsPackage" => "plugins/admin/fai/tabsPackage.inc", + "askClassName" => "plugins/admin/fai/class_askClassName.inc", + "faiVariable" => "plugins/admin/fai/class_faiVariable.inc", "faiPartitionTableEntry" => "plugins/admin/fai/class_faiPartitionTableEntry.inc", - "tabsProfile" => "plugins/admin/fai/tabsProfile.inc", - "faiVariableEntry" => "plugins/admin/fai/class_faiVariableEntry.inc", - "tabsScript" => "plugins/admin/fai/tabsScript.inc", + "faiTemplate" => "plugins/admin/fai/class_faiTemplate.inc", "divListFai" => "plugins/admin/fai/class_divListFai.inc", - "tabsTemplate" => "plugins/admin/fai/tabsTemplate.inc", + "tabsScript" => "plugins/admin/fai/tabsScript.inc", "faiPartitionTable" => "plugins/admin/fai/class_faiPartitionTable.inc", - "faiHookEntry" => "plugins/admin/fai/class_faiHookEntry.inc", - "faiProfileEntry" => "plugins/admin/fai/class_faiProfileEntry.inc", - "faiPackageConfiguration" => "plugins/admin/fai/class_faiPackageConfiguration.inc", - "faiVariable" => "plugins/admin/fai/class_faiVariable.inc", - "askClassName" => "plugins/admin/fai/class_askClassName.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", - "groupManagement" => "plugins/admin/groups/class_groupManagement.inc", - "group" => "plugins/admin/groups/class_groupGeneric.inc", - "divListGroup" => "plugins/admin/groups/class_divListGroup.inc", - "mailgroup" => "plugins/admin/groups/class_groupMail.inc", - "appgroup" => "plugins/admin/groups/class_groupApplication.inc", - "grouptabs" => "plugins/admin/groups/tabs_group.inc", + "faiHook" => "plugins/admin/fai/class_faiHook.inc", "usertabs" => "plugins/admin/users/tabs_user.inc", - "userManagement" => "plugins/admin/users/class_userManagement.inc", "divListUsers" => "plugins/admin/users/class_divListUsers.inc", - "divListApplication" => "plugins/admin/applications/class_divListApplication.inc", - "applicationParameters" => "plugins/admin/applications/class_applicationParameters.inc", - "apptabs" => "plugins/admin/applications/tabs_application.inc", - "application" => "plugins/admin/applications/class_applicationGeneric.inc", - "applicationManagement" => "plugins/admin/applications/class_applicationManagement.inc", - "divListDepartment" => "plugins/admin/departments/class_divListDepartment.inc", - "deptabs" => "plugins/admin/departments/tabs_department.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", - "wintabs" => "plugins/admin/systems/tabs_winstation.inc", - "terminfo" => "plugins/admin/systems/class_terminalInfo.inc", - "goFaxServer" => "plugins/admin/systems/class_goFaxServer.inc", - "divListSystemService" => "plugins/admin/systems/class_divListSystemService.inc", - "workstartup" => "plugins/admin/systems/class_workstationStartup.inc", - "goGlpiServer" => "plugins/admin/systems/class_goGlpiServer.inc", - "workgeneric" => "plugins/admin/systems/class_workstationGeneric.inc", - "govirusserver" => "plugins/admin/systems/class_goVirusServer.inc", - "goService" => "plugins/admin/systems/class_goService.inc", - "ServerService" => "plugins/admin/systems/class_serverService.inc", - "dhcpNetwork" => "plugins/admin/systems/class_dhcpNetwork.inc", - "dhcpGroup" => "plugins/admin/systems/class_dhcpGroup.inc", - "dhcpNewSectionDialog" => "plugins/admin/systems/class_dhcpNewSectionDialog.inc", - "glpiPrinterCartridges" => "plugins/admin/systems/class_glpiPrinterCartridges.inc", - "worktabs" => "plugins/admin/systems/tabs_workstation.inc", - "dhcpHost" => "plugins/admin/systems/class_dhcpHost.inc", - "termDNS" => "plugins/admin/systems/class_termDNS.inc", - "glpiPrinterCartridgesEdit" => "plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc", - "goNtpServer" => "plugins/admin/systems/class_goNtpServer.inc", - "ServiceAddDialog" => "plugins/admin/systems/class_ServiceAddDialog.inc", - "glpiSelectUser" => "plugins/admin/systems/class_glpiSelectUser.inc", - "goLdapServer" => "plugins/admin/systems/class_goLdapServer.inc", - "termstartup" => "plugins/admin/systems/class_terminalStartup.inc", - "dhcpAdvanced" => "plugins/admin/systems/class_dhcpAdvanced.inc", - "termgeneric" => "plugins/admin/systems/class_terminalGeneric.inc", - "servgeneric" => "plugins/admin/systems/class_servGeneric.inc", - "systems" => "plugins/admin/systems/class_systemManagement.inc", - "servdnseditZone" => "plugins/admin/systems/class_servDNSeditZone.inc", - "printgeneric" => "plugins/admin/systems/class_printGeneric.inc", - "baseSelectDialog" => "plugins/admin/systems/class_baseSelectDialog.inc", - "goKrbServer" => "plugins/admin/systems/class_goKrbServer.inc", - "goMailServer" => "plugins/admin/systems/class_goMailServer.inc", - "servRepositorySetup" => "plugins/admin/systems/class_servRepositorySetup.inc", - "SelectDeviceType" => "plugins/admin/systems/class_SelectDeviceType.inc", - "glpiManufacturer" => "plugins/admin/systems/class_glpiManufacturer.inc", - "dhcpSharedNetwork" => "plugins/admin/systems/class_dhcpSharedNetwork.inc", - "gosaLogServer" => "plugins/admin/systems/class_gosaLogServer.inc", - "componenttabs" => "plugins/admin/systems/tabs_component.inc", - "printtabs" => "plugins/admin/systems/tabs_printers.inc", - "servtabs" => "plugins/admin/systems/tabs_server.inc", - "dhcpService" => "plugins/admin/systems/class_dhcpService.inc", - "workservice" => "plugins/admin/systems/class_workstationService.inc", - "goSpamServerRule" => "plugins/admin/systems/class_goSpamServerRule.inc", - "printerPPDDialog" => "plugins/admin/systems/class_printerPPDDialog.inc", - "glpiPrinterAccount" => "plugins/admin/systems/class_glpiPrinterAccount.inc", - "divListSystem" => "plugins/admin/systems/class_divListSystem.inc", - "servnfs" => "plugins/admin/systems/class_servNfs.inc", - "goCupsServer" => "plugins/admin/systems/class_goCupsServer.inc", - "goTerminalServer" => "plugins/admin/systems/class_goTerminalServer.inc", - "servkolab" => "plugins/admin/systems/class_servKolab.inc", - "phonetabs" => "plugins/admin/systems/tabs_phone.inc", - "componentGeneric" => "plugins/admin/systems/class_componentGeneric.inc", - "dhcpSubnet" => "plugins/admin/systems/class_dhcpSubnet.inc", - "glpiAccount" => "plugins/admin/systems/class_glpiAccount.inc", - "dhcpPool" => "plugins/admin/systems/class_dhcpPool.inc", - "servrepository" => "plugins/admin/systems/class_servRepository.inc", - "wingeneric" => "plugins/admin/systems/class_winGeneric.inc", - "termservice" => "plugins/admin/systems/class_terminalService.inc", - "goSyslogServer" => "plugins/admin/systems/class_goSyslogServer.inc", - "goFonServer" => "plugins/admin/systems/class_goFonServer.inc", - "termtabs" => "plugins/admin/systems/tabs_terminal.inc", - "goLogDBServer" => "plugins/admin/systems/class_goLogDBServer.inc", - "selectUserToPrinterDialog" => "plugins/admin/systems/class_selectUserToPrinterDialog.inc", - "glpiDeviceManagement" => "plugins/admin/systems/class_glpiDeviceManagement.inc", - "servdhcp" => "plugins/admin/systems/class_servDHCP.inc", - "servDNSeditZoneEntries" => "plugins/admin/systems/class_servDNSeditZoneEntries.inc", - "servdns" => "plugins/admin/systems/class_servDNS.inc", - "glpiAttachmentPool" => "plugins/admin/systems/class_glpiAttachmentPool.inc", - "goImapServer" => "plugins/admin/systems/class_goImapServer.inc", - "phoneGeneric" => "plugins/admin/systems/class_phoneGeneric.inc", - "gospamserver" => "plugins/admin/systems/class_goSpamServer.inc", - "printerPPDSelectionDialog" => "plugins/admin/systems/class_printerPPDSelectionDialog.inc", - "goShareServer" => "plugins/admin/systems/class_goShareServer.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", - "mimetabs" => "plugins/admin/mimetypes/tabs_mimetypes.inc", - "ogrouptabs" => "plugins/admin/ogroups/tabs_ogroups.inc", - "termgroup" => "plugins/admin/ogroups/class_termgroup.inc", - "ogroupManagement" => "plugins/admin/ogroups/class_ogroupManagement.inc", - "divListOGroup" => "plugins/admin/ogroups/class_divListOGroup.inc", - "ogroup" => "plugins/admin/ogroups/class_ogroup.inc", - "phonequeue" => "plugins/admin/ogroups/class_phonequeue.inc", - "mailogroup" => "plugins/admin/ogroups/class_mailogroup.inc", - "fonreport" => "plugins/gofon/fonreports/class_fonreport.inc", - "divListMacro" => "plugins/gofon/macro/class_divListMacros.inc", - "goFonMacro" => "plugins/gofon/macro/class_gofonMacroManagement.inc", - "macrotabs" => "plugins/gofon/macro/tabs_macros.inc", - "macroParameter" => "plugins/gofon/macro/class_gofonMacroParameters.inc", - "macro" => "plugins/gofon/macro/class_gofonMacro.inc", - "phoneAccount" => "plugins/gofon/phoneaccount/class_phoneAccount.inc", - "divListConference" => "plugins/gofon/conference/class_divListConferences.inc", - "phoneConferenceManagment" => "plugins/gofon/conference/class_phoneConferenceManagment.inc", - "conferencetabs" => "plugins/gofon/conference/tabs_conference.inc", - "conference" => "plugins/gofon/conference/class_phoneConferenceGeneric.inc", - "reference" => "plugins/generic/references/class_reference.inc", - "writeexcel_biffwriter" => "include/php_writeexcel/class.writeexcel_biffwriter.inc.php", - "writeexcel_formula" => "include/php_writeexcel/class.writeexcel_formula.inc.php", - "writeexcel_format" => "include/php_writeexcel/class.writeexcel_format.inc.php", - "writeexcel_worksheet" => "include/php_writeexcel/class.writeexcel_worksheet.inc.php", - "writeexcel_olewriter" => "include/php_writeexcel/class.writeexcel_olewriter.inc.php", - "writeexcel_workbook" => "include/php_writeexcel/class.writeexcel_workbook.inc.php", - "stream" => "include/heimdal/asnencode.php", - "asnEncode" => "include/heimdal/asnencode.php", - "Des" => "include/heimdal/deslib.php", - "genkey" => "include/heimdal/genkey.php", - "entry" => "include/heimdal/mkey.php", - "principal" => "include/heimdal/mkey.php", - "mkey" => "include/heimdal/mkey.php", - "sieve_block_end" => "include/sieve/class_sieveElement_Block_End.inc", - "Semantics" => "include/sieve/class_semantics.inc", - "sieve_keep" => "include/sieve/class_sieveElement_Keep.inc", - "Scanner" => "include/sieve/class_scanner.inc", - "sieve_stop" => "include/sieve/class_sieveElement_Stop.inc", - "Parser" => "include/sieve/class_parser.inc", - "My_Scanner" => "include/sieve/class_My_Scanner.inc", - "Tree" => "include/sieve/class_tree.inc", - "My_Parser" => "include/sieve/class_My_Parser.inc", - "sieve_if" => "include/sieve/class_sieveElement_If.inc", - "My_Tree" => "include/sieve/class_My_Tree.inc", - "sieve_redirect" => "include/sieve/class_sieveElement_Redirect.inc", - "sieve_comment" => "include/sieve/class_sieveElement_Comment.inc", - "sieveManagement" => "include/sieve/class_sieveManagement.inc", - "sieve_vacation" => "include/sieve/class_sieveElement_Vacation.inc", - "sieve" => "include/sieve/class_sieve.inc", - "sieve_block_start" => "include/sieve/class_sieveElement_Block_Start.inc", - "sieve_fileinto" => "include/sieve/class_sieveElement_Fileinto.inc", - "sieve_discard" => "include/sieve/class_sieveElement_Discard.inc", - "sieve_elsif" => "include/sieve/class_sieveElement_Else_Elsif.inc", - "sieve_else" => "include/sieve/class_sieveElement_Else_Elsif.inc", - "sieve_reject" => "include/sieve/class_sieveElement_Reject.inc", - "sieve_require" => "include/sieve/class_sieveElement_Require.inc", - "mailMethod" => "include/class_mail-methods.inc", - "mailMethodCyrus" => "include/class_mail-methods-cyrus.inc", - "passwordMethodClear" => "include/class_password-methods-clear.inc", - "userinfo" => "include/class_userinfo.inc", - "glpiDB" => "include/class_glpi.inc", - "debconf" => "include/class_debconfTemplate.inc", - "plugin" => "include/class_plugin.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", - "passwordMethodCrypt" => "include/class_password-methods-crypt.inc", - "passwordMethod" => "include/class_password-methods.inc", - "pgre_sql" => "include/class_pgsql_opengw.inc", - "mailMethodGolab" => "include/class_mail-methods-golab.inc", - "mailMethodKolab" => "include/class_mail-methods-kolab.inc", - "passwordMethodsha" => "include/class_password-methods-sha.inc", - "passwordMethodkerberos" => "include/class_password-methods-kerberos.inc", - "passwordMethodsasl" => "include/class_password-methods-kerberos.inc", - "parseXml" => "include/functions_helpviewer.inc", - "ppdManager" => "include/class_ppdManager.inc", - "divlist" => "include/class_divlist.inc", - "MultiSelectWindow" => "include/class_MultiSelectWindow.inc", - "certificate" => "include/class_certificate.inc", - "passwordMethodMd5" => "include/class_password-methods-md5.inc", - "tabs" => "include/class_tabs.inc", - "Print_a_class" => "include/functions_debug.inc", - "divSelectBox" => "include/class_divSelectBox.inc", - "passwordMethodssha" => "include/class_password-methods-ssha.inc", - "ogw" => "include/class_opengw.inc", - "acl" => "include/class_acl.inc", - "pluglist" => "include/class_pluglist.inc", - "CopyPasteHandler" => "include/class_CopyPasteHandler.inc", - "config" => "include/class_config.inc", - "passwordMethodsmd5" => "include/class_password-methods-smd5.inc", - "sambaMungedDial" => "include/class_sambaMungedDial.inc", - "dhcpPlugin" => "include/class_dhcpPlugin.inc", - "SnapShotDialog" => "include/class_SnapShotDialog.inc", - "mailMethodSendmailCyrus" => "include/class_mail-methods-sendmail-cyrus.inc", - "LDAP" => "include/class_ldap.inc", - "log" => "include/class_log.inc", - "gosa_cache" => "include/class_cache_handler.inc", - "msg_dialog" => "include/class_msg_dialog.inc", - "Step_Ldap" => "setup/class_setupStep_Ldap.inc", - "Step_Finish" => "setup/class_setupStep_Finish.inc", - "setup_step" => "setup/class_setupStep.inc", - "Step_License" => "setup/class_setupStep_License.inc", - "Step_Language" => "setup/class_setupStep_Language.inc", - "Step_Feedback" => "setup/class_setupStep_Feedback.inc", - "setup" => "setup/class_setup.inc", - "Step_Config1" => "setup/class_setupStep_Config1.inc", - "Step_Config2" => "setup/class_setupStep_Config2.inc", - "Step_Migrate" => "setup/class_setupStep_Migrate.inc", - "Step_Config3" => "setup/class_setupStep_Config3.inc", - "Step_Welcome" => "setup/class_setupStep_Welcome.inc", - "Step_Schema" => "setup/class_setupStep_Schema.inc", - "Step_Checks" => "setup/class_setupStep_Checks.inc", ); ?> \ No newline at end of file diff --git a/include/class_mail-methods-golab.inc b/include/class_mail-methods-golab.inc index e8d581c6b..dc75674c2 100644 --- a/include/class_mail-methods-golab.inc +++ b/include/class_mail-methods-golab.inc @@ -17,7 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once("class_mail-methods-cyrus.inc"); class mailMethodGolab extends mailMethodCyrus { diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc index 04027c388..c0606046b 100644 --- a/include/class_mail-methods-kolab.inc +++ b/include/class_mail-methods-kolab.inc @@ -17,7 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once("class_mail-methods-cyrus.inc"); class mailMethodKolab extends mailMethodCyrus { diff --git a/include/class_mail-methods-sendmail-cyrus.inc b/include/class_mail-methods-sendmail-cyrus.inc index 686431ed3..8bb8d73be 100644 --- a/include/class_mail-methods-sendmail-cyrus.inc +++ b/include/class_mail-methods-sendmail-cyrus.inc @@ -17,7 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once("class_mail-methods-cyrus.inc"); class mailMethodSendmailCyrus extends mailMethodCyrus { diff --git a/include/class_password-methods.inc b/include/class_password-methods.inc index 493cb5cf0..3942ef077 100644 --- a/include/class_password-methods.inc +++ b/include/class_password-methods.inc @@ -246,9 +246,6 @@ function generate_smb_nt_hash($password) function crypt_single($string,$enc_type ) { - if(!class_exists("passwordMethod")){ - require_once("class_password-methods.inc"); - } return( passwordMethod::crypt_single_str($string,$enc_type)); } diff --git a/include/class_plugin.inc b/include/class_plugin.inc index 3b87c5a39..6be4321c6 100644 --- a/include/class_plugin.inc +++ b/include/class_plugin.inc @@ -144,7 +144,7 @@ class plugin if ($dn != NULL){ /* Load data to 'attrs' and save 'dn' */ - if ($parent != NULL){ + if ($parent !== NULL){ $this->attrs= $parent->attrs; } else { $ldap->cat ($dn); diff --git a/include/class_tabs.inc b/include/class_tabs.inc index 10dcf26c9..c543065b2 100644 --- a/include/class_tabs.inc +++ b/include/class_tabs.inc @@ -44,7 +44,7 @@ class tabs foreach ($data as &$tab){ $this->by_name[$tab['CLASS']]= $tab['NAME']; - if ($baseobject == NULL){ + if ($baseobject === NULL){ $baseobject= new $tab['CLASS']($this->config, $this->dn); $this->by_object[$tab['CLASS']]= $baseobject; } else { diff --git a/include/functions.inc b/include/functions.inc index 6dc1e5f86..7532e479a 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -102,46 +102,6 @@ function __autoload($class_name) { } } - -/* Function to include all class_ files starting at a - given directory base */ -function get_dir_list($folder= ".") -{ - $currdir=getcwd(); - if ($folder){ - chdir("$folder"); - } - - $dh = opendir("."); - while(false !== ($file = readdir($dh))){ - - // Smarty is included by include/php_setup.inc require("smarty/Smarty.class.php"); - // Skip all files and dirs in "./.svn/" we don't need any information from them - // Skip all Template, so they won't be checked twice in the following preg_matches - // Skip . / .. - - // Result : from 1023 ms to 490 ms i think thats great... - if(preg_match("/.*\.svn.*/",$file)||preg_match("/.*smarty.*/i",$file)||preg_match("/.*\.tpl.*/",$file)||($file==".")||($file=="..")) - continue; - - - /* Recurse through all "common" directories */ - if(is_dir($file) &&$file!="CVS"){ - get_dir_list($file); - continue; - } - - /* Include existing class_ files */ - if (preg_match("/^class_.*\.inc$/", $file)) { - require_once($file); - } - } - - closedir($dh); - chdir($currdir); -} - - /* Create seed with microseconds */ function make_seed() { list($usec, $sec) = explode(' ', microtime()); diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc index 2dfe3c5d4..c66caf4bb 100644 --- a/plugins/personal/mail/class_mailAccount.inc +++ b/plugins/personal/mail/class_mailAccount.inc @@ -9,10 +9,6 @@ and displays the formulars required. */ -/* Load mail methods */ -global $BASE_DIR; -get_dir_list("$BASE_DIR/include"); - class mailAccount extends plugin { /* Definitions */ @@ -83,6 +79,7 @@ class mailAccount extends plugin /* Set mailMethod to the one defined in gosa.conf */ if (isset($this->config->current['MAILMETHOD'])){ $method= $this->config->current['MAILMETHOD']; + __autoload("mailMethod$method"); if (class_exists("mailMethod$method")){ $this->method= "mailMethod$method"; } else { @@ -103,7 +100,7 @@ class mailAccount extends plugin } /* This is not a new account, parse additional attributes */ - if (($dn != NULL) && ($dn != "new") && $this->is_account){ + if (($dn !== NULL) && ($dn != "new") && $this->is_account){ /* Load attributes containing arrays */ foreach (array("gosaMailAlternateAddress", "gosaMailForwardingAddress") as $val){ @@ -281,7 +278,7 @@ class mailAccount extends plugin } /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This account has no mail extensions.").""; @@ -290,7 +287,7 @@ class mailAccount extends plugin } /* Show tab dialog headers */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ if($this->accountDelegationsConfigured()){ $display= $this->show_disable_header(_("Remove mail account"),