<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.7 |
+ | CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2016 |
+ | Copyright CiviCRM LLC (c) 2004-2017 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2016
+ * @copyright CiviCRM LLC (c) 2004-2017
* $Id$
* @param $filesDirectory
*/
if ($installType == 'drupal') {
$siteDir = isset($config['site_dir']) ? $config['site_dir'] : getSiteDir($cmsPath, $_SERVER['SCRIPT_FILENAME']);
- civicrm_setup($cmsPath . DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR .
- $siteDir . DIRECTORY_SEPARATOR . 'files'
+ civicrm_setup($cmsPath . DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . $siteDir . DIRECTORY_SEPARATOR . 'files'
);
}
elseif ($installType == 'backdrop') {
civicrm_setup($files_dirname);
}
- $dsn = "mysql://{$config['mysql']['username']}:{$config['mysql']['password']}@{$config['mysql']['server']}/{$config['mysql']['database']}?new_link=true";
+ $parts = explode(':', $config['mysql']['server']);
+ if (empty($parts[1])) {
+ $parts[1] = 3306;
+ }
+ $config['mysql']['server'] = implode(':', $parts);
+ $dsn = "mysql://{$config['mysql']['username']}:{$config['mysql']['password']}@{$config['mysql']['server']}/{$config['mysql']['database']}?new_link=true";
civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm.mysql');
if (!empty($config['loadGenerated'])) {
civicrm_write_file($configFile,
$string
);
-
}
/**
require_once "$crmPath/packages/DB.php";
+ // CRM-19699 See also CRM_Core_DAO for PHP7 mysqli compatiblity.
+ // Duplicated here because this is not using CRM_Core_DAO directly
+ // and this function may be called directly from Drush.
+ if (!defined('DB_DSN_MODE')) {
+ define('DB_DSN_MODE', 'auto');
+ }
+
$db = DB::connect($dsn);
if (PEAR::isError($db)) {
die("Cannot open $dsn: " . $db->getMessage());
global $compileDir;
global $tplPath, $installType;
+ // Ex: $extraSettings[] = '$civicrm_settings["domain"]["foo"] = "bar";';
+ $extraSettings = array();
+
$params = array(
'crmRoot' => $crmPath,
'templateCompileDir' => $compileDir,
$params['baseURL'] = isset($config['base_url']) ? $config['base_url'] : civicrm_cms_base();
if ($installType == 'drupal' && defined('VERSION')) {
- if (version_compare(VERSION, '7.0-rc1') >= 0) {
+ if (version_compare(VERSION, '8.0') >= 0) {
+ $params['cms'] = 'Drupal';
+ $params['CMSdbUser'] = addslashes($config['drupal']['username']);
+ $params['CMSdbPass'] = addslashes($config['drupal']['password']);
+ $params['CMSdbHost'] = $config['drupal']['host'] . ":" . !empty($config['drupal']['port']) ? $config['drupal']['port'] : "3306";
+ $params['CMSdbName'] = addslashes($config['drupal']['database']);
+ }
+ elseif (version_compare(VERSION, '7.0-rc1') >= 0) {
$params['cms'] = 'Drupal';
$params['CMSdbUser'] = addslashes($config['drupal']['username']);
$params['CMSdbPass'] = addslashes($config['drupal']['password']);
// CRM-12386
$params['crmRoot'] = addslashes($params['crmRoot']);
+ //CRM-16421
+
+ $extraSettings[] = sprintf('$civicrm_paths[\'wp.frontend.base\'][\'url\'] = %s;', var_export(home_url() . '/', 1));
+ $extraSettings[] = sprintf('$civicrm_paths[\'wp.backend.base\'][\'url\'] = %s;', var_export(admin_url(), 1));
+ $extraSettings[] = sprintf('$civicrm_setting[\'URL Preferences\'][\'userFrameworkResourceURL\'] = %s;', var_export(plugin_dir_url(CIVICRM_PLUGIN_FILE) . 'civicrm', 1));
+ }
+
+ if ($extraSettings) {
+ $params['extraSettings'] = "Additional settings generated by installer:\n" . implode("\n", $extraSettings);
+ }
+ else {
+ $params['extraSettings'] = "";
}
$params['siteKey'] = md5(rand() . mt_rand() . rand() . uniqid('', TRUE) . $params['baseURL']);