[prev in list] [next in list] [prev in thread] [next in thread]
List: squirrelmail-cvs
Subject: [SM-CVS] CVS: squirrelmail/functions attachment_common.php,1.33,1.34 imap_general.php,1.198,1.199 im
From: Jimmy Conner <cigamit () users ! sourceforge ! net>
Date: 2004-10-31 23:24:39
Message-ID: E1COP3v-0003p7-8U () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14325/functions
Modified Files:
attachment_common.php imap_general.php imap_mailbox.php
imap_messages.php imap_search.php mime.php options.php
page_header.php prefs.php
Log Message:
Remove unused globals
Index: attachment_common.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/attachment_common.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -r1.33 -r1.34
--- attachment_common.php 26 Oct 2004 05:43:11 -0000 1.33
+++ attachment_common.php 31 Oct 2004 23:24:03 -0000 1.34
@@ -146,7 +146,7 @@
}
function attachment_common_link_image(&$Args) {
- global $attachment_common_show_images, $attachment_common_show_images_list;
+ global $attachment_common_show_images_list;
sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
Index: imap_general.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_general.php,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -w -r1.198 -r1.199
--- imap_general.php 29 Oct 2004 18:15:59 -0000 1.198
+++ imap_general.php 31 Oct 2004 23:24:03 -0000 1.199
@@ -548,7 +548,7 @@
* @return imap-stream resource identifier
*/
function sqimap_create_stream($server,$port,$tls=false) {
- global $username, $use_imap_tls, $squirrelmail_language;
+ global $squirrelmail_language;
if ($tls == true) {
if ((check_php_version(4,3)) and (extension_loaded('openssl'))) {
Index: imap_mailbox.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_mailbox.php,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -w -r1.241 -r1.242
--- imap_mailbox.php 9 Oct 2004 12:46:40 -0000 1.241
+++ imap_mailbox.php 31 Oct 2004 23:24:04 -0000 1.242
@@ -749,7 +749,7 @@
}
function sqimap_mailbox_tree($imap_stream) {
- global $default_folder_prefix, $unseen_notify, $unseen_type;
+ global $default_folder_prefix;
if (true) {
global $data_dir, $username, $list_special_folders_first,
$folder_prefix, $delimiter, $trash_folder, $move_to_trash,
Index: imap_messages.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_messages.php,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -w -r1.176 -r1.177
--- imap_messages.php 28 Oct 2004 05:17:41 -0000 1.176
+++ imap_messages.php 31 Oct 2004 23:24:04 -0000 1.177
@@ -131,8 +131,7 @@
* @return array $id sorted uid list
*/
function sqimap_get_sort_order($imap_stream, $sSortField, $reverse, $search='ALL') {
- global $default_charset,
- $sent_folder;
+ global $default_charset;
$id = array();
$sort_test = array();
@@ -936,7 +935,7 @@
* Deprecated !!!!!!! DO NOT USE THIS, use sqimap_msgs_list_delete instead
*/
function sqimap_messages_delete($imap_stream, $start, $end, $mailbox, $bypass_trash=false) {
- global $move_to_trash, $trash_folder, $auto_expunge;
+ global $move_to_trash, $trash_folder;
if (($move_to_trash == true) && ($bypass_trash != true) &&
(sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
Index: imap_search.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_search.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -w -r1.68 -r1.69
--- imap_search.php 24 Aug 2004 00:40:28 -0000 1.68
+++ imap_search.php 31 Oct 2004 23:24:04 -0000 1.69
@@ -24,8 +24,7 @@
function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
$color, $search_position = '', $search_all, $count_all) {
- global $message_highlight_list, $squirrelmail_language, $languages,
- $index_order, $pos, $allow_charset_search,
+ global $squirrelmail_language, $languages, $pos, $allow_charset_search,
$imap_server_type;
$pos = $search_position;
Index: mime.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mime.php,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -w -r1.318 -r1.319
--- mime.php 28 Oct 2004 18:28:44 -0000 1.318
+++ mime.php 31 Oct 2004 23:24:04 -0000 1.319
@@ -341,9 +341,8 @@
* primary message. To add more of them, just put them in the
* order that is their priority.
*/
- global $startMessage, $username, $key, $imapServerAddress, $imapPort,
+ global $startMessage, $languages, $squirrelmail_language,
$show_html_default, $sort, $has_unsafe_images, $passed_ent_id;
- global $languages, $squirrelmail_language;
if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
$view_unsafe_images = false;
@@ -422,7 +421,6 @@
function formatAttachments($message, $exclude_id, $mailbox, $id) {
global $where, $what, $startMessage, $color, $passed_ent_id;
- static $ShownHTML = 0;
$att_ar = $message->getAttachments($exclude_id);
Index: options.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/options.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -w -r1.52 -r1.53
--- options.php 28 Oct 2004 05:50:39 -0000 1.52
+++ options.php 31 Oct 2004 23:24:05 -0000 1.53
@@ -154,7 +154,7 @@
}
function createHTMLWidget() {
- global $javascript_on, $color;
+ global $color;
// Use new value if available
if (!empty($this->new_value)) {
Index: page_header.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/page_header.php,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -w -r1.173 -r1.174
--- page_header.php 7 Sep 2004 13:46:36 -0000 1.173
+++ page_header.php 31 Oct 2004 23:24:05 -0000 1.174
@@ -124,9 +124,8 @@
global $hide_sm_attributions, $PHP_SELF, $frame_top,
$compose_new_win, $compose_width, $compose_height,
- $attachemessages, $provider_name, $provider_uri,
- $javascript_on, $default_use_mdn, $mdn_user_support,
- $startMessage;
+ $provider_name, $provider_uri, $startMessage,
+ $javascript_on, $default_use_mdn, $mdn_user_support;
sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION );
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION );
@@ -371,7 +370,7 @@
* Locate the first displayable form element (only when JavaScript on)
*/
if($javascript_on) {
- global $delimiter, $base_uri, $PHP_SELF, $data_dir, $username;
+ global $base_uri, $PHP_SELF, $data_dir, $username;
$module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
Index: prefs.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/prefs.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -w -r1.75 -r1.76
--- prefs.php 24 Aug 2004 00:40:28 -0000 1.75
+++ prefs.php 31 Oct 2004 23:24:05 -0000 1.76
@@ -47,7 +47,6 @@
* @return string the hashed location of datafile
*/
function getHashedFile($username, $dir, $datafile, $hash_search = true) {
- global $dir_hash_level;
/* Remove trailing slash from $dir if found */
if (substr($dir, -1) == '/') {
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic