X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fmailto.php;h=0ad9224fc78221582a25fff4f16f6307e63201ab;hb=48d015b4373687e272b90168c0859ab4617babc0;hp=a89c45a51e7c4506b132c6655b537517ede6dfc1;hpb=8f6f9ba5df6491d396aa690dcf3e5b9070a565ca;p=squirrelmail.git

diff --git a/src/mailto.php b/src/mailto.php
index a89c45a5..0ad9224f 100644
--- a/src/mailto.php
+++ b/src/mailto.php
@@ -3,72 +3,77 @@
 /**
  * mailto.php -- mailto: url handler
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This checks to see if we're logged in.  If we are we open up a new
  * compose window for this email, otherwise we go to login.php
  * (the above functionality has been disabled, by default you are required to
  *  login first)
  *
  * Use the following url to use mailto:
- * http://<your server>/<squirrelmail base dir>/src/mailto.php?emailaddress="%1"
+ * http://<your server>/<squirrelmail base dir>/src/mailto.php?emailaddress=%1
  * see ../contrib/squirrelmail.mailto.reg for a Windows Registry file
+ * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package squirrelmail
  */
 
-/** Path for SquirrelMail required files. */
-define('SM_PATH','../');
+// reduce the included files in int.php
+$bLogin = true;
+
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'config/config.php');
-require_once(SM_PATH . 'functions/global.php');
+/* Force users to login each time? */
+$force_login  = true;
+/* Open only the compose window, meaningless if $force_login is true */
+$compose_only = false;
 
 header('Pragma: no-cache');
-if(!sqgetGlobalVar('emailaddress', $emailaddress)) {
-    return;
-}
 
-$mailto_pos = strpos(strtolower($emailaddress), 'mailto:');
-if($mailto_pos !== false) {
-    $emailaddress = substr($emailaddress, $mailto_pos+7);
-    $_GET['emailaddress'] = $emailaddress;
-}
-if(($pos = strpos($emailaddress, '?')) !== false) {
-    $a = substr($emailaddress, $pos+1);
-    list($emailaddress, $a) = explode('?', $emailaddress, 2);
-    $a = explode('=', $a, 2);
-    $_GET['emailaddress'] = $emailaddress;
-    $_GET[$a[0]] = $a[1];
-}
-$trtable = array('emailaddress' => 'send_to',
-                 'cc'           => 'send_to_cc',
+$trtable = array('cc'           => 'send_to_cc',
                  'bcc'          => 'send_to_bcc',
                  'body'         => 'body',
                  'subject'      => 'subject');
 $url = '';
-/* CC, BCC, etc could be any case, so we'll fix them here */
-foreach($_GET as $k=>$g) {
-    if($g != '') {
+
+if(sqgetGlobalVar('emailaddress', $emailaddress)) {
+    $emailaddress = trim($emailaddress);
+    if(stristr($emailaddress, 'mailto:')) {
+        $emailaddress = substr($emailaddress, 7);
+    }
+    if(strpos($emailaddress, '?') !== false) {
+        list($emailaddress, $a) = explode('?', $emailaddress, 2);
+        if(strlen(trim($a)) > 0) {
+            $a = explode('=', $a, 2);
+            $url .= $trtable[strtolower($a[0])] . '=' . urlencode($a[1]) . '&';
+        }
+    }
+    $url = 'send_to=' . urlencode($emailaddress) . '&' . $url;
+
+    /* CC, BCC, etc could be any case, so we'll fix them here */
+    foreach($_GET as $k=>$g) {
         $k = strtolower($k);
-        $k = $trtable[$k];
-        $url .= $k . '=' . urlencode($g) . '&';
+        if(isset($trtable[$k])) {
+            $k = $trtable[$k];
+            $url .= $k . '=' . urlencode($g) . '&';
+        }
     }
+    $url = substr($url, 0, -1);
 }
-$url = substr($url, 0, -1);
 
-sqsession_is_active();
-/* Check to see if we're logged in */
-/*
-if (sqsession_is_registered('user_is_logged_in')) {
-    $redirect = 'webmail.php?right_frame=compose.php?';
+if($force_login == false && sqsession_is_registered('user_is_logged_in')) {
+    if($compose_only == true) {
+        $redirect = 'compose.php?' . $url;
+    } else {
+        $redirect = 'webmail.php?right_frame=compose.php?' . urlencode($url);
+    }
 } else {
-    $redirect = 'login.php?mailto=';
+    $redirect = 'login.php?mailto=' . urlencode($url);
 }
-*/
-$url = urlencode($url);
-/* $redirect .= $url; */
-$redirect = 'login.php?mailto=' . $url;
+
 session_write_close();
-header('Location: ' .get_location(). $redirect);
-?>
+header('Location: ' . get_location() . '/' . $redirect);
+
+?>
\ No newline at end of file