[Vtigercrm-commits] [vtiger-commits] r10802 - in /vtigercrm/branches/5.0.3: config.template.php install/2setConfig.php install/4createConfigFile.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Fri Apr 27 08:29:48 2007
New Revision: 10802

Log:
removed default domain name

Modified:
    vtigercrm/branches/5.0.3/config.template.php
    vtigercrm/branches/5.0.3/install/2setConfig.php
    vtigercrm/branches/5.0.3/install/4createConfigFile.php

Modified: vtigercrm/branches/5.0.3/config.template.php
==============================================================================
--- vtigercrm/branches/5.0.3/config.template.php (original)
+++ vtigercrm/branches/5.0.3/config.template.php Fri Apr 27 08:29:48 2007
@@ -28,11 +28,11 @@
 $FCKEDITOR_DISPLAY = 'true';
 
 // url for customer portal (Example: http://vtiger.com/portal)
-$PORTAL_URL = 'http://your-domain.com/customerportal';
+$PORTAL_URL = 'http://vtiger.com/customerportal';
 
 // helpdesk support email id and support name (Example: 'support at vtiger.com' and 'vtiger support')
-$HELPDESK_SUPPORT_EMAIL_ID = 'support at your-domain.com';
-$HELPDESK_SUPPORT_NAME = 'your-domain name';
+$HELPDESK_SUPPORT_EMAIL_ID = '_SUPPORT_EMAIL_';
+$HELPDESK_SUPPORT_NAME = 'your-support name';
 
 /* database configuration
       db_server

Modified: vtigercrm/branches/5.0.3/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/5.0.3/install/2setConfig.php (original)
+++ vtigercrm/branches/5.0.3/install/2setConfig.php Fri Apr 27 08:29:48 2007
@@ -289,7 +289,7 @@
 	if (trim(form.admin_email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.admin_email.value)) {
 		alert("The email id \'"+form.admin_email.value+"\' in the email field is invalid");
 		form.admin_email.focus();
-		exit();
+		return false;
 	}
 
 	form.submit();
@@ -454,7 +454,7 @@
 			</tr>
 			<tr>
 				<td bgcolor="#F5F5F5" nowrap><strong>Email</strong><sup><font color=red>*</font></sup></td>
-				<td bgcolor="white" align="left"><input class="dataInput" type="text" name="admin_email" value="<?php if (isset($admin_email)) echo "$admin_email"; else echo "admin at your-domain.com"; ?>"></td>
+				<td bgcolor="white" align="left"><input class="dataInput" type="text" name="admin_email" value="<?php if (isset($admin_email)) echo "$admin_email"; ?>"></td>
 			</tr>
 			<tr>
 				<td colspan="2" bgcolor="white"><font color=blue> <b>Note:</b> The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.</font></td>

Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php
==============================================================================
--- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original)
+++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Fri Apr 27 08:29:48 2007
@@ -216,12 +216,14 @@
 						      	$buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer);
 						      	$buffer = str_replace( "_DB_STAT_", "true", $buffer);
 				
-						      	/* replace the application unique key variable */
+						      	/* replace master currency variable */
 				      			$buffer = str_replace( "_MASTER_CURRENCY_", $currency_name, $buffer);
 
 						      	/* replace the application unique key variable */
 					      		$buffer = str_replace( "_VT_APP_UNIQKEY_", md5($root_directory), $buffer);
-	
+							/* replace support email variable */
+							$buffer = str_replace( "_SUPPORT_EMAIL_", $admin_email, $buffer);
+
 					      		fwrite($includeHandle, $buffer);
 					      		}