X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fsquirrelspell%2Fsqspell_functions.php;h=85dae527279195c397c749861d1b915b21501765;hp=4acf28d3395643bdca400e760859ab00222b4991;hb=f8a1ed5aa365d515e4e2ac3602f900bfb9447fce;hpb=2ad4cea967df0d35acf226cce6cd74f6ab765bd6
diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index 4acf28d3..85dae527 100644
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -1,10 +1,10 @@
format. This
* allows to separate javascript from the rest of the
* plugin and place it into the js/ directory.
@@ -34,12 +34,12 @@ function sqspell_makePage($title, $scriptsrc, $body){
$MOD = 'options_main';
}
- displayPageHeader($color, 'None');
+ displayPageHeader($color, 'None');
echo "
\n";
/**
* Check if we need to link in a script.
*/
- if($scriptsrc) {
+ if($scriptsrc) {
echo "\n";
}
echo html_tag( 'table', '', 'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' ) . "\n"
@@ -47,7 +47,7 @@ function sqspell_makePage($title, $scriptsrc, $body){
html_tag( 'td', '' . $title .'', 'center', $color[9] )
) . "\n"
. html_tag( 'tr', "\n" .
- html_tag( 'td', '
', 'left' )
+ html_tag( 'td', '
', 'left' )
) . "\n"
. html_tag( 'tr', "\n" .
html_tag( 'td', $body, 'left' )
@@ -56,9 +56,9 @@ function sqspell_makePage($title, $scriptsrc, $body){
* Generate a nice "Return to Options" link, unless this is the
* starting page.
*/
- if ($MOD != "options_main"){
+ if ($MOD != "options_main"){
echo html_tag( 'tr', "\n" .
- html_tag( 'td', '
', 'left' )
+ html_tag( 'td', '
', 'left' )
) . "\n"
. html_tag( 'tr', "\n" .
html_tag( 'td', ''
@@ -71,7 +71,7 @@ function sqspell_makePage($title, $scriptsrc, $body){
* Close the table and display the version.
*/
echo html_tag( 'tr', "\n" .
- html_tag( 'td', '
', 'left' )
+ html_tag( 'td', '
', 'left' )
) . "\n"
. html_tag( 'tr',
html_tag( 'td', 'SquirrelSpell ' . $SQSPELL_VERSION, 'center', $color[9] )
@@ -95,47 +95,35 @@ 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] )
) . "\n" .
html_tag( 'tr', "\n" .
- html_tag( 'td', '
', 'left' )
+ html_tag( 'td', '
', 'left' )
) . "\n" .
html_tag( 'tr', "\n" .
html_tag( 'td', $body, 'left' )
) . "\n" .
html_tag( 'tr', "\n" .
- html_tag( 'td', '
', 'left' )
+ html_tag( 'td', '
', 'left' )
) . "\n" .
html_tag( 'tr', "\n" .
html_tag( 'td', 'SquirrelSpell ' . $SQSPELL_VERSION, 'center', $color[9] )
@@ -146,7 +134,7 @@ function sqspell_makeWindow($onload, $title, $scriptsrc, $body){
/**
* This function does the encryption and decryption of the user
- * dictionary. It is only available when PHP is compiled with
+ * dictionary. It is only available when PHP is compiled with
* mcrypt support (--with-mcrypt). See doc/CRYPTO for more
* information.
*
@@ -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';
}
/**
@@ -183,7 +171,7 @@ function sqspell_crypto($mode, $ckey, $input){
break;
case 'decrypt':
$crypto = mdecrypt_generic($td, $input);
- /**
+ /**
* See if it decrypted successfully. If so, it should contain
* the string "# SquirrelSpell". If not, then bail out.
*/
@@ -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;
}
@@ -209,7 +204,7 @@ function sqspell_crypto($mode, $ckey, $input){
*
* @param $words_string Contents of the 0.2-style user dictionary.
* @return Contents of the 0.3-style user dictionary.
- */
+ */
function sqspell_upgradeWordsFile($words_string){
global $SQSPELL_APP_DEFAULT, $SQSPELL_VERSION;
/**
@@ -217,18 +212,18 @@ function sqspell_upgradeWordsFile($words_string){
* If the user wants more, s/he can set them up in personal
* preferences. See doc/UPGRADING for more info.
*/
- $new_words_string =
- substr_replace($words_string,
- "# SquirrelSpell User Dictionary $SQSPELL_VERSION\n# "
- . "Last Revision: " . date("Y-m-d")
- . "\n# LANG: $SQSPELL_APP_DEFAULT\n# $SQSPELL_APP_DEFAULT",
- 0, strpos($words_string, "\n")) . "# End\n";
+ $new_words_string =
+ substr_replace($words_string,
+ "# SquirrelSpell User Dictionary $SQSPELL_VERSION\n# "
+ . "Last Revision: " . date("Y-m-d")
+ . "\n# LANG: $SQSPELL_APP_DEFAULT\n# $SQSPELL_APP_DEFAULT",
+ 0, strpos($words_string, "\n")) . "# End\n";
sqspell_writeWords($new_words_string);
return $new_words_string;
}
/**
- * Right now it just returns an array with the dictionaries
+ * Right now it just returns an array with the dictionaries
* available to the user for spell-checking. It will probably
* do more in the future, as features are added.
*
@@ -280,12 +275,12 @@ function sqspell_getSettings($words){
* to the requested language.
*
* @param $words The contents of the user's ".words" file.
- * @param $lang Which language words to return, e.g. requesting
+ * @param $lang Which language words to return, e.g. requesting
* "English" will return ONLY the words from user's
* English dictionary, disregarding any others.
* @return The list of words corresponding to the language
* requested.
- */
+ */
function sqspell_getLang($words, $lang){
$start=strpos($words, "# $lang\n");
/**
@@ -310,8 +305,8 @@ function sqspell_getLang($words, $lang){
* the file is encrypted (well, "garbled"), then it tries to decrypt
* it, checks whether the decryption was successful, troubleshoots if
* not, then returns the clear-text dictionary to the app.
- *
- * @return the contents of the user's ".words" file, decrypted if
+ *
+ * @return the contents of the user's ".words" file, decrypted if
* necessary.
*/
function sqspell_getWords(){
@@ -373,53 +368,53 @@ function sqspell_getWords(){
'' . _("ATTENTION:") . '
'
. _("SquirrelSpell was unable to decrypt your personal dictionary. This is most likely due to the fact that you have changed your mailbox password. In order to proceed, you will have to supply your old password so that SquirrelSpell can decrypt your personal dictionary. It will be re-encrypted with your new password after this. If you haven't encrypted your dictionary, then it got mangled and is no longer valid. You will have to delete it and start anew. This is also true if you don't remember your old password -- without it, the encrypted data is no longer accessible.") ,
'left' ) . "\n"
- . '' . "\n"
- . '
' . "\n"
- . html_tag( 'p', "\n" .
- '' ,
- 'center' ) . "\n"
- . '' . "\n";
+ . '' . "\n"
+ . '
' . "\n"
+ . html_tag( 'p', "\n" .
+ '' ,
+ 'center' ) . "\n"
+ . '' . "\n";
/**
* Add some string vars so they can be i18n'd.
*/
$msg .= "\n";
+ . "var ui_choice = \"" . _("You must make a choice") ."\";\n"
+ . "var ui_candel = \"" . _("You can either delete your dictionary or type in the old password. Not both.") . "\";\n"
+ . "var ui_willdel = \"" . _("This will delete your personal dictionary file. Proceed?") . "\";\n"
+ . "//-->\n";
/**
* See if this happened in the pop-up window or when accessing
- * the SpellChecker options page.
+ * the SpellChecker options page.
* This is a dirty solution, I agree. TODO: make this prettier.
*/
global $SCRIPT_NAME;
if (strstr($SCRIPT_NAME, "sqspell_options")){
- sqspell_makePage(_("Error Decrypting Dictionary"),
- "decrypt_error.js", $msg);
+ sqspell_makePage(_("Error Decrypting Dictionary"),
+ "decrypt_error.js", $msg);
} else {
- sqspell_makeWindow(null, _("Error Decrypting Dictionary"),
- "decrypt_error.js", $msg);
+ sqspell_makeWindow(null, _("Error Decrypting Dictionary"),
+ "decrypt_error.js", $msg);
}
exit;
} else {
/**
- * OK! Phew. Set the encryption flag to true so we can later on
+ * OK! Phew. Set the encryption flag to true so we can later on
* encrypt it again before saving to HDD.
*/
$SQSPELL_CRYPTO=true;
}
} else {
/**
- * No encryption is/was used. Set $SQSPELL_CRYPTO to false,
+ * No encryption is/was used. Set $SQSPELL_CRYPTO to false,
* in case we have to save the dictionary later.
*/
$SQSPELL_CRYPTO=false;
@@ -433,7 +428,7 @@ function sqspell_getWords(){
}
return $words;
}
-
+
/**
* Writes user dictionary into the $username.words file, then changes mask
* to 0600. If encryption is needed -- does that, too.
@@ -484,7 +479,7 @@ function sqspell_writeWords($words){
fclose($fp);
chmod($SQSPELL_WORDS_FILE, 0600);
}
-
+
function sqspell_deleteWords(){
/**
* So I open the door to my enemies,
@@ -502,12 +497,12 @@ function sqspell_deleteWords(){
* whatever.
*
* @return The template to use when storing the user dictionary.
- */
+ */
function sqspell_makeDummy(){
global $SQSPELL_VERSION, $SQSPELL_APP_DEFAULT;
$words = "# SquirrelSpell User Dictionary $SQSPELL_VERSION\n"
- . "# Last Revision: " . date('Y-m-d')
- . "\n# LANG: $SQSPELL_APP_DEFAULT\n# End\n";
+ . "# Last Revision: " . date('Y-m-d')
+ . "\n# LANG: $SQSPELL_APP_DEFAULT\n# End\n";
return $words;
}
@@ -522,10 +517,10 @@ function sqspell_makeDummy(){
* @return void, since it bails out with an access error if needed.
*/
function sqspell_ckMOD($rMOD){
- if (strstr($rMOD, '.')
- || strstr($rMOD, '/')
+ if (strstr($rMOD, '.')
+ || strstr($rMOD, '/')
|| strstr($rMOD, '%')
- || strstr($rMOD, "\\")){
+ || strstr($rMOD, "\\")){
echo _("Cute.");
exit;
}
@@ -533,8 +528,8 @@ function sqspell_ckMOD($rMOD){
/**
* SquirrelSpell version. Don't modify, since it identifies the format
- * of the user dictionary files and messing with this can do ugly
+ * of the user dictionary files and messing with this can do ugly
* stuff. :)
*/
$SQSPELL_VERSION="v0.3.8";
-?>
+?>
\ No newline at end of file