From 44d661aa1bdc1a6f35d03ac7e1aee4c93dbc2c93 Mon Sep 17 00:00:00 2001 From: tokul Date: Mon, 1 Nov 2004 09:40:27 +0000 Subject: [PATCH] phpdoc: added block tags, @version is set to Id:, removed Author: and Date: because author is Konstantin and date/last commiter is present in Id: fixed: unchecked test of $msg removed tabs. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8297 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/squirrelspell/modules/check_me.mod | 56 ++++++++--------- plugins/squirrelspell/modules/crypto.mod | 10 ++-- .../squirrelspell/modules/crypto_badkey.mod | 12 ++-- plugins/squirrelspell/modules/edit_dic.mod | 60 +++++++++---------- plugins/squirrelspell/modules/enc_setup.mod | 12 ++-- plugins/squirrelspell/modules/forget_me.mod | 12 ++-- .../squirrelspell/modules/forget_me_not.mod | 11 ++-- plugins/squirrelspell/modules/index.php | 33 +++++----- plugins/squirrelspell/modules/init.mod | 10 ++-- plugins/squirrelspell/modules/lang_change.mod | 40 ++++++------- plugins/squirrelspell/modules/lang_setup.mod | 10 ++-- .../squirrelspell/modules/options_main.mod | 10 ++-- 12 files changed, 138 insertions(+), 138 deletions(-) diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod index 288ac4f6..40baaba3 100644 --- a/plugins/squirrelspell/modules/check_me.mod +++ b/plugins/squirrelspell/modules/check_me.mod @@ -11,10 +11,10 @@ * the message to the spell-checker, parses the output, and loads * the interface window. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ /** @@ -99,7 +99,7 @@ if( check_php_version ( 4, 3 ) ) { for($i=1; $i<=2; $i++){ while(!feof($pipes[$i])) array_push($sqspell_output, rtrim(fgetss($pipes[$i],999),"\n")); - fclose($pipes[$i]); + fclose($pipes[$i]); } $sqspell_exitcode=proc_close($spell_proc); } else { @@ -196,15 +196,15 @@ for ($i=0; $i - +
@@ -435,4 +435,4 @@ if ($errors){ * End: * vim: syntax=php et ts=4 */ -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/crypto.mod b/plugins/squirrelspell/modules/crypto.mod index 21245041..82239739 100644 --- a/plugins/squirrelspell/modules/crypto.mod +++ b/plugins/squirrelspell/modules/crypto.mod @@ -4,16 +4,16 @@ * --------------- * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module handles the encryption/decryption of the user dictionary * if the user so chooses from the options page. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ /** diff --git a/plugins/squirrelspell/modules/crypto_badkey.mod b/plugins/squirrelspell/modules/crypto_badkey.mod index e8e84979..8e33050f 100644 --- a/plugins/squirrelspell/modules/crypto_badkey.mod +++ b/plugins/squirrelspell/modules/crypto_badkey.mod @@ -4,16 +4,16 @@ * ------------------ * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module tries to decrypt the user dictionary with a newly provided - * old password, or erases the file if everything else fails. :( + * old password, or erases the file if everything else fails. :( * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $SCRIPT_NAME; diff --git a/plugins/squirrelspell/modules/edit_dic.mod b/plugins/squirrelspell/modules/edit_dic.mod index 90a7a6e9..ead670d2 100644 --- a/plugins/squirrelspell/modules/edit_dic.mod +++ b/plugins/squirrelspell/modules/edit_dic.mod @@ -4,15 +4,15 @@ * ------------- * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module lets the user edit his/her personal dictionary. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $color; @@ -26,8 +26,8 @@ if (!$words){ * Neo: "So are you." */ sqspell_makePage(_("Personal Dictionary"), null, - '

' . _("No words in your personal dictionary.") - . '

'); + '

' . _("No words in your personal dictionary.") + . '

'); } else { /** * We're loaded with booty. @@ -52,18 +52,18 @@ if (!$words){ * "header" message. */ if (!isset($msg) || !$msg) { - $msg = $pre_msg; + $msg = $pre_msg; } $msg .= "" - . sprintf( _("%s dictionary"), $langs[$i] ) . '' - . '' - . '
' - . '' - . '' - . '' - . '' - . "' + . '' - . "\n"; + . "\n"; } } /** * Check if all dictionaries were empty. */ - if (!$msg) { + if (! isset($msg)) { $msg = '

' . _("No words in your personal dictionary.") . '

'; } else { $msg .= '
\n"; + . sprintf( _("%s dictionary"), $langs[$i] ) . '
' + . '' + . '' + . '' + . '' + . '' + . "
\n"; $words_ary=explode("\n", $lang_words); /** * There are two lines we need to remove: @@ -77,26 +77,26 @@ if (!$words){ * columns. */ for ($j=0; $j\n"; - } - $msg .= " ' - . htmlspecialchars($words_ary[$j]) . "
\n"; + if ($j==intval(sizeof($words_ary)/3) + || $j==intval(sizeof($words_ary)/3*2)){ + $msg .= "		\n"; + } + $msg .= " ' + . htmlspecialchars($words_ary[$j]) . "
\n"; } $msg .= '
" - . '' - . '
' - . "
" + . '' + . '
' + . "
'; diff --git a/plugins/squirrelspell/modules/enc_setup.mod b/plugins/squirrelspell/modules/enc_setup.mod index dd5ad951..451dfd41 100644 --- a/plugins/squirrelspell/modules/enc_setup.mod +++ b/plugins/squirrelspell/modules/enc_setup.mod @@ -4,16 +4,16 @@ * -------------- * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module shows the user a nice invitation to encrypt or decypt * his/her personal dictionary and explains the caveats of such a decision. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $SQSPELL_CRYPTO; @@ -88,7 +88,7 @@ if ($SQSPELL_CRYPTO){ . ''; } sqspell_makePage(_("Personal Dictionary Crypto Settings"), - "crypto_settings.js", $msg); + "crypto_settings.js", $msg); /** * For Emacs weenies: diff --git a/plugins/squirrelspell/modules/forget_me.mod b/plugins/squirrelspell/modules/forget_me.mod index 129c3af9..7507f926 100644 --- a/plugins/squirrelspell/modules/forget_me.mod +++ b/plugins/squirrelspell/modules/forget_me.mod @@ -4,16 +4,18 @@ * -------------- * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module deletes the words from the user dictionary. Called * after EDIT_DIC module. * - * $Id$ + * * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $SQSPELL_VERSION; @@ -79,7 +81,7 @@ if (sizeof($words_ary)){ * Click on some words first, Einstein! */ sqspell_makePage(_("Personal Dictionary"), null, - '

' . _("No changes requested.") . '

'); + '

' . _("No changes requested.") . '

'); } /** diff --git a/plugins/squirrelspell/modules/forget_me_not.mod b/plugins/squirrelspell/modules/forget_me_not.mod index 85f94d63..0e647ba2 100644 --- a/plugins/squirrelspell/modules/forget_me_not.mod +++ b/plugins/squirrelspell/modules/forget_me_not.mod @@ -4,15 +4,16 @@ * ------------------ * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module saves the added words into the user dictionary. Called * after CHECK_ME module. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $SQSPELL_VERSION, $SQSPELL_APP_DEFAULT; @@ -52,7 +53,7 @@ if (!$words){ $lang_words=sqspell_getLang($words, $langs[$i]); if ($langs[$i]==$sqspell_use_app){ if (!$lang_words) { - $lang_words="# $langs[$i]\n"; + $lang_words="# $langs[$i]\n"; } $lang_words .= $new_words; } diff --git a/plugins/squirrelspell/modules/index.php b/plugins/squirrelspell/modules/index.php index 2e6f3704..b4d05f77 100644 --- a/plugins/squirrelspell/modules/index.php +++ b/plugins/squirrelspell/modules/index.php @@ -1,19 +1,16 @@ +/** + * index.php -- Displays the main frameset + * + * Copyright (c) 1999-2004 The SquirrelMail development team + * Licensed under the GNU GPL. For full terms see the file COPYING. + * + * Redirects to the login page. + * + * @version $Id$ + * @package plugins + * @subpackage squirrelspell + */ +header("Location:../../../src/login.php\n\n"); +exit(); +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/init.mod b/plugins/squirrelspell/modules/init.mod index 6d384be3..c0aaebba 100644 --- a/plugins/squirrelspell/modules/init.mod +++ b/plugins/squirrelspell/modules/init.mod @@ -4,15 +4,15 @@ * --------- * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Initial loading of the popup window interface. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ /** diff --git a/plugins/squirrelspell/modules/lang_change.mod b/plugins/squirrelspell/modules/lang_change.mod index 3617e5fe..3519a903 100644 --- a/plugins/squirrelspell/modules/lang_change.mod +++ b/plugins/squirrelspell/modules/lang_change.mod @@ -4,16 +4,16 @@ * ---------------- * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module changes the international dictionaries selection * for the user. Called after LANG_SETUP module. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $SQSPELL_APP_DEFAULT; @@ -40,19 +40,19 @@ if (sizeof($use_langs)){ * to make the default dictionary first in line. */ if (in_array($lang_default, $use_langs)){ - /** - * See if the user was dumb and chose a default dictionary - * to be something other than the ones he selected. - */ - $hold = array_shift($use_langs); - $lang_string = join(", ", $use_langs); - $lang_string = str_replace("$lang_default", "$hold", $lang_string); - $lang_string = $lang_default . ", " . $lang_string; + /** + * See if the user was dumb and chose a default dictionary + * to be something other than the ones he selected. + */ + $hold = array_shift($use_langs); + $lang_string = join(", ", $use_langs); + $lang_string = str_replace("$lang_default", "$hold", $lang_string); + $lang_string = $lang_default . ", " . $lang_string; } else { - /** - * Yes, he is dumb. - */ - $lang_string = join(', ', $use_langs); + /** + * Yes, he is dumb. + */ + $lang_string = join(', ', $use_langs); } } else { /** @@ -86,13 +86,13 @@ if (sizeof($use_langs)){ } $old_lang_string = join(", ", $langs); $words = str_replace("# LANG: $old_lang_string", "# LANG: $lang_string", - $words); + $words); /** * Write it down where the sun don't shine. */ sqspell_writeWords($words); sqspell_makePage(_("International Dictionaries Preferences Updated"), - null, $msg); + null, $msg); /** * For Emacs weenies: @@ -101,4 +101,4 @@ sqspell_makePage(_("International Dictionaries Preferences Updated"), * End: * vim: syntax=php */ -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/lang_setup.mod b/plugins/squirrelspell/modules/lang_setup.mod index f1a1d889..94868ce7 100644 --- a/plugins/squirrelspell/modules/lang_setup.mod +++ b/plugins/squirrelspell/modules/lang_setup.mod @@ -4,16 +4,16 @@ * --------------- * Squirrelspell module * - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This module displays available dictionaries to the user and lets * him/her choose which ones s/he wants to check messages with. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $SQSPELL_APP; diff --git a/plugins/squirrelspell/modules/options_main.mod b/plugins/squirrelspell/modules/options_main.mod index 8ebe5193..a559bcb0 100644 --- a/plugins/squirrelspell/modules/options_main.mod +++ b/plugins/squirrelspell/modules/options_main.mod @@ -3,15 +3,15 @@ * options_main.mod * ---------------- * Squirrelspell module - * Copyright (c) 1999-2003 The SquirrelMail development team + * Copyright (c) 1999-2004 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Default page called when accessing SquirrelSpell's options. * - * $Id$ - * - * @author Konstantin Riabitsev ($Author$) - * @version $Date$ + * @author Konstantin Riabitsev + * @version $Id$ + * @package plugins + * @subpackage squirrelspell */ global $SQSPELL_APP; -- 2.25.1