From 1f5f3294eb294aef2716c78b6e8bc176274f36f2 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 13:35:24 -0800 Subject: [PATCH] INFRA-132 - install/ - phpcbf --- install/civicrm.php | 1 - install/index.php | 34 ++++++++++++++++------------------ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/install/civicrm.php b/install/civicrm.php index ca5db0bc3a..e9a7190cea 100644 --- a/install/civicrm.php +++ b/install/civicrm.php @@ -303,4 +303,3 @@ function civicrm_home_url() { $drupalURL = civicrm_cms_base(); return $drupalURL . 'index.php?q=civicrm'; } - diff --git a/install/index.php b/install/index.php index cb18967a2f..e9cb8757e7 100644 --- a/install/index.php +++ b/install/index.php @@ -76,7 +76,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . $crmPath); require_once $crmPath . '/CRM/Core/ClassLoader.php'; CRM_Core_ClassLoader::singleton()->register(); -$docLink = CRM_Utils_System::docURL2('Installation and Upgrades', FALSE, 'Installation Guide',NULL,NULL,"wiki"); +$docLink = CRM_Utils_System::docURL2('Installation and Upgrades', FALSE, 'Installation Guide', NULL, NULL, "wiki"); if ($installType == 'drupal') { //lets check only /modules/. @@ -130,7 +130,8 @@ foreach ($langs as $locale => $_) { if ($locale == 'en_US') { continue; } - if (!file_exists(implode(CIVICRM_DIRECTORY_SEPARATOR, array($crmPath, 'sql', "civicrm_data.$locale.mysql"))))unset($langs[$locale]); + if (!file_exists(implode(CIVICRM_DIRECTORY_SEPARATOR, array($crmPath, 'sql', "civicrm_data.$locale.mysql")))) { unset($langs[$locale]); + } } $seedLanguage = 'en_US'; @@ -174,7 +175,7 @@ if ($alreadyInstalled) { $versionFile = $crmPath . CIVICRM_DIRECTORY_SEPARATOR . 'civicrm-version.php'; if (file_exists($versionFile)) { - require_once ($versionFile); + require_once $versionFile; $civicrm_version = civicrmVersion(); } else { @@ -242,7 +243,7 @@ if ($databaseConfig) { if (isset($_REQUEST['go']) && !$req->hasErrors() && !$dbReq->hasErrors()) { // Confirm before reinstalling if (!isset($_REQUEST['force_reinstall']) && $alreadyInstalled) { - include ($installDirPath . 'template.html'); + include $installDirPath . 'template.html'; } else { $inst = new Installer(); @@ -252,7 +253,7 @@ if (isset($_REQUEST['go']) && !$req->hasErrors() && !$dbReq->hasErrors()) { // Show the config form } else { - include ($installDirPath . 'template.html'); + include $installDirPath . 'template.html'; } /** @@ -900,7 +901,6 @@ class InstallRequirements { $this->error($testDetails); } - mysql_query('DROP TRIGGER civicrm_install_temp_table_test_trigger'); mysql_query('DROP TABLE civicrm_install_temp_table_test'); } @@ -1016,8 +1016,8 @@ class InstallRequirements { $this->error($testDetails); } else { $values = mysql_fetch_row($result); - if ($values[1] < (1024*$minValueKB)) { - $testDetails[2] = 'MySQL "thread_stack" is ' . ($values[1]/1024) . 'k'; + if ($values[1] < (1024 * $minValueKB)) { + $testDetails[2] = 'MySQL "thread_stack" is ' . ($values[1] / 1024) . 'k'; $this->error($testDetails); } } @@ -1146,7 +1146,6 @@ class InstallRequirements { $section = $testDetails[0]; $test = $testDetails[1]; - $this->tests[$section][$test] = array("warning", $testDetails[2]); $this->warnings[] = $testDetails; } @@ -1240,7 +1239,7 @@ class Installer extends InstallRequirements { $output .= ''; $output .= '

CiviCRM has been successfully installed

'; $output .= '