From 48049647d8557f71edafca05f84aca59c770f8d3 Mon Sep 17 00:00:00 2001 From: zauberfisch Date: Wed, 16 Oct 2013 21:17:22 +0100 Subject: [PATCH] formatted install.php5 according to SilverStripe coding conventions (spaces) --- dev/install/install.php5 | 272 +++++++++++++++++++-------------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/dev/install/install.php5 b/dev/install/install.php5 index 57d4cb02b..438a29224 100755 --- a/dev/install/install.php5 +++ b/dev/install/install.php5 @@ -27,7 +27,7 @@ ini_set('display_errors', '1'); error_reporting(E_ALL | E_STRICT); // Attempt to start a session so that the username and password can be sent back to the user. -if (function_exists('session_start') && !session_id()) { +if(function_exists('session_start') && !session_id()) { session_start(); } @@ -45,19 +45,19 @@ $dirsToCheck = array( dirname($_SERVER['SCRIPT_FILENAME']) ); //if they are the same, remove one of them -if ($dirsToCheck[0] == $dirsToCheck[1]) { +if($dirsToCheck[0] == $dirsToCheck[1]) { unset($dirsToCheck[1]); } -foreach ($dirsToCheck as $dir) { +foreach($dirsToCheck as $dir) { //check this dir and every parent dir (until we hit the base of the drive) // or until we hit a dir we can't read do { //add the trailing slash we need to concatenate properly $dir .= DIRECTORY_SEPARATOR; //if it's readable, go ahead - if (@is_readable($dir)) { + if(@is_readable($dir)) { //if the file exists, then we include it, set relevant vars and break out - if (file_exists($dir . $envFile)) { + if(file_exists($dir . $envFile)) { include_once($dir . $envFile); $envFileExists = true; //legacy variable assignment @@ -73,11 +73,11 @@ foreach ($dirsToCheck as $dir) { $dir = dirname($dir); //here we need to check that the path of the last dir and the next one are // not the same, if they are, we have hit the root of the drive - } while (dirname($dir) != $dir); + } while(dirname($dir) != $dir); } -if ($envFileExists) { - if (!empty($_REQUEST['useEnv'])) { +if($envFileExists) { + if(!empty($_REQUEST['useEnv'])) { $usingEnv = true; } else { $usingEnv = false; @@ -152,9 +152,9 @@ $locales = array( DatabaseAdapterRegistry::autodiscover(); // Determine which external database modules are USABLE -foreach (DatabaseAdapterRegistry::get_adapters() as $class => $details) { +foreach(DatabaseAdapterRegistry::get_adapters() as $class => $details) { $databaseClasses[$class] = $details; - if (file_exists($details['helperPath'])) { + if(file_exists($details['helperPath'])) { $databaseClasses[$class]['hasModule'] = true; include_once($details['helperPath']); } else { @@ -163,12 +163,12 @@ foreach (DatabaseAdapterRegistry::get_adapters() as $class => $details) { } // Load database config -if (isset($_REQUEST['db'])) { - if (isset($_REQUEST['db']['type'])) $type = $_REQUEST['db']['type']; +if(isset($_REQUEST['db'])) { + if(isset($_REQUEST['db']['type'])) $type = $_REQUEST['db']['type']; else $type = $_REQUEST['db']['type'] = defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase'; // Disabled inputs don't submit anything - we need to use the environment (except the database name) - if ($usingEnv) { + if($usingEnv) { $_REQUEST['db'][$type] = $databaseConfig = array( "type" => defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : $type, "server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : "localhost", @@ -193,9 +193,9 @@ if (isset($_REQUEST['db'])) { ); } -if (isset($_REQUEST['admin'])) { +if(isset($_REQUEST['admin'])) { // Disabled inputs don't submit anything - we need to use the environment (except the database name) - if ($usingEnv) { + if($usingEnv) { $_REQUEST['admin'] = $adminConfig = array( 'username' => defined('SS_DEFAULT_ADMIN_USERNAME') ? SS_DEFAULT_ADMIN_USERNAME : 'admin', 'password' => defined('SS_DEFAULT_ADMIN_PASSWORD') ? SS_DEFAULT_ADMIN_PASSWORD : '', @@ -211,19 +211,19 @@ if (isset($_REQUEST['admin'])) { } $alreadyInstalled = false; -if (file_exists('mysite/_config.php')) { +if(file_exists('mysite/_config.php')) { // Find the $database variable in the relevant config file without having to execute the config file - if (preg_match("/\\\$database\s*=\s*[^\n\r]+[\n\r]/", file_get_contents("mysite/_config.php"), $parts)) { + if(preg_match("/\\\$database\s*=\s*[^\n\r]+[\n\r]/", file_get_contents("mysite/_config.php"), $parts)) { eval($parts[0]); - if ($database) $alreadyInstalled = true; + if($database) $alreadyInstalled = true; // Assume that if $databaseConfig is defined in mysite/_config.php, then a non-environment-based installation has // already gone ahead - } else if (preg_match("/\\\$databaseConfig\s*=\s*[^\n\r]+[\n\r]/", file_get_contents("mysite/_config.php"), $parts)) { + } else if(preg_match("/\\\$databaseConfig\s*=\s*[^\n\r]+[\n\r]/", file_get_contents("mysite/_config.php"), $parts)) { $alreadyInstalled = true; } } -if (file_exists(FRAMEWORK_NAME . '/silverstripe_version')) { +if(file_exists(FRAMEWORK_NAME . '/silverstripe_version')) { $silverstripe_version = file_get_contents(FRAMEWORK_NAME . '/silverstripe_version'); } else { $silverstripe_version = "unknown"; @@ -234,23 +234,23 @@ $req = new InstallRequirements(); $req->check(); $webserverConfigFile = ''; -if ($req->isIIS()) { +if($req->isIIS()) { $webserverConfigFile = 'web.config'; } else { $webserverConfigFile = '.htaccess'; } -if ($req->hasErrors()) { +if($req->hasErrors()) { $hasErrorOtherThanDatabase = true; $phpIniLocation = php_ini_loaded_file(); } -if ($databaseConfig) { +if($databaseConfig) { $dbReq = new InstallRequirements(); $dbReq->checkDatabase($databaseConfig); } -if ($adminConfig) { +if($adminConfig) { $adminReq = new InstallRequirements(); $adminReq->checkAdminConfig($adminConfig); } @@ -259,21 +259,21 @@ if ($adminConfig) { $installFromCli = (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'install'); // CLI-install error message. exit(1) will halt any makefile. -if ($installFromCli && ($req->hasErrors() || $dbReq->hasErrors())) { +if($installFromCli && ($req->hasErrors() || $dbReq->hasErrors())) { echo "Cannot install due to errors:\n"; $req->listErrors(); $dbReq->listErrors(); exit(1); } -if ((isset($_REQUEST['go']) || $installFromCli) && !$req->hasErrors() && !$dbReq->hasErrors() && $adminConfig['username'] && $adminConfig['password']) { +if((isset($_REQUEST['go']) || $installFromCli) && !$req->hasErrors() && !$dbReq->hasErrors() && $adminConfig['username'] && $adminConfig['password']) { // Confirm before reinstalling - if (!$installFromCli && $alreadyInstalled) { + if(!$installFromCli && $alreadyInstalled) { include(FRAMEWORK_NAME . '/dev/install/config-form.html'); } else { $inst = new Installer(); - if ($_REQUEST) $inst->install($_REQUEST); + if($_REQUEST) $inst->install($_REQUEST); else $inst->install(array( 'db' => $databaseConfig, 'admin' => $adminConfig, @@ -302,7 +302,7 @@ class InstallRequirements { * continuing onto more difficult checks like database permissions. */ function checkDatabase($databaseConfig) { - if ($this->requireDatabaseFunctions( + if($this->requireDatabaseFunctions( $databaseConfig, array( "Database Configuration", @@ -311,7 +311,7 @@ class InstallRequirements { $this->getDatabaseTypeNice($databaseConfig['type']) ) )) { - if ($this->requireDatabaseServer( + if($this->requireDatabaseServer( $databaseConfig, array( "Database Configuration", @@ -320,7 +320,7 @@ class InstallRequirements { $databaseConfig['type'] == 'SQLiteDatabase' ? $databaseConfig['path'] : $databaseConfig['server'] ) )) { - if ($this->requireDatabaseConnection( + if($this->requireDatabaseConnection( $databaseConfig, array( "Database Configuration", @@ -328,7 +328,7 @@ class InstallRequirements { "That username/password doesn't work" ) )) { - if ($this->requireDatabaseVersion( + if($this->requireDatabaseVersion( $databaseConfig, array( "Database Configuration", @@ -352,10 +352,10 @@ class InstallRequirements { } function checkAdminConfig($adminConfig) { - if (!$adminConfig['username']) { + if(!$adminConfig['username']) { $this->error(array('', 'Please enter a username!')); } - if (!$adminConfig['password']) { + if(!$adminConfig['password']) { $this->error(array('', 'Please enter a password!')); } } @@ -365,7 +365,7 @@ class InstallRequirements { * @return boolean */ function isIIS($version = 7) { - if (strpos($this->findWebserver(), 'IIS/' . $version) !== false) { + if(strpos($this->findWebserver(), 'IIS/' . $version) !== false) { return true; } else { return false; @@ -373,7 +373,7 @@ class InstallRequirements { } function isApache() { - if (strpos($this->findWebserver(), 'Apache') !== false) { + if(strpos($this->findWebserver(), 'Apache') !== false) { return true; } else { return false; @@ -387,9 +387,9 @@ class InstallRequirements { function findWebserver() { // Try finding from SERVER_SIGNATURE or SERVER_SOFTWARE $webserver = @$_SERVER['SERVER_SIGNATURE']; - if (!$webserver) $webserver = @$_SERVER['SERVER_SOFTWARE']; + if(!$webserver) $webserver = @$_SERVER['SERVER_SOFTWARE']; - if ($webserver) return strip_tags(trim($webserver)); + if($webserver) return strip_tags(trim($webserver)); else return false; } @@ -419,14 +419,14 @@ class InstallRequirements { $this->requireModule('mysite', array("File permissions", "mysite/ directory exists?")); $this->requireModule(FRAMEWORK_NAME, array("File permissions", FRAMEWORK_NAME . "/ directory exists?")); - if ($isApache) { + if($isApache) { $this->checkApacheVersion(array( "Webserver Configuration", "Webserver is not Apache 1.x", "SilverStripe requires Apache version 2 or greater", $webserver )); $this->requireWriteable('.htaccess', array("File permissions", "Is the .htaccess file writeable?", null)); - } elseif ($isIIS) { + } elseif($isIIS) { $this->requireWriteable('web.config', array("File permissions", "Is the web.config file writeable?", null)); } @@ -435,7 +435,7 @@ class InstallRequirements { "Is the mysite/_config.php file writeable?", null )); - if (!$this->checkModuleExists('cms')) { + if(!$this->checkModuleExists('cms')) { $this->requireWriteable('mysite/code/RootURLController.php', array( "File permissions", "Is the mysite/code/RootURLController.php file writeable?", @@ -446,7 +446,7 @@ class InstallRequirements { $tempFolder = $this->getTempFolder(); $this->requireTempFolder(array('File permissions', 'Is a temporary directory available?', null, $tempFolder)); - if ($tempFolder) { + if($tempFolder) { // in addition to the temp folder being available, check it is writable $this->requireWriteable($tempFolder, array( "File permissions", @@ -458,13 +458,13 @@ class InstallRequirements { // Check for web server, unless we're calling the installer from the command-line $this->isRunningWebServer(array("Webserver Configuration", "Server software", "Unknown", $webserver)); - if ($isApache) { + if($isApache) { $this->requireApacheRewriteModule('mod_rewrite', array( "Webserver Configuration", "URL rewriting support", "You need mod_rewrite to use friendly URLs with SilverStripe, but it is not enabled." )); - } elseif ($isIIS) { + } elseif($isIIS) { $this->requireIISRewriteModule('IIS_UrlRewriteModule', array( "Webserver Configuration", "URL rewriting support", @@ -492,7 +492,7 @@ class InstallRequirements { )); // Check for GD support - if (!$this->requireFunction("imagecreatetruecolor", array( + if(!$this->requireFunction("imagecreatetruecolor", array( "PHP Configuration", "GD2 support", "PHP must have GD version 2." @@ -644,14 +644,14 @@ class InstallRequirements { // special case for display_errors, check the original value before // it was changed at the start of this script. - if ($settingName = 'display_errors') { + if($settingName = 'display_errors') { global $originalDisplayErrorsValue; $val = $originalDisplayErrorsValue; } else { $val = ini_get($settingName); } - if (!in_array($val, $settingValues) && $val != $settingValues) { + if(!in_array($val, $settingValues) && $val != $settingValues) { $testDetails[2] = "$settingName is set to '$val' in php.ini. $testDetails[2]"; $this->warning($testDetails); } @@ -661,7 +661,7 @@ class InstallRequirements { $this->testing($testDetails); $val = ini_get($settingName); - if (!in_array($val, $settingValues) && $val != $settingValues) { + if(!in_array($val, $settingValues) && $val != $settingValues) { $testDetails[2] = "$settingName is set to '$val' in php.ini. $testDetails[2]"; $this->error($testDetails); } @@ -670,7 +670,7 @@ class InstallRequirements { function suggestClass($class, $testDetails) { $this->testing($testDetails); - if (!class_exists($class)) { + if(!class_exists($class)) { $this->warning($testDetails); } } @@ -678,7 +678,7 @@ class InstallRequirements { function suggestFunction($class, $testDetails) { $this->testing($testDetails); - if (!function_exists($class)) { + if(!function_exists($class)) { $this->warning($testDetails); } } @@ -687,7 +687,7 @@ class InstallRequirements { $this->testing($testDetails); $result = ini_get('date.timezone') && in_array(ini_get('date.timezone'), timezone_identifiers_list()); - if (!$result) { + if(!$result) { $this->error($testDetails); } } @@ -696,7 +696,7 @@ class InstallRequirements { $_SESSION['forcemem'] = false; $mem = $this->getPHPMemory(); - if ($mem < (64 * 1024 * 1024)) { + if($mem < (64 * 1024 * 1024)) { ini_set('memory_limit', '64M'); $mem = $this->getPHPMemory(); $testDetails[3] = ini_get("memory_limit"); @@ -704,13 +704,13 @@ class InstallRequirements { $this->testing($testDetails); - if ($mem < $min && $mem > 0) { + if($mem < $min && $mem > 0) { $testDetails[2] .= " You only have " . ini_get("memory_limit") . " allocated"; $this->error($testDetails); - } else if ($mem < $recommended && $mem > 0) { + } else if($mem < $recommended && $mem > 0) { $testDetails[2] .= " You only have " . ini_get("memory_limit") . " allocated"; $this->warning($testDetails); - } elseif ($mem == 0) { + } elseif($mem == 0) { $testDetails[2] .= " We can't determine how much memory you have allocated. " . "Install only if you're sure you've allocated at least 20 MB."; $this->warning($testDetails); @@ -720,7 +720,7 @@ class InstallRequirements { function getPHPMemory() { $memString = ini_get("memory_limit"); - switch (strtolower(substr($memString, -1))) { + switch(strtolower(substr($memString, -1))) { case "k": return round(substr($memString, 0, -1) * 1024); @@ -736,35 +736,35 @@ class InstallRequirements { } function listErrors() { - if ($this->errors) { + if($this->errors) { echo "

