Code

Added new session class.
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 Jan 2008 11:07:36 +0000 (11:07 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 Jan 2008 11:07:36 +0000 (11:07 +0000)
-Added class_session.inc
-Modified html/main.php to use session:: isntead of $_SESSION

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

gosa-core/html/main.php
gosa-core/include/class_location.inc

index 37a2eec73c14796cb2a3bceeaddd24c303c9413c..c6097168789628f1eb14dd7012f9617651d5bfa8 100644 (file)
@@ -34,42 +34,31 @@ $domain = 'messages';
 bindtextdomain($domain, "$BASE_DIR/locale");
 textdomain($domain);
 
-/* Set cookie lifetime to one day (The parameter is in seconds ) */
-session_set_cookie_params(24*60*60);
-
-/* Set cache limter to one day (parameter is minutes !!)*/
-session_cache_expire(60*24);  // default is 180
-
-/* Set session max lifetime, to prevent the garbage collector to delete session before timeout.
-    !! The garbage collector is a cron job on debian systems, the cronjob will fetch the timeout from 
-    the php.ini, so if you use debian, you must hardcode session.gc_maxlifetime in your php.ini */
-ini_set("session.gc_maxlifetime",24*60*60);
-
 /* Remember everything we did after the last click */
-session_start ();
-
-$_SESSION['limit_exceeded'] =FALSE;
+restore_error_handler();
+session::start();
+session::set('limit_exceeded',FALSE);
 
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
   @DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, "_POST");
 }
-@DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_SESSION, "_SESSION");
+@DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, session::get_all(), "_SESSION");
 
 /* Logged in? Simple security check */
