[Vtigercrm-commits] [vtiger-commits] r3967 - in /vtigercrm/branches/4.2: config.db.php config.template.php install/4createConfigFile.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: fathi
Date: Mon Feb 27 14:29:31 2006
New Revision: 3967

Log:
use site_URL previously removed by mistake

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

Modified: vtigercrm/branches/4.2/config.db.php
==============================================================================
--- vtigercrm/branches/4.2/config.db.php (original)
+++ vtigercrm/branches/4.2/config.db.php Mon Feb 27 14:29:31 2006
@@ -5,6 +5,4 @@
   $dbconfig['db_password'] = '_DBC_PASS_';
   $dbconfig['db_name'] = '_DBC_NAME_';
   $dbconfig['db_type'] = '_DBC_TYPE_'
-
-  $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port'];
 ?>

Modified: vtigercrm/branches/4.2/config.template.php
==============================================================================
--- vtigercrm/branches/4.2/config.template.php (original)
+++ vtigercrm/branches/4.2/config.template.php Mon Feb 27 14:29:31 2006
@@ -41,13 +41,15 @@
       db_name
 */
 
-// TODO: test if port is empty
 $dbconfig['db_server'] = '_DBC_SERVER_';
 $dbconfig['db_port'] = ':_DBC_PORT_';
 $dbconfig['db_username'] = '_DBC_USER_';
 $dbconfig['db_password'] = '_DBC_PASS_';
 $dbconfig['db_name'] = '_DBC_NAME_';
 $dbconfig['db_type'] = '_DBC_TYPE_';
+
+// TODO: test if port is empty
+// TODO: set db_hostname dependending on db_type
 $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port'];
 
 // log_sql default value = false
@@ -72,7 +74,8 @@
 $dbconfigoption['ssl'] = false;
 
 $host_name = $dbconfig['db_hostname'];
-$site_URL = 'http://'.$dbconfig['db_server'].'/vtigercrm';
+
+$site_URL = '_SITE_URL_';
 
 // root directory path
 $root_directory = '_VT_ROOTDIR_';

Modified: vtigercrm/branches/4.2/install/4createConfigFile.php
==============================================================================
--- vtigercrm/branches/4.2/install/4createConfigFile.php (original)
+++ vtigercrm/branches/4.2/install/4createConfigFile.php Mon Feb 27 14:29:31 2006
@@ -145,6 +145,9 @@
       $buffer = str_replace( "_DBC_PASS_", $db_password, $buffer);
       $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer);
       $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer);
+      
+      $buffer = str_replace( "_SITE_URL_", "site_URL", $buffer);
+      
       /* replace dir variable */
       $buffer = str_replace( "_VT_ROOTDIR_", $root_directory, $buffer);
       $buffer = str_replace( "_VT_CACHEDIR_", $cache_dir, $buffer);