removing trailing ?> from function scripts

ChangeLog

@@ -98,6 +98,7 @@ Version 1.5.2 - CVS
   - Add HTML labels for form elements.
   - Fixed spamcop web based reporting form (#1519673) and removed service
     type options from spamcop plugin.
+  - Removed trailing ?> from function scripts.
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

class/deliver/Deliver.class.php

@@ -812,5 +812,3 @@ class Deliver {
         return $ret;
     }
 }
-
-?>

class/deliver/Deliver_IMAP.class.php

@@ -28,5 +28,3 @@ class Deliver_IMAP extends Deliver {
     /* to do: finishing the imap-class so the initStream function can call the
        imap-class */
 }
-
-?>

class/deliver/Deliver_SMTP.class.php

@@ -514,5 +514,3 @@ class Deliver_SMTP extends Deliver {
         return $ret;
     }
 }
-
-?>

class/deliver/Deliver_SendMail.class.php

@@ -156,4 +156,3 @@ class Deliver_SendMail extends Deliver {
 
 
 }
-?>

class/error.class.php

@@ -281,4 +281,3 @@ function sqm_trigger_error($sErrNo,$aExtra=array()) {
     }
     trigger_error($sErrString, $iPhpErr);
 }
-?>

class/helper/VCard.class.php

@@ -40,5 +40,3 @@ class VCard {
         return $array;
     }
 }
-
-?>

class/l10n.class.php

@@ -20,4 +20,3 @@ if (! defined('SM_PATH')) define('SM_PATH','../');
 /** Load all php-gettext classes */
 include_once(SM_PATH . 'class/l10n/streams.class.php');
 include_once(SM_PATH . 'class/l10n/gettext.class.php');
-?>

class/l10n/gettext.class.php

@@ -288,4 +288,3 @@ class gettext_reader {
         }
     }
 }
-?>

class/l10n/streams.class.php

@@ -125,4 +125,3 @@ class FileReader {
         fclose($this->_fd);
     }
 }
-?>

class/mime.class.php

@@ -24,5 +24,3 @@ require_once(SM_PATH . 'class/mime/SMimeMessage.class.php');
 require_once(SM_PATH . 'class/mime/Disposition.class.php');
 require_once(SM_PATH . 'class/mime/Language.class.php');
 require_once(SM_PATH . 'class/mime/ContentType.class.php');
-
-?>

class/mime/AddressStructure.class.php

@@ -98,5 +98,3 @@ class AddressStructure {
         return $this->getAddress(true, true);
     }
 }
-
-?>

class/mime/ContentType.class.php

@@ -56,5 +56,3 @@ class ContentType {
         $this->properties = array();
     }
 }
-
-?>

class/mime/Disposition.class.php

@@ -45,5 +45,3 @@ class Disposition {
         return '';
     }
 }
-
-?>

class/mime/Language.class.php

@@ -36,5 +36,3 @@ class Language {
         $this->properties = array();
     }
 }
-
-?>

class/mime/Message.class.php

@@ -1071,5 +1071,3 @@ class Message {
         }
     }
 }
-
-?>

class/mime/MessageHeader.class.php

@@ -96,5 +96,3 @@ class MessageHeader {
         $this->parameters[strtolower($parameter)] = $value;
     }
 }
-
-?>

class/mime/Rfc822Header.class.php

@@ -940,5 +940,3 @@ class Rfc822Header {
         return $this->content_type->properties;
     }
 }
-
-?>

class/mime/SMimeMessage.class.php

@@ -23,5 +23,3 @@
 class SMimeMessage {
 
 }
-
-?>

class/template/template.class.php

@@ -272,5 +272,3 @@ class Template
     return $paths;
   }
 }
-
-?>

config/conf.pl

