Code

Added initial dojo support
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 29 Nov 2007 09:11:38 +0000 (09:11 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 29 Nov 2007 09:11:38 +0000 (09:11 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7934 594d385d-05f5-0310-b6e9-bd551577e9d8

html/main.php
ihtml/themes/default/framework.tpl
ihtml/themes/default/headers.tpl
include/class_location.inc
include/functions.inc
plugins/personal/generic/class_user.inc
plugins/personal/generic/generic.tpl

index 37a2eec73c14796cb2a3bceeaddd24c303c9413c..fe78ce1c1bb866c419c86879b535b35b37fdf1bc 100644 (file)
@@ -154,7 +154,7 @@ if (!isset($_SESSION['plist'])){
   /* Initially load all classes */
   $class_list= get_declared_classes();
   foreach ($class_mapping as $class => $path){
-    if (!in_array($class, $class_list)){
+    if (!in_array($class, $class_list) && !preg_match('/\/dojo\//', $path)){
         require_once("$BASE_DIR/$path");
     }
   }
index fd2baefc50f67eff9bd1261fc53f7ac6f05f6932..415e8e88deb34696704c8005e72db931fb413769 100644 (file)
@@ -1,5 +1,5 @@
 <!-- Headline -->
-<body>
+<body class="tundra">
 {$php_errors}
 <form action='main.php{$plug}' name='mainform' method='post' enctype='multipart/form-data'>
 <div class='setup_header'>
index b52a00abf1661071236d0911522f5ef553699e1c..8f5a24c155263f7ff90140b69ef6057ff8b9ed52 100644 (file)
   <meta http-equiv="Cache-Control" content="post-check=0, pre-check=0">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
-  <style type="text/css">@import url('themes/default/style.css');</style>
+  <style type="text/css">
+       @import url('themes/default/style.css');
+       @import url('include/dojo/dijit/themes/tundra/tundra.css');
+       @import url('include/dojo/dojo/resources/dojo.css');
+  </style>
   <link rel="shortcut icon" href="favicon.ico">
 
   <script language="javascript" src="include/events.js" type="text/javascript"></script>
   <script language="javascript" src="include/layersmenu-browser_detection.js" type="text/javascript"></script>
   <script language="javascript" src="include/layersmenu-library.js" type="text/javascript"></script>
   <script language="javascript" src="include/layersmenu.js" type="text/javascript"></script>
+  <script language="javascript" src="include/dojo/dojo/dojo.js" type="text/javascript" djConfig="parseOnLoad: true"></script>
+
+  <script type="text/javascript">
+       dojo.require("dojo.parser");
+       dojo.require("dijit.form.TextBox");
+       dojo.require("dijit.form.ValidationTextBox");
+  </script>
 </head>
 
index 7f5fccd3f17a6e334312920fd3c697bbe94d87df..5e4bb25762381af3438898999339e21fd9017d87 100644 (file)
 <?php
 $class_mapping= array(
-                "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",
-                "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",
+                "Step_Checks" => "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",
-                "webdavAccount" => "plugins/personal/connectivity/class_webdavAccount.inc",
-                "proxyAccount" => "plugins/personal/connectivity/class_proxyAccount.inc",
+                "sambaLogonHours" => "plugins/personal/samba/class_sambaLogonHours.inc",
+                "sambaAccount" => "plugins/personal/samba/class_sambaAccount.inc",
+                "nagiosAccount" => "plugins/personal/nagios/class_nagiosAccount.inc",
+                "password" => "plugins/personal/password/class_password.inc",
+                "posixAccount" => "plugins/personal/posix/class_posixAccount.inc",
                 "pptpAccount" => "plugins/personal/connectivity/class_pptpAccount.inc",
-                "intranetAccount" => "plugins/personal/connectivity/class_intranetAccount.inc",
-                "phpgwAccount" => "plugins/personal/connectivity/class_phpgwAccount.inc",
-                "kolabAccount" => "plugins/personal/connectivity/class_kolabAccount.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",
+                "webdavAccount" => "plugins/personal/connectivity/class_webdavAccount.inc",
+                "kolabAccount" => "plugins/personal/connectivity/class_kolabAccount.inc",
+                "intranetAccount" => "plugins/personal/connectivity/class_intranetAccount.inc",
+                "phpgwAccount" => "plugins/personal/connectivity/class_phpgwAccount.inc",
                 "opengwAccount" => "plugins/personal/connectivity/class_opengwAccount.inc",
-                "phpscheduleitAccount" => "plugins/personal/connectivity/class_phpscheduleitAccount.inc",
-                "connectivity" => "plugins/personal/connectivity/class_connectivity.inc",
-                "blocklistGeneric" => "plugins/gofax/blocklists/class_blocklistGeneric.inc",
-                "blocklist" => "plugins/gofax/blocklists/class_blocklistManagement.inc",
-                "divListBlocklist" => "plugins/gofax/blocklists/class_divListBlocklists.inc",
-                "faxblocktabs" => "plugins/gofax/blocklists/tabs_blocklist.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",
+                "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",
                 "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",
-                "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",
                 "tabsScript" => "plugins/admin/fai/tabsScript.inc",
-                "divListFai" => "plugins/admin/fai/class_divListFai.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",
-                "faiHookEntry" => "plugins/admin/fai/class_faiHookEntry.inc",
-                "faiProfileEntry" => "plugins/admin/fai/class_faiProfileEntry.inc",
+                "tabsProfile" => "plugins/admin/fai/tabsProfile.inc",
+                "faiPackage" => "plugins/admin/fai/class_faiPackage.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",
+                "divListFai" => "plugins/admin/fai/class_divListFai.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",
+                "tabsPackage" => "plugins/admin/fai/tabsPackage.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",
                 "group" => "plugins/admin/groups/class_groupGeneric.inc",
                 "divListGroup" => "plugins/admin/groups/class_divListGroup.inc",
-                "mailgroup" => "plugins/admin/groups/class_groupMail.inc",
+                "groupManagement" => "plugins/admin/groups/class_groupManagement.inc",
                 "appgroup" => "plugins/admin/groups/class_groupApplication.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",
+                "glpiAttachmentPool" => "plugins/admin/systems/class_glpiAttachmentPool.inc",
+                "gosaLogServer" => "plugins/admin/systems/class_gosaLogServer.inc",
+                "servdnseditZone" => "plugins/admin/systems/class_servDNSeditZone.inc",
+                "goTerminalServer" => "plugins/admin/systems/class_goTerminalServer.inc",
+                "goService" => "plugins/admin/systems/class_goService.inc",
                 "workstartup" => "plugins/admin/systems/class_workstationStartup.inc",
-                "goGlpiServer" => "plugins/admin/systems/class_goGlpiServer.inc",
-                "workgeneric" => "plugins/admin/systems/class_workstationGeneric.inc",
+                "dhcpSharedNetwork" => "plugins/admin/systems/class_dhcpSharedNetwork.inc",
                 "govirusserver" => "plugins/admin/systems/class_goVirusServer.inc",
-                "goService" => "plugins/admin/systems/class_goService.inc",
-                "ServerService" => "plugins/admin/systems/class_serverService.inc",
+                "termtabs" => "plugins/admin/systems/tabs_terminal.inc",
+                "phonetabs" => "plugins/admin/systems/tabs_phone.inc",
+                "servtabs" => "plugins/admin/systems/tabs_server.inc",
+                "dhcpAdvanced" => "plugins/admin/systems/class_dhcpAdvanced.inc",
+                "servdns" => "plugins/admin/systems/class_servDNS.inc",
+                "workgeneric" => "plugins/admin/systems/class_workstationGeneric.inc",
+                "gospamserver" => "plugins/admin/systems/class_goSpamServer.inc",
                 "dhcpNetwork" => "plugins/admin/systems/class_dhcpNetwork.inc",
+                "dhcpPool" => "plugins/admin/systems/class_dhcpPool.inc",
+                "selectUserToPrinterDialog" => "plugins/admin/systems/class_selectUserToPrinterDialog.inc",
+                "wintabs" => "plugins/admin/systems/tabs_winstation.inc",
+                "goCupsServer" => "plugins/admin/systems/class_goCupsServer.inc",
+                "phoneGeneric" => "plugins/admin/systems/class_phoneGeneric.inc",
+                "glpiPrinterAccount" => "plugins/admin/systems/class_glpiPrinterAccount.inc",
+                "goMailServer" => "plugins/admin/systems/class_goMailServer.inc",
+                "ArpNewDevice" => "plugins/admin/systems/class_ArpNewDevice.inc",
+                "dhcpSubnet" => "plugins/admin/systems/class_dhcpSubnet.inc",
+                "goLogDBServer" => "plugins/admin/systems/class_goLogDBServer.inc",
+                "baseSelectDialog" => "plugins/admin/systems/class_baseSelectDialog.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",
+                "glpiDeviceManagement" => "plugins/admin/systems/class_glpiDeviceManagement.inc",
+                "systems" => "plugins/admin/systems/class_systemManagement.inc",
                 "goNtpServer" => "plugins/admin/systems/class_goNtpServer.inc",
+                "goKrbServer" => "plugins/admin/systems/class_goKrbServer.inc",
                 "ServiceAddDialog" => "plugins/admin/systems/class_ServiceAddDialog.inc",
-                "glpiSelectUser" => "plugins/admin/systems/class_glpiSelectUser.inc",
+                "goSyslogServer" => "plugins/admin/systems/class_goSyslogServer.inc",
+                "servRepositorySetup" => "plugins/admin/systems/class_servRepositorySetup.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",
+                "dhcpHost" => "plugins/admin/systems/class_dhcpHost.inc",
+                "divListSystem" => "plugins/admin/systems/class_divListSystem.inc",
                 "servgeneric" => "plugins/admin/systems/class_servGeneric.inc",
-                "systems" => "plugins/admin/systems/class_systemManagement.inc",
-                "servdnseditZone" => "plugins/admin/systems/class_servDNSeditZone.inc",
+                "worktabs" => "plugins/admin/systems/tabs_workstation.inc",
                 "goKioskService" => "plugins/admin/systems/class_goKioskService.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",
+                "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",
-                "goSpamServerRule" => "plugins/admin/systems/class_goSpamServerRule.inc",
+                "termgeneric" => "plugins/admin/systems/class_terminalGeneric.inc",
+                "servrepository" => "plugins/admin/systems/class_servRepository.inc",
+                "printtabs" => "plugins/admin/systems/tabs_printers.inc",
+                "ArpNewDeviceTabs" => "plugins/admin/systems/tabs_arpnewdevice.inc",
                 "printerPPDDialog" => "plugins/admin/systems/class_printerPPDDialog.inc",
-                "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",
+                "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",
-                "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",
-                "termservice" => "plugins/admin/systems/class_terminalService.inc",
-                "goSyslogServer" => "plugins/admin/systems/class_goSyslogServer.inc",
+                "divListRepository" => "plugins/admin/systems/class_divListRepositories.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",
+                "servnfs" => "plugins/admin/systems/class_servNfs.inc",
+                "wingeneric" => "plugins/admin/systems/class_winGeneric.inc",
+                "glpiPrinterCartridges" => "plugins/admin/systems/class_glpiPrinterCartridges.inc",
+                "glpiManufacturer" => "plugins/admin/systems/class_glpiManufacturer.inc",
+                "termDNS" => "plugins/admin/systems/class_termDNS.inc",
+                "termstartup" => "plugins/admin/systems/class_terminalStartup.inc",
+                "terminfo" => "plugins/admin/systems/class_terminalInfo.inc",
+                "printgeneric" => "plugins/admin/systems/class_printGeneric.inc",
+                "goFaxServer" => "plugins/admin/systems/class_goFaxServer.inc",
+                "printerPPDSelectionDialog" => "plugins/admin/systems/class_printerPPDSelectionDialog.inc",
+                "dhcpService" => "plugins/admin/systems/class_dhcpService.inc",
                 "servdhcp" => "plugins/admin/systems/class_servDHCP.inc",
+                "glpiAccount" => "plugins/admin/systems/class_glpiAccount.inc",
+                "ServerService" => "plugins/admin/systems/class_serverService.inc",
+                "SelectDeviceType" => "plugins/admin/systems/class_SelectDeviceType.inc",
+                "glpiPrinterCartridgesEdit" => "plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc",
                 "servDNSeditZoneEntries" => "plugins/admin/systems/class_servDNSeditZoneEntries.inc",
-                "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",
-                "divListRepository" => "plugins/admin/systems/class_divListRepositories.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",
+                "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",
                 "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",
-                "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",
+                "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",
                 "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",
-                "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",
+                "faxreport" => "plugins/gofax/faxreports/class_faxreport.inc",
+                "gofaxAccount" => "plugins/gofax/faxaccount/class_gofaxAccount.inc",
+                "blocklistGeneric" => "plugins/gofax/blocklists/class_blocklistGeneric.inc",
+                "divListBlocklist" => "plugins/gofax/blocklists/class_divListBlocklists.inc",
+                "faxblocktabs" => "plugins/gofax/blocklists/tabs_blocklist.inc",
+                "blocklist" => "plugins/gofax/blocklists/class_blocklistManagement.inc",
+                "fifo_test" => "plugins/addons/fifo_test/class_fifo_test.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",
+                "Services_JSON" => "html/include/dojo/dojo/tests/resources/JSON.php",
+                "DojoFunctionCall" => "html/include/dojo/util/docscripts/lib/parser/DojoFunctionCall.php",
+                "DojoExecutedFunction" => "html/include/dojo/util/docscripts/lib/parser/DojoExecutedFunction.php",
+                "Dojo" => "html/include/dojo/util/docscripts/lib/parser/Dojo.php",
+                "DojoNull" => "html/include/dojo/util/docscripts/lib/parser/DojoNull.php",
+                "DojoFunctionDeclare" => "html/include/dojo/util/docscripts/lib/parser/DojoFunctionDeclare.php",
+                "DojoParameter" => "html/include/dojo/util/docscripts/lib/parser/DojoParameter.php",
+                "DojoFunctionBody" => "html/include/dojo/util/docscripts/lib/parser/DojoFunctionBody.php",
+                "Text" => "html/include/dojo/util/docscripts/lib/parser/Text.php",
+                "DojoArray" => "html/include/dojo/util/docscripts/lib/parser/DojoArray.php",
+                "DojoString" => "html/include/dojo/util/docscripts/lib/parser/DojoString.php",
+                "DojoPackage" => "html/include/dojo/util/docscripts/lib/parser/DojoPackage.php",
+                "DojoParameters" => "html/include/dojo/util/docscripts/lib/parser/DojoParameters.php",
+                "DojoVariable" => "html/include/dojo/util/docscripts/lib/parser/DojoVariable.php",
+                "DojoObject" => "html/include/dojo/util/docscripts/lib/parser/DojoObject.php",
+                "DojoBoolean" => "html/include/dojo/util/docscripts/lib/parser/DojoBoolean.php",
+                "testClass" => "html/include/dojo/dojo/tests/resources/testClass.php",
  );
 ?>
\ No newline at end of file
index 8899b7d0b7a66c7c373e90f7daf403f359eccafc..2ed6b9be5a7aeca1884e73e7850e60294ced0f03 100644 (file)
@@ -956,6 +956,24 @@ function is_dn($dn)
 }
 
 
+function strict_uid_mode()
+{
+  return !(isset($config->current['STRICT']) && preg_match('/^(no|false)$/i', $config->current['STRICT']));
+}
+
+
+function get_uid_regexp()
+{
+  /* STRICT adds spaces and case insenstivity to the uid check.
+     This is dangerous and should not be used. */
+  if (strict_uid_mode()){
+    return "^[a-z0-9_-]+$";
+  } else {
+    return "^[a-zA-Z0-9 _.-]+$";
+  }
+}
+
+
 function is_uid($uid)
 {
   global $config;
@@ -966,10 +984,10 @@ function is_uid($uid)
 
   /* STRICT adds spaces and case insenstivity to the uid check.
      This is dangerous and should not be used. */
-  if (isset($config->current['STRICT']) && preg_match('/^(no|false)$/i', $config->current['STRICT'])){
-    return preg_match ("/^[a-z0-9 _.-]+$/i", $uid);
-  } else {
+  if (strict_uid_mode()){
     return preg_match ("/^[a-z0-9_-]+$/", $uid);
+  } else {
+    return preg_match ("/^[a-z0-9 _.-]+$/i", $uid);
   }
 }
 
index 5bc1c78f04d1f9b989c0b0e7dbbc2a61d791dff4..bc67f37b3501e21cc4d8eac5ede2d1a0f7c4604d 100644 (file)
@@ -285,6 +285,14 @@ class user extends plugin
     $smarty->assign("years", $years);
     $smarty->assign("year", $date["year"]);
 
+    /* Assign uid regex for dojo */
+    $smarty->assign("uid_regex", get_uid_regexp());
+    if (strict_uid_mode()){
+      $smarty->assign("uid_invalid_message", _("Please use only a-z, 0-9, _ or - as valid characters"));
+    } else {
+      $smarty->assign("uid_invalid_message", _("Please use only a-z, A-Z, 0-9, ., space, _ or - as valid characters"));
+    }
+
     /* Assign sex */
     $sex= array(0 => "&nbsp;", "F" => _("female"), "M" => _("male"));
     $smarty->assign("gender_list", $sex);
index f96d764b25c193ac38dffde37df0ea855c03002c..d0943fec193ae33096e955e613b88e0fbe822144 100644 (file)
     {if $is_template ne "true"}
     <tr>
      <td><label for="sn">{t}Last name{/t}{$must}</label></td>
-     <td>{render acl=$snACL}<input id="sn" name="sn" size=25 maxlength=60 value="{$sn}">{/render}</td>
+     <td>{render acl=$snACL}<input id="sn" name="sn" size="25" maxLength="60" value="{$sn}" dojoType="dijit.form.ValidationTextBox" propercase="true" trim="true" invalidMessage="{t}Please specify the last name{/t}" required="true">{/render}</td>
     </tr>
     {else}
     <tr>
      <td><label for="sn">{t}Template name{/t}{$must}</label></td>
-     <td>{render acl=$snACL}<input id="sn" name="sn" size=25 maxlength=60 value="{$sn}">{/render}</td>
+     <td>{render acl=$snACL}<input id="sn" name="sn" maxLength="60" value="{$sn}" dojoType="dijit.form.ValidationTextBox" trim="true" required="true" invalidMessage="{t}Please specify the template name{/t}">{/render}</td>
     </tr>
     {/if}
 
     {if $is_template ne "true"}
     <tr>
      <td><label for="givenName">{t}First name{/t}{$must}</label></td>
-     <td>{render acl=$givenNameACL}<input id="givenName" name="givenName" size=25 maxlength=60 value="{$givenName}">{/render}</td>
+     <td>{render acl=$givenNameACL}<input id="givenName" size="25" name="givenName" maxLength="60" value="{$givenName}" dojoType="dijit.form.ValidationTextBox" trim="true" required="true" invalidMessage="{t}Please specify the first name{/t}">{/render}</td>
     </tr>
     <tr>
      <td><label for="uid">{t}Login{/t}{$must}</label></td>
-     <td>{render acl=$uidACL}<input id="uid" name="uid" size=25 maxlength=60  value="{$uid}">{/render}</td>
+     <td>{render acl=$uidACL}<input id="uid" name="uid" size="25" maxLength="60"  value="{$uid}" dojoType="dijit.form.ValidationTextBox" propercase="false" trim="true" required="true" promptMessage="{t}Please specify the login ID{/t}" invalidMessage="{$uid_invalid_message}" regExp="{$uid_regex}">{/render}</td>
     </tr>
     {/if}