diff --git a/CRM/Core/I18n/PseudoConstant.php b/CRM/Core/I18n/PseudoConstant.php
index ef5ea2be4f75889c0a21c59b6796351026965488..ee4074dc2406e3194bb9e4e0d503ad9fec0fd8cb 100644
--- a/CRM/Core/I18n/PseudoConstant.php
+++ b/CRM/Core/I18n/PseudoConstant.php
@@ -51,7 +51,7 @@ class CRM_Core_I18n_PseudoConstant {
}
// hand-crafted enforced overrides for language variants
// NB: when adding support for a regional override for a new language below, update
- // relevant comments in templates/CRM/common/civicrm.settings.php.tpl as well
+ // relevant comments in templates/CRM/common/civicrm.settings.php.template as well
$longForShortMapping['zh'] = defined("CIVICRM_LANGUAGE_MAPPING_ZH") ? CIVICRM_LANGUAGE_MAPPING_ZH : 'zh_CN';
$longForShortMapping['en'] = defined("CIVICRM_LANGUAGE_MAPPING_EN") ? CIVICRM_LANGUAGE_MAPPING_EN : 'en_US';
$longForShortMapping['fr'] = defined("CIVICRM_LANGUAGE_MAPPING_FR") ? CIVICRM_LANGUAGE_MAPPING_FR : 'fr_FR';
diff --git a/install/civicrm.php b/install/civicrm.php
index 21ac16abd1c5fa00004f4e9d3bd2490ccdf979c7..e306c37f1fab70f19bece989f95d81a802984a47 100644
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -216,7 +216,7 @@ function civicrm_config(&$config) {
$params['siteKey'] = md5(uniqid('', TRUE) . $params['baseURL']);
- $str = file_get_contents($tplPath . 'civicrm.settings.php.tpl');
+ $str = file_get_contents($tplPath . 'civicrm.settings.php.template');
foreach ($params as $key => $value) {
$str = str_replace('%%' . $key . '%%', $value, $str);
}
diff --git a/templates/CRM/common/civicrm.settings.php.tpl b/templates/CRM/common/civicrm.settings.php.tpl
deleted file mode 100644
index 94d394321bbf7b1f87c7117662053114dc2ec3f5..0000000000000000000000000000000000000000
--- a/templates/CRM/common/civicrm.settings.php.tpl
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
-*/
-
-/**
- * CiviCRM Configuration File
- */
-
-/**
- * Content Management System (CMS) Host:
- *
- * CiviCRM can be hosted in either Drupal 6 or 7, Joomla or WordPress.
- *
- * Settings for Drupal 7.x:
- * define( 'CIVICRM_UF' , 'Drupal' );
- *
- * Settings for Drupal 6.x:
- * define( 'CIVICRM_UF' , 'Drupal6' );
- *
- * Settings for Joomla 1.7.x - 2.5.x:
- * define( 'CIVICRM_UF' , 'Joomla' );
- *
- * Settings for WordPress 3.3.x:
- * define( 'CIVICRM_UF' , 'WordPress' );
- *
- * You may have issues with images in CiviCRM. If this is the case, be sure
- * to update the CiviCRM Resource URL field to your CiviCRM root directory
- * (Administer::System Settings::Resource URLs).
- */
-define( 'CIVICRM_UF' , '%%cms%%' );
-
-/**
- * Content Management System (CMS) Datasource:
- *
- * Update this setting with your CMS (Drupal or Joomla) database username, server and DB name.
- * Datasource (DSN) format:
- * define( 'CIVICRM_UF_DSN', 'mysql://cms_db_username:cms_db_password@db_server/cms_database?new_link=true');
- */
-define( 'CIVICRM_UF_DSN' , 'mysql://%%CMSdbUser%%:%%CMSdbPass%%@%%CMSdbHost%%/%%CMSdbName%%?new_link=true' );
-
-/**
- * CiviCRM Database Settings
- *
- * Database URL (CIVICRM_DSN) for CiviCRM Data:
- * Database URL format:
- * define( 'CIVICRM_DSN', 'mysql://crm_db_username:crm_db_password@db_server/crm_database?new_link=true');
- *
- * Drupal and CiviCRM can share the same database, or can be installed into separate databases.
- *
- * EXAMPLE: Drupal and CiviCRM running in the same database...
- * DB Name = drupal, DB User = drupal
- * define( 'CIVICRM_DSN' , 'mysql://drupal:YOUR_PASSWORD@localhost/drupal?new_link=true' );
- *
- * EXAMPLE: Drupal and CiviCRM running in separate databases...
- * Drupal DB Name = drupal, DB User = drupal
- * CiviCRM DB Name = civicrm, CiviCRM DB User = civicrm
- * define( 'CIVICRM_DSN' , 'mysql://civicrm:YOUR_PASSWORD@localhost/civicrm?new_link=true' );
- *
- */
-define( 'CIVICRM_DSN' , 'mysql://%%dbUser%%:%%dbPass%%@%%dbHost%%/%%dbName%%?new_link=true' );
-
-/**
- * CiviCRM Logging Database
- *
- * Used to point to a different database to use for logging (if desired). If unset defaults to equal CIVICRM_DSN.
- * The CIVICRM_DSN user needs to have the rights to modify the below database schema and be able to write to it.
- */
-define('CIVICRM_LOGGING_DSN', CIVICRM_DSN);
-
-/**
- * File System Paths:
- *
- * $civicrm_root is the file system path on your server where the civicrm
- * code is installed. Use an ABSOLUTE path (not a RELATIVE path) for this setting.
- *
- * CIVICRM_TEMPLATE_COMPILEDIR is the file system path where compiled templates are stored.
- * These sub-directories and files are temporary caches and will be recreated automatically
- * if deleted.
- *
- * IMPORTANT: The COMPILEDIR directory must exist,
- * and your web server must have read/write access to these directories.
- *
- *
- * EXAMPLE - Drupal:
- * If the path to the Drupal home directory is /var/www/htdocs/drupal
- * the $civicrm_root setting would be:
- * $civicrm_root = '/var/www/htdocs/drupal/sites/all/modules/civicrm/';
- *
- * the CIVICRM_TEMPLATE_COMPILEDIR would be:
- * define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/drupal/sites/default/files/civicrm/templates_c/' );
- *
- * EXAMPLE - Joomla Installations:
- * If the path to the Joomla home directory is /var/www/htdocs/joomla
- * the $civicrm_root setting would be:
- * $civicrm_root = '/var/www/htdocs/joomla/administrator/components/com_civicrm/civicrm/';
- *
- * the CIVICRM_TEMPLATE_COMPILEDIR would be:
- * define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/joomla/media/civicrm/templates_c/' );
- *
- * EXAMPLE - WordPress Installations:
- * If the path to the WordPress home directory is /var/www/htdocs/wordpress
- * the $civicrm_root setting would be:
- * $civicrm_root = '/var/www/htdocs/wordpress/wp-content/plugins/civicrm/civicrm/';
- *
- * the CIVICRM_TEMPLATE_COMPILEDIR would be:
- * define( 'CIVICRM_TEMPLATE_COMPILEDIR', '/var/www/htdocs/wordpress/wp-content/plugins/files/civicrm/templates_c/' );
- *
- */
-
-global $civicrm_root;
-
-$civicrm_root = '%%crmRoot%%';
-define( 'CIVICRM_TEMPLATE_COMPILEDIR', '%%templateCompileDir%%' );
-
-/**
- * Site URLs:
- *
- * This section defines absolute and relative URLs to access the host CMS (Drupal or Joomla) resources.
- *
- * IMPORTANT: Trailing slashes should be used on all URL settings.
- *
- *
- * EXAMPLE - Drupal Installations:
- * If your site's home url is http://www.example.com/drupal/
- * these variables would be set as below. Modify as needed for your install.
- *
- * CIVICRM_UF_BASEURL - home URL for your site:
- * define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/drupal/' );
- *
- * EXAMPLE - Joomla Installations:
- * If your site's home url is http://www.example.com/joomla/
- *
- * CIVICRM_UF_BASEURL - home URL for your site:
- * Administration site:
- * define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/joomla/administrator/' );
- * Front-end site:
- * define( 'CIVICRM_UF_BASEURL' , 'http://www.example.com/joomla/' );
- *
- */
-define( 'CIVICRM_UF_BASEURL' , '%%baseURL%%' );
-
-/*
- * If you are using any CiviCRM script in the bin directory that
- * requires authentication, then you also need to set this key.
- * We recommend using a 16-32 bit alphanumeric/punctuation key.
- * More info at http://wiki.civicrm.org/confluence/display/CRMDOC/Command-line+Script+Configuration
- */
-define( 'CIVICRM_SITE_KEY', '%%siteKey%%' );
-
-/**
- * Enable this constant, if you want to send your email through the smarty
- * templating engine(allows you to do conditional and more complex logic)
- *
- */
-define( 'CIVICRM_MAIL_SMARTY', 0 );
-
-/**
- * This setting logs all emails to a file. Useful for debugging any mail (or civimail) issues.
- * Enabling this setting will not send any email, ensure this is commented out in production
- * The CIVICRM_MAIL_LOG is a debug option which disables MTA (mail transport agent) interaction.
- * You must disable CIVICRM_MAIL_LOG before CiviCRM will talk to your MTA.
- */
-// define( 'CIVICRM_MAIL_LOG', '%%templateCompileDir%%/mail.log' );
-
-define( 'CIVICRM_DOMAIN_ID' , 1 );
-
-/**
- * Settings to enable external caching using a Memcache server. This is an
- * advanced feature, and you should read and understand the documentation
- * before you turn it on. We cannot store these settings in the DB since the
- * config could potentially also be cached and we need to avoid an infinite
- * recursion scenario.
- *
- * @see http://civicrm.org/node/126
- */
-
-/**
- * If you have a memcache server configured and want CiviCRM to make use of it,
- * set the following constant. You should only set this once you have your memcache
- * server up and working, because CiviCRM will not start up if your server is
- * unavailable on the host and port that you specify. By default CiviCRM will use
- * an in-memory array cache
- *
- * To use the php extension memcache use a value of 'Memcache'
- * To use the php extension memcached use a value of 'Memcached'
- * To use the php extension apc use a value of 'APCcache'
- * To not use any caching (not recommended), use a value of 'NoCache'
- *
- */
-define( 'CIVICRM_DB_CACHE_CLASS', 'ArrayCache' );
-
-/**
- * Change this to the IP address of your cache server if it is not on the
- * same machine (Unix).
- */
-define( 'CIVICRM_DB_CACHE_HOST', 'localhost' );
-
-/**
- * Change this if you are not using the standard port for memcache or apccache (11211)
- */
-define( 'CIVICRM_DB_CACHE_PORT', 11211 );
-
-/**
- * Items in cache will expire after the number of seconds specified here.
- * Default value is 3600 (i.e., after an hour)
- */
-define( 'CIVICRM_DB_CACHE_TIMEOUT', 3600 );
-
-/**
- * If you are sharing the same memcache instance with more than one CiviCRM
- * database, you will need to set a different value for the following argument
- * so that each copy of CiviCRM will not interfere with other copies. If you only
- * have one copy of CiviCRM, you may leave this set to ''. A good value for
- * this if you have two servers might be 'server1_' for the first server, and
- * 'server2_' for the second server.
- */
-define( 'CIVICRM_MEMCACHE_PREFIX', '' );
-
-/**
- * If you have multilingual site and you are using the "inherit CMS language"
- * configuration option, but wish to, for example, use fr_CA instead of the
- * default fr_FR (for French), set one or more of the constants below to an
- * appropriate regional value.
- */
-// define('CIVICRM_LANGUAGE_MAPPING_FR', 'fr_CA');
-// define('CIVICRM_LANGUAGE_MAPPING_EN', 'en_CA');
-// define('CIVICRM_LANGUAGE_MAPPING_ES', 'es_MX');
-// define('CIVICRM_LANGUAGE_MAPPING_PT', 'pt_BR');
-// define('CIVICRM_LANGUAGE_MAPPING_ZH', 'zh_TW');
-
-/**
- * Configure MySQL to throw more errors when encountering unusual SQL expressions.
- *
- * If undefined, the value is determined automatically. For CiviCRM tarballs, it defaults
- * to FALSE; for SVN checkouts, it defaults to TRUE.
- */
-// define( 'CIVICRM_MYSQL_STRICT', TRUE );
-
-/**
- *
- * Do not change anything below this line. Keep as is
- *
- */
-
-$include_path = '.' . PATH_SEPARATOR .
- $civicrm_root . PATH_SEPARATOR .
- $civicrm_root . DIRECTORY_SEPARATOR . 'packages' . PATH_SEPARATOR .
- get_include_path( );
-if ( set_include_path( $include_path ) === false ) {
- echo "Could not set the include path<p>";
- exit( );
-}
-
-if ( function_exists( 'variable_get' ) && variable_get('clean_url', '0') != '0' ) {
- define( 'CIVICRM_CLEANURL', 1 );
-} else {
- define( 'CIVICRM_CLEANURL', 0 );
-}
-
-// force PHP to auto-detect Mac line endings
-ini_set('auto_detect_line_endings', '1');
-
-// make sure the memory_limit is at least 64 MB
-$memLimitString = trim(ini_get('memory_limit'));
-$memLimitUnit = strtolower(substr($memLimitString, -1));
-$memLimit = (int) $memLimitString;
-switch ($memLimitUnit) {
- case 'g': $memLimit *= 1024;
- case 'm': $memLimit *= 1024;
- case 'k': $memLimit *= 1024;
-}
-if ($memLimit >= 0 and $memLimit < 134217728) {
- ini_set('memory_limit', '128M');
-}
-
-require_once 'CRM/Core/ClassLoader.php';
-CRM_Core_ClassLoader::singleton()->register();
diff --git a/tools/scripts/mk-drupal-test-site b/tools/scripts/mk-drupal-test-site
index 67be6b68822eed118fe38ff7d5e6297a27e30345..d5402670cf7f0fc4251c5291ec1550c6f1848601 100755
--- a/tools/scripts/mk-drupal-test-site
+++ b/tools/scripts/mk-drupal-test-site
@@ -112,7 +112,7 @@ done
ln -s "$CIVI_ROOT" "sites/$SITE_URL/modules/civicrm"
-cat "$CIVI_ROOT/templates/CRM/common/civicrm.settings.php.tpl" \
+cat "$CIVI_ROOT/templates/CRM/common/civicrm.settings.php.template" \
| sed "s;%%baseURL%%;http://${SITE_URL};" \
| sed "s;%%cms%%;Drupal;" \
| sed "s;%%CMSdbHost%%;${DB_HOST};" \