[Vtigercrm-commits] [vtiger-commits] r3938 - in /vtigercrm/branches/4.2: install/4createConfigFile.php install/config.template.php vtigerpatch.php vtigerversion.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: fathi
Date: Sun Feb 26 11:38:42 2006
New Revision: 3938

Log:
Put vtiger version and release date only in vtigerversion.php

Modified:
    vtigercrm/branches/4.2/install/4createConfigFile.php
    vtigercrm/branches/4.2/install/config.template.php
    vtigercrm/branches/4.2/vtigerpatch.php
    vtigercrm/branches/4.2/vtigerversion.php

Modified: vtigercrm/branches/4.2/install/4createConfigFile.php
==============================================================================
--- vtigercrm/branches/4.2/install/4createConfigFile.php (original)
+++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 11:38:42 2006
@@ -20,12 +20,9 @@
  ********************************************************************************/
 
 require_once('include/utils.php');
+include('vtigerversion.php');
 
 session_start();
-
-// vtigerCRM version number; do not edit!
-$vtiger_version = "4.2.3";
-$release_date = "23 December 2005";
 
 if (isset($_REQUEST['db_hostname']))
   $db_hostname = $_REQUEST['db_hostname'];
@@ -131,11 +128,11 @@
   $is_writable = is_writable('.');
 
 /* open template configuration file read only */
-$templateFilename = $root_directory."install/config.template.php";
+$templateFilename = 'install/config.template.php';
 $templateHandle = fopen($templateFilename, "r");
 if($templateHandle) {
   /* open include configuration file write only */
-  $includeFilename = $root_directory."config.php";
+  $includeFilename = 'config.php';
   $includeHandle = fopen($includeFilename, "w");
   if($includeHandle) {
     while (!feof($templateHandle)) {

Modified: vtigercrm/branches/4.2/install/config.template.php
==============================================================================
--- vtigercrm/branches/4.2/install/config.template.php (original)
+++ vtigercrm/branches/4.2/install/config.template.php Sun Feb 26 11:38:42 2006
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /*********************************************************************************
  * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
  * ("License"); You may not use this file except in compliance with the 
@@ -13,8 +13,7 @@
  * Contributor(s): ______________________________________.
 ********************************************************************************/
 
-$vtiger_version = '4.2.3';
-$release_date = '23 December 2005';
+include('vtigerversion.php');
 
 // more than 8MB memory needed for graphics
 // memory limit default value = 16M

Modified: vtigercrm/branches/4.2/vtigerpatch.php
==============================================================================
--- vtigercrm/branches/4.2/vtigerpatch.php (original)
+++ vtigercrm/branches/4.2/vtigerpatch.php Sun Feb 26 11:38:42 2006
@@ -40,7 +40,7 @@
 		$newbuf .= "\$patch_version = '2';\n";
 		$newbuf .= "\$patch_release_date = '16 September 2005';\n";
     	    }
-	    elseif($starter == '$vtiger_current_version' && !stristr($tmp,'4.2'))
+	    elseif($starter == '$vtiger_version' && !stristr($tmp,'4.2'))
     	    {
 		die("<font color=red><center> *** This Patch cannot be applied for vtiger CRM versions other than 4.2! *** </center></font>");   
     	    }

Modified: vtigercrm/branches/4.2/vtigerversion.php
==============================================================================
--- vtigercrm/branches/4.2/vtigerversion.php (original)
+++ vtigercrm/branches/4.2/vtigerversion.php Sun Feb 26 11:38:42 2006
@@ -11,5 +11,6 @@
 
 $patch_version = '';
 $modified_database = '';
-$vtiger_current_version = '4.2.3';
+$vtiger_version = '4.2.3';
+$release_date = '23 December 2005';
 ?>