@@ -4173,8 +4173,6 @@ sub save_data {
         print CF " * sent and regular output to begin, which will majorly screw\n";
         print CF " * things up when we try to send more headers later.\n";
         print CF " */\n";
-        print CF "?>";
-
         close CF;
 
         print "Data saved in config.php\n";

config/config_default.php

@@ -1208,4 +1208,3 @@ $config_use_color = 2;
  * sent and regular output to begin, which will majorly screw
  * things up when we try to send more headers later.
  */
-?>

config/config_local.example.php

@@ -13,5 +13,3 @@
  * @package squirrelmail
  * @subpackage config
  */
-
-?>

functions/abook_database.php

@@ -473,4 +473,3 @@ class abook_database extends addressbook_backend {
 } /* End of class abook_database */
 
 // vim: et ts=4
-?>

functions/abook_local_file.php

@@ -573,4 +573,3 @@ class abook_local_file extends addressbook_backend {
     }
 
 } /* End of class abook_local_file */
-?>

functions/attachment_common.php

@@ -262,5 +262,3 @@ function attachment_common_octet_stream(&$Args) {
         $Args[$a] = $b;
     }
 }
-
-?>

functions/auth.php

@@ -272,5 +272,3 @@ function get_smtp_user(&$user, &$pass) {
         $pass = sqauth_read_password();
     }
 }
-
-?>

functions/db_prefs.php

@@ -543,4 +543,3 @@ function getSig($data_dir, $username, $number) {
 }
 
 // vim: et ts=4
-?>

functions/decode/cp1250.php

@@ -168,5 +168,3 @@ function charset_decode_cp1250 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1251.php

@@ -168,5 +168,3 @@ function charset_decode_cp1251 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1252.php

@@ -169,5 +169,3 @@ function charset_decode_cp1252 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1253.php

@@ -168,5 +168,3 @@ function charset_decode_cp1253 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1254.php

@@ -168,5 +168,3 @@ function charset_decode_cp1254 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1255.php

@@ -168,5 +168,3 @@ function charset_decode_cp1255 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1256.php

@@ -168,5 +168,3 @@ function charset_decode_cp1256 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1257.php

@@ -156,5 +156,3 @@ function charset_decode_cp1257 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp1258.php

@@ -168,5 +168,3 @@ function charset_decode_cp1258 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp855.php

@@ -168,5 +168,3 @@ function charset_decode_cp855 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/cp866.php

@@ -169,4 +169,4 @@ function charset_decode_cp866 ($string) {
     $string = str_replace(array_keys($cp866), array_values($cp866), $string);
 
     return $string;
-}
+}

functions/decode/iso_8859_1.php

@@ -31,5 +31,3 @@ function charset_decode_iso_8859_1 ($string) {
     $string = preg_replace("/([\241-\377])/e","'&#' . ord('\\1') . ';'",$string);
     return $string;
 }
-
-?>

functions/decode/iso_8859_10.php

@@ -153,5 +153,3 @@ function charset_decode_iso_8859_10 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/iso_8859_11.php

@@ -145,5 +145,3 @@ function charset_decode_iso_8859_11 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/iso_8859_13.php

@@ -153,5 +153,3 @@ function charset_decode_iso_8859_13 ($string) {
 
     return $string;
 }
-
-?>

functions/decode/iso_8859_14.php

@@ -154,4 +154,3 @@ function charset_decode_iso_8859_14 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_15.php

@@ -154,4 +154,3 @@ function charset_decode_iso_8859_15 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_16.php

@@ -153,4 +153,3 @@ function charset_decode_iso_8859_16 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_2.php

@@ -153,4 +153,3 @@ function charset_decode_iso_8859_2 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_3.php

@@ -146,4 +146,3 @@ function charset_decode_iso_8859_3 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_4.php

@@ -153,4 +153,3 @@ function charset_decode_iso_8859_4 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_5.php

@@ -153,4 +153,3 @@ function charset_decode_iso_8859_5 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_6.php

@@ -108,4 +108,3 @@ function charset_decode_iso_8859_6 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_7.php

@@ -147,4 +147,3 @@ function charset_decode_iso_8859_7 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_8.php

@@ -117,4 +117,3 @@ function charset_decode_iso_8859_8 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_8859_9.php

@@ -153,4 +153,3 @@ function charset_decode_iso_8859_9 ($string) {
 
     return $string;
 }
-?>

functions/decode/iso_ir_111.php

@@ -157,4 +157,3 @@ function charset_decode_iso_ir_111 ($string) {
 
     return $string;
 }
-?>

