Merge pull request #4642 from masakik/master

Minor enhancement to console.php
remotes/origin/stable6
Morris Jobke 12 years ago
commit 0a23ac18bc
  1. 30
      console.php
  2. 7
      status.php

@ -1,3 +1,4 @@
<?php
/**
* Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
@ -20,17 +21,32 @@ if (!OC::$CLI) {
exit(0);
}
$self = basename($argv[0]);
if ($argc <= 1) {
echo "Usage:" . PHP_EOL;
echo " " . basename($argv[0]) . " <command>" . PHP_EOL;
exit(0);
$argv[1] = "help";
}
$command = $argv[1];
array_shift($argv);
if ($command === 'files:scan') {
require_once 'apps/files/console/scan.php';
} else {
echo "Unknown command '$command'" . PHP_EOL;
switch ($command) {
case 'files:scan':
require_once 'apps/files/console/scan.php';
break;
case 'status':
require_once 'status.php';
break;
case 'help':
echo "Usage:" . PHP_EOL;
echo " " . $self . " <command>" . PHP_EOL;
echo PHP_EOL;
echo "Available commands:" . PHP_EOL;
echo " files:scan -> rescan filesystem" .PHP_EOL;
echo " status -> show some status information" .PHP_EOL;
echo " help -> show this help screen" .PHP_EOL;
break;
default:
echo "Unknown command '$command'" . PHP_EOL;
echo "For available commands type ". $self . " help" . PHP_EOL;
break;
}

@ -33,8 +33,11 @@ try {
'version'=>implode('.', OC_Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(),
'edition'=>OC_Util::getEditionString());
echo(json_encode($values));
if (OC::$CLI) {
print_r($values);
} else {
echo(json_encode($values));
}
} catch (Exception $ex) {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);

Loading…
Cancel
Save