X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fsquirrelspell%2Fsqspell_interface.php;h=c9d9f981e5b5ca82002e304c724f4e330c68a8b7;hp=837cbf8e1e81f5d8ec82ef1d667224266b225a1f;hb=16dd8736f68b753f06df30ff39892ef18579e2ce;hpb=8d6a115b0ef06dbcf9b149ba2509208f09b3a2ab

diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index 837cbf8e..c9d9f981 100644
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -5,50 +5,47 @@
  *
  * Main wrapper for the pop-up.
  *
- * Copyright (c) 1999-2002 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This is a main wrapper for the pop-up window interface of
- * SquirrelSpell.    
- *
- * $Id$
+ * SquirrelSpell.
  *
- * @author Konstantin Riabitsev <icon@duke.edu> ($Author$)
- * @version $Date$
+ * @author Konstantin Riabitsev <icon at duke.edu>
+ * @copyright 1999-2012 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage squirrelspell
+ */
+
+/**
+ * Include the SquirrelMail initialization file.
  */
+require('../../include/init.php');
 
-/**    	
+/**
  * Set up a couple of non-negotiable constants and
  * defaults. Don't change these, * the setuppable stuff is in
  * sqspell_config.php
  */
 $SQSPELL_DIR='plugins/squirrelspell/';
 $SQSPELL_CRYPTO=FALSE;
-    
-/**
- * Load the stuff needed from squirrelmail
- */
 
-define('SM_PATH','../../');
+include_once(SM_PATH . $SQSPELL_DIR . 'sqspell_functions.php');
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'include/load_prefs.php');
-require_once($SQSPELL_DIR . 'sqspell_config.php');
-require_once($SQSPELL_DIR . 'sqspell_functions.php');
-    
 /**
  * $MOD is the name of the module to invoke.
- * If $MOD is undefined, use "init", else check for security
- * breaches.
+ * If $MOD is unspecified, assign "init" to it. Else check for
+ * security breach attempts.
  */
-if (!isset($MOD) || !$MOD){
-    $MOD='init';
-} else {
-    sqspell_ckMOD($MOD);
+if(! sqgetGlobalVar('MOD',$MOD,SQ_FORM)) {
+    $MOD = 'init';
 }
+sqspell_ckMOD($MOD);
 
-/* Include the module. */
-require_once($SQSPELL_DIR . "modules/$MOD.mod");
-
-?>
+/* Load the stuff already. */
+if (file_exists(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod")) {
+    require_once(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod");
+} else {
+    error_box(_("Invalid SquirrelSpell module."));
+    // display sm footer (closes html tags)
+    $oTemplate->display('footer.tpl');
+}