functions/decode/koi8_r.php

@@ -184,4 +184,3 @@ function charset_decode_koi8_r ($string) {
 
     return $string;
 }
-?>

functions/decode/koi8_u.php

@@ -188,4 +188,3 @@ function charset_decode_koi8_u ($string) {
 
     return $string;
 }
-?>

functions/decode/ns_4551_1.php

@@ -32,4 +32,3 @@ function charset_decode_ns_4551_1 ($string) {
      */
     return strtr ($string, "[\\]{|}", "ÆØÅæøå");
 }
-?>

functions/decode/tis_620.php

@@ -151,4 +151,3 @@ function charset_decode_tis_620 ($string) {
 
     return $string;
 }
-?>

functions/decode/us_ascii.php

@@ -34,4 +34,3 @@ function charset_decode_us_ascii ($string) {
     $string = preg_replace("/([\241-\377])/e","'?'",$string);
     return $string;
 }
-?>

functions/decode/utf_8.php

@@ -92,4 +92,3 @@ function charset_decode_utf_8 ($string) {
 
     return $string;
 }
-?>

functions/encode/cp1251.php

@@ -176,4 +176,3 @@ function unicodetocp1251($var) {
     }
     return $ret;
 }
-?>

functions/encode/cp1255.php

@@ -154,4 +154,3 @@ function unicodetocp1255($var) {
     }
     return $ret;
 }
-?>

functions/encode/cp1256.php

@@ -177,4 +177,3 @@ function unicodetocp1256($var) {
     }
     return $ret;
 }
-?>

functions/encode/iso_8859_1.php

@@ -48,4 +48,3 @@ function unicodetoiso88591($var) {
     }
     return $ret;
 }
-?>

functions/encode/iso_8859_15.php

@@ -145,4 +145,3 @@ function unicodetoiso885915($var) {
     }
     return $ret;
 }
-?>

functions/encode/iso_8859_2.php

@@ -146,4 +146,3 @@ function unicodetoiso88592($var) {
     }
     return $ret;
 }
-?>

functions/encode/iso_8859_7.php

@@ -140,4 +140,3 @@ function unicodetoiso88597($var) {
     }
     return $ret;
 }
-?>

functions/encode/iso_8859_9.php

@@ -146,4 +146,3 @@ function unicodetoiso88599($var) {
     }
     return $ret;
 }
-?>

functions/encode/koi8_r.php

@@ -177,4 +177,3 @@ function unicodetokoi8r($var) {
     }
     return $ret;
 }
-?>

functions/encode/koi8_u.php

@@ -177,4 +177,3 @@ function unicodetokoi8u($var) {
     }
     return $ret;
 }
-?>

functions/encode/tis_620.php

@@ -136,4 +136,3 @@ function unicodetotis620($var) {
     }
     return $ret;
 }
-?>

functions/encode/us_ascii.php

@@ -48,4 +48,3 @@ function unicodetousascii($var) {
     }
     return $ret;
 }
-?>

functions/encode/utf_8.php

@@ -118,4 +118,3 @@ function unicodetoutf8($var) {
     }
     return $ret;
 }
-?>

functions/file_prefs.php

@@ -309,4 +309,3 @@ function getSig($data_dir, $username, $number) {
 }
 
 // vim: et ts=4
-?>

functions/folder_manip.php

@@ -340,6 +340,3 @@ function folders_unsubscribe($imapConnection, $folder_names)
 
     return;
 }
-
-
-?>

functions/forms.php

@@ -299,5 +299,3 @@ function addForm($sAction, $sMethod = 'post', $sName = '', $sEnctype = '', $sCha
     return '<form action="'. $sAction .'" method="'. $sMethod .'"'.
         $sEnctype . $sName . $sCharset . $sAttribs . ">\n";
 }
-
-?>

functions/gettext.php

@@ -101,4 +101,3 @@ if (! function_exists('dgettext')) {
         return $l10n[$domain]->translate($str);
     }
 }
-?>

functions/global.php

@@ -418,5 +418,3 @@ function php_self () {
 
     return '';
 }
-
-

functions/html.php

