[prev in list] [next in list] [prev in thread] [next in thread]
List: squirrelmail-cvs
Subject: [SM-CVS] SF.net SVN: squirrelmail:[14436] branches/SM-1_4-STABLE/squirrelmail
From: pdontthink () users ! sourceforge ! net
Date: 2014-01-21 21:31:00
Message-ID: E1W5iuW-0008NX-3p () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 14436
http://sourceforge.net/p/squirrelmail/code/14436
Author: pdontthink
Date: 2014-01-21 21:30:59 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
Correction to variable name
Modified Paths:
--------------
branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php
branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php
branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog
branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php
branches/SM-1_4-STABLE/squirrelmail/plugins/filters/filters.php
branches/SM-1_4-STABLE/squirrelmail/plugins/filters/options.php
branches/SM-1_4-STABLE/squirrelmail/plugins/filters/spamoptions.php
branches/SM-1_4-STABLE/squirrelmail/plugins/info/options.php
branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php
branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php
branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php
branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_bottom.php
branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/setup.php
branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/setup.php
branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/spamcop.php
branches/SM-1_4-STABLE/squirrelmail/src/compose.php
branches/SM-1_4-STABLE/squirrelmail/src/delete_message.php
branches/SM-1_4-STABLE/squirrelmail/src/download.php
branches/SM-1_4-STABLE/squirrelmail/src/empty_trash.php
branches/SM-1_4-STABLE/squirrelmail/src/folders.php
branches/SM-1_4-STABLE/squirrelmail/src/folders_create.php
branches/SM-1_4-STABLE/squirrelmail/src/folders_delete.php
branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_do.php
branches/SM-1_4-STABLE/squirrelmail/src/folders_subscribe.php
branches/SM-1_4-STABLE/squirrelmail/src/left_main.php
branches/SM-1_4-STABLE/squirrelmail/src/move_messages.php
branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php
branches/SM-1_4-STABLE/squirrelmail/src/read_body.php
branches/SM-1_4-STABLE/squirrelmail/src/redirect.php
branches/SM-1_4-STABLE/squirrelmail/src/right_main.php
branches/SM-1_4-STABLE/squirrelmail/src/search.php
branches/SM-1_4-STABLE/squirrelmail/src/vcard.php
branches/SM-1_4-STABLE/squirrelmail/src/view_header.php
branches/SM-1_4-STABLE/squirrelmail/src/view_text.php
Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -90,7 +90,7 @@
//
if ($reply_id) {
global $imapConnection, $username, $key, $imapServerAddress,
- $imapPort, $imapSslOptions, $mailbox;
+ $imapPort, $imap_stream_options, $mailbox;
// try our best to use an existing IMAP handle
//
@@ -104,7 +104,7 @@
} else {
$close_imap_stream = TRUE;
$my_imap_stream = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0, $imapSslOptions);
+ $imapPort, 0, $imap_stream_options);
}
sqimap_mailbox_select($my_imap_stream, $mailbox);
@@ -449,11 +449,11 @@
* @param string $pass password to log into the SMTP server with
* @param boolean $authpop whether or not to use POP-before-SMTP authorization
* @param string $pop_host host name or IP to connect to for POP-before-SMTP \
authorization
- * @param array $ssl_options SSL context options (OPTIONAL), see \
http://www.php.net/manual/context.php and especially \
http://www.php.net/manual/context.ssl.php + * @param array $stream_options \
Stream context options (OPTIONAL), see http://www.php.net/manual/context.php and \
especially http://www.php.net/manual/context.ssl.php
*
* @return handle $stream file handle resource to SMTP stream
*/
- function initStream($message, $domain, $length=0, $host='', $port='', $user='', \
$pass='', $authpop=false, $pop_host='', $ssl_options=array()) { + function \
initStream($message, $domain, $length=0, $host='', $port='', $user='', $pass='', \
$authpop=false, $pop_host='', $stream_options=array()) { return $stream;
}
Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -27,7 +27,7 @@
}
}
- function initStream($message, $domain, $length=0, $host='', $port='', $user='', \
$pass='', $authpop=false, $pop_host='', ssl_options=array()) { + function \
initStream($message, $domain, $length=0, $host='', $port='', $user='', $pass='', \
$authpop=false, $pop_host='', stream_options=array()) { global $use_smtp_tls, \
$smtp_auth_mech;
if ($authpop) {
@@ -62,7 +62,7 @@
if (($use_smtp_tls == true) and (check_php_version(4,3)) and \
(extension_loaded('openssl'))) { if (function_exists('stream_socket_client')) {
$server_address = 'ssl://' . $host . ':' . $port;
- $ssl_context = @stream_context_create($ssl_options);
+ $ssl_context = @stream_context_create($stream_options);
$connect_timeout = ini_get('default_socket_timeout');
// null timeout is broken
if ($connect_timeout == 0)
Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -84,7 +84,7 @@
*
* @param Message $message Message object containing the from address
* @param string $sendmail_path Location of sendmail binary
- * @param mixed $ignore Seven extra arguments that the parent class
+ * @param mixed $ignore Eight extra arguments that the parent class
* requires which are not used here
* @return void
* @access public
Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2014-01-21 20:19:48 UTC (rev \
14435)
+++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog 2014-01-21 21:30:59 UTC (rev \
14436) @@ -66,9 +66,9 @@
line 322...")
- Added advanced control over the SSL context used when connecting
to the SMTP and IMAP servers over SSL/TLS (thanks to Emmanuel
- Dreyfus). You can take a look at $imapSslOptions and $smtpSslOptions
- in config_local.example.php in SquirrelMail version 1.5.2 for more
- information.
+ Dreyfus). You can take a look at $imap_stream_options and
+ $smtp_stream_options in config_local.example.php in SquirrelMail
+ version 1.5.2 for more information.
- Added ability to show login error from the IMAP server instead of
traditional "Unknown user or password incorrect" (thanks to Alain
Williams). See $display_imap_login_error in the configuration
Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -479,7 +479,7 @@
* Logs the user into the IMAP server. If $hide is set, no error messages
* will be displayed. This function returns the IMAP connection handle.
*/
-function sqimap_login ($username, $password, $imap_server_address, $imap_port, \
$hide, $ssl_options=array()) { +function sqimap_login ($username, $password, \
$imap_server_address, $imap_port, $hide, $stream_options=array()) {
global $color, $squirrelmail_language, $onetimepad, $use_imap_tls, \
$imap_auth_mech, $sqimap_capabilities, $display_imap_login_error;
@@ -519,7 +519,7 @@
if (($use_imap_tls == true) and (check_php_version(4,3)) and \
(extension_loaded('openssl'))) { if (function_exists('stream_socket_client')) {
$server_address = 'ssl://' . $imap_server_address . ':' . $imap_port;
- $ssl_context = @stream_context_create($ssl_options);
+ $ssl_context = @stream_context_create($stream_options);
$connect_timeout = ini_get('default_socket_timeout');
// null timeout is broken
if ($connect_timeout == 0)
Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -34,12 +34,12 @@
* @return array all option information
*/
function load_optpage_data_folder() {
- global $username, $key, $imapServerAddress, $imapPort, $imapSslOptions;
+ global $username, $key, $imapServerAddress, $imapPort, $imap_stream_options;
global $folder_prefix, $default_folder_prefix, $show_prefix_option;
/* Get some imap data we need later. */
$imapConnection =
- sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); + sqimap_login($username, $key, $imapServerAddress, \
$imapPort, 0, $imap_stream_options); $boxes = sqimap_mailbox_list($imapConnection);
/* Build a simple array into which we will build options. */
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/filters/filters.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/filters/filters.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/filters/filters.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -180,7 +180,7 @@
* @access private
*/
function start_filters() {
- global $mailbox, $imapServerAddress, $imapPort, $imapSslOptions,
+ global $mailbox, $imapServerAddress, $imapPort, $imap_stream_options,
$imap_general, $filters, $imap_stream, $imapConnection,
$UseSeparateImapConnection, $AllowSpamFilters;
@@ -214,7 +214,7 @@
if ((!isset($imap_stream) && !isset($imapConnection)) ||
$UseSeparateImapConnection ) {
$stream = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 10, $imapSslOptions);
+ $imapPort, 10, $imap_stream_options);
$previously_connected = false;
} else if (isset($imapConnection)) {
$stream = $imapConnection;
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/filters/options.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/filters/options.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/filters/options.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -52,7 +52,7 @@
sqgetGlobalVar('theid', $theid);
sqgetGlobalVar('action', $action, SQ_GET);
-global $imapSslOptions; // in case not defined in config
+global $imap_stream_options; // in case not defined in config
if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
@@ -155,7 +155,7 @@
if (isset($action) && ($action == 'add' || $action == 'edit')) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, \
$imapPort, 0, $imapSslOptions); + $imapConnection = sqimap_login($username, \
$key, $imapServerAddress, $imapPort, 0, $imap_stream_options); $boxes = \
sqimap_mailbox_list($imapConnection);
for ($a = 0, $cnt = count($boxes); $a < $cnt; $a++) {
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/filters/spamoptions.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/filters/spamoptions.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/filters/spamoptions.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -47,7 +47,7 @@
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('action', $action, SQ_GET);
-global $imapSslOptions; // in case not defined in config
+global $imap_stream_options; // in case not defined in config
/* end globals */
displayPageHeader($color, 'None');
@@ -102,7 +102,7 @@
if (isset($action) && $action == 'spam') {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, \
0, $imapSslOptions); + $imapConnection = sqimap_login($username, $key, \
$imapServerAddress, $imapPort, 0, $imap_stream_options); $boxes = \
sqimap_mailbox_list($imapConnection); sqimap_logout($imapConnection);
$numboxes = count($boxes);
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/info/options.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/info/options.php 2014-01-21 20:19:48 \
UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/info/options.php 2014-01-21 21:30:59 \
UTC (rev 14436) @@ -55,8 +55,8 @@
/* END GLOBALS */
-global $imapSslOptions; // in case not defined in config
-$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); $caps_array = get_caps($imap_stream);
$list = array (
'TEST_0',
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/fetch.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -29,7 +29,7 @@
sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-global $imapSslOptions; // in case not defined in config
+global $imap_stream_options; // in case not defined in config
/* end globals */
function Mail_Fetch_Status($msg) {
@@ -152,7 +152,7 @@
}
Mail_Fetch_Status(_("Opening IMAP server"));
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10, \
$imapSslOptions); + $imap_stream = sqimap_login($username, $key, \
$imapServerAddress, $imapPort, 10, $imap_stream_options);
// check if destination folder is not set, is not subscribed and is not \
\noselect folder if($mailfetch_subfolder == '' ||
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/options.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -28,7 +28,7 @@
sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-global $imapSslOptions; // in case not defined in config
+global $imap_stream_options; // in case not defined in config
if(!sqgetGlobalVar('mf_cypher', $mf_cypher, SQ_POST)) {
$mf_cypher = '';
@@ -276,7 +276,7 @@
html_tag( 'tr' ) .
html_tag( 'th', _("Store in Folder:"), 'right' ) .
html_tag( 'td', '', 'left' );
- $imapConnection = sqimap_login ($username, $key, $imapServerAddress, \
$imapPort, 0, $imapSslOptions); + $imapConnection = sqimap_login ($username, \
$key, $imapServerAddress, $imapPort, 0, $imap_stream_options); $boxes = \
sqimap_mailbox_list($imapConnection); echo '<select name="mf_subfolder">';
@@ -392,7 +392,7 @@
html_tag( 'th', _("Store in Folder:"), 'right' ) .
html_tag( 'td', '', 'left' );
- $imapConnection = sqimap_login ($username, $key, $imapServerAddress, \
$imapPort, 0, $imapSslOptions); + $imapConnection = sqimap_login ($username, \
$key, $imapServerAddress, $imapPort, 0, $imap_stream_options); $boxes = \
sqimap_mailbox_list($imapConnection); echo '<select name="mf_subfolder">';
$selected = 0;
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/mail_fetch/setup.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -69,7 +69,7 @@
require_once (SM_PATH . 'plugins/mail_fetch/class.POP3.php');
require_once (SM_PATH . 'plugins/mail_fetch/functions.php');
- global $data_dir, $imapServerAddress, $imapPort, $imapSslOptions;
+ global $data_dir, $imapServerAddress, $imapPort, $imap_stream_options;
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('key', $key, SQ_COOKIE);
@@ -123,7 +123,7 @@
continue;
}
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, \
$imapPort, 10, $imapSslOptions); + $imap_stream = sqimap_login($username, \
$key, $imapServerAddress, $imapPort, 10, $imap_stream_options);
$Count = $pop3->login($mailfetch_user, $mailfetch_pass);
if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_bottom.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_bottom.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/message_details/message_details_bottom.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -33,7 +33,7 @@
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-global $imapSslOptions; // in case not defined in config
+global $imap_stream_options; // in case not defined in config
/**
* Calculates id of MIME entity
@@ -72,7 +72,7 @@
return ($result);
}
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +$imapConnection = sqimap_login($username, $key, \
$imapServerAddress, $imapPort, 0, $imap_stream_options); $read = \
sqimap_mailbox_select($imapConnection, $mailbox); if (!empty($passed_ent_id))
$body = sqimap_run_command($imapConnection, "FETCH $passed_id \
BODY[$passed_ent_id]",true, $response, $readmessage, $uid_support);
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/setup.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/setup.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/sent_subfolders/setup.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -102,14 +102,14 @@
* Adds sent_subfolders options in folder preferences
*/
function sent_subfolders_optpage_loadhook_folders() {
- global $optpage_data, $imapServerAddress, $imapPort, $imapSslOptions;
+ global $optpage_data, $imapServerAddress, $imapPort, $imap_stream_options;
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('key', $key, SQ_COOKIE);
/* Get some imap data we need later. */
$imapConnection =
- sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); + sqimap_login($username, $key, $imapServerAddress, \
$imapPort, 0, $imap_stream_options); $boxes = sqimap_mailbox_list($imapConnection);
sqimap_logout($imapConnection);
@@ -191,7 +191,7 @@
function sent_subfolders_update_sentfolder() {
global $sent_folder, $auto_create_special, $auto_create_done;
global $sent_subfolders_base, $sent_subfolders_setting;
- global $data_dir, $imapServerAddress, $imapPort, $imapSslOptions;
+ global $data_dir, $imapServerAddress, $imapPort, $imap_stream_options;
global $use_sent_subfolders, $move_to_sent, $imap_server_type;
sqgetGlobalVar('username', $username, SQ_SESSION);
@@ -259,7 +259,7 @@
if ($sent_folder != 'none') {
/* Create the imap connection. */
$ic = sqimap_login
- ($username, $key, $imapServerAddress, $imapPort, 10, \
$imapSslOptions); + ($username, $key, $imapServerAddress, $imapPort, \
10, $imap_stream_options);
/* Auto-create the year folder, if it does not yet exist.
(only for monthly/quarterly modes */
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/setup.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/setup.php 2014-01-21 20:19:48 \
UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/setup.php 2014-01-21 21:30:59 \
UTC (rev 14436) @@ -121,7 +121,7 @@
// When we send the email, we optionally trash it then too
function spamcop_while_sending() {
global $mailbox, $spamcop_delete, $auto_expunge,
- $username, $key, $imapServerAddress, $imapPort, $imapSslOptions;
+ $username, $key, $imapServerAddress, $imapPort, $imap_stream_options;
// load sqgetGlobalVar()
include_once(SM_PATH . 'functions/global.php');
@@ -129,7 +129,7 @@
// check if compose.php is called by spamcop plugin
if (sqgetGlobalVar('spamcop_is_composing' , $spamcop_is_composing)) {
if ($spamcop_delete) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, \
$imapPort, 0, $imapSslOptions); + $imapConnection = sqimap_login($username, \
$key, $imapServerAddress, $imapPort, 0, $imap_stream_options); \
sqimap_mailbox_select($imapConnection, $mailbox);
sqimap_msgs_list_delete($imapConnection, $mailbox, \
$spamcop_is_composing); if ($auto_expunge)
Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/spamcop.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/spamcop.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/spamcop/spamcop.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -70,14 +70,14 @@
$composesession = 0;
sqsession_register($composesession, 'composesession');
}
-global $imapSslOptions; // in case not defined in config
+global $imap_stream_options; // in case not defined in config
/* END GLOBALS */
displayPageHeader($color, $mailbox);
$imap_stream = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0, $imapSslOptions);
+ $imapPort, 0, $imap_stream_options);
sqimap_mailbox_select($imap_stream, $mailbox);
if ($spamcop_method == 'quick_email' ||
Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2014-01-21 20:19:48 UTC (rev \
14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php 2014-01-21 21:30:59 UTC (rev \
14436) @@ -691,7 +691,7 @@
function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', \
$session='') { global $editor_size, $default_use_priority, $body, $idents,
$use_signature, $composesession, $data_dir, $username,
- $username, $key, $imapServerAddress, $imapPort, $imapSslOptions,
+ $username, $key, $imapServerAddress, $imapPort, $imap_stream_options,
$composeMessage, $body_quote, $strip_sigs, $do_not_reply_to_self;
global $languages, $squirrelmail_language, $default_charset;
@@ -707,7 +707,7 @@
if ($passed_id) {
$imapConnection = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0, $imapSslOptions);
+ $imapPort, 0, $imap_stream_options);
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
@@ -1608,7 +1608,7 @@
$username, $popuser, $usernamedata, $identity, $idents, $data_dir,
$request_mdn, $request_dr, $default_charset, $color, $useSendmail,
$domain, $action, $default_move_to_sent, $move_to_sent;
- global $imapServerAddress, $imapPort, $imapSslOptions, $sent_folder, $key;
+ global $imapServerAddress, $imapPort, $imap_stream_options, $sent_folder, $key;
$rfc822_header = $composeMessage->rfc822_header;
@@ -1723,7 +1723,7 @@
if (!$useSendmail && !$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $smtpSslOptions,
+ global $smtpServerAddress, $smtpPort, $smtp_stream_options,
$pop_before_smtp, $pop_before_smtp_host;
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
@@ -1736,7 +1736,7 @@
get_smtp_user($user, $pass);
$stream = $deliver->initStream($composeMessage,$domain,0,
- $smtpServerAddress, $smtpPort, $user, $pass, $authPop, \
$pop_before_smtp_host, $smtpSslOptions); + $smtpServerAddress, \
$smtpPort, $user, $pass, $authPop, $pop_before_smtp_host, $smtp_stream_options); } \
elseif (!$draft) {
require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
global $sendmail_path, $sendmail_args;
@@ -1753,7 +1753,7 @@
} elseif ($draft) {
global $draft_folder;
$imap_stream = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0, $imapSslOptions);
+ $imapPort, 0, $imap_stream_options);
if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
@@ -1785,7 +1785,7 @@
plain_error_message($msg, $color);
} else {
unset ($deliver);
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, \
0, $imapSslOptions); + $imap_stream = sqimap_login($username, $key, \
$imapServerAddress, $imapPort, 0, $imap_stream_options);
// mark original message as having been replied to if applicable
Modified: branches/SM-1_4-STABLE/squirrelmail/src/delete_message.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/delete_message.php 2014-01-21 20:19:48 \
UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/delete_message.php 2014-01-21 21:30:59 \
UTC (rev 14436) @@ -56,8 +56,8 @@
// first, validate security token
sm_validate_security_token($submitted_token, -1, TRUE);
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options);
sqimap_mailbox_select($imapConnection, $mailbox);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/download.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/download.php 2014-01-21 20:19:48 UTC (rev \
14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/download.php 2014-01-21 21:30:59 UTC (rev \
14436) @@ -48,8 +48,8 @@
global $uid_support;
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); $mbx_response = sqimap_mailbox_select($imapConnection, \
$mailbox);
$message = '';
Modified: branches/SM-1_4-STABLE/squirrelmail/src/empty_trash.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/empty_trash.php 2014-01-21 20:19:48 UTC \
(rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/empty_trash.php 2014-01-21 21:30:59 UTC \
(rev 14436) @@ -41,8 +41,8 @@
$submitted_token = '';
sm_validate_security_token($submitted_token, -1, TRUE);
-global $imapSslOptions; // in case not defined in config
-$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options);
sqimap_mailbox_list($imap_stream);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/folders.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/folders.php 2014-01-21 20:19:48 UTC (rev \
14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/folders.php 2014-01-21 21:30:59 UTC (rev \
14436) @@ -91,8 +91,8 @@
echo "\n<br />";
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options);
// force retrieval of a non cached folderlist
$boxes = sqimap_mailbox_list($imapConnection,true);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/folders_create.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/folders_create.php 2014-01-21 20:19:48 \
UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/folders_create.php 2014-01-21 21:30:59 \
UTC (rev 14436) @@ -75,8 +75,8 @@
$subfolder_orig = $subfolder;
}
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options);
if (trim($subfolder_orig) == '') {
sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, \
$folder_type);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/folders_delete.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/folders_delete.php 2014-01-21 20:19:48 \
UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/folders_delete.php 2014-01-21 21:30:59 \
UTC (rev 14436) @@ -91,8 +91,8 @@
// first, validate security token
sm_validate_security_token($submitted_token, -1, TRUE);
-global $imapSslOptions; // in case not defined in config
-$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options);
$boxes = sqimap_mailbox_list ($imap_stream);
$numboxes = count($boxes);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_do.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_do.php 2014-01-21 20:19:48 \
UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/folders_rename_do.php 2014-01-21 21:30:59 \
UTC (rev 14436) @@ -61,8 +61,8 @@
if ($old_name <> $new_name) {
- global $imapSslOptions; // in case not defined in config
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, \
0, $imapSslOptions); + global $imap_stream_options; // in case not defined in \
config + $imapConnection = sqimap_login($username, $key, $imapServerAddress, \
$imapPort, 0, $imap_stream_options);
if (strpos($orig, $delimiter)) {
$old_dir = substr($orig, 0, strrpos($orig, $delimiter));
Modified: branches/SM-1_4-STABLE/squirrelmail/src/folders_subscribe.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/folders_subscribe.php 2014-01-21 20:19:48 \
UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/folders_subscribe.php 2014-01-21 21:30:59 \
UTC (rev 14436) @@ -49,8 +49,8 @@
exit(0);
}
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options);
if ($method == 'sub') {
if($no_list_for_subscribe && $imap_server_type == 'cyrus') {
Modified: branches/SM-1_4-STABLE/squirrelmail/src/left_main.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/left_main.php 2014-01-21 20:19:48 UTC \
(rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/left_main.php 2014-01-21 21:30:59 UTC \
(rev 14436) @@ -310,8 +310,8 @@
header('Expires: Sat, 1 Jan 2000 00:00:00 GMT');
// open a connection to the IMAP server
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10, \
$imapSslOptions); // the 10 is to hide the output +global $imap_stream_options; // in \
case not defined in config +$imapConnection = sqimap_login($username, $key, \
$imapServerAddress, $imapPort, 10, $imap_stream_options); // the 10 is to hide the \
output
/**
* Using stristr since older preferences may contain "None" and "none".
Modified: branches/SM-1_4-STABLE/squirrelmail/src/move_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/move_messages.php 2014-01-21 20:19:48 UTC \
(rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/move_messages.php 2014-01-21 21:30:59 UTC \
(rev 14436) @@ -159,8 +159,8 @@
// security check
sm_validate_security_token($submitted_token, -1, TRUE);
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); $mbx_response=sqimap_mailbox_select($imapConnection, \
$mailbox);
$location = set_url_var($location,'composenew',0,false);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2014-01-21 \
20:19:48 UTC (rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/printer_friendly_bottom.php 2014-01-21 \
21:30:59 UTC (rev 14436) @@ -42,8 +42,8 @@
/* end globals */
$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', false);
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); $mbx_response = sqimap_mailbox_select($imapConnection, \
$mailbox); if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) {
$message = $messages[$mbx_response['UIDVALIDITY']][$passed_id];
Modified: branches/SM-1_4-STABLE/squirrelmail/src/read_body.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/read_body.php 2014-01-21 20:19:48 UTC \
(rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/read_body.php 2014-01-21 21:30:59 UTC \
(rev 14436) @@ -771,8 +771,8 @@
/* end of get globals */
global $uid_support, $sqimap_capabilities;
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); $mbx_response = sqimap_mailbox_select($imapConnection, \
$mailbox, false, false, true);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/redirect.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/redirect.php 2014-01-21 20:19:48 UTC (rev \
14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/redirect.php 2014-01-21 21:30:59 UTC (rev \
14436) @@ -102,8 +102,8 @@
$login_username = strtolower($login_username);
}
- global $imapSslOptions; // in case not defined in config
- $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, \
$imapPort, 0, $imapSslOptions); + global $imap_stream_options; // in case not \
defined in config + $imapConnection = sqimap_login($login_username, $key, \
$imapServerAddress, $imapPort, 0, $imap_stream_options);
$sqimap_capabilities = sqimap_capability($imapConnection);
sqsession_register($sqimap_capabilities, 'sqimap_capabilities');
Modified: branches/SM-1_4-STABLE/squirrelmail/src/right_main.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/right_main.php 2014-01-21 20:19:48 UTC \
(rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/right_main.php 2014-01-21 21:30:59 UTC \
(rev 14436) @@ -95,8 +95,8 @@
/* Open a connection on the imap port (143) */
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options);
if (isset($PG_SHOWALL)) {
if ($PG_SHOWALL) {
Modified: branches/SM-1_4-STABLE/squirrelmail/src/search.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/search.php 2014-01-21 20:19:48 UTC (rev \
14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/search.php 2014-01-21 21:30:59 UTC (rev \
14436) @@ -287,8 +287,8 @@
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
/* get mailbox names */
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); $boxes = sqimap_mailbox_list($imapConnection);
/* set current mailbox to INBOX if none was selected or if page
Modified: branches/SM-1_4-STABLE/squirrelmail/src/vcard.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/vcard.php 2014-01-21 20:19:48 UTC (rev \
14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/vcard.php 2014-01-21 21:30:59 UTC (rev \
14436) @@ -38,8 +38,8 @@
sqgetGlobalVar('startMessage', $startMessage, SQ_GET);
/* end globals */
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); sqimap_mailbox_select($imapConnection, $mailbox);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/view_header.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/view_header.php 2014-01-21 20:19:48 UTC \
(rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/view_header.php 2014-01-21 21:30:59 UTC \
(rev 14436) @@ -133,9 +133,9 @@
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-global $imapSslOptions; // in case not defined in config
+global $imap_stream_options; // in case not defined in config
$imapConnection = sqimap_login($username, $key, $imapServerAddress,
- $imapPort, 0, $imapSslOptions);
+ $imapPort, 0, $imap_stream_options);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, \
true);
$header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id);
Modified: branches/SM-1_4-STABLE/squirrelmail/src/view_text.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/view_text.php 2014-01-21 20:19:48 UTC \
(rev 14435)
+++ branches/SM-1_4-STABLE/squirrelmail/src/view_text.php 2014-01-21 21:30:59 UTC \
(rev 14436) @@ -46,8 +46,8 @@
-global $imapSslOptions; // in case not defined in config
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imapSslOptions); +global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0, \
$imap_stream_options); $mbx_response = sqimap_mailbox_select($imapConnection, \
$mailbox);
// were we using a reference here just to save memory?
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic