Remove $version, use SM_VERSION constant instead

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12346 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 31a674b3dc0071777a537cd4c3924db17a292bc4..0907faaf39a3cc5c2a0d56267b1a99d6d8b8f6bc 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -378,7 +378,7 @@ class Deliver {
      * @return string $header
      */
     function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
-        global $domain, $version, $username, $encode_header_key,
+        global $domain, $username, $encode_header_key,
                $edit_identity, $hide_auth_header;
 
         /* if server var SERVER_NAME not available, use $domain */
@@ -497,7 +497,7 @@ class Deliver {
             }
         }
         /* Identify SquirrelMail */
-        $header[] = 'User-Agent: SquirrelMail/' . $version . $rn;
+        $header[] = 'User-Agent: SquirrelMail/' . SM_VERSION . $rn;
         /* Do the MIME-stuff */
         $header[] = 'MIME-Version: 1.0' . $rn;
         $contenttype = 'Content-Type: '. $rfc822_header->content_type->type0 .'/'.

diff --git a/config/conf.pl b/config/conf.pl
index e3044ea1764ae64d0190a5a8784efdbd3cfbc7f4..f936c3f516338a461f1ad06b61e9fbacc68ef66d 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -4315,7 +4315,6 @@ sub save_data {
         print CF " * Created using the configure script, conf.pl\n";
         print CF " */\n";
         print CF "\n";
-        print CF "global \$version;\n";
 
         if ($print_config_version) {
             print CF "\$config_version = '$print_config_version';\n";

diff --git a/config/config_default.php b/config/config_default.php
index a4dd81cac286c3db95cb2081c7608433a239566d..04817a0b513ba8a1cde8242deea19f254b1db2bb 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -23,7 +23,6 @@
  */
 
 /* Do not change this value. */
-global $version;
 global $config_version;
 $config_version = '1.5.0';
 

diff --git a/include/constants.php b/include/constants.php
index 419d6a42c5a4373cf2a6517ebdccf08459928f5b..5fc115c05cda6604e4d5b81d74b701326d451b4b 100644 (file)
--- a/include/constants.php
+++ b/include/constants.php
@@ -15,6 +15,12 @@
 
 /** @ignore */
 
+/**
+ * SquirrelMail version number -- DO NOT CHANGE
+ * @since 1.5.2
+ */
+define('SM_VERSION', '1.5.2 [SVN]');
+
 /**************************************************************/
 /* Set values for constants used by SquirrelMail preferences. */
 /**************************************************************/

diff --git a/include/init.php b/include/init.php
index a6eb383b5db0500b9c6200c100b568b0404baa88..53cebad214d7bf98d324108531c20d273165f80b 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -223,16 +223,12 @@ ini_set('session.name' , $session_name);
 session_set_cookie_params (0, $base_uri);
 sqsession_is_active();
 
-/**
- * SquirrelMail version number -- DO NOT CHANGE
- */
-$version = '1.5.2 [SVN]';
-
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE
  * $sm_internal_version = array (release, major, minor)
  */
-$SQM_INTERNAL_VERSION = array(1,5,2);
+$SQM_INTERNAL_VERSION = preg_split('/\./', SM_VERSION, 3);
+$SQM_INTERNAL_VERSION[2] = intval($SQM_INTERNAL_VERSION[2]);
 
 
 /* if plugins are disabled only for one user and

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index fdc9642d5f349ad0b9b8acaea4dd525ac7633f11..527108a691f92d97a1b74e2321c8eec526266075 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -44,7 +44,7 @@ function adm_template_options() {
     return $ret;
 }
 
-global $languages, $version;
+global $languages;
 
 $language_values = array( );
 foreach ($languages as $lang_key => $lang_attributes) {
@@ -64,7 +64,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                              'size' => 7 ),
                  'SM_ver' => array( 'name' => _("SquirrelMail Version"),
                                     'type' => SMOPT_TYPE_EXTERNAL,
-                                    'value' => "$version" ),
+                                    'value' => SM_VERSION ),
                  'PHP_ver' => array( 'name' => _("PHP Version"),
                                      'type' => SMOPT_TYPE_EXTERNAL,
                                      'value' => phpversion() ),

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 57e631b5f6f25b20308dc1c6df1d275a6d0e7ec1..1fcf1fc5897faa79237f739656fc2b6358309976 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -622,8 +622,7 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) {
     " * SquirrelMail Configuration File\n".
     " * Created using the Administrator Plugin\n".
     " */\n".
-    "\n".
-    "global \$version;\n" );
+    "\n" );
 
     foreach ( $newcfg as $k => $v ) {
         if ( $k{0} == '$' && $v <> '' || is_int($v)) {

diff --git a/src/about.php b/src/about.php
index 108a6ff00f5c38a484513f94597b474bf7dd676a..f54c1cd68b9701407691d23a158a2f8c7fe42949 100644 (file)
--- a/src/about.php
+++ b/src/about.php
@@ -29,7 +29,7 @@ displayPageHeader($color);
     alt="SquirrelMail Logo" /><br />
 <table align="center" width="80%" cellpadding="1" cellspacing="2" border="0">
 <tr><td bgcolor="#dcdcdc" align="center"><div style="text-align: center;"><b>
-<?php echo sprintf(_("About SquirrelMail %s"),$version); ?>
+<?php echo sprintf(_("About SquirrelMail %s"), SM_VERSION); ?>
 </b></div></td></tr>
 <tr><td>
 <br />
@@ -64,7 +64,7 @@ echo sprintf(_("For more information about SquirrelMail and the SquirrelMail Pro
 </b><br/><br/>
 <small>
 <?php
-echo sprintf(_("You are using SquirrelMail version: %s"),$version);
+echo sprintf(_("You are using SquirrelMail version: %s"), SM_VERSION);
 echo "<br />\n";
 echo _("The administrator installed the following plugins:");
 echo "<br />\n";

diff --git a/src/configtest.php b/src/configtest.php
index 33096746b38d808eb249f772f80d30adee203777..5ed8083aab89407806945a069c9e7b2cec0170db 100644 (file)
--- a/src/configtest.php
+++ b/src/configtest.php
@@ -81,8 +81,11 @@ ob_implicit_flush();
 /** @ignore */
 define('SM_PATH', '../');
 /** load minimal function set */
+require(SM_PATH . 'include/constants.php');
 require(SM_PATH . 'functions/global.php');
 require(SM_PATH . 'functions/strings.php');
+$SQM_INTERNAL_VERSION = preg_split('/\./', SM_VERSION, 3);
+$SQM_INTERNAL_VERSION[2] = intval($SQM_INTERNAL_VERSION[2]);
 
 /** set default value in order to block remote access */
 $allow_remote_configtest=false;
@@ -169,7 +172,7 @@ if (! $allow_remote_configtest) {
 }
 /* checking PHP specs */
 
-echo "<p><table>\n<tr><td>SquirrelMail version:</td><td><b>" . $version . "</b></td></tr>\n" .
+echo "<p><table>\n<tr><td>SquirrelMail version:</td><td><b>" . SM_VERSION . "</b></td></tr>\n" .
     '<tr><td>Config file version:</td><td><b>' . $config_version . "</b></td></tr>\n" .
     '<tr><td>Config file last modified:</td><td><b>' .
     date ('d F Y H:i:s', filemtime(SM_PATH . 'config/config.php')) .

diff --git a/src/read_body.php b/src/read_body.php
index 7ad607ecfff670e6185be7e84e8f14a141daafa1..6b588bd6c88a057f46bf75b042b7dbba42ee240a 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -126,7 +126,7 @@ function ServerMDNSupport($aFlags) {
 
 function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
     global $username, $attachment_dir, $popuser, $username, $color,
-           $version, $squirrelmail_language, $default_charset,
+           $squirrelmail_language, $default_charset,
            $languages, $useSendmail, $domain, $sent_folder;
 
     sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER);
@@ -223,7 +223,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
     $original_recipient  = $to;
     $original_message_id = $header->message_id;
 
-    $report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version $version) \r\n";
+    $report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version " . SM_VERSION . ") \r\n";
     if ($original_recipient != '') {
         $report .= "Original-Recipient : $original_recipient\r\n";
     }