From: tokul Date: Sun, 24 Apr 2005 08:55:59 +0000 (+0000) Subject: removing includes that are loaded by validate.php. X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=5c89bd6391d2c9527db3145a7b0e8cf9b3190008;ds=sidebyside removing includes that are loaded by validate.php. switching other files from require_once() to include_once(). They might be already loaded by plugins attached to load_prefs hook. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9386 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php index 2bb9d2d4..e902182c 100644 --- a/plugins/mail_fetch/fetch.php +++ b/plugins/mail_fetch/fetch.php @@ -17,12 +17,9 @@ define('SM_PATH','../../'); require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'functions/imap.php'); -require_once(SM_PATH . 'include/load_prefs.php'); -require_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php'); -require_once(SM_PATH . 'plugins/mail_fetch/functions.php' ); -require_once(SM_PATH . 'functions/html.php' ); +include_once(SM_PATH . 'functions/imap.php'); +include_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php'); +include_once(SM_PATH . 'plugins/mail_fetch/functions.php' ); /* globals */ sqgetGlobalVar('username', $username, SQ_SESSION); @@ -31,133 +28,133 @@ sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); /* end globals */ - function Mail_Fetch_Status($msg) { - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', htmlspecialchars( $msg ) , 'left' ) - ), - '', '', 'width="90%"' ); - flush(); +function Mail_Fetch_Status($msg) { + echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', htmlspecialchars( $msg ) , 'left' ) + ), + '', '', 'width="90%"' ); + flush(); +} + +function Mail_Fetch_Servers() { + global $data_dir, $username; + + $mailfetch['server_number'] = getPref($data_dir, $username, "mailfetch_server_number"); + if (!isset($mailfetch['server_number']) || ($mailfetch['server_number'] < 1)) { + $mailfetch['server_number'] = 0; } - - function Mail_Fetch_Servers() { - global $data_dir, $username; - - $mailfetch['server_number'] = getPref($data_dir, $username, "mailfetch_server_number"); - if (!isset($mailfetch['server_number']) || ($mailfetch['server_number'] < 1)) { - $mailfetch['server_number'] = 0; + $mailfetch['cypher'] = getPref($data_dir, $username, "mailfetch_cypher"); + for ($i = 0; $i < $mailfetch['server_number']; $i++) { + $mailfetch[$i]['server'] = getPref($data_dir, $username, "mailfetch_server_$i"); + $mailfetch[$i]['port'] = getPref($data_dir, $username, "mailfetch_port_$i"); + $mailfetch[$i]['alias'] = getPref($data_dir, $username, "mailfetch_alias_$i"); + $mailfetch[$i]['user'] = getPref($data_dir, $username, "mailfetch_user_$i"); + $mailfetch[$i]['pass'] = getPref($data_dir, $username, "mailfetch_pass_$i"); + if($mailfetch['cypher'] == 'on') { + $mailfetch[$i]['pass'] = decrypt($mailfetch[$i]['pass']); } - $mailfetch['cypher'] = getPref($data_dir, $username, "mailfetch_cypher"); - for ($i = 0; $i < $mailfetch['server_number']; $i++) { - $mailfetch[$i]['server'] = getPref($data_dir, $username, "mailfetch_server_$i"); - $mailfetch[$i]['port'] = getPref($data_dir, $username, "mailfetch_port_$i"); - $mailfetch[$i]['alias'] = getPref($data_dir, $username, "mailfetch_alias_$i"); - $mailfetch[$i]['user'] = getPref($data_dir, $username, "mailfetch_user_$i"); - $mailfetch[$i]['pass'] = getPref($data_dir, $username, "mailfetch_pass_$i"); - if($mailfetch['cypher'] == 'on') { - $mailfetch[$i]['pass'] = decrypt($mailfetch[$i]['pass']); - } - if ($mailfetch[$i]['pass'] == '') { - sqgetGlobalVar("pass_$i", $mailfetch[$i]['pass'], SQ_POST); - } - $mailfetch[$i]['lmos'] = getPref($data_dir, $username, "mailfetch_lmos_$i"); - $mailfetch[$i]['login'] = getPref($data_dir, $username, "mailfetch_login_$i"); - $mailfetch[$i]['uidl'] = getPref($data_dir, $username, "mailfetch_uidl_$i"); - $mailfetch[$i]['subfolder'] = getPref($data_dir, $username, "mailfetch_subfolder_$i"); - if($mailfetch[$i]['alias'] == '') { - $mailfetch[$i]['alias'] == $mailfetch[$i]['server']; - } - } - return $mailfetch; - } - - function Mail_Fetch_Select_Server($mailfetch) { - global $PHP_SELF; - - echo '
' . - '
' . - html_tag( 'table', '', 'center', '', 'width="70%" cols="2"' ) . - html_tag( 'tr' ) . - html_tag( 'td', _("Select Server:") . '    ', 'right' ) . - html_tag( 'td', '', 'left' ) . - '' . - '' . - ''; - - //if password not set, ask for it - for ($i = 0;$i < $mailfetch['server_number'];$i++) { - if ($mailfetch[$i]['pass'] == '') { - echo html_tag( 'tr', - html_tag( 'td', _("Password for") . ' ' . - htmlspecialchars($mailfetch[$i]['alias']) . - ':     ', - 'right' ) . - html_tag( 'td', '', 'left' ) - ); - } + $mailfetch[$i]['lmos'] = getPref($data_dir, $username, "mailfetch_lmos_$i"); + $mailfetch[$i]['login'] = getPref($data_dir, $username, "mailfetch_login_$i"); + $mailfetch[$i]['uidl'] = getPref($data_dir, $username, "mailfetch_uidl_$i"); + $mailfetch[$i]['subfolder'] = getPref($data_dir, $username, "mailfetch_subfolder_$i"); + if($mailfetch[$i]['alias'] == '') { + $mailfetch[$i]['alias'] == $mailfetch[$i]['server']; } - echo html_tag( 'tr', - html_tag( 'td', ' ' ) . - html_tag( 'td', '', 'left' ) - ) . - '
'; } - - $mailfetch = Mail_Fetch_Servers(); - displayPageHeader($color, 'None'); - - echo '
'; - - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', '' . _("Remote POP server Fetching Mail") . '', 'center', $color[0] ) - ) , - 'center', '', 'width="95%" cols="1"' ); - - - /* there are no servers defined yet... */ - if($mailfetch['server_number'] == 0) { - echo '

' . _("No POP3 servers configured yet.") . '

'; - displayInternalLink('plugins/mail_fetch/options.php', - _("Click here to go to the options page.") ); - echo ''; - exit(); - } - - // get $server_to_fetch from globals, if not set display a choice to the user - if (! sqgetGlobalVar('server_to_fetch', $server_to_fetch, SQ_POST) ) { - Mail_Fetch_Select_Server($mailfetch); - exit(); + return $mailfetch; +} + +function Mail_Fetch_Select_Server($mailfetch) { + global $PHP_SELF; + + echo '
' . + '
' . + html_tag( 'table', '', 'center', '', 'width="70%" cols="2"' ) . + html_tag( 'tr' ) . + html_tag( 'td', _("Select Server:") . '    ', 'right' ) . + html_tag( 'td', '', 'left' ) . + '' . + '' . + ''; + + //if password not set, ask for it + for ($i = 0;$i < $mailfetch['server_number'];$i++) { + if ($mailfetch[$i]['pass'] == '') { + echo html_tag( 'tr', + html_tag( 'td', _("Password for") . ' ' . + htmlspecialchars($mailfetch[$i]['alias']) . + ':     ', + 'right' ) . + html_tag( 'td', '', 'left' ) + ); + } } - - for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) { - $mailfetch_server = $mailfetch[$i_loop]['server']; - $mailfetch_port = $mailfetch[$i_loop]['port']; - $mailfetch_user = $mailfetch[$i_loop]['user']; - $mailfetch_pass = $mailfetch[$i_loop]['pass']; - $mailfetch_lmos = $mailfetch[$i_loop]['lmos']; - $mailfetch_login = $mailfetch[$i_loop]['login']; - $mailfetch_uidl = $mailfetch[$i_loop]['uidl']; - $mailfetch_subfolder = $mailfetch[$i_loop]['subfolder']; - - $pop3 = new POP3($mailfetch_server, 60); - - echo '
' . + echo html_tag( 'tr', + html_tag( 'td', ' ' ) . + html_tag( 'td', '', 'left' ) + ) . + '
'; +} + +$mailfetch = Mail_Fetch_Servers(); +displayPageHeader($color, 'None'); + +echo '
'; + +echo html_tag( 'table', + html_tag( 'tr', + html_tag( 'td', '' . _("Remote POP server Fetching Mail") . '', 'center', $color[0] ) + ) , + 'center', '', 'width="95%" cols="1"' ); + + +/* there are no servers defined yet... */ +if($mailfetch['server_number'] == 0) { + echo '

' . _("No POP3 servers configured yet.") . '

'; + displayInternalLink('plugins/mail_fetch/options.php', + _("Click here to go to the options page.") ); + echo ''; + exit(); +} + +// get $server_to_fetch from globals, if not set display a choice to the user +if (! sqgetGlobalVar('server_to_fetch', $server_to_fetch, SQ_POST) ) { + Mail_Fetch_Select_Server($mailfetch); + exit(); +} + +if ( $server_to_fetch == 'all' ) { + $i_start = 0; + $i_stop = $mailfetch['server_number']; +} else { + $i_start = $server_to_fetch; + $i_stop = $i_start+1; +} + +for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) { + $mailfetch_server = $mailfetch[$i_loop]['server']; + $mailfetch_port = $mailfetch[$i_loop]['port']; + $mailfetch_user = $mailfetch[$i_loop]['user']; + $mailfetch_pass = $mailfetch[$i_loop]['pass']; + $mailfetch_lmos = $mailfetch[$i_loop]['lmos']; + $mailfetch_login = $mailfetch[$i_loop]['login']; + $mailfetch_uidl = $mailfetch[$i_loop]['uidl']; + $mailfetch_subfolder = $mailfetch[$i_loop]['subfolder']; + + $pop3 = new POP3($mailfetch_server, 60); + + echo '
' . html_tag( 'table', html_tag( 'tr', html_tag( 'td', '' . _("Fetching from ") . @@ -167,164 +164,162 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); '', $color[9] ) , '', '', 'width="90%"' ); - flush(); + flush(); - if (!$pop3->connect($mailfetch_server,$mailfetch_port)) { - Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR ); - continue; - } + if (!$pop3->connect($mailfetch_server,$mailfetch_port)) { + Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR ); + continue; + } - Mail_Fetch_Status(_("Opening IMAP server")); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); + Mail_Fetch_Status(_("Opening IMAP server")); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); - // check if destination folder is not set, is not subscribed and is not \noselect folder - if($mailfetch_subfolder == '' || - ! mail_fetch_check_folder($imap_stream,$mailfetch_subfolder)) { - $mailfetch_subfolder = 'INBOX'; - } + // check if destination folder is not set, is not subscribed and is not \noselect folder + if($mailfetch_subfolder == '' || + ! mail_fetch_check_folder($imap_stream,$mailfetch_subfolder)) { + $mailfetch_subfolder = 'INBOX'; + } - Mail_Fetch_Status(_("Opening POP server")); - $Count = $pop3->login($mailfetch_user, $mailfetch_pass); - if (($Count == false || $Count == -1) && $pop3->ERROR != '') { - Mail_Fetch_Status(_("Login Failed:") . ' ' . htmlspecialchars($pop3->ERROR) ); - continue; - } + Mail_Fetch_Status(_("Opening POP server")); + $Count = $pop3->login($mailfetch_user, $mailfetch_pass); + if (($Count == false || $Count == -1) && $pop3->ERROR != '') { + Mail_Fetch_Status(_("Login Failed:") . ' ' . htmlspecialchars($pop3->ERROR) ); + continue; + } - // register_shutdown_function($pop3->quit()); + // register_shutdown_function($pop3->quit()); - $msglist = $pop3->uidl(); + $msglist = $pop3->uidl(); - $i = 1; - for ($j = 1; $j < sizeof($msglist); $j++) { - if ($msglist[$j] == $mailfetch_uidl) { - $i = $j+1; - break; - } + $i = 1; + for ($j = 1; $j < sizeof($msglist); $j++) { + if ($msglist[$j] == $mailfetch_uidl) { + $i = $j+1; + break; } + } - if ($Count < $i) { - Mail_Fetch_Status(_("Login OK: No new messages")); - $pop3->quit(); - continue; - } - if ($Count == 0) { - Mail_Fetch_Status(_("Login OK: Inbox EMPTY")); - $pop3->quit(); - continue; - } else { - $newmsgcount = $Count - $i + 1; - Mail_Fetch_Status(sprintf(ngettext("Login OK: Inbox contains %s message", - "Login OK: Inbox contains %s messages",$newmsgcount), $newmsgcount)); - } + if ($Count < $i) { + Mail_Fetch_Status(_("Login OK: No new messages")); + $pop3->quit(); + continue; + } + if ($Count == 0) { + Mail_Fetch_Status(_("Login OK: Inbox EMPTY")); + $pop3->quit(); + continue; + } else { + $newmsgcount = $Count - $i + 1; + Mail_Fetch_Status(sprintf(ngettext("Login OK: Inbox contains %s message", + "Login OK: Inbox contains %s messages",$newmsgcount), $newmsgcount)); + } - Mail_Fetch_Status(_("Fetching UIDL...")); - // Faster to get them all at once - $mailfetch_uidl = $pop3->uidl(); + Mail_Fetch_Status(_("Fetching UIDL...")); + // Faster to get them all at once + $mailfetch_uidl = $pop3->uidl(); - if (! is_array($mailfetch_uidl) && $mailfetch_lmos == 'on') - Mail_Fetch_Status(_("Server does not support UIDL.")); + if (! is_array($mailfetch_uidl) && $mailfetch_lmos == 'on') + Mail_Fetch_Status(_("Server does not support UIDL.")); - if ($mailfetch_lmos == 'on') { - Mail_Fetch_Status(_("Leaving mail on server...")); - } else { - Mail_Fetch_Status(_("Deleting messages from server...")); - } + if ($mailfetch_lmos == 'on') { + Mail_Fetch_Status(_("Leaving mail on server...")); + } else { + Mail_Fetch_Status(_("Deleting messages from server...")); + } - for (; $i <= $Count; $i++) { - Mail_Fetch_Status(_("Fetching message ") . "$i" ); + for (; $i <= $Count; $i++) { + Mail_Fetch_Status(_("Fetching message ") . "$i" ); - if (!ini_get('safe_mode')) - set_time_limit(20); // 20 seconds per message max - $Message = ''; - $MessArray = $pop3->get($i); + if (!ini_get('safe_mode')) + set_time_limit(20); // 20 seconds per message max + $Message = ''; + $MessArray = $pop3->get($i); - while ( (!$MessArray) or (gettype($MessArray) != "array")) { - Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR); - // re-connect pop3 - Mail_Fetch_Status(_("Server error. Disconnect")); - $pop3->quit(); - Mail_Fetch_Status(_("Reconnect from dead connection")); - if (!$pop3->connect($mailfetch_server)) { - Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR ); - Mail_Fetch_Status(_("Saving UIDL")); - setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]); - - continue; - } - $Count = $pop3->login($mailfetch_user, $mailfetch_pass); - if (($Count == false || $Count == -1) && $pop3->ERROR != '') { - Mail_Fetch_Status(_("Login Failed:") . ' ' . $pop3->ERROR ); - Mail_Fetch_Status(_("Saving UIDL")); - setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]); - - continue; - } - Mail_Fetch_Status(_("Refetching message ") . "$i" ); - $MessArray = $pop3->get($i); - - } // end while - - while (list($lineNum, $line) = each ($MessArray)) { - $Message .= $line; + while ( (!$MessArray) or (gettype($MessArray) != "array")) { + Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR); + // re-connect pop3 + Mail_Fetch_Status(_("Server error. Disconnect")); + $pop3->quit(); + Mail_Fetch_Status(_("Reconnect from dead connection")); + if (!$pop3->connect($mailfetch_server)) { + Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR ); + Mail_Fetch_Status(_("Saving UIDL")); + setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]); + + continue; } + $Count = $pop3->login($mailfetch_user, $mailfetch_pass); + if (($Count == false || $Count == -1) && $pop3->ERROR != '') { + Mail_Fetch_Status(_("Login Failed:") . ' ' . $pop3->ERROR ); + Mail_Fetch_Status(_("Saving UIDL")); + setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]); - fputs($imap_stream, "A3$i APPEND \"$mailfetch_subfolder\" {" . strlen($Message) . "}\r\n"); - $Line = fgets($imap_stream, 1024); - if (substr($Line, 0, 1) == '+') { - fputs($imap_stream, $Message); - fputs($imap_stream, "\r\n"); - sqimap_read_data($imap_stream, "A3$i", false, $response, $message); - $response=(implode('',$response)); - $message=(implode('',$message)); - if ($response != 'OK') { - Mail_Fetch_Status(_("Error Appending Message!")." ".htmlspecialchars($message) ); - Mail_Fetch_Status(_("Closing POP")); - $pop3->quit(); - Mail_Fetch_Status(_("Logging out from IMAP")); - sqimap_logout($imap_stream); - - Mail_Fetch_Status(_("Saving UIDL")); - setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]); - exit; - } else { - Mail_Fetch_Status(_("Message appended to mailbox")); - } + continue; + } + Mail_Fetch_Status(_("Refetching message ") . "$i" ); + $MessArray = $pop3->get($i); - if ($mailfetch_lmos != 'on') { - if( $pop3->delete($i) ) { - Mail_Fetch_Status(sprintf(_("Message %d deleted from remote server!"), $i)); - } else { - Mail_Fetch_Status(_("Delete failed:") . htmlspecialchars($pop3->ERROR) ); - } - } - } else { - echo $Line; - Mail_Fetch_Status(_("Error Appending Message!")); + } // end while + + while (list($lineNum, $line) = each ($MessArray)) { + $Message .= $line; + } + + fputs($imap_stream, "A3$i APPEND \"$mailfetch_subfolder\" {" . strlen($Message) . "}\r\n"); + $Line = fgets($imap_stream, 1024); + if (substr($Line, 0, 1) == '+') { + fputs($imap_stream, $Message); + fputs($imap_stream, "\r\n"); + sqimap_read_data($imap_stream, "A3$i", false, $response, $message); + $response=(implode('',$response)); + $message=(implode('',$message)); + if ($response != 'OK') { + Mail_Fetch_Status(_("Error Appending Message!")." ".htmlspecialchars($message) ); Mail_Fetch_Status(_("Closing POP")); $pop3->quit(); Mail_Fetch_Status(_("Logging out from IMAP")); sqimap_logout($imap_stream); - // not gurantee corect! Mail_Fetch_Status(_("Saving UIDL")); setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]); exit; + } else { + Mail_Fetch_Status(_("Message appended to mailbox")); } - } - Mail_Fetch_Status(_("Closing POP")); - $pop3->quit(); - Mail_Fetch_Status(_("Logging out from IMAP")); - sqimap_logout($imap_stream); - if (is_array($mailfetch_uidl)) { + if ($mailfetch_lmos != 'on') { + if( $pop3->delete($i) ) { + Mail_Fetch_Status(sprintf(_("Message %d deleted from remote server!"), $i)); + } else { + Mail_Fetch_Status(_("Delete failed:") . htmlspecialchars($pop3->ERROR) ); + } + } + } else { + echo $Line; + Mail_Fetch_Status(_("Error Appending Message!")); + Mail_Fetch_Status(_("Closing POP")); + $pop3->quit(); + Mail_Fetch_Status(_("Logging out from IMAP")); + sqimap_logout($imap_stream); + + // not gurantee corect! Mail_Fetch_Status(_("Saving UIDL")); - setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($mailfetch_uidl)); + setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]); + exit; } + } - Mail_Fetch_Status(_("Done")); - - } + Mail_Fetch_Status(_("Closing POP")); + $pop3->quit(); + Mail_Fetch_Status(_("Logging out from IMAP")); + sqimap_logout($imap_stream); + if (is_array($mailfetch_uidl)) { + Mail_Fetch_Status(_("Saving UIDL")); + setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($mailfetch_uidl)); + } + Mail_Fetch_Status(_("Done")); +} ?>
diff --git a/plugins/mail_fetch/functions.php b/plugins/mail_fetch/functions.php index e26eae68..4e5b1699 100644 --- a/plugins/mail_fetch/functions.php +++ b/plugins/mail_fetch/functions.php @@ -23,7 +23,7 @@ global $mail_fetch_allow_unsubscribed; /** * Controls use of unsubscribed folders in plugin * @global boolean $mail_fetch_allow_unsubscribed - * @since 1.5.1 + * @since 1.5.1 and 1.4.5 */ $mail_fetch_allow_unsubscribed = false; @@ -94,7 +94,7 @@ function decrypt( $txt ) { * @param stream $imap_stream imap connection resource * @param string $imap_folder imap folder name * @return boolean true, when folder can be used to store messages. - * @since 1.5.1 + * @since 1.5.1 and 1.4.5 */ function mail_fetch_check_folder($imap_stream,$imap_folder) { global $mail_fetch_allow_unsubscribed; @@ -123,7 +123,7 @@ function mail_fetch_check_folder($imap_stream,$imap_folder) { * @param stream $imap_stream imap connection resource * @param string $imap_folder imap folder name * @return boolean true, when folder has noselect flag. false in any other case. - * @since 1.5.1 + * @since 1.5.1 and 1.4.5 */ function mail_fetch_check_noselect($imap_stream,$imap_folder) { $boxes=sqimap_mailbox_list($imap_stream); diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php index 9eb26186..6ba4ec2b 100644 --- a/plugins/mail_fetch/options.php +++ b/plugins/mail_fetch/options.php @@ -17,8 +17,7 @@ define('SM_PATH','../../'); require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/imap.php'); -require_once(SM_PATH . 'include/load_prefs.php'); +include_once(SM_PATH . 'functions/imap.php'); /* globals */ sqgetGlobalVar('username', $username, SQ_SESSION); @@ -390,5 +389,5 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST); 'center', '', 'width="70%"' ); } - ?> +?> \ No newline at end of file