From 1374a0a230c81a1974326e319b7576f4f1855afe Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 27 Nov 2007 13:07:04 +0000 Subject: [PATCH] Split gofaxBlocklists into management and generic class - Not finished yed git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7909 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/class_location.inc | 523 +++++++++--------- .../blocklists/class_blocklistGeneric.inc | 330 +++++++++++ .../blocklists/class_blocklistManagement.inc | 476 +++------------- plugins/gofax/blocklists/generic.tpl | 11 +- plugins/gofax/blocklists/main.inc | 1 + 5 files changed, 666 insertions(+), 675 deletions(-) create mode 100644 plugins/gofax/blocklists/class_blocklistGeneric.inc diff --git a/include/class_location.inc b/include/class_location.inc index 6f0259c4a..438c7fcb6 100644 --- a/include/class_location.inc +++ b/include/class_location.inc @@ -1,302 +1,303 @@ "setup/class_setupStep_Checks.inc", - "Step_Schema" => "setup/class_setupStep_Schema.inc", - "Step_Config3" => "setup/class_setupStep_Config3.inc", - "Step_Feedback" => "setup/class_setupStep_Feedback.inc", - "Step_Migrate" => "setup/class_setupStep_Migrate.inc", - "Step_License" => "setup/class_setupStep_License.inc", - "Step_Welcome" => "setup/class_setupStep_Welcome.inc", - "Step_Finish" => "setup/class_setupStep_Finish.inc", - "Step_Ldap" => "setup/class_setupStep_Ldap.inc", - "Step_Language" => "setup/class_setupStep_Language.inc", - "setup" => "setup/class_setup.inc", - "Step_Config2" => "setup/class_setupStep_Config2.inc", - "Step_Config1" => "setup/class_setupStep_Config1.inc", - "setup_step" => "setup/class_setupStep.inc", - "debconf" => "include/class_debconfTemplate.inc", - "certificate" => "include/class_certificate.inc", - "passwordMethodClear" => "include/class_password-methods-clear.inc", - "mailMethodCyrus" => "include/class_mail-methods-cyrus.inc", - "pgre_sql" => "include/class_pgsql_opengw.inc", - "divlist" => "include/class_divlist.inc", - "ppdManager" => "include/class_ppdManager.inc", - "divSelectBox" => "include/class_divSelectBox.inc", - "tabs" => "include/class_tabs.inc", - "hostActionQueue" => "include/class_hostActionQueue.inc", - "CopyPasteHandler" => "include/class_CopyPasteHandler.inc", - "passwordMethodMd5" => "include/class_password-methods-md5.inc", - "passwordMethodssha" => "include/class_password-methods-ssha.inc", - "plugin" => "include/class_plugin.inc", - "passwordMethodheimdal" => "include/class_password-methods-heimdal.inc", - "glpiDB" => "include/class_glpi.inc", - "Template_PHPLIB" => "include/php_layers_menu/lib/PHPLIB.php", - "PHPTreeMenu" => "include/php_layers_menu/lib/phptreemenu.inc.php", - "ProcessLayersMenu" => "include/php_layers_menu/lib/layersmenu-process.inc.php", - "TreeMenu" => "include/php_layers_menu/lib/treemenu.inc.php", - "LayersMenu" => "include/php_layers_menu/lib/layersmenu.inc.php", - "LayersMenuCommon" => "include/php_layers_menu/lib/layersmenu-common.inc.php", - "PlainMenu" => "include/php_layers_menu/lib/plainmenu.inc.php", - "passwordMethodkerberos" => "include/class_password-methods-kerberos.inc", - "mailMethodSendmailCyrus" => "include/class_mail-methods-sendmail-cyrus.inc", - "acl" => "include/class_acl.inc", - "mailMethodKolab" => "include/class_mail-methods-kolab.inc", - "pluglist" => "include/class_pluglist.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", - "sieve" => "include/sieve/class_sieve.inc", - "sieve_if" => "include/sieve/class_sieveElement_If.inc", - "sieve_elsif" => "include/sieve/class_sieveElement_Else_Elsif.inc", - "sieve_else" => "include/sieve/class_sieveElement_Else_Elsif.inc", - "sieve_stop" => "include/sieve/class_sieveElement_Stop.inc", - "Tree" => "include/sieve/class_tree.inc", - "sieve_redirect" => "include/sieve/class_sieveElement_Redirect.inc", - "sieve_keep" => "include/sieve/class_sieveElement_Keep.inc", - "Scanner" => "include/sieve/class_scanner.inc", - "Parser" => "include/sieve/class_parser.inc", - "My_Parser" => "include/sieve/class_My_Parser.inc", - "sieve_comment" => "include/sieve/class_sieveElement_Comment.inc", - "sieve_fileinto" => "include/sieve/class_sieveElement_Fileinto.inc", - "sieve_require" => "include/sieve/class_sieveElement_Require.inc", - "sieve_block_end" => "include/sieve/class_sieveElement_Block_End.inc", - "sieveManagement" => "include/sieve/class_sieveManagement.inc", - "sieve_reject" => "include/sieve/class_sieveElement_Reject.inc", - "sieve_block_start" => "include/sieve/class_sieveElement_Block_Start.inc", - "My_Tree" => "include/sieve/class_My_Tree.inc", - "Semantics" => "include/sieve/class_semantics.inc", - "sieve_vacation" => "include/sieve/class_sieveElement_Vacation.inc", - "sieve_discard" => "include/sieve/class_sieveElement_Discard.inc", - "My_Scanner" => "include/sieve/class_My_Scanner.inc", - "ogw" => "include/class_opengw.inc", - "gosa_cache" => "include/class_cache_handler.inc", - "mailMethodGolab" => "include/class_mail-methods-golab.inc", - "log" => "include/class_log.inc", - "passwordMethodsmd5" => "include/class_password-methods-smd5.inc", - "multi_plug" => "include/class_multi_plug.inc", - "msg_dialog" => "include/class_msg_dialog.inc", - "passwordMethodCrypt" => "include/class_password-methods-crypt.inc", - "parseXml" => "include/functions_helpviewer.inc", - "writeexcel_biffwriter" => "include/php_writeexcel/class.writeexcel_biffwriter.inc.php", - "writeexcel_worksheet" => "include/php_writeexcel/class.writeexcel_worksheet.inc.php", - "writeexcel_olewriter" => "include/php_writeexcel/class.writeexcel_olewriter.inc.php", - "writeexcel_formula" => "include/php_writeexcel/class.writeexcel_formula.inc.php", - "writeexcel_workbook" => "include/php_writeexcel/class.writeexcel_workbook.inc.php", - "writeexcel_format" => "include/php_writeexcel/class.writeexcel_format.inc.php", - "passwordMethodsha" => "include/class_password-methods-sha.inc", - "sambaMungedDial" => "include/class_sambaMungedDial.inc", - "MultiSelectWindow" => "include/class_MultiSelectWindow.inc", - "config" => "include/class_config.inc", - "SnapShotDialog" => "include/class_SnapShotDialog.inc", - "mailMethod" => "include/class_mail-methods.inc", - "dhcpPlugin" => "include/class_dhcpPlugin.inc", - "passwordMethod" => "include/class_password-methods.inc", - "Print_a_class" => "include/functions_debug.inc", - "LDAP" => "include/class_ldap.inc", - "userinfo" => "include/class_userinfo.inc", - "environment" => "plugins/personal/environment/class_environment.inc", - "hotplugDialog" => "plugins/personal/environment/class_hotplugDialog.inc", - "logonManagementDialog" => "plugins/personal/environment/class_logonManagementDialog.inc", - "selectPrinterDialog" => "plugins/personal/environment/class_selectPrinterDialog.inc", - "scalixAccount" => "plugins/personal/scalix/class_scalixAccount.inc", - "mailAccount" => "plugins/personal/mail/class_mailAccount.inc", - "user" => "plugins/personal/generic/class_user.inc", - "sambaLogonHours" => "plugins/personal/samba/class_sambaLogonHours.inc", - "sambaAccount" => "plugins/personal/samba/class_sambaAccount.inc", "nagiosAccount" => "plugins/personal/nagios/class_nagiosAccount.inc", + "mailAccount" => "plugins/personal/mail/class_mailAccount.inc", "password" => "plugins/personal/password/class_password.inc", "posixAccount" => "plugins/personal/posix/class_posixAccount.inc", - "pptpAccount" => "plugins/personal/connectivity/class_pptpAccount.inc", - "proxyAccount" => "plugins/personal/connectivity/class_proxyAccount.inc", - "pureftpdAccount" => "plugins/personal/connectivity/class_pureftpdAccount.inc", - "connectivity" => "plugins/personal/connectivity/class_connectivity.inc", - "phpscheduleitAccount" => "plugins/personal/connectivity/class_phpscheduleitAccount.inc", - "oxchangeAccount" => "plugins/personal/connectivity/class_oxchangeAccount.inc", + "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", + "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", + "user" => "plugins/personal/generic/class_user.inc", "webdavAccount" => "plugins/personal/connectivity/class_webdavAccount.inc", - "kolabAccount" => "plugins/personal/connectivity/class_kolabAccount.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", + "kolabAccount" => "plugins/personal/connectivity/class_kolabAccount.inc", + "pureftpdAccount" => "plugins/personal/connectivity/class_pureftpdAccount.inc", + "oxchangeAccount" => "plugins/personal/connectivity/class_oxchangeAccount.inc", "opengwAccount" => "plugins/personal/connectivity/class_opengwAccount.inc", - "netatalk" => "plugins/personal/netatalk/class_netatalk.inc", - "divListConference" => "plugins/gofon/conference/class_divListConferences.inc", - "phoneConferenceManagment" => "plugins/gofon/conference/class_phoneConferenceManagment.inc", - "conference" => "plugins/gofon/conference/class_phoneConferenceGeneric.inc", - "conferencetabs" => "plugins/gofon/conference/tabs_conference.inc", - "phoneAccount" => "plugins/gofon/phoneaccount/class_phoneAccount.inc", - "fonreport" => "plugins/gofon/fonreports/class_fonreport.inc", - "goFonMacro" => "plugins/gofon/macro/class_gofonMacroManagement.inc", - "divListMacro" => "plugins/gofon/macro/class_divListMacros.inc", - "macro" => "plugins/gofon/macro/class_gofonMacro.inc", - "macroParameter" => "plugins/gofon/macro/class_gofonMacroParameters.inc", - "macrotabs" => "plugins/gofon/macro/tabs_macros.inc", - "divListUsers" => "plugins/admin/users/class_divListUsers.inc", - "userManagement" => "plugins/admin/users/class_userManagement.inc", - "usertabs" => "plugins/admin/users/tabs_user.inc", - "applicationManagement" => "plugins/admin/applications/class_applicationManagement.inc", - "divListApplication" => "plugins/admin/applications/class_divListApplication.inc", - "application" => "plugins/admin/applications/class_applicationGeneric.inc", - "applicationParameters" => "plugins/admin/applications/class_applicationParameters.inc", - "apptabs" => "plugins/admin/applications/tabs_application.inc", - "faiScriptEntry" => "plugins/admin/fai/class_faiScriptEntry.inc", - "faiProfileEntry" => "plugins/admin/fai/class_faiProfileEntry.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", + "blocklistGeneric" => "plugins/gofax/blocklists/class_blocklistGeneric.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", + "divListMasses" => "plugins/addons/gotomasses/class_divListMasses.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", + "bugsubmitter" => "plugins/addons/bugsubmitter/class_bugsubmitter.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", + "aclrole" => "plugins/admin/acl/class_aclRole.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", - "tabsScript" => "plugins/admin/fai/tabsScript.inc", - "faiProfile" => "plugins/admin/fai/class_faiProfile.inc", - "faiTemplateEntry" => "plugins/admin/fai/class_faiTemplateEntry.inc", "faiSummaryTab" => "plugins/admin/fai/class_faiSummaryTab.inc", - "askClassName" => "plugins/admin/fai/class_askClassName.inc", - "tabsTemplate" => "plugins/admin/fai/tabsTemplate.inc", - "faiPartitionTable" => "plugins/admin/fai/class_faiPartitionTable.inc", - "tabsProfile" => "plugins/admin/fai/tabsProfile.inc", + "faiScriptEntry" => "plugins/admin/fai/class_faiScriptEntry.inc", + "tabsVariable" => "plugins/admin/fai/tabsVariable.inc", "faiPackage" => "plugins/admin/fai/class_faiPackage.inc", + "faiHook" => "plugins/admin/fai/class_faiHook.inc", + "faiProfile" => "plugins/admin/fai/class_faiProfile.inc", + "tabsPackage" => "plugins/admin/fai/tabsPackage.inc", + "faiPartitionTableEntry" => "plugins/admin/fai/class_faiPartitionTableEntry.inc", + "tabsProfile" => "plugins/admin/fai/tabsProfile.inc", "faiVariableEntry" => "plugins/admin/fai/class_faiVariableEntry.inc", - "faiPackageConfiguration" => "plugins/admin/fai/class_faiPackageConfiguration.inc", - "faiPackageEntry" => "plugins/admin/fai/class_faiPackageEntry.inc", - "tabsVariable" => "plugins/admin/fai/tabsVariable.inc", - "tabsHook" => "plugins/admin/fai/tabsHook.inc", + "tabsScript" => "plugins/admin/fai/tabsScript.inc", "divListFai" => "plugins/admin/fai/class_divListFai.inc", - "faiVariable" => "plugins/admin/fai/class_faiVariable.inc", - "tabsPackage" => "plugins/admin/fai/tabsPackage.inc", + "tabsTemplate" => "plugins/admin/fai/tabsTemplate.inc", + "faiPartitionTable" => "plugins/admin/fai/class_faiPartitionTable.inc", "faiHookEntry" => "plugins/admin/fai/class_faiHookEntry.inc", - "faiPartitionTableEntry" => "plugins/admin/fai/class_faiPartitionTableEntry.inc", - "faiHook" => "plugins/admin/fai/class_faiHook.inc", - "faiTemplate" => "plugins/admin/fai/class_faiTemplate.inc", - "faiScript" => "plugins/admin/fai/class_faiScript.inc", - "mailgroup" => "plugins/admin/groups/class_groupMail.inc", - "grouptabs" => "plugins/admin/groups/tabs_group.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", + "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", - "groupManagement" => "plugins/admin/groups/class_groupManagement.inc", + "mailgroup" => "plugins/admin/groups/class_groupMail.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", + "grouptabs" => "plugins/admin/groups/tabs_group.inc", + "usertabs" => "plugins/admin/users/tabs_user.inc", + "userManagement" => "plugins/admin/users/class_userManagement.inc", + "divListUsers" => "plugins/admin/users/class_divListUsers.inc", + "devicetabs" => "plugins/admin/devices/tabs_devices.inc", + "deviceGeneric" => "plugins/admin/devices/class_deviceGeneric.inc", + "deviceManagement" => "plugins/admin/devices/class_deviceManagement.inc", + "divListDevices" => "plugins/admin/devices/class_divListDevices.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", + "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", - "dhcpSharedNetwork" => "plugins/admin/systems/class_dhcpSharedNetwork.inc", + "goGlpiServer" => "plugins/admin/systems/class_goGlpiServer.inc", + "workgeneric" => "plugins/admin/systems/class_workstationGeneric.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", + "goService" => "plugins/admin/systems/class_goService.inc", + "ServerService" => "plugins/admin/systems/class_serverService.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", - "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", + "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", - "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", + "glpiSelectUser" => "plugins/admin/systems/class_glpiSelectUser.inc", "goLdapServer" => "plugins/admin/systems/class_goLdapServer.inc", - "dhcpHost" => "plugins/admin/systems/class_dhcpHost.inc", - "divListSystem" => "plugins/admin/systems/class_divListSystem.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", - "worktabs" => "plugins/admin/systems/tabs_workstation.inc", + "systems" => "plugins/admin/systems/class_systemManagement.inc", + "servdnseditZone" => "plugins/admin/systems/class_servDNSeditZone.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", + "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", - "ArpNewDeviceTabs" => "plugins/admin/systems/tabs_arpnewdevice.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", - "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", - "goFonServer" => "plugins/admin/systems/class_goFonServer.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", + "dhcpSubnet" => "plugins/admin/systems/class_dhcpSubnet.inc", + "componentGeneric" => "plugins/admin/systems/class_componentGeneric.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", - "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", + "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", + "ArpNewDeviceTabs" => "plugins/admin/systems/tabs_arpnewdevice.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", - "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", - "divListACL" => "plugins/admin/acl/class_divListACL.inc", - "aclrole" => "plugins/admin/acl/class_aclRole.inc", - "deviceManagement" => "plugins/admin/devices/class_deviceManagement.inc", - "divListDevices" => "plugins/admin/devices/class_divListDevices.inc", - "devicetabs" => "plugins/admin/devices/tabs_devices.inc", - "deviceGeneric" => "plugins/admin/devices/class_deviceGeneric.inc", - "department" => "plugins/admin/departments/class_departmentGeneric.inc", - "deptabs" => "plugins/admin/departments/tabs_department.inc", - "divListDepartment" => "plugins/admin/departments/class_divListDepartment.inc", - "departmentManagement" => "plugins/admin/departments/class_departmentManagement.inc", - "mailogroup" => "plugins/admin/ogroups/class_mailogroup.inc", - "phonequeue" => "plugins/admin/ogroups/class_phonequeue.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", + "ArpNewDevice" => "plugins/admin/systems/class_ArpNewDevice.inc", + "gospamserver" => "plugins/admin/systems/class_goSpamServer.inc", + "printerPPDSelectionDialog" => "plugins/admin/systems/class_printerPPDSelectionDialog.inc", + "goShareServer" => "plugins/admin/systems/class_goShareServer.inc", + "mimetype" => "plugins/admin/mimetypes/class_mimetypeGeneric.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", - "ogroup" => "plugins/admin/ogroups/class_ogroup.inc", "termgroup" => "plugins/admin/ogroups/class_termgroup.inc", "ogroupManagement" => "plugins/admin/ogroups/class_ogroupManagement.inc", "divListOGroup" => "plugins/admin/ogroups/class_divListOGroup.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", + "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", + "macro" => "plugins/gofon/macro/class_gofonMacro.inc", + "macroParameter" => "plugins/gofon/macro/class_gofonMacroParameters.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", - "faxreport" => "plugins/gofax/faxreports/class_faxreport.inc", - "gofaxAccount" => "plugins/gofax/faxaccount/class_gofaxAccount.inc", - "divListBlocklist" => "plugins/gofax/blocklists/class_divListBlocklists.inc", - "blocklist" => "plugins/gofax/blocklists/class_blocklistManagement.inc", - "parseMailQueue" => "plugins/addons/mailqueue/class_parseMailQueue.inc", - "mailqueue" => "plugins/addons/mailqueue/class_mailqueue.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", - "addressbook" => "plugins/addons/addressbook/class_addressbook.inc", - "logview" => "plugins/addons/logview/class_logview.inc", - "gosa_logview" => "plugins/addons/logview/class_gosa_logview.inc", - "log_tabs" => "plugins/addons/logview/tabs_log.inc", - "target_list" => "plugins/addons/gotomasses/class_target_list.inc", - "goto_task" => "plugins/addons/gotomasses/class_goto_task.inc", - "gotomasses" => "plugins/addons/gotomasses/class_gotomasses.inc", - "divListMasses" => "plugins/addons/gotomasses/class_divListMasses.inc", - "msgplug" => "plugins/addons/notifications/class_msgplug.inc", - "ldifimport" => "plugins/addons/ldapmanager/class_import.inc", - "ldif" => "plugins/addons/ldapmanager/class_ldif.inc", - "xlsexport" => "plugins/addons/ldapmanager/class_exportxls.inc", - "ldifexport" => "plugins/addons/ldapmanager/class_export.inc", - "csvimport" => "plugins/addons/ldapmanager/class_csvimport.inc", - "ldiftab" => "plugins/addons/ldapmanager/tabs_ldif.inc", - "bugsubmitter" => "plugins/addons/bugsubmitter/class_bugsubmitter.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", + "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", + "gosa_cache" => "include/class_cache_handler.inc", + "passwordMethodCrypt" => "include/class_password-methods-crypt.inc", + "passwordMethod" => "include/class_password-methods.inc", + "passwordMethodheimdal" => "include/class_password-methods-heimdal.inc", + "msg_dialog" => "include/class_msg_dialog.inc", + "mailMethodGolab" => "include/class_mail-methods-golab.inc", + "pgre_sql" => "include/class_pgsql_opengw.inc", + "mailMethodKolab" => "include/class_mail-methods-kolab.inc", + "passwordMethodsha" => "include/class_password-methods-sha.inc", + "passwordMethodkerberos" => "include/class_password-methods-kerberos.inc", + "parseXml" => "include/functions_helpviewer.inc", + "divlist" => "include/class_divlist.inc", + "ppdManager" => "include/class_ppdManager.inc", + "multi_plug" => "include/class_multi_plug.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", + "dhcpPlugin" => "include/class_dhcpPlugin.inc", + "ogw" => "include/class_opengw.inc", + "acl" => "include/class_acl.inc", + "passwordMethodssha" => "include/class_password-methods-ssha.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", + "SnapShotDialog" => "include/class_SnapShotDialog.inc", + "mailMethodSendmailCyrus" => "include/class_mail-methods-sendmail-cyrus.inc", + "LDAP" => "include/class_ldap.inc", + "log" => "include/class_log.inc", + "PlainMenu" => "include/php_layers_menu/lib/plainmenu.inc.php", + "PHPTreeMenu" => "include/php_layers_menu/lib/phptreemenu.inc.php", + "LayersMenu" => "include/php_layers_menu/lib/layersmenu.inc.php", + "Template_PHPLIB" => "include/php_layers_menu/lib/PHPLIB.php", + "TreeMenu" => "include/php_layers_menu/lib/treemenu.inc.php", + "LayersMenuCommon" => "include/php_layers_menu/lib/layersmenu-common.inc.php", + "ProcessLayersMenu" => "include/php_layers_menu/lib/layersmenu-process.inc.php", + "hostActionQueue" => "include/class_hostActionQueue.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/plugins/gofax/blocklists/class_blocklistGeneric.inc b/plugins/gofax/blocklists/class_blocklistGeneric.inc new file mode 100644 index 000000000..81c5dfd2a --- /dev/null +++ b/plugins/gofax/blocklists/class_blocklistGeneric.inc @@ -0,0 +1,330 @@ +type = BLOCK_LIST_SEND; + + /* Load defined numbers */ + if($dn != "new"){ + + /* We will not be able to rename edited blocklists */ + $this->readonly = TRUE; + + /* Get blocklist type and defined numbers */ + if (in_array("goFaxSBlock",$this->attrs['objectClass'])){ + if(isset($this->attrs["goFaxSBlocklist"])){ + for ($i= 0; $i<$this->attrs["goFaxSBlocklist"]["count"]; $i++){ + $this->goFaxBlocklist[]= $this->attrs["goFaxSBlocklist"][$i]; + } + } + $this->type= BLOCK_LIST_SEND; + } elseif (in_array("goFaxRBlock",$this->attrs['objectClass'])){ + if(isset($this->attrs["goFaxRBlocklist"])){ + for ($i= 0; $i<$this->attrs["goFaxRBlocklist"]["count"]; $i++){ + $this->goFaxBlocklist[]= $this->attrs["goFaxRBlocklist"][$i]; + } + } + $this->type= BLOCK_LIST_RECEIVE; + } + } + + /* Set base */ + if ($this->dn == "new"){ + if(isset($_SESSION['CurrentMainBase'])){ + $this->base= $_SESSION['CurrentMainBase']; + }else{ + $ui= get_userinfo(); + $this->base= dn2base($ui->dn); + } + } else { + $this->base =preg_replace ("/^[^,]+,[^,]+,[^,]+,/","",$this->dn); + } + } + + public function execute() + { + /* Log view */ + if(!$this->view_logged){ + $this->view_logged = TRUE; + new log("view","blocklist/".get_class($this),$this->dn); + } + + + /************** + * Base select dialog + **************/ + + $once = true; + foreach($_POST as $name => $value){ + if(preg_match("/^chooseBase/",$name) && $once){ + $once = false; + $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases()); + $this->dialog->setCurrentBase($this->base); + } + } + + /* Dialog handling */ + if(is_object($this->dialog)){ + /* Must be called before save_object */ + $this->dialog->save_object(); + + if($this->dialog->isClosed()){ + $this->dialog = false; + }elseif($this->dialog->isSelected()){ + + /* A new base was selected, check if it is a valid one */ + $tmp = $this->get_allowed_bases(); + if(isset($tmp[$this->dialog->isSelected()])){ + $this->base = $this->dialog->isSelected(); + } + $this->dialog= false; + + }else{ + return($this->dialog->execute()); + } + } + + + /*************** + Add numer to blocklist + ***************/ + + + /* Handle interactions: add */ + if (isset($_POST['add_number']) && $_POST['number'] != ""){ + if (is_phone_nr($_POST['number']) || preg_match ("/^[\/0-9 ()\^\.\$+*-]+$/",$_POST['number'])){ + $this->addNumber ($_POST['number']); + } else { + print_red (_("Please specify a valid phone number.")); + } + } + + + /*************** + Delete number from list + ***************/ + + /* Handle interactions: delete */ + if (isset($_POST['delete_number']) && isset($_POST['numbers']) && count($_POST['numbers']) > 0){ + $this->delNumber ($_POST['numbers']); + } + + + /*************** + Template output + ***************/ + + $smarty = get_smarty(); + foreach($this->attributes as $name){ + $smarty->assign($name,$this->$name); + } + $tmp = $this->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $translation){ + $smarty->assign($name."ACL",$this->getacl($name)); + } + $smarty->assign("goFaxBlocklist",$this->goFaxBlocklist); + $smarty->assign("cnACL",$this->getacl("cn",$this->readonly)); + $smarty->assign("typeACL",$this->getacl("type",$this->readonly)); + $smarty->assign("base",$this->base); + $smarty->assign("bases", $this->get_allowed_bases()); + $smarty->assign("types", array(BLOCK_LIST_SEND => _("send"), BLOCK_LIST_RECEIVE => _("receive"))); + $smarty->assign("type", $this->type); + return($smarty->fetch(get_template_path('generic.tpl', TRUE))); + } + + + public function save_object() + { + if(isset($_POST['blocklist_posted'])){ + plugin::save_object(); + + /* Save base, since this is no LDAP attribute */ + $tmp = $this->get_allowed_bases(); + if(isset($_POST['base'])){ + if(isset($tmp[$_POST['base']])){ + $this->base= $_POST['base']; + } + } + foreach($this->attributes as $attr){ + if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){ + $this->$attr = $_POST[$attr]; + } + } + if(isset($_POST['type']) && $this->acl_is_writeable("type",$this->readonly)){ + + $this->type = $_POST['type']; + } + } + } + + + function remove_from_parent() + { + $ldap= $this->config->get_ldap_link(); + $ldap->rmDir($this->dn); + new log("remove","gofaxlist/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of blocklist with dn '%s' failed."),$this->dn)); + $this->handle_post_events("remove"); + } + + + /* Check values */ + function check() + { + /* Call common method to give check the hook */ + $message= plugin::check(); + + /* check syntax: must cn */ + if ($this->cn == ""){ + $message[]= _("Required field 'Name' is not set."); + } else { + if (!is_uid($this->cn)){ + $message[]= _("Required field 'Name' contains invalid characters"); + } + if ($this->dn == 'new'){ + $ldap= $this->config->get_ldap_link(); + $ldap->cd ("ou=gofax,ou=systems,".$this->config->current["BASE"]); + $ldap->search ("(&(|(objectClass=goFaxSBlock)(objectClass=goFaxRBlock))(cn=".$this->cn."))", array("cn")); + if ($ldap->count() != 0){ + $message[]= _("Specified name is already used."); + } + } + } + return $message; + } + + + /* Save to LDAP */ + function save() + { + plugin::save(); + + + /* Type selection */ + if ($this->type == BLOCK_LIST_SEND){ + $type= "goFaxSBlocklist"; + $this->attrs['objectClass']= "goFaxSBlock"; + } else { + $type= "goFaxRBlocklist"; + $this->attrs['objectClass']= "goFaxRBlock"; + } + + /* Add list */ + if (count($this->goFaxBlocklist)){ + $this->attrs[$type]= $this->goFaxBlocklist; + } + + /* Create base */ + $this->dn = "cn=".$this->cn.",ou=gofax,ou=systems,".$this->base; + + + /* Write back to ldap */ + $ldap= $this->config->get_ldap_link(); + $ldap->cd($this->base); + $ldap->cat($this->dn, array('dn')); + if ($ldap->count()){ + if (!isset($this->attrs[$type])){ + $this->attrs[$type]= array(); + } + $ldap->cd($this->dn); + $this->cleanup(); + $ldap->modify($this->attrs); + new log("modify","faxblocklist/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + $this->handle_post_events("modify"); + } else { + $ldap->cd($this->config->current['BASE']); + $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn)); + $ldap->cd($this->dn); + $ldap->add($this->attrs); + new log("create","gofaxlist/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); + $this->handle_post_events("add"); + } + show_ldap_error($ldap->get_error(), sprintf(_("Saving of blocklist with dn '%s' failed."),$this->dn)); + } + + + /* Add number */ + function addNumber($number) + { + if (!in_array($number, $this->goFaxBlocklist)){ + $this->goFaxBlocklist[]= $number; + sort($this->goFaxBlocklist); + } + } + + + /* Remove number from list */ + function delNumber($numbers) + { + $tmp= array(); + foreach ($this->goFaxBlocklist as $val){ + if (!in_array($val, $numbers)){ + $tmp[]= $val; + } + } + $this->goFaxBlocklist= $tmp; + } + + + + + + + + + + + + + + + + /* Return plugin informations for acl handling */ + static function plInfo() + { + return (array( + "plShortName" => _("Fax"), + "plDescription" => _("Fax blocklists"), + "plSelfModify" => FALSE, + "plDepends" => array(), + + "plPriority" => 0, + "plSection" => array("administration" => _("FAX Blocklists")), + "plCategory" => array("gofaxlist" => array("description" => _("Fax blocklists"), + "objectClass" => array("goFaxRBlock","goFaxSBlock"))), + "plProvidedAcls" => array( + "cn" => _("Name"), + "description" => _("Description"), + "base" => _("Base"), + "goFaxBlocklist" => _("Blocklist"), + "type" => _("Blocklist type")) + )); + } + +} +// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: +?> diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc index d054e3b6a..f0283640f 100644 --- a/plugins/gofax/blocklists/class_blocklistManagement.inc +++ b/plugins/gofax/blocklists/class_blocklistManagement.inc @@ -10,32 +10,21 @@ class blocklist extends plugin var $cli_description= "Some longer text\nfor help"; var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser"); - /* blocklist attributes */ - var $cn = ""; - var $description = ""; - var $type = ""; - var $base = ""; - - var $goFaxBlocklist = array(); var $blocklists = array(); - var $attributes = array("cn", "description"); - var $objectclasses = array(); var $DivListBlocklist = NULL; - var $view_logged = FALSE; var $CopyPasteHandler = NULL; + function blocklist (&$config, $ui) { - /* Init class */ $this->ui = $ui; $this->dn = ""; $this->config = &$config; $this->base = $_SESSION['CurrentMainBase']; $this->DivListBlocklist = new divListBlocklist($this->config,$this); - $this->set_acl_category("gofaxlist"); - $this->set_acl_base($this->base); } + function execute() { /* Call parent execute */ @@ -118,26 +107,49 @@ class blocklist extends plugin /* Cancel dialog */ if (isset($_POST['edit_cancel']) || isset($_POST['delete_blocklist_cancel']) || - isset($_POST['delete_blocklist_confirm']) || isset($_POST['delete_lock'])){ del_lock ($this->dn); - if(!isset($_POST['delete_blocklist_confirm'])){ - $this->clear_fields(); - } + $this->dialog = NULL; unset($_SESSION['objectinfo']); } + /*************** + Save blocklist + ***************/ + + /* What about finish? */ + if (isset($_POST['edit_finish']) || isset($_POST['edit_apply'])){ + + /* No errors, save object */ + $this->dialog->save_object(); + $message= $this->check(); + if (count ($message) == 0){ + + $this->dialog->save (); + + if (!isset($_POST['edit_apply'])){ + del_lock ($this->dn); + $this->dn= ""; + $this->dialog = NULL; + unset($_SESSION['objectinfo']); + } + } else { + /* Errors found, show message */ + show_errors ($message); + } + } + + /*************** Create a new blocklist (dialog) ***************/ /* Create new blocklist? */ if ($s_action=="new"){ - $this->clear_fields(); $this->dn= "new"; - plugin::plugin ($this->config, $this->dn); + $this->dialog = new blocklistGeneric($this->config,$this->dn); } @@ -145,38 +157,27 @@ class blocklist extends plugin Edit blocklist ***************/ - /* Edit selected blocklist? */ - if (($s_action=="edit") && (empty($this->dn))){ - $this->clear_fields(); - $this->dn=$this->blocklists[$s_entry]['dn']; + if ($s_action=="edit" && !is_object($this->dialog)){ + + $this->dn=$this->blocklists[$s_entry]['dn']; + if (($user= get_lock($this->dn)) != ""){ - $_SESSION['dn']= $this->dn; - //$this->dn =""; return(gen_locked_message($user, $this->dn)); - } else { -# Lock this dn for editing + }else{ add_lock ($this->dn, $this->ui->dn); + } + $_SESSION['objectinfo']= trim($this->dn); + $this->dialog = new blocklistGeneric($this->config,$this->dn); + } - plugin::plugin ($this->config, $this->dn); - /* Load missing lists */ - if (in_array("goFaxSBlock",$this->attrs['objectClass'])){ - if(isset($this->attrs["goFaxSBlocklist"])){ - for ($i= 0; $i<$this->attrs["goFaxSBlocklist"]["count"]; $i++){ - $this->goFaxBlocklist[]= $this->attrs["goFaxSBlocklist"][$i]; - } - } - $this->type= 0; - } elseif (in_array("goFaxRBlock",$this->attrs['objectClass'])){ - if(isset($this->attrs["goFaxRBlocklist"])){ - for ($i= 0; $i<$this->attrs["goFaxRBlocklist"]["count"]; $i++){ - $this->goFaxBlocklist[]= $this->attrs["goFaxRBlocklist"][$i]; - } - } - $this->type= 1; - } - $_SESSION['objectinfo']= trim($this->dn); - } + /*************** + Display dialog + ***************/ + + if(is_object($this->dialog) && ($this->dialog instanceof blocklistGeneric)){ + $this->dialog->save_object(); + return($this->dialog->execute()); } @@ -225,7 +226,9 @@ class blocklist extends plugin $acl = $this->ui->get_permissions($dn, "blocklist/blocklist"); if (preg_match('/d/', $acl)){ $this->dn = $dn; - $this->remove_from_parent(); + $this->dialog = new blocklistGeneric($this->config,$this->dn); + $this->dialog->remove_from_parent(); + $this->dialog = NULL; } else { print_red (sprintf(_("You are not allowed to delete the blocklist '%s'!"),$dn)); } @@ -257,14 +260,15 @@ class blocklist extends plugin /* Delete blocklist requested */ if ($s_action=="del"){ $this->dn=$this->blocklists[$s_entry]['dn']; + /* Check locking */ if (($user= get_lock($this->dn)) != ""){ $_SESSION['dn']= $this->dn; return(gen_locked_message($user, $this->dn)); } else { -# Lock this dn for editing - add_lock ($this->dn, $this->ui->dn); + // Lock this dn for editing + add_lock ($this->dn, $this->ui->dn); $smarty->assign("info", sprintf(_("You're about to delete the blocklist '%s'."), $this->dn)); $smarty->assign("multiple", false); return($smarty->fetch(get_template_path('remove.tpl', TRUE))); @@ -279,190 +283,35 @@ class blocklist extends plugin /* Finally delete blocklist */ if (isset($_POST['delete_blocklist_confirm'])){ if ($this->acl_is_removeable()){ - $this->remove_from_parent(); - $this->reload (); + $this->dialog = new blocklistGeneric($this->config,$this->dn); + $this->dialog->remove_from_parent(); + $this->dialog = NULL; } else { print_red (_("You have no permission to remove this blocklist.")); } } - - /*************** - Add numer to blocklist - ***************/ - - - /* Handle interactions: add */ - if (isset($_POST['add_number']) && $_POST['number'] != ""){ - if (is_phone_nr($_POST['number']) || preg_match ("/^[\/0-9 ()\^\.\$+*-]+$/",$_POST['number'])){ - $this->addNumber ($_POST['number']); - } else { - print_red (_("Please specify a valid phone number.")); - } - } - - - /*************** - Delete number from list - ***************/ - - /* Handle interactions: delete */ - if (isset($_POST['delete_number']) && isset($_POST['numbers']) && count($_POST['numbers']) > 0){ - $this->delNumber ($_POST['numbers']); - } - - /*************** - Edit finished + Divlist dialog ***************/ - /* What about finish? */ - if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (!empty($this->dn))){ - $message= $this->check(); - $this->remove_lock(); - - /* No errors, save object */ - if (count ($message) == 0){ - - /* Perpare 'dn' in case of new entries */ - if ($this->dn == "new"){ - $this->dn= "cn=$this->cn,ou=gofax,ou=systems,".$this->base; - } - - $this->save (); - - if (!isset($_POST['edit_apply'])){ - $this->dn= ""; - del_lock ($this->ui->dn); - unset($_SESSION['objectinfo']); - } - } else { - /* Errors found, show message */ - show_errors ($message); - } + /* Check if there is a snapshot dialog open */ + $base = $this->DivListBlocklist->selectedBase; + if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){ + return($str); } + /* Display dialog with system list */ + $this->DivListBlocklist->parent = $this; + $this->DivListBlocklist->execute(); - /*************** - Object currently in edit - ***************/ - - if($this->dn){ - - $dn = $this->dn; - - /* Log view */ - if(!$this->view_logged){ - $this->view_logged = TRUE; - new log("view","users/".get_class($this),$this->dn); - } - - /* set Account states, this is nescessary for get_allowed_bases */ - $this->initially_was_account= true; - $this->is_account = true; - if($dn == "new"){ - $dn = "cn=dummy,ou=gofax,ou=systems,".$this->base; - $this->initially_was_account= false; - } - - $this->set_acl_category("gofaxlist"); - $this->set_acl_base($dn); - - /* Base select dialog */ - $once = true; - foreach($_POST as $name => $value){ - if(preg_match("/^chooseBase/",$name) && $once){ - $once = false; - $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases()); - $this->dialog->setCurrentBase($this->base); - } - } - - /* Dialog handling */ - if(is_object($this->dialog)){ - /* Must be called before save_object */ - $this->dialog->save_object(); - - if($this->dialog->isClosed()){ - $this->dialog = false; - }elseif($this->dialog->isSelected()){ - - /* A new base was selected, check if it is a valid one */ - $tmp = $this->get_allowed_bases(); - if(isset($tmp[$this->dialog->isSelected()])){ - $this->base = $this->dialog->isSelected(); - } - $this->dialog= false; - - }else{ - return($this->dialog->execute()); - } - } - - /* Set base */ - if ($this->base == ""){ - if ($this->dn == "new"){ - $ui= get_userinfo(); - $this->base= dn2base($ui->dn); - } else { - $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn); - } - } - - /* Fill templating stuff */ - $smarty->assign("bases", $this->get_allowed_bases()); - - $smarty->assign("base_select", $this->base); - $smarty->assign("types", array(0 => _("send"), 1 => _("receive"))); - if ($this->dn == "new" || preg_match ("/,ou=incoming,/", $this->dn)){ - $smarty->assign("selectmode", ""); - $smarty->assign("mode", ""); - $smarty->assign("apply", "0"); - } else { - $smarty->assign("selectmode", "disabled"); - $smarty->assign("mode", "readonly"); - $smarty->assign("apply", "1"); - } - - $tmp = $this->plInfo(); - foreach($tmp['plProvidedAcls'] as $name => $translation){ - $smarty->assign($name."ACL",$this->getacl($name)); - } - - foreach(array("cn", "description", "type", "goFaxBlocklist") as $val){ - $smarty->assign("$val", $this->$val); - } - - /* Lock blocklist type for non new entries */ - $smarty->assign('typeACL',$this->getacl("type", ($this->dn != "new"))); - - /* Show main page */ - return($smarty->fetch (get_template_path('generic.tpl', TRUE))); - - }else{ - - /*************** - Divlist dialog - ***************/ - - /* Check if there is a snapshot dialog open */ - $base = $this->DivListBlocklist->selectedBase; - if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){ - return($str); - } - - /* Display dialog with system list */ - $this->DivListBlocklist->parent = $this; - $this->DivListBlocklist->execute(); - - /* Add departments if subsearch is disabled */ - if(!$this->DivListBlocklist->SubSearch){ - $this->DivListBlocklist->AddDepartments($this->DivListBlocklist->selectedBase,3,1); - } - $this->reload(); - $this->DivListBlocklist->setEntries($this->blocklists); - return($this->DivListBlocklist->Draw()); + /* Add departments if subsearch is disabled */ + if(!$this->DivListBlocklist->SubSearch){ + $this->DivListBlocklist->AddDepartments($this->DivListBlocklist->selectedBase,3,1); } + $this->reload(); + $this->DivListBlocklist->setEntries($this->blocklists); + return($this->DivListBlocklist->Draw()); } @@ -486,18 +335,6 @@ class blocklist extends plugin } - /* Clear garbage from edited lists */ - function clear_fields() - { - $this->dn= ""; - $this->description= ""; - $this->cn= ""; - $this->base= $_SESSION['CurrentMainBase']; - $this->view_logged = FALSE; - $this->goFaxBlocklist= array(); - } - - /* Reload the list of known blocklists */ function reload() { @@ -548,184 +385,11 @@ class blocklist extends plugin } - function remove_from_parent() - { - $ldap= $this->config->get_ldap_link(); - $ldap->rmDir($this->dn); - - new log("remove","gofaxlist/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); - - show_ldap_error($ldap->get_error(), sprintf(_("Removing of blocklist with dn '%s' failed."),$this->dn)); - $this->clear_fields(); - $this->handle_post_events("remove"); - } - - /* Save data to object */ function save_object() { $this->DivListBlocklist->save_object(); - - /* Create a base backup and reset the - base directly after calling plugin::save_object(); - Base will be set seperatly a few lines below */ - $base_tmp = $this->base; - plugin::save_object(); - $this->base = $base_tmp; - - /* Save base, since this is no LDAP attribute */ - $tmp = $this->get_allowed_bases(); - if(isset($_POST['base'])){ - if(isset($tmp[$_POST['base']])){ - $this->base= $_POST['base']; - } - } - - foreach($this->attributes as $attr){ - if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){ - $this->$attr = $_POST[$attr]; - } - } - if(isset($_POST['type']) && $this->acl_is_writeable("type",($this->dn != "new"))){ - $this->type = $_POST['type']; - } - } - - - /* Check values */ - function check() - { - /* Call common method to give check the hook */ - $message= plugin::check(); - - /* Permissions for that base? */ - if ($this->base != ""){ - $new_dn= "cn=".$this->cn.",ou=gofax,ou=systems,".$this->base; - } else { - $new_dn= $this->dn; - } - - /* check syntax: must cn */ - if ($this->cn == ""){ - $message[]= _("Required field 'Name' is not set."); - } else { - if (!is_uid($this->cn)){ - $message[]= _("Required field 'Name' contains invalid characters"); - } - if ($this->dn == 'new'){ - $ldap= $this->config->get_ldap_link(); - $ldap->cd ("ou=gofax,ou=systems,".$this->config->current["BASE"]); - $ldap->search ("(&(|(objectClass=goFaxSBlock)(objectClass=goFaxRBlock))(cn=".$this->cn."))", array("cn")); - if ($ldap->count() != 0){ - $message[]= _("Specified name is already used."); - } - } - } - - return $message; - } - - - /* Save to LDAP */ - function save() - { - plugin::save(); - - - /* Type selection */ - if ($this->type == 0){ - $type= "goFaxSBlock"; - } else { - $type= "goFaxRBlock"; - } - - /* Add list */ - $this->attrs['objectClass']= $type; - if (count($this->goFaxBlocklist)){ - $this->attrs["$type"."list"]= $this->goFaxBlocklist; - } - - /* Write back to ldap */ - $ldap= $this->config->get_ldap_link(); - $ldap->cd($this->base); - $ldap->search("cn=$this->cn",array("cn")); - $ldap->cat($this->dn, array('dn')); - $a= $ldap->fetch(); - - if (count($a)){ - if (!isset($this->attrs["$type"."list"])){ - $this->attrs["$type"."list"]= array(); - } - $ldap->cd($this->dn); - $this->cleanup(); - $ldap->modify($this->attrs); - new log("modify","gofaxlist/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); - $this->handle_post_events("modify"); - } else { - $ldap->cd($this->config->current['BASE']); - $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn)); - $ldap->cd($this->dn); - $ldap->add($this->attrs); - new log("create","gofaxlist/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error()); - $this->handle_post_events("add"); - } - show_ldap_error($ldap->get_error(), sprintf(_("Saving of blocklist with dn '%s' failed."),$this->dn)); - } - - - /* Add number */ - function addNumber($number) - { - if (!in_array($number, $this->goFaxBlocklist)){ - $this->goFaxBlocklist[]= $number; - sort($this->goFaxBlocklist); - } - } - - - /* Remove number from list */ - function delNumber($numbers) - { - $tmp= array(); - foreach ($this->goFaxBlocklist as $val){ - if (!in_array($val, $numbers)){ - $tmp[]= $val; - } - } - $this->goFaxBlocklist= $tmp; } - - - /* Delete lock */ - function remove_lock() - { - if (isset($this->dn)){ - del_lock ($this->dn); - } - } - - /* Return plugin informations for acl handling */ - static function plInfo() - { - return (array( - "plShortName" => _("Fax"), - "plDescription" => _("Fax blocklists"), - "plSelfModify" => FALSE, - "plDepends" => array(), - - "plPriority" => 0, - "plSection" => array("administration" => _("FAX Blocklists")), - "plCategory" => array("gofaxlist" => array("description" => _("Fax blocklists"), - "objectClass" => array("goFaxRBlock","goFaxSBlock"))), - "plProvidedAcls" => array( - "cn" => _("Name"), - "description" => _("Description"), - "base" => _("Base"), - "goFaxBlocklist" => _("Blocklist"), - "type" => _("Blocklist type")) - )); - } - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/plugins/gofax/blocklists/generic.tpl b/plugins/gofax/blocklists/generic.tpl index b645ba68c..df9f84a6b 100644 --- a/plugins/gofax/blocklists/generic.tpl +++ b/plugins/gofax/blocklists/generic.tpl @@ -9,7 +9,7 @@ {render acl=$cnACL} - + {/render} @@ -18,7 +18,7 @@ {render acl=$baseACL} {/render} @@ -95,17 +95,12 @@ -

-   - {if $apply eq "1"} -   - {/if}

- +