@@ -157,4 +157,3 @@ function set_url_var($url, $var, $val=0, $link=true) {
     }
     return $url;
 }
-?>

functions/htmlentities/iso-8859-1.php

@@ -107,4 +107,3 @@ $sq_html_ent_table = array_merge($sq_html_ent_table,
               "\xFE" => 'þ',
               "\xFF" => 'ÿ')
                 );
-?>

functions/htmlentities/readme.php

@@ -321,4 +321,3 @@
  * @package squirrelmail
  * @subpackage strings
  */
-?>

functions/htmlentities/utf-8.php

@@ -273,4 +273,3 @@ $sq_html_ent_table = array_merge($sq_html_ent_table,
               "\xE2\x99\xA6" => '♦'
               )
        );
-?>

functions/identity.php

@@ -210,5 +210,3 @@ function empty_identity($ident) {
         return false;
     }
 }
-
-?>

functions/imap.php

@@ -16,5 +16,3 @@
 /** Includes */
 include_once(SM_PATH . 'functions/imap_messages.php');
 include_once(SM_PATH . 'functions/imap_general.php');
-
-?>

functions/imap_asearch.php

@@ -486,5 +486,3 @@ function sqimap_asearch($imapConnection, &$mailbox_array, &$biop_array, &$unop_a
     }
     return ($mbox_search);
 }
-
-?>

functions/imap_general.php

@@ -1306,5 +1306,3 @@ function map_yp_alias($username) {
    $yp = `ypmatch $username aliases`;
    return chop(substr($yp, strlen($username)+1));
 }
-
-?>

functions/imap_messages.php

@@ -944,5 +944,3 @@ function sqimap_get_message($imap_stream, $id, $mailbox) {
     $msg->rfc822_header = $rfc822_header;
     return $msg;
 }
-
-?>

functions/imap_utf7_local.php

@@ -250,5 +250,3 @@ function decodeBASE64($s) {
     }
     return $d;
 }
-
-?>

functions/mailbox_display.php

@@ -1460,5 +1460,3 @@ function attachSelectedMessages($imapConnection,$aMsgHeaders) {
     sqsession_register($compose_messages,'compose_messages');
     return $composesession;
 }
-
-?>

functions/mime.php

@@ -2409,5 +2409,3 @@ function SendDownloadHeaders($type0, $type1, $filename, $force, $filesize=0) {
     }
 
 }  // end fn SendDownloadHeaders
-
-?>

functions/ngettext.php

@@ -67,4 +67,3 @@ if (! function_exists('dngettext')) {
         return $l10n[$domain]->ngettext($single, $plural, $number);
     }
 }
-?>

functions/options.php

@@ -734,4 +734,3 @@ function OptionSubmit( $name ) {
 }
 
 // vim: et ts=4
-?>

functions/plugin.php

@@ -206,4 +206,3 @@ function is_plugin_enabled($plugin_name) {
     return false;
   }
 }
-?>

functions/prefs.php

@@ -126,4 +126,3 @@ function computeHashDirs($username) {
     /* Return our array of hash directories. */
     return ($hash_dirs);
 }
-?>

functions/rfc822address.php

@@ -406,4 +406,3 @@ function _getAddressTokens($address) {
     }
     return $aTokens;
 }
-?>

functions/strings.php

@@ -1290,5 +1290,3 @@ function sq_count8bit($string) {
 function sq_trim_value ( &$value ) {
     $value = trim($value);
 }
-
-?>

functions/tree.php

@@ -194,5 +194,3 @@ function simpleWalkTreePre($index, $tree) {
         echo $tree[$index]['value'] . '<br />';
     }
 }
-
-?>

functions/url_parser.php

@@ -277,4 +277,3 @@ function sq_strpos_8bit($haystack,$offset=0,$maxlength=false) {
     }
     return $ret;
 }
-?>

images/themes/default/theme.php

@@ -9,5 +9,4 @@
  * @package squirrelmail
  * @subpackage themes
  */
-    $icon_themes[] = array('NAME'=>_("Default"),'PATH'=> SM_PATH.'images/');
-?>
+$icon_themes[] = array('NAME'=>_("Default"),'PATH'=> SM_PATH.'images/');