projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve attachment file handling: use one new function to create a temp
[squirrelmail.git]
/
plugins
/
info
/
options.php
diff --git
a/plugins/info/options.php
b/plugins/info/options.php
index 5489441e17d9e7a9b9cead3c176296b164508d70..278e22c20dae61a13843f456c2f97bee4190f3d2 100644
(file)
--- a/
plugins/info/options.php
+++ b/
plugins/info/options.php
@@
-13,13
+13,14
@@
* @subpackage info
*/
* @subpackage info
*/
-/** @ignore */
-define('SM_PATH','../../');
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+require('../../include/init.php');
/* SquirrelMail required files. */
/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/imap_general.php');
require_once(SM_PATH . 'functions/forms.php');
require_once(SM_PATH . 'plugins/info/functions.php');
require_once(SM_PATH . 'functions/forms.php');
require_once(SM_PATH . 'plugins/info/functions.php');
@@
-34,16
+35,13
@@
$mailbox = 'INBOX';
* prevent use of plugin if it is not enabled
*/
if (! is_plugin_enabled('info')) {
* prevent use of plugin if it is not enabled
*/
if (! is_plugin_enabled('info')) {
- error_box(_("Plugin is disabled."),$color);
- echo '</body></html>';
+ error_box(_("Plugin is disabled."));
+ // display footer (closes html) and stop script execution
+ $oTemplate->display('footer.tpl');
exit;
}
/* GLOBALS */
exit;
}
/* GLOBALS */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-
sqgetGlobalVar('submit', $submit, SQ_POST);
for($i = 0; $i <= 9; $i++){
sqgetGlobalVar('submit', $submit, SQ_POST);
for($i = 0; $i <= 9; $i++){
@@
-55,7
+53,7
@@
for($i = 0; $i <= 9; $i++){
/* END GLOBALS */
/* END GLOBALS */
-$imap_stream = sqimap_login($username,
$key
, $imapServerAddress, $imapPort, 0);
+$imap_stream = sqimap_login($username,
false
, $imapServerAddress, $imapPort, 0);
$caps_array = get_caps($imap_stream);
$list = array ('TEST_0',
'TEST_1',
$caps_array = get_caps($imap_stream);
$list = array ('TEST_0',
'TEST_1',
@@
-205,6
+203,6
@@
sqimap_logout($imap_stream);
*
* Hook allows attaching plugin to bottom of info plugin
*/
*
* Hook allows attaching plugin to bottom of info plugin
*/
-do_hook('info_bottom');
+do_hook('info_bottom'
, $null
);
?>
?>
-</body></html>
\ No newline at end of file
+</body></html>