X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fsquirrelspell%2Fsqspell_options.php;h=bde8bcf8cc3a569a17dcc6c0442e33c348b4493d;hp=009f5959e7a0aae12a66b7b6f9e9e4f263878a43;hb=5d55011bdf7fe06a1f88c5502f44a4f5a245b4cb;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe

diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php
index 009f5959..bde8bcf8 100644
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -1,56 +1,50 @@
 <?php
+
 /**
- * sqspell_options.php 
+ * sqspell_options.php
  *
  * Main wrapper for the options interface.
  *
- * Copyright (c) 1999-2003 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
- *
- * @author Konstantin Riabitsev <icon@duke.edu> ($Author$)
- * @version $Date$
+ * @author Konstantin Riabitsev <icon at duke.edu>
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage squirrelspell
  */
 
 /**
- * Set a couple of constants and defaults. Don't change these, 
+ * Include the SquirrelMail initialization file.
+ */
+require('../../include/init.php');
+
+/**
+ * Set a couple of constants and defaults. Don't change these,
  * the configurable stuff is in sqspell_config.php
+ * @todo do we really need $SQSPELL_DIR var?
  */
 $SQSPELL_DIR='plugins/squirrelspell/';
 $SQSPELL_CRYPTO=FALSE;
 
-/**
- * Load some necessary stuff from squirrelmail. 
- */
-define('SM_PATH','../../');
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'include/load_prefs.php');
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . $SQSPELL_DIR . 'sqspell_config.php');
-require_once(SM_PATH . $SQSPELL_DIR . 'sqspell_functions.php');
+
+include_once(SM_PATH . $SQSPELL_DIR . 'sqspell_functions.php');
 
 /**
  * $MOD is the name of the module to invoke.
- * If $MOD is unspecified, assign "init" to it. Else check for
+ * If $MOD is unspecified, assign "options_main" to it. Else check for
  * security breach attempts.
  */
-if(isset($_POST['MOD'])) {
-    $MOD = $_POST['MOD'];
-} elseif (isset($_GET['MOD'])) {
-    $MOD = $_GET['MOD'];
+if(! sqgetGlobalVar('MOD',$MOD,SQ_FORM)) {
+    $MOD = 'options_main';
 }
+sqspell_ckMOD($MOD);
 
-if(!isset($MOD) || !$MOD) {
-  $MOD = 'options_main';
+/* Load the stuff already. */
+if (file_exists(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod")) {
+    require_once(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod");
 } else {
-  sqspell_ckMOD($MOD);
+    error_box(_("Invalid SquirrelSpell module."));
+    // display footer (closes html tags)
+    $oTemplate->display('footer.tpl');
 }
-
-/* Load the stuff already. */
-require_once(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod");
-
-?>