Skip to content
Snippets Groups Projects
Commit 00f90d5c authored by Demian Katz's avatar Demian Katz
Browse files

Use ZF2 prompt; renamed variable to avoid confusion.

parent 573cd320
Branches
Tags instance/local/alpha/21603_after
No related merge requests found
...@@ -70,14 +70,14 @@ echo "VuFind has been found in {$baseDir}.\n\n"; ...@@ -70,14 +70,14 @@ echo "VuFind has been found in {$baseDir}.\n\n";
// Are we allowing user interaction? // Are we allowing user interaction?
$interactive = !$opts->getOption('non-interactive'); $interactive = !$opts->getOption('non-interactive');
$getInput = array(); $userInputNeeded = array();
// Load user settings if we are not forcing defaults: // Load user settings if we are not forcing defaults:
if (!$opts->getOption('use-defaults')) { if (!$opts->getOption('use-defaults')) {
if ($opts->getOption('overridedir')) { if ($opts->getOption('overridedir')) {
$overrideDir = $opts->getOption('overridedir'); $overrideDir = $opts->getOption('overridedir');
} else if ($interactive) { } else if ($interactive) {
$getInput['overrideDir'] = true; $userInputNeeded['overrideDir'] = true;
} }
if ($opts->getOption('module-name')) { if ($opts->getOption('module-name')) {
if ($opts->getOption('module-name') !== 'disabled') { if ($opts->getOption('module-name') !== 'disabled') {
...@@ -87,7 +87,7 @@ if (!$opts->getOption('use-defaults')) { ...@@ -87,7 +87,7 @@ if (!$opts->getOption('use-defaults')) {
} }
} }
} else if ($interactive) { } else if ($interactive) {
$getInput['module'] = true; $userInputNeeded['module'] = true;
} }
if ($opts->getOption('basepath')) { if ($opts->getOption('basepath')) {
...@@ -96,7 +96,7 @@ if (!$opts->getOption('use-defaults')) { ...@@ -96,7 +96,7 @@ if (!$opts->getOption('use-defaults')) {
die($result . "\n"); die($result . "\n");
} }
} else if ($interactive) { } else if ($interactive) {
$getInput['basePath'] = true; $userInputNeeded['basePath'] = true;
} }
// We assume "single site" mode unless the --multisite switch is set: // We assume "single site" mode unless the --multisite switch is set:
...@@ -108,22 +108,22 @@ if (!$opts->getOption('use-defaults')) { ...@@ -108,22 +108,22 @@ if (!$opts->getOption('use-defaults')) {
} else if (($bad = $opts->getOption('multisite')) && $bad !== true) { } else if (($bad = $opts->getOption('multisite')) && $bad !== true) {
die('Unexpected multisite mode: ' . $bad . "\n"); die('Unexpected multisite mode: ' . $bad . "\n");
} else if ($interactive) { } else if ($interactive) {
$getInput['multisiteMode'] = true; $userInputNeeded['multisiteMode'] = true;
} }
} }
// Now that we've validated as many parameters as possible, retrieve // Now that we've validated as many parameters as possible, retrieve
// user input where needed. // user input where needed.
if (isset($getInput['overrideDir'])) { if (isset($userInputNeeded['overrideDir'])) {
$overrideDir = getOverrideDir($overrideDir); $overrideDir = getOverrideDir($overrideDir);
} }
if (isset($getInput['module'])) { if (isset($userInputNeeded['module'])) {
$module = getModule(); $module = getModule();
} }
if (isset($getInput['basePath'])) { if (isset($userInputNeeded['basePath'])) {
$basePath = getBasePath($basePath); $basePath = getBasePath($basePath);
} }
if (isset($getInput['multisiteMode'])) { if (isset($userInputNeeded['multisiteMode'])) {
$multisiteMode = getMultisiteMode(); $multisiteMode = getMultisiteMode();
} }
...@@ -453,19 +453,7 @@ function getHost() ...@@ -453,19 +453,7 @@ function getHost()
*/ */
function getInput($prompt) function getInput($prompt)
{ {
// Standard function for most uses return \Zend\Console\Prompt\Line::prompt($prompt, true);
if (function_exists('readline')) {
$in = readline($prompt);
return $in;
} else {
// Or use our own if it doesn't exist (windows)
print $prompt;
$fp = fopen("php://stdin", "r");
$in = fgets($fp, 4094); // Maximum windows buffer size
fclose($fp);
// Seems to keep the carriage return if you don't trim
return trim($in);
}
} }
/** /**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment