projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ChangeLog
[squirrelmail.git]
/
plugins
/
fortune
/
setup.php
diff --git
a/plugins/fortune/setup.php
b/plugins/fortune/setup.php
index 0dca671e0ced4a039c81bc4e5fbc5fa41bc8ed30..08ac52e4126f6fa61ef8bb3795302e3c61dcf2fa 100644
(file)
--- a/
plugins/fortune/setup.php
+++ b/
plugins/fortune/setup.php
@@
-1,22
+1,15
@@
<?php
<?php
+
/**
* Fortune plugin setup script
*
/**
* Fortune plugin setup script
*
- * @copyright
(c) 1999-2004
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 fortune
*/
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @subpackage fortune
*/
-/**
- * If SM_PATH isn't defined, define it.
- * @ignore
- */
-if (!defined('SM_PATH')) {
- define('SM_PATH','../../');
-}
-
/**
* Init plugin
* @access private
/**
* Init plugin
* @access private
@@
-24,7
+17,7
@@
if (!defined('SM_PATH')) {
function squirrelmail_plugin_init_fortune() {
global $squirrelmail_plugin_hooks;
function squirrelmail_plugin_init_fortune() {
global $squirrelmail_plugin_hooks;
- $squirrelmail_plugin_hooks['
mailbox_index_before
']['fortune'] = 'fortune';
+ $squirrelmail_plugin_hooks['
template_construct_message_list.tpl
']['fortune'] = 'fortune';
$squirrelmail_plugin_hooks['loading_prefs']['fortune'] = 'fortune_load';
$squirrelmail_plugin_hooks['optpage_loadhook_display']['fortune'] = 'fortune_options';
}
$squirrelmail_plugin_hooks['loading_prefs']['fortune'] = 'fortune_load';
$squirrelmail_plugin_hooks['optpage_loadhook_display']['fortune'] = 'fortune_options';
}
@@
-35,7
+28,7
@@
function squirrelmail_plugin_init_fortune() {
*/
function fortune() {
include_once(SM_PATH . 'plugins/fortune/functions.php');
*/
function fortune() {
include_once(SM_PATH . 'plugins/fortune/functions.php');
- fortune_function();
+
return
fortune_function();
}
/**
}
/**
@@
-55,4
+48,3
@@
function fortune_load() {
include_once(SM_PATH . 'plugins/fortune/functions.php');
fortune_function_load();
}
include_once(SM_PATH . 'plugins/fortune/functions.php');
fortune_function_load();
}
-?>
\ No newline at end of file