-if (!isset($_SESSION['config'])){
+if (!session::is_set('config')){
   new log("security","login","",array(),"main.php called without session - logging out") ;
   header ("Location: logout.php");
   exit;
 } 
 
 /* Check for uniqe ip address */
-$ui= $_SESSION["ui"];
+$ui= session::get('ui');
 if ($_SERVER['REMOTE_ADDR'] != $ui->ip){
   new log("security","login","",array(),"main.php called with session which has a changed IP address.") ;
   header ("Location: logout.php");
   exit;
 }
-$config= $_SESSION['config'];
+$config= session::get('config');
 $config->check_and_reload();
 
 /* Enable compressed output */
@@ -78,8 +67,8 @@ if (isset($config->data['MAIN']['COMPRESSED']) && preg_match('/^(true|on)$/i', $
 }
 
 /* Check for invalid sessions */
-if(empty($_SESSION['_LAST_PAGE_REQUEST'])){
-  $_SESSION['_LAST_PAGE_REQUEST']= time();
+if(session::get('_LAST_PAGE_REQUEST') == ""){
+  session::set('_LAST_PAGE_REQUEST',time());
 }else{
 
   /* check GOsa.conf for defined session lifetime */
@@ -90,7 +79,7 @@ if(empty($_SESSION['_LAST_PAGE_REQUEST'])){
   }
 
   /* get time difference between last page reload */
-  $request_time = (time()-$_SESSION['_LAST_PAGE_REQUEST']);
+  $request_time = (time()- session::get('_LAST_PAGE_REQUEST'));
 
   /* If page wasn't reloaded for more than max_life seconds 
    * kill session
@@ -101,7 +90,7 @@ if(empty($_SESSION['_LAST_PAGE_REQUEST'])){
     header ("Location: logout.php");
     exit;
   }
-  $_SESSION['_LAST_PAGE_REQUEST'] = time();
+  session::set('_LAST_PAGE_REQUEST',time());
 }
 
 
@@ -118,23 +107,23 @@ if (isset ($config->data['MAIN']['COMPILE'])){
 $reload_navigation = false;
 
 /* Set last initialised language to current, browser settings */
-if((!isset($_SESSION['Last_init_lang']))){
+if(!session::is_set('Last_init_lang')){
   $reload_navigation = true;
-  $_SESSION['Last_init_lang'] = get_browser_language();
+  session::set('Last_init_lang',get_browser_language());
 }
 
 /* If last language != current force navi reload */
 $lang= get_browser_language();
-if($_SESSION['Last_init_lang'] != $lang){
+if(session::get('Last_init_lang',$lang)){
   $reload_navigation = true;
 }
 
 /* Language setup */
-$_SESSION['Last_init_lang'] = $lang;
+session::set('Last_init_lang',$lang);
 
 /* Preset current main base */
-if(!isset($_SESSION['CurrentMainBase'])){
-  $_SESSION['CurrentMainBase']= get_base_from_people($ui->dn);
+if(session::is_set('CurrentMainBase')){
+  session::set('CurrentMainBase',get_base_from_people($ui->dn));
 }
 
 putenv("LANGUAGE=");
@@ -150,7 +139,7 @@ textdomain($domain);
 @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
 
 /* Prepare plugin list */
-if (!isset($_SESSION['plist'])){
+if (session::is_set('plist')){
   /* Initially load all classes */
   $class_list= get_declared_classes();
   foreach ($class_mapping as $class => $path){
@@ -159,14 +148,14 @@ if (!isset($_SESSION['plist'])){
     }
   }
   
-  $_SESSION['plist']= new pluglist($config, $ui);
+  session::set('plist', new pluglist($config, $ui));
 
   /* Load ocMapping into userinfo */
   $tmp= new acl($config, NULL, $ui->dn);
   $ui->ocMapping= $tmp->ocMapping;
-  $_SESSION['ui']= $ui;
+  session::set('ui',$ui);
 }
-$plist= $_SESSION['plist'];
+$plist= session::get('plist');
 
 /* Check for register globals */
 if (isset($global_check) && $config->data['MAIN']['FORCEGLOBALS'] == 'true'){
@@ -177,23 +166,24 @@ if (isset($global_check) && $config->data['MAIN']['FORCEGLOBALS'] == 'true'){
 }
 
 /* Check Plugin variable */
-if (isset($_SESSION['plugin_dir'])){
-  $old_plugin_dir= $_SESSION['plugin_dir'];
+if (session::is_set('plugin_dir')){
+  $old_plugin_dir= session::get('plugin_dir');
 } else {
   $old_plugin_dir= "";
 }
 if (isset($_GET['plug'])){
   $plug= validate($_GET['plug']);
   $plugin_dir= $plist->get_path($plug);
-  $_SESSION['plugin_dir']= $plugin_dir;
+  session::set('plugin_dir',$plugin_dir);
   if ($plugin_dir == ""){
     new log("security","gosa","",array(),"main.php called with invalid plug parameter \"$plug\"") ;
     header ("Location: logout.php");
     exit;
   }
 } else {
+
   /* set to welcome page as default plugin */
-  $_SESSION['plugin_dir']= "welcome";
+  session::set('plugin_dir',"welcome");
   $plugin_dir= "$BASE_DIR/plugins/generic/welcome";
 }
 
@@ -244,7 +234,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
   }
 
   if (isset($_POST['cancel_lock'])){
-    unset ($_SESSION['dn']);
+    session::un_set('dn');
   }
 }
 
@@ -252,21 +242,21 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
 /* Load department list when plugin has changed. That is some kind of
    compromise between speed and beeing up to date */
 if (isset($_GET['reset'])){
-  if (isset($_SESSION['objectinfo'])){
-    unset ($_SESSION['objectinfo']);
+  if (session::is_set('objectinfo')){
+    session::un_set('objectinfo');
   }
 }
 
 /* Install eGOsa hooks, convert _POST to _SESSION['POST'] */
 if(isset($_GET['explorer'])){
-  $_SESSION{'eGosa'}=1;
+  session::set('eGosa',TRUE);
 }
-if(isset($_SESSION['POST'])){
+if(session::is_set('POST')){
   $_SERVER["REQUEST_METHOD"] = "POST";
-  foreach ($_SESSION['POST'] as $key => $dummy){
-    $_POST[$key]=$_SESSION['POST'][$key];
+  foreach (session::get('POST') as $key => $dummy){
+    $_POST[$key]= $dummy;
   }
-  unset($_SESSION['POST']);
+  session::un_set('POST');
 }
 
 /* show web frontend */
@@ -277,7 +267,7 @@ if (isset($plug)){
 } else {
   $plug= "";
 }
-if ($_SESSION['js']==FALSE){
+if (session::get('js')==FALSE){
   $smarty->assign("javascript", "false");
   $smarty->assign("help_method", "href='helpviewer.php$plug' target='_blank'");
 } else {
@@ -311,12 +301,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
 
   /* 'delete_lock' is set by the lock removal dialog. We should remove the
      lock at this point globally. Plugins do not need to remove it. */
-  if (isset($_POST['delete_lock']) && isset($_SESSION['dn'])){
-    del_lock ($_SESSION['dn']);
+  if (isset($_POST['delete_lock']) && session::is_set('dn')){
+    del_lock (session::get('dn'));
 
     /* Set old Post data */
-    if(isset($_SESSION['LOCK_VARS_USED'])){
-      foreach($_SESSION['LOCK_VARS_USED'] as $name => $value){
+    if(session::is_set('LOCK_VARS_USED')){
+      foreach(session::get('LOCK_VARS_USED') as $name => $value){
         $_GET[$name]  = $value;
         $_POST[$name] = $value;
       } 
@@ -329,18 +319,18 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
      to count a hidden field and warn the user if SESSION and INPUT count
      differ. */
   if (isset($_POST['session_cnt'])){
-    if ($_POST['session_cnt'] != $_SESSION['session_cnt']){
+    if ($_POST['session_cnt'] != session::get('session_cnt')){
       $smarty->display(get_template_path('conflict.tpl'));
       exit ();
     }
-    $_SESSION['session_cnt']= $_SESSION['session_cnt'] + 1;
-    $_SESSION['post_cnt']= validate($_POST['session_cnt']) + 1;
+    session::set('session_cnt',$_SESSION['session_cnt'] + 1);
+    session::set('post_cnt' , validate($_POST['session_cnt']) + 1);
   }
 }
 
 /* Only generate hidden click counter, if post_cnt is defined */
-if (isset ($_SESSION['post_cnt'])){
-  echo "<input type=\"hidden\" name=\"session_cnt\" value=\"".$_SESSION['post_cnt']."\">\n";
+if (session::is_set('post_cnt')){
+  echo "<input type=\"hidden\" name=\"session_cnt\" value=\"".session::get('post_cnt')."\">\n";
 }
 
 /* check if we are using account expiration */
@@ -376,8 +366,8 @@ $smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
 $smarty->assign("contents", $display);
 
 /* Assign erros to smarty */
-if (isset($_SESSION['errors'])){
-  $smarty->assign("errors", $_SESSION['errors']);
+if (session::is_set('errors')){
+  $smarty->assign("errors", session::get('errors'));
 }
 if ($error_collector != ""){
   $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
@@ -387,7 +377,7 @@ if ($error_collector != ""){
 
 /* Set focus to the error button if we've an error message */
 $focus= "";
-if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){
+if (session::is_set('errors') && session::get('errors') != ""){
   $focus= '<script language="JavaScript" type="text/javascript">';
   $focus.= 'document.forms[0].error_accept.focus();';
   $focus.= '</script>';
@@ -413,23 +403,23 @@ if(isset($_COOKIE['GOsa_Filter_Settings'])){
 if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){
   $cookie_vars = array("MultiDialogFilters","CurrentMainBase");
   foreach($cookie_vars as $var){
-    if(isset($_SESSION[$var])){
-      $cookie[$ui->dn][$var] = $_SESSION[$var];
+    if(session::is_set($var)){
+      $cookie[$ui->dn][$var] = session::get($var);
     }
   }
   if(isset($_GET['plug'])){
     $cookie[$ui->dn]['plug'] = $_GET['plug'];
   }
-  setcookie("GOsa_Filter_Settings",base64_encode(serialize($cookie)),time() + (60*60*24));
+  @setcookie("GOsa_Filter_Settings",base64_encode(serialize($cookie)),time() + (60*60*24));
 }
 
 /* Show page... */
 echo $display;
 
 /* Save plist and config */
-$_SESSION['plist']= $plist;
-$_SESSION['config']= $config;
-$_SESSION['errorsAlreadyPosted']= array();
+session::set('plist',$plist);
+session::set('config',$config);
+session::set('errorsAlreadyPosted',array());
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
index dc17ec0be716c15ab1390f59e5adad7506e924d4..46ff5631f8a0deaa08e58a85ee203d40951c66b2 100644 (file)
 <?php
 $class_mapping= array(
-                "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",
-                "Socket_Client" => "include/class_socketClient.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",
+                "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",
                 "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",
-                "workstartup" => "plugins/admin/systems/class_workstationStartup.inc",
-                "termtabs" => "plugins/admin/systems/tabs_terminal.inc",
-                "phonetabs" => "plugins/admin/systems/tabs_phone.inc",
-                "servtabs" => "plugins/admin/systems/tabs_server.inc",
-                "workgeneric" => "plugins/admin/systems/class_workstationGeneric.inc",
-                "selectUserToPrinterDialog" => "plugins/admin/systems/class_selectUserToPrinterDialog.inc",
-                "wintabs" => "plugins/admin/systems/tabs_winstation.inc",
-                "phoneGeneric" => "plugins/admin/systems/class_phoneGeneric.inc",
-                "ArpNewDevice" => "plugins/admin/systems/class_ArpNewDevice.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",
+                "printerPPDDialog" => "plugins/admin/systems/ppd/class_printerPPDDialog.inc",
+                "printerPPDSelectionDialog" => "plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc",
+                "servrepository" => "plugins/admin/systems/services/repository/class_servRepository.inc",
+                "servRepositorySetup" => "plugins/admin/systems/services/repository/class_servRepositorySetup.inc",
+                "goLdapServer" => "plugins/admin/systems/services/ldap/class_goLdapServer.inc",
+                "goKioskService" => "plugins/admin/systems/services/kiosk/class_goKioskService.inc",
+                "goLogDBServer" => "plugins/admin/systems/services/syslog/class_goLogDBServer.inc",
+                "goSyslogServer" => "plugins/admin/systems/services/syslog/class_goSyslogServer.inc",
                 "gosaLogServer" => "plugins/admin/systems/services/log/class_gosaLogServer.inc",
-                "servdnseditZone" => "plugins/admin/systems/services/dns/class_servDNSeditZone.inc",
+                "goMailServer" => "plugins/admin/systems/services/mail/class_goMailServer.inc",
                 "servdns" => "plugins/admin/systems/services/dns/class_servDNS.inc",
+                "servdnseditZone" => "plugins/admin/systems/services/dns/class_servDNSeditZone.inc",
                 "termDNS" => "plugins/admin/systems/services/dns/class_termDNS.inc",
                 "servDNSeditZoneEntries" => "plugins/admin/systems/services/dns/class_servDNSeditZoneEntries.inc",
-                "glpiAttachmentPool" => "plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc",
-                "glpiPrinterAccount" => "plugins/admin/systems/services/glpi/class_glpiPrinterAccount.inc",
-                "glpiDeviceManagement" => "plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc",
+                "goShareServer" => "plugins/admin/systems/services/shares/class_goShareServer.inc",
+                "goImapServer" => "plugins/admin/systems/services/imap/class_goImapServer.inc",
+                "servnfs" => "plugins/admin/systems/services/nfs/class_servNfs.inc",
+                "servkolab" => "plugins/admin/systems/services/kolab/class_servKolab.inc",
                 "glpiSelectUser" => "plugins/admin/systems/services/glpi/class_glpiSelectUser.inc",
-                "goGlpiServer" => "plugins/admin/systems/services/glpi/class_goGlpiServer.inc",
+                "glpiAttachmentPool" => "plugins/admin/systems/services/glpi/class_glpiAttachmentPool.inc",
                 "glpiPrinterCartridges" => "plugins/admin/systems/services/glpi/class_glpiPrinterCartridges.inc",
+                "goGlpiServer" => "plugins/admin/systems/services/glpi/class_goGlpiServer.inc",
                 "glpiManufacturer" => "plugins/admin/systems/services/glpi/class_glpiManufacturer.inc",
+                "glpiDeviceManagement" => "plugins/admin/systems/services/glpi/class_glpiDeviceManagement.inc",
                 "glpiAccount" => "plugins/admin/systems/services/glpi/class_glpiAccount.inc",
+                "glpiPrinterAccount" => "plugins/admin/systems/services/glpi/class_glpiPrinterAccount.inc",
                 "glpiPrinterCartridgesEdit" => "plugins/admin/systems/services/glpi/class_glpiPrinterCartridgesEdit.inc",
-                "goLdapServer" => "plugins/admin/systems/services/ldap/class_goLdapServer.inc",
-                "servnfs" => "plugins/admin/systems/services/nfs/class_servNfs.inc",
-                "goService" => "plugins/admin/systems/services/class_goService.inc",
-                "goMailServer" => "plugins/admin/systems/services/mail/class_goMailServer.inc",
-                "goFonServer" => "plugins/admin/systems/services/gofon/class_goFonServer.inc",
-                "gospamserver" => "plugins/admin/systems/services/spam/class_goSpamServer.inc",
                 "goSpamServerRule" => "plugins/admin/systems/services/spam/class_goSpamServerRule.inc",
-                "goImapServer" => "plugins/admin/systems/services/imap/class_goImapServer.inc",
+                "gospamserver" => "plugins/admin/systems/services/spam/class_goSpamServer.inc",
                 "goNtpServer" => "plugins/admin/systems/services/ntp/class_goNtpServer.inc",
-                "goShareServer" => "plugins/admin/systems/services/shares/class_goShareServer.inc",
                 "goFaxServer" => "plugins/admin/systems/services/gofax/class_goFaxServer.inc",
+                "goFonServer" => "plugins/admin/systems/services/gofon/class_goFonServer.inc",
                 "govirusserver" => "plugins/admin/systems/services/virus/class_goVirusServer.inc",
-                "dhcpSharedNetwork" => "plugins/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc",
-                "dhcpAdvanced" => "plugins/admin/systems/services/dhcp/class_dhcpAdvanced.inc",
+                "goCupsServer" => "plugins/admin/systems/services/cups/class_goCupsServer.inc",
+                "goTerminalServer" => "plugins/admin/systems/services/terminal/class_goTerminalServer.inc",
+                "goKrbServer" => "plugins/admin/systems/services/kerberos/class_goKrbServer.inc",
                 "dhcpNetwork" => "plugins/admin/systems/services/dhcp/class_dhcpNetwork.inc",
-                "dhcpPool" => "plugins/admin/systems/services/dhcp/class_dhcpPool.inc",
-                "dhcpSubnet" => "plugins/admin/systems/services/dhcp/class_dhcpSubnet.inc",
                 "dhcpGroup" => "plugins/admin/systems/services/dhcp/class_dhcpGroup.inc",
-                "dhcpHost" => "plugins/admin/systems/services/dhcp/class_dhcpHost.inc",
                 "dhcpNewSectionDialog" => "plugins/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc",
+                "dhcpSubnet" => "plugins/admin/systems/services/dhcp/class_dhcpSubnet.inc",
                 "dhcpService" => "plugins/admin/systems/services/dhcp/class_dhcpService.inc",
+                "dhcpAdvanced" => "plugins/admin/systems/services/dhcp/class_dhcpAdvanced.inc",
+                "dhcpPool" => "plugins/admin/systems/services/dhcp/class_dhcpPool.inc",
+                "dhcpHost" => "plugins/admin/systems/services/dhcp/class_dhcpHost.inc",
                 "servdhcp" => "plugins/admin/systems/services/dhcp/class_servDHCP.inc",
+                "dhcpSharedNetwork" => "plugins/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc",
+                "goService" => "plugins/admin/systems/services/class_goService.inc",
                 "ServiceAddDialog" => "plugins/admin/systems/services/class_ServiceAddDialog.inc",
-                "goLogDBServer" => "plugins/admin/systems/services/syslog/class_goLogDBServer.inc",
-                "goSyslogServer" => "plugins/admin/systems/services/syslog/class_goSyslogServer.inc",
-                "servkolab" => "plugins/admin/systems/services/kolab/class_servKolab.inc",
-                "goCupsServer" => "plugins/admin/systems/services/cups/class_goCupsServer.inc",
-                "goTerminalServer" => "plugins/admin/systems/services/terminal/class_goTerminalServer.inc",
-                "goKioskService" => "plugins/admin/systems/services/kiosk/class_goKioskService.inc",
-                "servRepositorySetup" => "plugins/admin/systems/services/repository/class_servRepositorySetup.inc",
-                "servrepository" => "plugins/admin/systems/services/repository/class_servRepository.inc",
-                "goKrbServer" => "plugins/admin/systems/services/kerberos/class_goKrbServer.inc",
-                "baseSelectDialog" => "plugins/admin/systems/class_baseSelectDialog.inc",
-                "systems" => "plugins/admin/systems/class_systemManagement.inc",
-                "divListSystem" => "plugins/admin/systems/class_divListSystem.inc",
-                "servgeneric" => "plugins/admin/systems/class_servGeneric.inc",
-                "worktabs" => "plugins/admin/systems/tabs_workstation.inc",
+                "wintabs" => "plugins/admin/systems/tabs_winstation.inc",
+                "divListRepository" => "plugins/admin/systems/class_divListRepositories.inc",
+                "componenttabs" => "plugins/admin/systems/tabs_component.inc",
+                "terminfo" => "plugins/admin/systems/class_terminalInfo.inc",
+                "wingeneric" => "plugins/admin/systems/class_winGeneric.inc",
+                "printtabs" => "plugins/admin/systems/tabs_printers.inc",
+                "servtabs" => "plugins/admin/systems/tabs_server.inc",
                 "termservice" => "plugins/admin/systems/class_terminalService.inc",
+                "termstartup" => "plugins/admin/systems/class_terminalStartup.inc",
+                "termtabs" => "plugins/admin/systems/tabs_terminal.inc",
+                "ArpNewDeviceTabs" => "plugins/admin/systems/tabs_arpnewdevice.inc",
                 "divListSystemService" => "plugins/admin/systems/class_divListSystemService.inc",
-                "componentGeneric" => "plugins/admin/systems/class_componentGeneric.inc",
                 "workservice" => "plugins/admin/systems/class_workstationService.inc",
+                "selectUserToPrinterDialog" => "plugins/admin/systems/class_selectUserToPrinterDialog.inc",
+                "workstartup" => "plugins/admin/systems/class_workstationStartup.inc",
                 "termgeneric" => "plugins/admin/systems/class_terminalGeneric.inc",
-                "printtabs" => "plugins/admin/systems/tabs_printers.inc",
-                "ArpNewDeviceTabs" => "plugins/admin/systems/tabs_arpnewdevice.inc",
-                "componenttabs" => "plugins/admin/systems/tabs_component.inc",
-                "divListRepository" => "plugins/admin/systems/class_divListRepositories.inc",
-                "printerPPDDialog" => "plugins/admin/systems/ppd/class_printerPPDDialog.inc",
-                "printerPPDSelectionDialog" => "plugins/admin/systems/ppd/class_printerPPDSelectionDialog.inc",
-                "wingeneric" => "plugins/admin/systems/class_winGeneric.inc",
-                "termstartup" => "plugins/admin/systems/class_terminalStartup.inc",
-                "terminfo" => "plugins/admin/systems/class_terminalInfo.inc",
-                "printgeneric" => "plugins/admin/systems/class_printGeneric.inc",
+                "servgeneric" => "plugins/admin/systems/class_servGeneric.inc",
+                "workgeneric" => "plugins/admin/systems/class_workstationGeneric.inc",
+                "systems" => "plugins/admin/systems/class_systemManagement.inc",
+                "divListSystem" => "plugins/admin/systems/class_divListSystem.inc",
                 "ServerService" => "plugins/admin/systems/class_serverService.inc",
+                "printgeneric" => "plugins/admin/systems/class_printGeneric.inc",
+                "baseSelectDialog" => "plugins/admin/systems/class_baseSelectDialog.inc",
+                "phonetabs" => "plugins/admin/systems/tabs_phone.inc",
+                "componentGeneric" => "plugins/admin/systems/class_componentGeneric.inc",
                 "SelectDeviceType" => "plugins/admin/systems/class_SelectDeviceType.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",
+                "phoneGeneric" => "plugins/admin/systems/class_phoneGeneric.inc",
+                "worktabs" => "plugins/admin/systems/tabs_workstation.inc",
+                "ArpNewDevice" => "plugins/admin/systems/class_ArpNewDevice.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",
-                "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",
-                "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",
+                "LayersMenu" => "include/php_layers_menu/lib/layersmenu.inc.php",
+                "TreeMenu" => "include/php_layers_menu/lib/treemenu.inc.php",
+                "Template_PHPLIB" => "include/php_layers_menu/lib/PHPLIB.php",
+                "PlainMenu" => "include/php_layers_menu/lib/plainmenu.inc.php",
+                "LayersMenuCommon" => "include/php_layers_menu/lib/layersmenu-common.inc.php",
+                "PHPTreeMenu" => "include/php_layers_menu/lib/phptreemenu.inc.php",
+                "ProcessLayersMenu" => "include/php_layers_menu/lib/layersmenu-process.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",
+                "Socket_Client" => "include/class_socketClient.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",
+                "hostActionQueue" => "include/class_hostActionQueue.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",
+                "session" => "include/class_session.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