The following problems are preventing me from installing SilverStripe CMS:

\n\n"; - foreach ($this->errors as $error) { + foreach($this->errors as $error) { echo "
  • " . htmlentities(implode(", ", $error), ENT_COMPAT, 'UTF-8') . "
    • \n"; } } } function showTable($section = null) { - if ($section) { + if($section) { $tests = $this->tests[$section]; $id = strtolower(str_replace(' ', '_', $section)); echo ""; - foreach ($tests as $test => $result) { + foreach($tests as $test => $result) { echo ""; } echo "
    $test" . nl2br(htmlentities($result[1], ENT_COMPAT, 'UTF-8')) . "
    "; } else { - foreach ($this->tests as $section => $tests) { + foreach($this->tests as $section => $tests) { $failedRequirements = 0; $warningRequirements = 0; $output = ""; - foreach ($tests as $test => $result) { - if (isset($result['0'])) { - switch ($result['0']) { + foreach($tests as $test => $result) { + if(isset($result['0'])) { + switch($result['0']) { case 'error': $failedRequirements++; break; @@ -780,12 +780,12 @@ class InstallRequirements { $text = "All Requirements Pass"; $pluralWarnings = ($warningRequirements == 1) ? 'Warning' : 'Warnings'; - if ($failedRequirements > 0) { + if($failedRequirements > 0) { $className = "error"; $pluralWarnings = ($warningRequirements == 1) ? 'Warning' : 'Warnings'; $text = $failedRequirements . ' Failed and ' . $warningRequirements . ' ' . $pluralWarnings; - } else if ($warningRequirements > 0) { + } else if($warningRequirements > 0) { $className = "warning"; $text = "All Requirements Pass but " . $warningRequirements . ' ' . $pluralWarnings; } @@ -801,7 +801,7 @@ class InstallRequirements { function requireFunction($funcName, $testDetails) { $this->testing($testDetails); - if (!function_exists($funcName)) { + if(!function_exists($funcName)) { $this->error($testDetails); } else { return true; @@ -810,7 +810,7 @@ class InstallRequirements { function requireClass($className, $testDetails) { $this->testing($testDetails); - if (!class_exists($className)) { + if(!class_exists($className)) { $this->error($testDetails); } else { return false; @@ -823,10 +823,10 @@ class InstallRequirements { function requireNoClasses($classNames, $testDetails) { $this->testing($testDetails); $badClasses = array(); - foreach ($classNames as $className) { - if (class_exists($className)) $badClasses[] = $className; + foreach($classNames as $className) { + if(class_exists($className)) $badClasses[] = $className; } - if ($badClasses) { + if($badClasses) { $testDetails[2] .= ". The following classes are at fault: " . implode(', ', $badClasses); $this->error($testDetails); } else { @@ -838,7 +838,7 @@ class InstallRequirements { $this->testing($testDetails); $is1pointx = preg_match('#Apache[/ ]1\.#', $testDetails[3]); - if ($is1pointx) { + if($is1pointx) { $this->error($testDetails); } @@ -850,7 +850,7 @@ class InstallRequirements { $installedVersion = phpversion(); - if (version_compare($installedVersion, $requiredVersion, '<')) { + if(version_compare($installedVersion, $requiredVersion, '<')) { $testDetails[2] = "SilverStripe requires PHP version $requiredVersion or later.\n PHP version $installedVersion is currently installed.\n While SilverStripe requires at least PHP version $requiredVersion, upgrading to $recommendedVersion or later is recommended.\n @@ -859,7 +859,7 @@ class InstallRequirements { return; } - if (version_compare($installedVersion, $recommendedVersion, '<')) { + if(version_compare($installedVersion, $recommendedVersion, '<')) { $testDetails[2] = "PHP version $installedVersion is currently installed.\n Upgrading to at least PHP version $recommendedVersion is recommended.\n SilverStripe should run, but you may run into issues. Future releases may require a later version of PHP.\n"; @@ -885,10 +885,10 @@ class InstallRequirements { function requireModule($dirname, $testDetails) { $this->testing($testDetails); $path = $this->getBaseDir() . $dirname; - if (!file_exists($path)) { + if(!file_exists($path)) { $testDetails[2] .= " Directory '$path' not found. Please make sure you have uploaded the SilverStripe files to your webserver correctly."; $this->error($testDetails); - } elseif (!file_exists($path . '/_config.php') && $dirname != 'mysite') { + } elseif(!file_exists($path . '/_config.php') && $dirname != 'mysite') { $testDetails[2] .= " Directory '$path' exists, but is missing files. Please make sure you have uploaded " . "the SilverStripe files to your webserver correctly."; $this->error($testDetails); @@ -898,7 +898,7 @@ class InstallRequirements { function requireFile($filename, $testDetails) { $this->testing($testDetails); $filename = $this->getBaseDir() . $filename; - if (!file_exists($filename)) { + if(!file_exists($filename)) { $testDetails[2] .= " (file '$filename' not found)"; $this->error($testDetails); } @@ -907,17 +907,17 @@ class InstallRequirements { function requireWriteable($filename, $testDetails, $absolute = false) { $this->testing($testDetails); - if ($absolute) { + if($absolute) { $filename = str_replace('/', DIRECTORY_SEPARATOR, $filename); } else { $filename = $this->getBaseDir() . str_replace('/', DIRECTORY_SEPARATOR, $filename); } - if (file_exists($filename)) $isWriteable = is_writeable($filename); + if(file_exists($filename)) $isWriteable = is_writeable($filename); else $isWriteable = is_writeable(dirname($filename)); - if (!$isWriteable) { - if (function_exists('posix_getgroups')) { + if(!$isWriteable) { + if(function_exists('posix_getgroups')) { $userID = posix_geteuid(); $user = posix_getpwuid($userID); @@ -927,17 +927,17 @@ class InstallRequirements { $testDetails[2] .= "User '$user[name]' needs to be able to write to this file:\n$filename\n\nThe " . "file is currently owned by '$currentOwner[name]'. "; - if ($user['name'] == $currentOwner['name']) { + if($user['name'] == $currentOwner['name']) { $testDetails[2] .= "We recommend that you make the file writeable."; } else { $groups = posix_getgroups(); $groupList = array(); - foreach ($groups as $group) { + foreach($groups as $group) { $groupInfo = posix_getgrgid($group); - if (in_array($currentOwner['name'], $groupInfo['members'])) $groupList[] = $groupInfo['name']; + if(in_array($currentOwner['name'], $groupInfo['members'])) $groupList[] = $groupInfo['name']; } - if ($groupList) { + if($groupList) { $testDetails[2] .= " We recommend that you make the file group-writeable " . "and change the group to one of these groups:\n - " . implode("\n - ", $groupList) . "\n\nFor example:\nchmod g+w $filename\nchgrp " . $groupList[0] . " $filename"; @@ -961,19 +961,19 @@ class InstallRequirements { $worked = true; $ssTmp = "$sysTmp/silverstripe-cache"; - if (!@file_exists($ssTmp)) { + if(!@file_exists($ssTmp)) { $worked = @mkdir($ssTmp); } - if (!$worked) { + if(!$worked) { $ssTmp = dirname($_SERVER['SCRIPT_FILENAME']) . '/silverstripe-cache'; $worked = true; - if (!@file_exists($ssTmp)) { + if(!@file_exists($ssTmp)) { $worked = @mkdir($ssTmp); } } - if ($worked) return $ssTmp; + if($worked) return $ssTmp; return false; } @@ -982,7 +982,7 @@ class InstallRequirements { $this->testing($testDetails); $tempFolder = $this->getTempFolder(); - if (!$tempFolder) { + if(!$tempFolder) { $testDetails[2] = "Permission problem gaining access to a temp directory. " . "Please create a folder named silverstripe-cache in the base directory " . "of the installation and ensure it has the adequate permissions."; @@ -992,7 +992,7 @@ class InstallRequirements { function requireApacheModule($moduleName, $testDetails) { $this->testing($testDetails); - if (!in_array($moduleName, apache_get_modules())) { + if(!in_array($moduleName, apache_get_modules())) { $this->error($testDetails); return false; } else { @@ -1001,9 +1001,9 @@ class InstallRequirements { } function testApacheRewriteExists($moduleName = 'mod_rewrite') { - if (function_exists('apache_get_modules') && in_array($moduleName, apache_get_modules())) { + if(function_exists('apache_get_modules') && in_array($moduleName, apache_get_modules())) { return true; - } elseif (isset($_SERVER['HTTP_MOD_REWRITE']) && $_SERVER['HTTP_MOD_REWRITE'] == 'On') { + } elseif(isset($_SERVER['HTTP_MOD_REWRITE']) && $_SERVER['HTTP_MOD_REWRITE'] == 'On') { return true; } else { return false; @@ -1011,7 +1011,7 @@ class InstallRequirements { } function testIISRewriteModuleExists($moduleName = 'IIS_UrlRewriteModule') { - if (isset($_SERVER[$moduleName]) && $_SERVER[$moduleName]) { + if(isset($_SERVER[$moduleName]) && $_SERVER[$moduleName]) { return true; } else { return false; @@ -1020,7 +1020,7 @@ class InstallRequirements { function requireApacheRewriteModule($moduleName, $testDetails) { $this->testing($testDetails); - if ($this->testApacheRewriteExists()) { + if($this->testApacheRewriteExists()) { return true; } else { $this->warning($testDetails); @@ -1038,7 +1038,7 @@ class InstallRequirements { function requireIISRewriteModule($moduleName, $testDetails) { $this->testing($testDetails); - if ($this->testIISRewriteModuleExists()) { + if($this->testIISRewriteModuleExists()) { return true; } else { $this->warning($testDetails); @@ -1056,7 +1056,7 @@ class InstallRequirements { */ function getDatabaseConfigurationHelper($databaseClass) { $adapters = DatabaseAdapterRegistry::get_adapters(); - if (isset($adapters[$databaseClass])) { + if(isset($adapters[$databaseClass])) { $helperPath = $adapters[$databaseClass]['helperPath']; $class = str_replace('.php', '', basename($helperPath)); } @@ -1067,7 +1067,7 @@ class InstallRequirements { $this->testing($testDetails); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $result = $helper->requireDatabaseFunctions($databaseConfig); - if ($result) { + if($result) { return true; } else { $this->error($testDetails); @@ -1079,7 +1079,7 @@ class InstallRequirements { $this->testing($testDetails); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $result = $helper->requireDatabaseConnection($databaseConfig); - if ($result['success']) { + if($result['success']) { return true; } else { $testDetails[2] .= ": " . $result['error']; @@ -1091,9 +1091,9 @@ class InstallRequirements { function requireDatabaseVersion($databaseConfig, $testDetails) { $this->testing($testDetails); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); - if (method_exists($helper, 'requireDatabaseVersion')) { + if(method_exists($helper, 'requireDatabaseVersion')) { $result = $helper->requireDatabaseVersion($databaseConfig); - if ($result['success']) { + if($result['success']) { return true; } else { $testDetails[2] .= $result['error']; @@ -1109,7 +1109,7 @@ class InstallRequirements { $this->testing($testDetails); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $result = $helper->requireDatabaseServer($databaseConfig); - if ($result['success']) { + if($result['success']) { return true; } else { $testDetails[2] .= ": " . $result['error']; @@ -1122,13 +1122,13 @@ class InstallRequirements { $this->testing($testDetails); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $result = $helper->requireDatabaseOrCreatePermissions($databaseConfig); - if ($result['success']) { - if ($result['alreadyExists']) $testDetails[3] = "Database $databaseConfig[database]"; + if($result['success']) { + if($result['alreadyExists']) $testDetails[3] = "Database $databaseConfig[database]"; else $testDetails[3] = "Able to create a new database"; $this->testing($testDetails); return true; } else { - if (!@$result['cannotCreate']) { + if(!@$result['cannotCreate']) { $testDetails[2] .= ". Please create the database manually."; } else { $testDetails[2] .= " (user '$databaseConfig[username]' doesn't have CREATE DATABASE permissions.)"; @@ -1143,13 +1143,13 @@ class InstallRequirements { $this->testing($testDetails); $missing = array(); - foreach ($varNames as $varName) { - if (!isset($_SERVER[$varName]) || !$_SERVER[$varName]) { + foreach($varNames as $varName) { + if(!isset($_SERVER[$varName]) || !$_SERVER[$varName]) { $missing[] = '$_SERVER[' . $varName . ']'; } } - if (!$missing) { + if(!$missing) { return true; } else { $testDetails[2] .= " (the following PHP variables are missing: " . implode(", ", $missing) . ")"; @@ -1161,7 +1161,7 @@ class InstallRequirements { function requirePostSupport($testDetails) { $this->testing($testDetails); - if (!isset($_POST)) { + if(!isset($_POST)) { $this->error($testDetails); return false; @@ -1172,7 +1172,7 @@ class InstallRequirements { function isRunningWebServer($testDetails) { $this->testing($testDetails); - if ($testDetails[3]) { + if($testDetails[3]) { return true; } else { $this->warning($testDetails); @@ -1186,18 +1186,18 @@ class InstallRequirements { function getBaseDir() { // Cache the value so that when the installer mucks with SCRIPT_FILENAME half way through, this method // still returns the correct value. - if (!$this->baseDir) $this->baseDir = realpath(dirname($_SERVER['SCRIPT_FILENAME'])) . DIRECTORY_SEPARATOR; + if(!$this->baseDir) $this->baseDir = realpath(dirname($_SERVER['SCRIPT_FILENAME'])) . DIRECTORY_SEPARATOR; return $this->baseDir; } function testing($testDetails) { - if (!$testDetails) return; + if(!$testDetails) return; $section = $testDetails[0]; $test = $testDetails[1]; $message = "OK"; - if (isset($testDetails[3])) $message .= " ($testDetails[3])"; + if(isset($testDetails[3])) $message .= " ($testDetails[3])"; $this->tests[$section][$test] = array("good", $message); } @@ -1273,8 +1273,8 @@ class Installer extends InstallRequirements { flush(); - if (isset($config['stats'])) { - if (file_exists(FRAMEWORK_NAME . '/silverstripe_version')) { + if(isset($config['stats'])) { + if(file_exists(FRAMEWORK_NAME . '/silverstripe_version')) { $silverstripe_version = file_get_contents(FRAMEWORK_NAME . '/silverstripe_version'); } else { $silverstripe_version = "unknown"; @@ -1287,20 +1287,20 @@ class Installer extends InstallRequirements { // Try to determine the database version from the helper $databaseVersion = $config['db']['type']; $helper = $this->getDatabaseConfigurationHelper($dbType); - if ($helper && method_exists($helper, 'getDatabaseVersion')) { + if($helper && method_exists($helper, 'getDatabaseVersion')) { $databaseVersion = urlencode($dbType . ': ' . $helper->getDatabaseVersion($config['db'][$dbType])); } $url = "http://ss2stat.silverstripe.com/Installation/add?SilverStripe=$silverstripe_version&PHP=$phpVersion&Database=$databaseVersion&WebServer=$encWebserver"; - if (isset($_SESSION['StatsID']) && $_SESSION['StatsID']) { + if(isset($_SESSION['StatsID']) && $_SESSION['StatsID']) { $url .= '&ID=' . $_SESSION['StatsID']; } @$_SESSION['StatsID'] = file_get_contents($url); } - if (file_exists('mysite/_config.php')) { + if(file_exists('mysite/_config.php')) { // Truncate the contents of _config instead of deleting it - we can't re-create it because Windows handles permissions slightly // differently to UNIX based filesystems - it takes the permissions from the parent directory instead of retaining them $fh = fopen('mysite/_config.php', 'wb'); @@ -1313,8 +1313,8 @@ class Installer extends InstallRequirements { $type = addcslashes($config['db']['type'], "\'"); $dbConfig = $config['db'][$type]; $dbConfig = array_map(create_function('$v', 'return addcslashes($v, "\\\'");'), $dbConfig); - if (!isset($dbConfig['path'])) $dbConfig['path'] = ''; - if (!$dbConfig) { + if(!isset($dbConfig['path'])) $dbConfig['path'] = ''; + if(!$dbConfig) { echo "

    Bad config submitted

    ";
 			print_r($config);
 			echo "
    "; @@ -1323,7 +1323,7 @@ class Installer extends InstallRequirements { // Write the config file global $usingEnv; - if ($usingEnv) { + if($usingEnv) { $this->statusMessage("Setting up 'mysite/_config.php' for use with _ss_environment.php..."); $this->writeToFile("mysite/_config.php", <<checkModuleExists('cms')) { + if(!$this->checkModuleExists('cms')) { $this->writeToFile("mysite/code/RootURLController.php", <<hasRewritingCapability()) { - if ($isApache) { + if($this->hasRewritingCapability()) { + if($isApache) { $this->statusMessage("Setting up '.htaccess' file..."); $this->createHtaccess(); - } elseif ($isIIS) { + } elseif($isIIS) { $this->statusMessage("Setting up 'web.config' file..."); $this->createWebConfig(); } @@ -1428,7 +1428,7 @@ PHP try { $this->statusMessage('Creating default CMS admin account...'); $adminMember->write(); - } catch (Exception $e) { + } catch(Exception $e) { $this->statusMessage( sprintf('Warning: Default CMS admin account could not be created (error: %s)', $e->getMessage()) ); @@ -1439,7 +1439,7 @@ PHP try { $this->statusMessage('Creating initial filesystem assets...'); Filesystem::sync(); - } catch (Exception $e) { + } catch(Exception $e) { $this->statusMessage( sprintf('Warning: Creating initial filesystem assets failed (error: %s)', $e->getMessage()) ); @@ -1448,8 +1448,8 @@ PHP $_SESSION['username'] = $config['admin']['username']; $_SESSION['password'] = $config['admin']['password']; - if (!$this->errors) { - if (isset($_SERVER['HTTP_HOST']) && $this->hasRewritingCapability()) { + if(!$this->errors) { + if(isset($_SERVER['HTTP_HOST']) && $this->hasRewritingCapability()) { $this->statusMessage("Checking that friendly URLs work..."); $this->checkRewrite(); } else { @@ -1481,7 +1481,7 @@ HTML; $base = $this->getBaseDir(); $this->statusMessage("Setting up $base$filename"); - if ((@$fh = fopen($base . $filename, 'wb')) && fwrite($fh, $content) && fclose($fh)) { + if((@$fh = fopen($base . $filename, 'wb')) && fwrite($fh, $content) && fclose($fh)) { return true; } else { $this->error("Couldn't write to file $base$filename"); @@ -1493,10 +1493,10 @@ HTML; $end = "\n### SILVERSTRIPE END ###"; $base = dirname($_SERVER['SCRIPT_NAME']); - if (defined('DIRECTORY_SEPARATOR')) $base = str_replace(DIRECTORY_SEPARATOR, '/', $base); + if(defined('DIRECTORY_SEPARATOR')) $base = str_replace(DIRECTORY_SEPARATOR, '/', $base); else $base = str_replace("\\", '/', $base); - if ($base != '.') $baseClause = "RewriteBase '$base'\n"; + if($base != '.') $baseClause = "RewriteBase '$base'\n"; else $baseClause = ""; $modulePath = FRAMEWORK_NAME; $rewrite = << TEXT; - if (file_exists('.htaccess')) { + if(file_exists('.htaccess')) { $htaccess = file_get_contents('.htaccess'); - if (strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) { + if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) { $htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n"; } - if (strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) { + if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) { $start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n"; $end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###')); } @@ -1642,7 +1642,7 @@ HTML; function var_export_array_nokeys($array) { $retval = "array(\n"; - foreach ($array as $item) { + foreach($array as $item) { $retval .= "\t'"; $retval .= trim($item); $retval .= "',\n";