X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fsquirrelspell%2Fsqspell_functions.php;h=bdbdd9f4683c7191b3c3282f3fdb7451d26c7b73;hp=094ac8d12835a210bbd5db299654897673de6403;hb=7413ef704c7998081328f00f2eb0a74411793588;hpb=04fa3c41370a9af66de1f649cf2a25560d31ab56
diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index 094ac8d1..bdbdd9f4 100644
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -95,35 +95,23 @@ function sqspell_makePage($title, $scriptsrc, $body){
* @return void
*/
function sqspell_makeWindow($onload, $title, $scriptsrc, $body){
- global $color, $SQSPELL_VERSION, $theme_css;
- echo "\n"
- . "\n"
- . "$title\n";
- /**
- * Check if we have a defined css theme to use.
- */
- if ($theme_css != "") {
- echo "\n";
- }
- /**
- * Link in the .js file if needed
- */
- if ($scriptsrc){
- echo "\n";
- }
- echo "\n"
- . "\n" : ''));
+
+ echo "'
+ echo ">\n"
. html_tag( 'table', "\n" .
html_tag( 'tr', "\n" .
html_tag( 'td', '' . $title . '', 'center', $color[9] )
@@ -163,7 +151,7 @@ function sqspell_crypto($mode, $ckey, $input){
* Double-check if we have the mcrypt_generic function. Bail out if
* not so.
*/
- if (!function_exists(mcrypt_generic)) {
+ if (!function_exists('mcrypt_generic')) {
return 'PANIC';
}
/**
@@ -195,7 +183,14 @@ function sqspell_crypto($mode, $ckey, $input){
/**
* Finish up the mcrypt routines and return the processed content.
*/
- mcrypt_generic_end ($td);
+ if (function_exists('mcrypt_generic_deinit')) {
+ // php 4.1.1+ syntax
+ mcrypt_generic_deinit ($td);
+ mcrypt_module_close ($td);
+ } else {
+ // older deprecated function
+ mcrypt_generic_end ($td);
+ }
return $crypto;
}