updated plugin to 1.5.2 API

added address book line length option
removed unused sqimap functions include

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11312 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 236a1ccdc082b05cf2c77a2dedd3563b2b5c848c..b0a5fb6830d40818a8564c9676b521f6261f743d 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -388,6 +388,8 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                           'type' => SMOPT_TYPE_BOOLEAN ),
                  '$abook_global_file_listing'   => array( 'name' => _("Allow listing of global address book"),
                                                           'type' => SMOPT_TYPE_BOOLEAN ),
+                 '$abook_file_line_length' => array( 'name' => _("Address book file line length"),
+                                                     'type' => SMOPT_TYPE_INTEGER ),
                  /* --------------------------------------------------------*/
                  'Group7' => array( 'name' => _("Templates"),
                                     'type' => SMOPT_TYPE_TITLE ),

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index ddbcf716585bab6df49aa7c32a46d17ba5d185de..113671108a0aed11581f28735538752b9e8ab139 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -219,15 +219,12 @@ function change_to_sm_path($old_path) {
 
 
 /* ---------------------- main -------------------------- */
-
-/** @ignore */
-define('SM_PATH','../../');
-
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'plugins/administrator/defines.php');
-require_once(SM_PATH . 'plugins/administrator/auth.php');
+/** main SquirrelMail include */
+require('../../include/init.php');
+/* configuration definitions */
+include_once(SM_PATH . 'plugins/administrator/defines.php');
+/* additional functions */
+include_once(SM_PATH . 'plugins/administrator/auth.php');
 
 global $data_dir, $username;