projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Note a bug
[squirrelmail.git]
/
plugins
/
administrator
/
defines.php
diff --git
a/plugins/administrator/defines.php
b/plugins/administrator/defines.php
index 939365d50f3c3af86107c7c4847d182bc6683b55..9288cd2ac49651c7b553790ea6c1ffad3cf82954 100644
(file)
--- a/
plugins/administrator/defines.php
+++ b/
plugins/administrator/defines.php
@@
-4,23
+4,14
@@
* Administrator plugin - Option definitions
*
* @author Philippe Mingo
* Administrator plugin - Option definitions
*
* @author Philippe Mingo
- * @copyright
© 1999-2006
The SquirrelMail Project Team
+ * @copyright
1999-2012
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @subpackage administrator
*/
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @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 constants for the various option types. */
define('SMOPT_TYPE_UNDEFINED', -1);
define('SMOPT_TYPE_STRING', 0);
define('SMOPT_TYPE_STRLIST', 1);
define('SMOPT_TYPE_UNDEFINED', -1);
define('SMOPT_TYPE_STRING', 0);
define('SMOPT_TYPE_STRLIST', 1);
@@
-48,12
+39,12
@@
function adm_template_options() {
global $aTemplateSet;
$ret = array();
foreach ($aTemplateSet as $iTemplateID => $aTemplate) {
global $aTemplateSet;
$ret = array();
foreach ($aTemplateSet as $iTemplateID => $aTemplate) {
- $ret[$
iTemplateID
] = $aTemplate['NAME'];
+ $ret[$
aTemplate['ID']
] = $aTemplate['NAME'];
}
return $ret;
}
}
return $ret;
}
-global $languages
, $version
;
+global $languages;
$language_values = array( );
foreach ($languages as $lang_key => $lang_attributes) {
$language_values = array( );
foreach ($languages as $lang_key => $lang_attributes) {
@@
-73,7
+64,7
@@
$defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
'size' => 7 ),
'SM_ver' => array( 'name' => _("SquirrelMail Version"),
'type' => SMOPT_TYPE_EXTERNAL,
'size' => 7 ),
'SM_ver' => array( 'name' => _("SquirrelMail Version"),
'type' => SMOPT_TYPE_EXTERNAL,
- 'value' =>
"$version"
),
+ 'value' =>
SM_VERSION
),
'PHP_ver' => array( 'name' => _("PHP Version"),
'type' => SMOPT_TYPE_EXTERNAL,
'value' => phpversion() ),
'PHP_ver' => array( 'name' => _("PHP Version"),
'type' => SMOPT_TYPE_EXTERNAL,
'value' => phpversion() ),
@@
-130,6
+121,7
@@
$defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
'hmailserver' => _("hMailServer IMAP server"),
'mercury32' => _("Mercury/32 IMAP server"),
'bincimap' => _("Binc IMAP server"),
'hmailserver' => _("hMailServer IMAP server"),
'mercury32' => _("Mercury/32 IMAP server"),
'bincimap' => _("Binc IMAP server"),
+ 'dovecot' => _("Dovecot IMAP server"),
'other' => _("Not one of the above servers") ) ),
'$optional_delimiter' => array( 'name' => _("IMAP Folder Delimiter"),
'type' => SMOPT_TYPE_STRING,
'other' => _("Not one of the above servers") ) ),
'$optional_delimiter' => array( 'name' => _("IMAP Folder Delimiter"),
'type' => SMOPT_TYPE_STRING,
@@
-177,11
+169,17
@@
$defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
'cram-md5' => 'CRAM-MD5',
'digest-md5' => 'DIGEST-MD5'),
'default' => 'none'),
'cram-md5' => 'CRAM-MD5',
'digest-md5' => 'DIGEST-MD5'),
'default' => 'none'),
+ '$smtp_sitewide_user' => array( 'name' => _("Custom SMTP AUTH username"),
+ 'type' => SMOPT_TYPE_STRING,
+ 'size' => 40 ),
+ '$smtp_sitewide_pass' => array( 'name' => _("Custom SMTP AUTH password"),
+ 'type' => SMOPT_TYPE_STRING,
+ 'size' => 40 ),
'$pop_before_smtp' => array( 'name' => _("POP3 Before SMTP?"),
'type' => SMOPT_TYPE_BOOLEAN,
'default' => false ),
'$encode_header_key' => array( 'name' => _("Header Encryption Key"),
'$pop_before_smtp' => array( 'name' => _("POP3 Before SMTP?"),
'type' => SMOPT_TYPE_BOOLEAN,
'default' => false ),
'$encode_header_key' => array( 'name' => _("Header Encryption Key"),
- 'type' => SMOPT_TYPE_STRING ),
+
'type' => SMOPT_TYPE_STRING ),
'$invert_time' => array( 'name' => _("Invert Time"),
'type' => SMOPT_TYPE_BOOLEAN ),
/* --------------------------------------------------------*/
'$invert_time' => array( 'name' => _("Invert Time"),
'type' => SMOPT_TYPE_BOOLEAN ),
/* --------------------------------------------------------*/
@@
-267,10
+265,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 ),
'$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' => _("Us
e server-side sorting"),
+ '$
disable_server_sort' => array( 'name' => _("Disabl
e server-side sorting"),
'type' => SMOPT_TYPE_BOOLEAN,
'default' => false ),
'type' => SMOPT_TYPE_BOOLEAN,
'default' => false ),
- '$
allow_thread_sort' => array( 'name' => _("Us
e server-side thread sorting"),
+ '$
disable_thread_sort' => array( 'name' => _("Disabl
e server-side thread sorting"),
'type' => SMOPT_TYPE_BOOLEAN,
'default' => false ),
'$allow_charset_search' => array( 'name' => _("Allow server charset search"),
'type' => SMOPT_TYPE_BOOLEAN,
'default' => false ),
'$allow_charset_search' => array( 'name' => _("Allow server charset search"),
@@
-291,6
+289,10
@@
$defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
2 => _("Custom GNU C time zones"),
3 => _("Custom strict time zones")),
'default' => 0 ),
2 => _("Custom GNU C time zones"),
3 => _("Custom strict time zones")),
'default' => 0 ),
+ '$config_location_base' => array( 'name' => _("Location base"),
+ 'type' => SMOPT_TYPE_STRING,
+ 'size' => 40,
+ 'default' => '' ),
/* --------------------------------------------------------*/
'Group5' => array( 'name' => _("Message of the Day"),
'type' => SMOPT_TYPE_TITLE ),
/* --------------------------------------------------------*/
'Group5' => array( 'name' => _("Message of the Day"),
'type' => SMOPT_TYPE_TITLE ),
@@
-376,8
+378,6
@@
$defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
/* ---- Tweaks ---- */
'Group10' => array( 'name' => _("Tweaks"),
'type' => SMOPT_TYPE_TITLE ),
/* ---- 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"),
'$use_icons' => array( 'name' => _("Use icons"),
'type' => SMOPT_TYPE_BOOLEAN ),
'$use_iframe' => array( 'name' => _("Use inline frames with HTML mails"),
@@
-399,6
+399,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 ),
'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 ),
/* --------------------------------------------------------*/
'Group7' => array( 'name' => _("Templates"),
'type' => SMOPT_TYPE_TITLE ),
@@
-414,6
+416,9
@@
$defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
'$templateset_default' => array( 'name' => _("Default template"),
'type' => SMOPT_TYPE_STRLIST,
'posvals' => adm_template_options()),
'$templateset_default' => array( 'name' => _("Default template"),
'type' => SMOPT_TYPE_STRLIST,
'posvals' => adm_template_options()),
+ '$templateset_fallback' => array( 'name' => _("Fallback template"),
+ 'type' => SMOPT_TYPE_STRLIST,
+ 'posvals' => adm_template_options()),
'$theme_default' => array( 'name' => _("Default theme"),
'type' => SMOPT_TYPE_INTEGER,
'default' => 0,
'$theme_default' => array( 'name' => _("Default theme"),
'type' => SMOPT_TYPE_INTEGER,
'default' => 0,
@@
-426,5
+431,3
@@
$defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
/* --------------------------------------------------------*/
);
/* --------------------------------------------------------*/
);
-
-?>
\ No newline at end of file