Centralized init

[squirrelmail.git] / plugins / administrator / defines.php

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 939365d50f3c3af86107c7c4847d182bc6683b55..d985aa459120608bce063db90e7639940e2d7d86 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -11,15 +11,6 @@
  * @subpackage administrator
  */
 
-/** @ignore */
-if (!defined('SM_PATH')) define('SM_PATH','../../');
-
-/**
- * Load SquirrelMail SMPREF constants for default_unseen_notify and 
- * default_unseen_type variables.
- */
-require_once( SM_PATH . 'functions/constants.php' );
-
 /* Define constants for the various option types. */
 define('SMOPT_TYPE_UNDEFINED', -1);
 define('SMOPT_TYPE_STRING', 0);
@@ -267,10 +258,10 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$hide_auth_header' => array( 'name' => _("Remove username from headers"),
                                                'comment' => _("Used only when identities can't be modified"),
                                                'type' => SMOPT_TYPE_BOOLEAN ),
-                 '$allow_server_sort' => array( 'name' => _("Use server-side sorting"),
+                 '$disable_server_sort' => array( 'name' => _("Disable server-side sorting"),
                                                 'type' => SMOPT_TYPE_BOOLEAN,
                                                 'default' => false ),
-                 '$allow_thread_sort' => array( 'name' => _("Use server-side thread sorting"),
+                 '$disable_thread_sort' => array( 'name' => _("Disable server-side thread sorting"),
                                                 'type' => SMOPT_TYPE_BOOLEAN,
                                                 'default' => false ),
                  '$allow_charset_search' => array( 'name' => _("Allow server charset search"),
@@ -376,8 +367,6 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  /* ---- Tweaks ---- */
                  'Group10' => array( 'name' => _("Tweaks"),
                                      'type' => SMOPT_TYPE_TITLE ),
-                 '$advanced_tree'  => array( 'name' => _("Use advanced tree folder listing"),
-                                             'type' => SMOPT_TYPE_BOOLEAN ),
                  '$use_icons'  => array( 'name' => _("Use icons"),
                                          'type' => SMOPT_TYPE_BOOLEAN ),
                  '$use_iframe' => array( 'name' => _("Use inline frames with HTML mails"),