LICENSE readme.txt @@ -136,8 +136,8 @@ class PHP_Shell { $cmd = PHP_Shell_Commands::getInstance(); $cmd->registerCommand('#^quit$#', $this, 'cmdQuit', 'quit', 'leaves the shell'); + $cmd->registerCommand('#^exit$#', $this, 'cmdQuit', 'exit', 'leaves the shell'); $cmd->registerCommand('#^\?$#', $this, 'cmdHelp', '?', 'show this help'); - $cmd->registerCommand('#^\?\s+license$#', $this, 'cmdLicense', '? license', 'show license of the shell'); } @@ -762,38 +762,7 @@ class PHP_Shell { return var_export($o, 1); } - - /** - * get the license string - * - * @return string the inline help as string - */ - public function cmdLicense($l) { - $o = <<<EOF -(c) 2006 Jan Kneschke <jan@kneschke.de> - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -EOF; - - return var_export($o, 1); - } - + /** * handle the 'quit' command * @@ -1077,6 +1046,4 @@ function __shell_readline_complete($str, $pos) { # printf("%s ... %s\n", $str, $pos); return $m; -} - - +} \ No newline at end of file Shell.php @@ -52,9 +52,9 @@ class PHP_Shell_Extensions_Colour implements PHP_Shell_Extension { $this->registerColourScheme( "dark", array( - "default" => self::C_YELLOW, - "value" => self::C_WHITE, - "exception" => self::C_PURPLE)); + "default" => self::C_WHITE, + "value" => self::C_YELLOW, + "exception" => self::C_RED)); $this->registerColourScheme( "light", array( Shell/Extensions/Colour.php @@ -20,28 +20,28 @@ require_once "Shell/Extensions/ExecutionTime.php"; require_once "Shell/Extensions/InlineHelp.php"; require_once "Shell/Extensions/VerbosePrint.php"; require_once "Shell/Extensions/LoadScript.php"; -require_once dirname(__FILE__) . "/../../../wp-blog-header.php"; +require_once dirname(__FILE__) . "/../../../wp-load.php"; /** * default error-handler * -* Instead of printing the NOTICE or WARNING from php we wan't the turn non-FATAL +* Instead of printing the NOTICE or WARNING from php we want to turn non-FATAL * messages into exceptions and handle them in our own way. * -* you can set your own error-handler by createing a function named +* you can set your own error-handler by creating a function named * __shell_error_handler * * @param integer $errno Error-Number * @param string $errstr Error-Message * @param string $errfile Filename where the error was raised -* @param interger $errline Line-Number in the File +* @param integer $errline Line-Number in the File * @param mixed $errctx ... */ function __shell_default_error_handler($errno, $errstr, $errfile, $errline, $errctx) { ## ... what is this errno again ? - if ($errno == 2048) return; - - throw new Exception(sprintf("%s:%d\r\n%s", $errfile, $errline, $errstr)); + // if ($errno == 2048) return; + // + // throw new Exception(sprintf("%s:%d\r\n%s", $errfile, $errline, $errstr)); } set_error_handler("__shell_default_error_handler"); @@ -50,7 +50,6 @@ $__shell = new PHP_Shell(); $__shell_exts = PHP_Shell_Extensions::getInstance(); $__shell_exts->registerExtensions(array( "options" => PHP_Shell_Options::getInstance(), /* the :set command */ - "autoload" => new PHP_Shell_Extensions_Autoload(), "autoload_debug" => new PHP_Shell_Extensions_AutoloadDebug(), "colour" => new PHP_Shell_Extensions_Colour(), @@ -59,16 +58,17 @@ $__shell_exts->registerExtensions(array( "verboseprint" => new PHP_Shell_Extensions_VerbosePrint(), "loadscript" => new PHP_Shell_Extensions_LoadScript(), )); +$__shell_exts->colour->applyColourScheme("dark"); $f = <<<EOF -WordPress Console (Version 0.1.0) +WordPress Console (0.1.0)%s >> use '?' to open the inline help EOF; printf($f, - $__shell->hasReadline() ? ', with readline() support' : ''); + $__shell->hasReadline() ? '' : ', no readline() support (tab-completion)'); unset($f); print $__shell_exts->colour->getColour("default"); @@ -105,7 +105,6 @@ while($__shell->input()) { ## we have a full command, execute it $__shell_exts->exectime->startExecTime(); - $__shell_retval = eval($__shell->getCode()); if (isset($__shell_retval)) { print $__shell_exts->colour->getColour("value"); @@ -122,8 +121,7 @@ while($__shell->input()) { } } catch(Exception $__shell_exception) { print $__shell_exts->colour->getColour("exception"); - printf('%s (code: %d) got thrown'.PHP_EOL, get_class($__shell_exception), $__shell_exception->getCode()); - print $__shell_exception; + print $__shell_exception->getMessage(); $__shell->resetCode(); wordpress-console.php aa81c2ac9df5d4807484255d032bc5d28d57fff2 sant0sk1 sant0sk1@b8457f37-d9ea-0310-8a92-e5e31aec5664 http://github.com/sant0sk1/wordpress-console/commit/2e43d6416f05c4d1ba8a09a265918ff0be01bb26 2e43d6416f05c4d1ba8a09a265918ff0be01bb26 2009-06-23T10:45:26-07:00 2009-06-23T10:45:26-07:00 added license and readme. customized color scheme. git-svn-id: http://svn.wp-plugins.org/wordpress-console/trunk@128834 b8457f37-d9ea-0310-8a92-e5e31aec5664 4805ff2b1019e6012d774fc168df85e3fcea60f0 sant0sk1 sant0sk1@b8457f37-d9ea-0310-8a92-e5e31aec5664