From 8687818177f6354eba36ddb10f278d798ce38df6 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Fri, 1 Jul 2011 03:09:18 +0800
Subject: [PATCH 01/11] Add show parameters functionality reload() will now
 unset $_SESSION['code']

---
 complete.php          | 566 ++++++++++++++++++++++++++++++------------
 console.css           |  10 +
 console.js            |  66 ++++-
 readme.txt            |  12 +-
 reload.php            |   4 +-
 wordpress-console.php |   7 +-
 6 files changed, 497 insertions(+), 168 deletions(-)

diff --git a/complete.php b/complete.php
index e6fdee7..302e667 100644
--- a/complete.php
+++ b/complete.php
@@ -1,206 +1,456 @@
 <?php
-require( 'common.php' );
+require('common.php');
 
-if ( isset($_POST['partial'] ) ) {
+if (isset($_POST['partial'])){
   $secret = get_option('wordpress-console-secret');
-  if ( !$secret ) {
-    return;
+  if (!$secret){
+    return ;
   }
 
-  if ( !isset( $_POST['signature'] ) || !$_POST['signature'] ) {
-    return;
+  if (!isset($_POST['signature']) || !$_POST['signature']){
+    return ;
   }
 
-  $partial = stripslashes( $_POST['partial'] );
-  if ( hash_hmac( 'sha1', $partial, $secret ) != $_POST['signature'] ) {
-    return;
+  $partial = stripslashes($_POST['partial']);
+  if (hash_hmac('sha1', $partial, $secret) != $_POST['signature']){
+    return ;
   }
 
-  if ( !preg_match( '#([0-9a-z_-]+)$#i', $partial, $m ) ) {
-    die( json_encode( false ) );
+  $show_parameter = (isset($_POST['show_parameter']) && $_POST['show_parameter'] == 1) ? true : false;
+
+  if (!preg_match('#(((?:\$)?(?:[0-9a-z_-])*)(?:(?:\[(?:[^\]]+)\]->)|(?:>|::))?)$#i', $partial, $m)){
+    die(json_encode(false));
   }
 
-  $candidates = preg_grep( "/^{$m[1]}/", complete( $m[1] ) );
-  sort( $candidates );
-  die( json_encode( ( array ) $candidates ) );
-} else {
-  error( 'Error initializing session.' );
+  $candidates = complete($m[0], $show_parameter);
+  sort($candidates);
+  die(json_encode((array)$candidates));
+}
+
+else{
+  error('Error initializing session.');
 }
 
 // returns array of possible matches
-function complete( $string ) {
-    /**
-    * parse the line-buffer backwards to see if we have a
-    * - constant
-    * - function
-    * - variable
-    */
+// returns array of possible matches
+function complete($string, $show_parameter){
+  /**
+   * parse the line-buffer backwards to see if we have a
+   * - constant
+   * - function
+   * - variable
+   */
+
+  $m = array();
+
+  if (preg_match('#\$([A-Za-z0-9_]+)->#', $string, $a)){
+    /* check for $o->... */
+    $name = $a[1];
+
+    if (isset($GLOBALS[$name]) && is_object($GLOBALS[$name])){
+      $class_info = get_class_structure($GLOBALS[$name]);
+
+      if (isset($class_info['methods']) && !empty($class_info['methods'])){
+        foreach($class_info['methods'] as $method_name => $method_info){
+          $m[] = class_method_info($GLOBALS[$name], $method_name, $show_parameter);
+        }
+      }
+
+      if (isset($class_info['properties']) && !empty($class_info['properties'])){
+        $m = array_merge($m, class_property_info($GLOBALS[$name]));
+      }
 
-    $m = array();
+      return $m;
+    }
+  }
+  else if (preg_match('#\$([A-Za-z0-9_]+)\[([^\]]+)\]->#', $string, $a)){
+    /* check for $o[...]->... */
+    $name = $a[1];
 
-    if ( preg_match( '#\$([A-Za-z0-9_]+)->#', $string, $a ) ) {
-        /* check for $o->... */
-        $name = $a[1];
+    if (isset($GLOBALS[$name]) && is_array($GLOBALS[$name]) && isset($GLOBALS[$name][$a[2]])){
+      $class_info = get_class_structure($GLOBALS[$name][$a[2]]);
 
-        if ( isset( $GLOBALS[$name] ) && is_object( $GLOBALS[$name] ) ) {
-            $c = get_class_methods( $GLOBALS[$name] );
+      if (isset($class_info['methods']) && !empty($class_info['methods'])){
+        foreach($class_info['methods'] as $method_name => $method_info){
+          $m[] = class_method_info($GLOBALS[$name][$a[2]], $method_name, $show_parameter);
+        }
+      }
 
-            foreach ( $c as $v ) {
-                $m[] = $v.'(';
-            }
-            $c = get_class_vars( get_class( $GLOBALS[$name] ) );
+      if (isset($class_info['properties']) && !empty($class_info['properties'])){
+        $m = array_merge($m, class_property_info($GLOBALS[$name][$a[2]]));
+      }
+      return $m;
+    }
+  }
+  else if (preg_match('#([A-Za-z0-9_]+)::#', $string, $a)){
+    /* check for Class:: */
+    $name = $a[1];
 
-            foreach ( $c as $k => $v ) {
-                $m[] = $k;
-            }
+    if (class_exists($name, false)){
+      $class_info = get_class_structure($name);
 
-            return $m;
+      if (isset($class_info['methods']) && !empty($class_info['methods'])){
+        foreach($class_info['methods'] as $method_name => $method_info){
+          $m[] = class_method_info($name, $method_name, $show_parameter);
         }
-    } else if ( preg_match( '#\$([A-Za-z0-9_]+)\[([^\]]+)\]->#', $string, $a ) ) {
-        /* check for $o[...]->... */
-        $name = $a[1];
+      }
 
-        if ( isset( $GLOBALS[$name] ) &&
-            is_array( $GLOBALS[$name] ) &&
-            isset( $GLOBALS[$name][$a[2]] ) ) {
+      if (isset($class_info['properties']) && !empty($class_info['properties'])){
 
-            $c = get_class_methods( $GLOBALS[$name][$a[2]] );
+        $m = array_merge($m, class_property_info($name));
+      }
 
-            foreach ( $c as $v ) {
-                $m[] = $v.'(';
-            }
-            $c = get_class_vars( get_class( $GLOBALS[$name][$a[2]] ) );
+      return $m;
+    }
+  }
+  else if (preg_match('#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string)){
+    $m = array_keys($GLOBALS);
 
-            foreach ( $c as $k => $v ) {
-                $m[] = $k;
-            }
-            return $m;
+    return $m;
+  }
+  else if (preg_match('#new #', $string)){
+    $c = get_declared_classes();
+
+    foreach($c as $name){
+      $class_info = get_class_structure($name);
+
+      if (isset($class_info['methods']) && !empty($class_info['methods'])){
+        foreach($class_info['methods'] as $method_name => $method_info){
+          $m[] = class_method_info($name, $method_name, $show_parameter);
         }
+      }
+    }
+
+    if (isset($class_info['properties']) && !empty($class_info['properties'])){
+      $m = array_merge($m, class_property_info($name));
+    }
+
+    return $m;
+  }
+  else if (preg_match('#^:set #', $string)){
+    foreach(PHP_Shell_Options::getInstance()->getOptions()as $v){
+      $m[] = $v;
+    }
 
-    } else if ( preg_match( '#([A-Za-z0-9_]+)::#', $string, $a ) ) {
-        /* check for Class:: */
-        $name = $a[1];
+    return $m;
+  }
 
-        if ( class_exists( $name, false ) ) {
-            $c = get_class_methods( $name );
+  $f = get_defined_functions();
 
-            foreach ( $c as $v ) {
-                $m[] = sprintf( '%s::%s(', $name, $v );
-            }
+  foreach($f['internal'] as $v){
+    if (preg_match("/^{$string}/", $v)){
+      $m[] = function_info($v, true);
+    }
+  }
 
-            $cl = new ReflectionClass( $name );
-            $c = $cl->getConstants();
+  foreach($f['user'] as $v){
+    if (preg_match("/^{$string}/", $v)){
+      $m[] = function_info($v, true);
+    }
+  }
 
-            foreach ( $c as $k => $v ) {
-                $m[] = sprintf( '%s::%s', $name, $k );
-            }
+  $c = get_declared_classes();
 
-            return $m;
-        }
-    } else if ( preg_match( '#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string ) ) {
-        $m = array_keys( $GLOBALS );
+  foreach($c as $v){
+    if (preg_match("/^{$string}/", $v)){
+      $m[] = $v.'::';
+    }
+    //$m[] = class_info($v, $show_parameter);
+  }
 
-        return $m;
-    } else if ( preg_match( '#new #', $string ) ) {
-        $c = get_declared_classes();
+  $c = get_defined_constants();
 
-        foreach ( $c as $v ) {
-            $m[] = $v.'(';
-        }
+  foreach($c as $k => $v){
+    if (preg_match("/^{$string}/", $v)){
+      $m[] = $v;
+    }
+  }
+
+  /* taken from http://de3.php.net/manual/en/reserved.php */
+  /* taken from http://de3.php.net/manual/en/reserved.php */
+  $reserved[] = 'abstract';
+  $reserved[] = 'and';
+  $reserved[] = ($show_parameter) ? 'array([ mixed $... ])' : 'array(';
+  $reserved[] = 'as';
+  $reserved[] = 'break';
+  $reserved[] = 'case';
+  $reserved[] = 'catch';
+  $reserved[] = 'class';
+  $reserved[] = 'const';
+  $reserved[] = 'continue';
+  # $reserved[] = 'declare';
+  $reserved[] = 'default';
+  $reserved[] = ($show_parameter) ? 'die([$status])' : 'die(';
+  $reserved[] = 'do';
+  $reserved[] = ($show_parameter) ? 'echo(string $arg1 [, string $... ])' : 'echo(';
+  $reserved[] = 'else';
+  $reserved[] = 'elseif';
+  $reserved[] = ($show_parameter) ? 'empty(mixed $var)' : 'empty(';
+  # $reserved[] = 'enddeclare';
+  $reserved[] = ($show_parameter) ? 'eval(string $code_str)' : 'eval(';
+  $reserved[] = 'exception';
+  $reserved[] = 'extends';
+  $reserved[] = ($show_parameter) ? 'exit([$status])' : 'exit(';
+  $reserved[] = 'extends';
+  $reserved[] = 'final';
+  $reserved[] = ($show_parameter) ? 'for (expr1; expr2; expr3)' : 'for (';
+  $reserved[] = ($show_parameter) ? 'foreach (array_expression as $key => $value | array_expression as $value)' : 'foreach (';
+  $reserved[] = 'function';
+  $reserved[] = 'global';
+  $reserved[] = 'if';
+  $reserved[] = 'implements';
+  $reserved[] = 'include "';
+  $reserved[] = 'include_once "';
+  $reserved[] = 'interface';
+  $reserved[] = ($show_parameter) ? 'isset(mixed $var [, mixed $var [, $... ]])' : 'isset(';
+  $reserved[] = ($show_parameter) ? 'list(mixed $varname [, mixed $... ])' : 'list(';
+  $reserved[] = 'new';
+  $reserved[] = 'or';
+  $reserved[] = ($show_parameter) ? 'print(string $arg)' : 'print(';
+  $reserved[] = 'private';
+  $reserved[] = 'protected';
+  $reserved[] = 'public';
+  $reserved[] = 'require "';
+  $reserved[] = 'require_once "';
+  $reserved[] = 'return';
+  $reserved[] = 'static';
+  $reserved[] = ($show_parameter) ? 'switch (expr)' : 'switch (';
+  $reserved[] = 'throw';
+  $reserved[] = 'try';
+  $reserved[] = ($show_parameter) ? 'unset(mixed $var [, mixed $var [, mixed $... ]])' : 'unset (';
+  # $reserved[] = 'use';
+  $reserved[] = 'var';
+  $reserved[] = 'while';
+  $reserved[] = 'xor';
+  $reserved[] = '__FILE__';
+  $reserved[] = '__FUNCTION__';
+  $reserved[] = '__CLASS__';
+  $reserved[] = '__LINE__';
+  $reserved[] = '__METHOD__';
+
+
+  foreach($reserved as $v){
+    if (preg_match("/^{$string}/", $v)){
+      $m[] = $v;
+    }
+  }
+
+  return $m;
+}
+
+/*
+This function will return an array that describe the class structure
+array(
+'name' => 'function_name',
+'parameters' => array(
+'$parameter1' => array(
+'optional' => bool,
+'default_value' => ''
+),...
+)
+)
+ */
+function get_function_structure($function_name){
+  // variable to store class information
+  $function_info;
+
+  $reflected_function = new ReflectionFunction($function_name);
+  // function name
+  $function_info['name'] = $reflected_function->getName();
+
+  // loop through all the class method
+  foreach($reflected_function->getParameters()as $function_parameter){
+    // method name, add &, if it is pass by reference
+    $parameter_name = ($function_parameter->isPassedByReference()) ? '&' : '';
+    $parameter_name .= '$'.$function_parameter->getName();
+
+    $function_info['parameters'][$parameter_name] = array('optional' => $function_parameter->isOptional(),
+    // if the function is not defined by the user, the reflection class cannot determine the default value for it's parameters
+    'default_value' => ($function_parameter->isOptional() &&
+      $reflected_function->isUserDefined()) ? $function_parameter
+      ->getDefaultValue(): ''
+    );
+  }
+  return $function_info;
+}
+
+// This function will return a nicely formatted string describing the function
+function function_info($function_name, $show_parameter = true){
+  // load the function structure
+  $function_info = get_function_structure($function_name);
+
+  $string = $function_info['name'];
+
+  if ($show_parameter){
+    $string .= '(';
 
-        return $m;
-    } else if ( preg_match( '#^:set #', $string ) ) {
-        foreach ( PHP_Shell_Options::getInstance()->getOptions() as $v ) {
-            $m[] = $v;
+    $params;
+    if (isset($function_info['parameters']) && !empty($function_info['parameters'])){
+      foreach($function_info['parameters'] as $parameter_name => $parameter_info){
+        if ($parameter_info['optional']){
+          $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
         }
+        else{
+          $params[] = $parameter_name;
+        }
+      }
 
-        return $m;
+      $string .= (count($params)) ? implode(', ', $params): '';
     }
 
-    $f = get_defined_functions();
+    $string .= ')';
+  }
+  else{
+    $string .= '(';
+  }
+
+  return $string;
+}
+
+function get_class_structure($class_name){
+  // variable to store class information
+  $class_info;
+
+  $reflected_class = new ReflectionClass($class_name);
+  // class name
+  $class_info['name'] = $reflected_class->getName();
 
-    foreach ( $f['internal'] as $v ) {
-        $m[] = $v.'(';
+  // loop through and store add parents
+  $reflected_parent_class = $reflected_class->getParentClass();
+  if (isset($reflected_parent_class) && !empty($reflected_parent_class)){
+    foreach($reflected_parent_class as $class_parent){
+      $class_info['parents'][] = $class_parent;
     }
+  }
+
+  foreach($reflected_class->getProperties()as $property){
+    // property name and it's modifier
+    $class_info['properties'][$property->name]['modifiers'] = Reflection::getModifierNames($property->getModifiers());
+  }
+
+  foreach($reflected_class->getDefaultProperties()as $property_name => $default_value){
+    // property name and it's modifier
+    // property default value
+    $class_info['properties'][$property_name]['default_value'] = $default_value;
+  }
+
+  // loop through all the class method
+  foreach($reflected_class->getMethods()as $method){
+    // method name and it's modifier
+    $class_info['methods'][$method->name]['modifiers'] = Reflection::getModifierNames($method->getModifiers());
+
 
-    foreach ( $f['user'] as $v ) {
-        $m[] = $v.'(';
+    // loop through each of the method parameter
+    foreach($method->getParameters()as $method_parameter){
+      // parameter name, add &, if it is pass by reference
+      $parameter_name = ($method_parameter->isPassedByReference()) ? '&' : '';
+      $parameter_name .= '$'.$method_parameter->getName();
+
+      $class_info['methods'][$method->name]['parameters'][$parameter_name] = array('optional' => $method_parameter->isOptional(),
+      // if the function is not defined by the user, the reflection class cannot determine the default value for it's parameters
+      'default_value' => ($method_parameter->isOptional() && $method
+        ->isUserDefined()) ? $method_parameter->getDefaultValue(): ''
+      );
     }
+  }
+  return $class_info;
+}
 
-    $c = get_declared_classes();
 
-    foreach ( $c as $v ) {
-        $m[] = $v.'::';
-    }
-
-    $c = get_defined_constants();
-
-    foreach ( $c as $k => $v ) {
-        $m[] = $k;
-    }
-
-    /* taken from http://de3.php.net/manual/en/reserved.php */
-    $m[] = 'abstract';
-    $m[] = 'and';
-    $m[] = 'array(';
-    $m[] = 'as';
-    $m[] = 'break';
-    $m[] = 'case';
-    $m[] = 'catch';
-    $m[] = 'class';
-    $m[] = 'const';
-    $m[] = 'continue';
-    # $m[] = 'declare';
-    $m[] = 'default';
-    $m[] = 'die(';
-    $m[] = 'do';
-    $m[] = 'echo(';
-    $m[] = 'else';
-    $m[] = 'elseif';
-    $m[] = 'empty(';
-    # $m[] = 'enddeclare';
-    $m[] = 'eval(';
-    $m[] = 'exception';
-    $m[] = 'extends';
-    $m[] = 'exit(';
-    $m[] = 'extends';
-    $m[] = 'final';
-    $m[] = 'for (';
-    $m[] = 'foreach (';
-    $m[] = 'function';
-    $m[] = 'global';
-    $m[] = 'if';
-    $m[] = 'implements';
-    $m[] = 'include "';
-    $m[] = 'include_once "';
-    $m[] = 'interface';
-    $m[] = 'isset(';
-    $m[] = 'list(';
-    $m[] = 'new';
-    $m[] = 'or';
-    $m[] = 'print(';
-    $m[] = 'private';
-    $m[] = 'protected';
-    $m[] = 'public';
-    $m[] = 'require "';
-    $m[] = 'require_once "';
-    $m[] = 'return';
-    $m[] = 'static';
-    $m[] = 'switch (';
-    $m[] = 'throw';
-    $m[] = 'try';
-    $m[] = 'unset(';
-    # $m[] = 'use';
-    $m[] = 'var';
-    $m[] = 'while';
-    $m[] = 'xor';
-    $m[] = '__FILE__';
-    $m[] = '__FUNCTION__';
-    $m[] = '__CLASS__';
-    $m[] = '__LINE__';
-    $m[] = '__METHOD__';
+function class_info($class_name, $show_parameter = true){
+  // load the class structure
+  $class_info = get_class_structure($class_name);
 
-    return $m;
+  $string = "\n".$class_info['name'];
+
+  if ($show_parameter){
+    $string .= '::';
+
+    if (isset($class_info['parents']) && !empty($class_info['parents'])){
+      $string .= 'inherit from '.''.implode(', ', $class_info['parents']);
+    }
+
+    $string .= "\n";
+
+    if (isset($class_info['methods']) && !empty($class_info['methods'])){
+      // loop through all the methods
+      foreach($class_info['methods'] as $method_name => $method_info){
+        $string .= implode(' ', $method_info['modifiers']).' '.$method_name.'(';
+
+        // loop through all the method parameters
+        $params;
+
+        if (isset($method_info['parameters']) && !empty($method_info['parameters'])){
+          foreach($method_info['parameters'] as $parameter_name => $parameter_info){
+            if ($parameter_info['optional']){
+              $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
+            }
+            else{
+              $params[] = $parameter_name;
+            }
+          }
+          $string .= (count($params)) ? implode(', ', $params): '';
+        }
+
+
+        $string .= ')'."\n";
+
+      }
+
+    }
+  }
+
+  return $string .= "\n".'END OF CLASS '.$class_info['name']."\n\n\n";
+}
+
+function class_method_info($class_name, $method_name, $show_parameter){
+  // load the class structure
+  $class_info = get_class_structure($class_name);
+
+  $string;
+
+  if (isset($class_info['methods']) && !empty($class_info['methods'])){
+
+    $method_info = $class_info['methods'][$method_name];
+
+    $string = implode(' ', $method_info['modifiers']).' '.$method_name.'(';
+
+    if ($show_parameter){
+
+      // loop through all the method parameters
+      $params;
+
+      if (isset($method_info['parameters']) && !empty($method_info['parameters'])){
+        foreach($method_info['parameters'] as $parameter_name => $parameter_info){
+          if ($parameter_info['optional']){
+            $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
+          }
+          else{
+            $params[] = $parameter_name;
+          }
+        }
+        $string .= (count($params)) ? implode(', ', $params): '';
+      }
+    }
+    $string .= ')';
+  }
+  return $string;
+}
+
+function class_property_info($class_name){
+  // load the class structure
+  $properties_info = get_class_structure($class_name);
+
+  $a = array();
+
+  if (isset($properties_info['properties']) && !empty($properties_info['properties'])){
+    foreach($properties_info['properties'] as $property_name => $property_info){
+      $s = implode(' ', $properties_info['properties'][$property_name]['modifiers']).' '.$property_name;
+      $s .= (isset($properties_info['properties'][$property_name]['default_value'])) ? ' = \''.$properties_info['properties'][$property_name]['default_value'].'\'': '';
+      $a[] = $s;
+    }
+  }
+  return $a;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/console.css b/console.css
index 3bffe82..b525d4d 100644
--- a/console.css
+++ b/console.css
@@ -56,4 +56,14 @@
 #wrapper #shell a:link,
 #wrapper #shell a:visited {
   color: #FFFFFF;
+}
+#wrapper #shell_control_panel {
+  font-family: Tahoma,Arial;
+  font-size: 10pt;
+  text-align:right;
+  color: #333;
+  background: none repeat scroll 0 0 #E6E8F2;
+  border-top: 1px solid #EEEFEE;
+  border-bottom: 1px solid #EEEFEE;
+  padding: 2px;
 }
\ No newline at end of file
diff --git a/console.js b/console.js
index 12f89a8..efc4cbf 100644
--- a/console.js
+++ b/console.js
@@ -86,10 +86,11 @@
                   } else if (j.length == 1) {
                     input.val(j).focus();
                   } else {
-                    // print 3-column listing of array values
+                    // print 3-column listing of array values, 1-column is return full parameter
                     buffer_to_longest(j);
                     while (j.length > 0) {
-                      var line = j.splice(0,3);
+					  var column = (getCookie("wordpress_console_show_parameter") == 1) ? 1 : 3 ;
+                      var line = j.splice(0,column);
                       self.print(line.join(" "));
                     }
                     self.doPrompt();
@@ -150,7 +151,9 @@
           case "help": case "?":
             self.print("\nWhat's New:\n" +
             "  Keyboard shortcuts: ctrl+l = clear, ctrl+a = goto start, ctrl+e = goto end\n" +
-            "  Admin functions: add_user(), wp_delete_user(), and friends!\n" +
+			"  Press Tab key for auto completion\n" +
+            "  Admin functions: add_user(), wp_delete_user(), and friends, support native PHP as well!\n" +
+			"  'ClassName::' without the quotes + Tab Key will return result for the class\n" + 
             "\n" +
             "Special Commands:\n" +
             "  clear  (c) = clears the console output\n" +
@@ -216,7 +219,8 @@
         type:     "POST",
         dataType: "json",
         data: {
-          "root": self.root
+          "root": self.root,
+		  'show_parameter': getCookie("wordpress_console_show_parameter"),
         }
       };
       var key = null;
@@ -316,8 +320,60 @@
       range.select();
     }
   }
-
+  
   $(function() {
     window.wpConsole = new $.wpConsole();
   });
+  
+	$(document).ready(function() {
+		$("#shell_show_parameter_chkbx").checked = getCookie("wordpress_console_show_parameter");
+		
+		$("#shell_show_parameter_chkbx").click(function(){
+			
+			if ($("#shell_show_parameter_chkbx").is(":checked"))
+			{
+				setCookie("wordpress_console_show_parameter", 1, 360);
+			}
+			else
+			{     
+				setCookie("wordpress_console_show_parameter", 0, 360);
+			}
+		});
+	});
+  
+	function setCookie(c_name, value, expiredays) {
+		var exdate = new Date();
+		exdate.setDate(exdate.getDate() + expiredays);
+		
+		document.cookie = c_name + "=" + escape(value) + ((expiredays==null) ? "" : ";expires=" + exdate.toGMTString());
+		
+		c_name = null;
+		value = null;
+		expiredays = null;
+		exdate = null;
+	}
+
+	function getCookie(c_name) {
+		var value = " ";
+
+		if (document.cookie.length > 0) {
+			var c_start = document.cookie.indexOf(c_name + "=");
+			if (c_start != -1) {
+				c_start = c_start + c_name.length + 1;
+				var c_end = document.cookie.indexOf(";", c_start);
+				if (c_end == -1) {
+					c_end = document.cookie.length;
+				}
+				value = unescape(document.cookie.substring(c_start, c_end));
+				c_end = null;
+			}
+			c_start = null;
+		}
+		
+		c_name = null;
+		
+		return value;
+	}
+  
 })(jQuery);
+
diff --git a/readme.txt b/readme.txt
index 0a0b471..c72b982 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: sant0sk1
 Donate link: http://jerodsanto.net
 Tags: admin, development, ajax, interactive, developer, shell, console
 Requires at least: 2.8
-Tested up to: 3.0.5
+Tested up to: 3.1.3
 Stable tag: trunk
 
 An interactive console for WordPress developers
@@ -14,8 +14,9 @@ This plugin adds a "Console" page to the administrator's menu which provides a J
 
 = New In This Version =
 
-1.  WordPress 3.0.5 compatibility
-2.  Attempt to fix environment loading on non-standard installs
+1.  WordPress 3.1.3 compatibility
+2.  Show full parameters option
+3.  Bug fixes
 
 **SECURITY NOTICE**
 
@@ -48,6 +49,11 @@ You should fork the project on [GitHub](http://github.com/sant0sk1/wordpress-con
 
 == Changelog ==
 
+= 0.3.6 =
+* WordPress 3.1.3 compatibility
+* show full parameters option
+* Bug fixes
+
 = 0.3.5 =
 * WordPress 3.0.5 compatibility
 * Attempt to fix environment loading on non-standard installs
diff --git a/reload.php b/reload.php
index 605e49d..2a07853 100644
--- a/reload.php
+++ b/reload.php
@@ -7,6 +7,8 @@
 if (isset($_SESSION['partial'])) {
   unset($_SESSION['partial']);
 }
-
+if (isset($_SESSION['code'])) {
+  unset($_SESSION['code']);
+}
 print json_encode(array('output' => "Success!"));
 ?>
\ No newline at end of file
diff --git a/wordpress-console.php b/wordpress-console.php
index 8aca93c..b8e71e8 100644
--- a/wordpress-console.php
+++ b/wordpress-console.php
@@ -25,7 +25,7 @@ function is_ssl() {
 endif;
 
 class WordPressConsole {
-  public  $version = '0.3.5';
+  public  $version = '0.3.6';
   private $url;
   private $secret;
 
@@ -62,6 +62,11 @@ function admin() { ?>
     <div class="wrap">
       <h2>WordPress Console: "?" for help menu</h2>
       <div id="wrapper">
+		<div id="shell_control_panel">
+			<div class="shell_controls">
+				<label>Show parameter: <input id="shell_show_parameter_chkbx" type="checkbox" name="show_parameter" /></label>
+			</div>
+		 <div>
       </div>
     </div><?php
   }

From e89dc4e0e44eb128039b7876665df5a5698b3f10 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Fri, 1 Jul 2011 09:28:32 +0800
Subject: [PATCH 02/11] 0.3.6

---
 complete.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/complete.php b/complete.php
index 302e667..f6062de 100644
--- a/complete.php
+++ b/complete.php
@@ -31,7 +31,6 @@
   error('Error initializing session.');
 }
 
-// returns array of possible matches
 // returns array of possible matches
 function complete($string, $show_parameter){
   /**
@@ -155,7 +154,6 @@ function complete($string, $show_parameter){
     if (preg_match("/^{$string}/", $v)){
       $m[] = $v.'::';
     }
-    //$m[] = class_info($v, $show_parameter);
   }
 
   $c = get_defined_constants();
@@ -166,7 +164,6 @@ function complete($string, $show_parameter){
     }
   }
 
-  /* taken from http://de3.php.net/manual/en/reserved.php */
   /* taken from http://de3.php.net/manual/en/reserved.php */
   $reserved[] = 'abstract';
   $reserved[] = 'and';
@@ -356,7 +353,7 @@ function get_class_structure($class_name){
   return $class_info;
 }
 
-
+/*
 function class_info($class_name, $show_parameter = true){
   // load the class structure
   $class_info = get_class_structure($class_name);
@@ -402,6 +399,7 @@ function class_info($class_name, $show_parameter = true){
 
   return $string .= "\n".'END OF CLASS '.$class_info['name']."\n\n\n";
 }
+*/
 
 function class_method_info($class_name, $method_name, $show_parameter){
   // load the class structure

From 5a0ba070c90c6f55d84cf4d7c7f2df39e7adf658 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Fri, 1 Jul 2011 23:05:11 +0800
Subject: [PATCH 03/11] Added show parameters feature for auto-completion
 Refactor the code and revert back the version no

---
 complete.php          | 322 ++++++++++++++++++++----------------------
 console.js            |   6 +-
 readme.txt            |  12 +-
 wordpress-console.php |   2 +-
 4 files changed, 163 insertions(+), 179 deletions(-)

diff --git a/complete.php b/complete.php
index f6062de..8b63cd7 100644
--- a/complete.php
+++ b/complete.php
@@ -1,38 +1,38 @@
 <?php
-require('common.php');
+require( 'common.php' );
 
-if (isset($_POST['partial'])){
-  $secret = get_option('wordpress-console-secret');
-  if (!$secret){
+if ( isset( $_POST['partial'] ) ) {
+  $secret = get_option( 'wordpress-console-secret' );
+  if ( !$secret ) {
     return ;
   }
 
-  if (!isset($_POST['signature']) || !$_POST['signature']){
+  if ( !isset( $_POST['signature'] ) || !$_POST['signature'] ) {
     return ;
   }
 
-  $partial = stripslashes($_POST['partial']);
-  if (hash_hmac('sha1', $partial, $secret) != $_POST['signature']){
+  $partial = stripslashes( $_POST['partial'] );
+  if ( hash_hmac( 'sha1', $partial, $secret ) != $_POST['signature'] ) {
     return ;
   }
 
-  $show_parameter = (isset($_POST['show_parameter']) && $_POST['show_parameter'] == 1) ? true : false;
+  $show_parameter = ( isset( $_POST['show_parameter'] ) && $_POST['show_parameter'] == 1 ) ? true : false;
 
-  if (!preg_match('#(((?:\$)?(?:[0-9a-z_-])*)(?:(?:\[(?:[^\]]+)\]->)|(?:>|::))?)$#i', $partial, $m)){
-    die(json_encode(false));
+  if ( !preg_match( '#(((?:\$)?(?:[0-9a-z_-])*)(?:(?:\[(?:[^\]]+)\]->)|(?:>|::))?)$#i', $partial, $m ) ) {
+    die( json_encode( false ) );
   }
 
-  $candidates = complete($m[0], $show_parameter);
-  sort($candidates);
-  die(json_encode((array)$candidates));
+  $candidates = complete( $m[0], $show_parameter );
+  sort( $candidates );
+  die( json_encode( ( array )$candidates ) );
 }
 
-else{
-  error('Error initializing session.');
+ else {
+  error( 'Error initializing session.' );
 }
 
 // returns array of possible matches
-function complete($string, $show_parameter){
+function complete( $string, $show_parameter ) {
   /**
    * parse the line-buffer backwards to see if we have a
    * - constant
@@ -42,92 +42,87 @@ function complete($string, $show_parameter){
 
   $m = array();
 
-  if (preg_match('#\$([A-Za-z0-9_]+)->#', $string, $a)){
+  if ( preg_match( '#\$([A-Za-z0-9_]+)->#', $string, $a ) ) {
     /* check for $o->... */
     $name = $a[1];
 
-    if (isset($GLOBALS[$name]) && is_object($GLOBALS[$name])){
-      $class_info = get_class_structure($GLOBALS[$name]);
+    if ( isset( $GLOBALS[$name] ) && is_object( $GLOBALS[$name] ) ) {
+      $class_info = get_class_structure( $GLOBALS[$name] );
 
-      if (isset($class_info['methods']) && !empty($class_info['methods'])){
-        foreach($class_info['methods'] as $method_name => $method_info){
-          $m[] = class_method_info($GLOBALS[$name], $method_name, $show_parameter);
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $GLOBALS[$name], $method_name, $show_parameter );
         }
       }
 
-      if (isset($class_info['properties']) && !empty($class_info['properties'])){
-        $m = array_merge($m, class_property_info($GLOBALS[$name]));
+      if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
+        $m = array_merge( $m, class_property_info( $GLOBALS[$name] ) );
       }
 
       return $m;
     }
-  }
-  else if (preg_match('#\$([A-Za-z0-9_]+)\[([^\]]+)\]->#', $string, $a)){
+  } else if ( preg_match( '#\$([A-Za-z0-9_]+)\[([^\]]+)\]->#', $string, $a ) ) {
     /* check for $o[...]->... */
     $name = $a[1];
 
-    if (isset($GLOBALS[$name]) && is_array($GLOBALS[$name]) && isset($GLOBALS[$name][$a[2]])){
-      $class_info = get_class_structure($GLOBALS[$name][$a[2]]);
+    if ( isset( $GLOBALS[$name] ) && is_array( $GLOBALS[$name] ) && isset( $GLOBALS[$name][$a[2]] ) ) {
+      $class_info = get_class_structure( $GLOBALS[$name][$a[2]] );
 
-      if (isset($class_info['methods']) && !empty($class_info['methods'])){
-        foreach($class_info['methods'] as $method_name => $method_info){
-          $m[] = class_method_info($GLOBALS[$name][$a[2]], $method_name, $show_parameter);
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $GLOBALS[$name][$a[2]], $method_name, $show_parameter );
         }
       }
 
-      if (isset($class_info['properties']) && !empty($class_info['properties'])){
-        $m = array_merge($m, class_property_info($GLOBALS[$name][$a[2]]));
+      if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
+        $m = array_merge( $m, class_property_info( $GLOBALS[$name][$a[2]] ) );
       }
       return $m;
     }
-  }
-  else if (preg_match('#([A-Za-z0-9_]+)::#', $string, $a)){
+  } else if ( preg_match( '#([A-Za-z0-9_]+)::#', $string, $a ) ) {
     /* check for Class:: */
     $name = $a[1];
 
-    if (class_exists($name, false)){
-      $class_info = get_class_structure($name);
+    if ( class_exists( $name, false ) ) {
+      $class_info = get_class_structure( $name );
 
-      if (isset($class_info['methods']) && !empty($class_info['methods'])){
-        foreach($class_info['methods'] as $method_name => $method_info){
-          $m[] = class_method_info($name, $method_name, $show_parameter);
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $name, $method_name, $show_parameter );
         }
       }
 
-      if (isset($class_info['properties']) && !empty($class_info['properties'])){
+      if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
 
-        $m = array_merge($m, class_property_info($name));
+        $m = array_merge( $m, class_property_info( $name ) );
       }
 
       return $m;
     }
-  }
-  else if (preg_match('#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string)){
-    $m = array_keys($GLOBALS);
+  } else if ( preg_match( '#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string ) ) {
+    $m = array_keys( $GLOBALS );
 
     return $m;
-  }
-  else if (preg_match('#new #', $string)){
+  } else if ( preg_match( '#new #', $string ) ) {
     $c = get_declared_classes();
 
-    foreach($c as $name){
-      $class_info = get_class_structure($name);
+    foreach( $c as $name ) {
+      $class_info = get_class_structure( $name );
 
-      if (isset($class_info['methods']) && !empty($class_info['methods'])){
-        foreach($class_info['methods'] as $method_name => $method_info){
-          $m[] = class_method_info($name, $method_name, $show_parameter);
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $name, $method_name, $show_parameter );
         }
       }
     }
 
-    if (isset($class_info['properties']) && !empty($class_info['properties'])){
-      $m = array_merge($m, class_property_info($name));
+    if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
+      $m = array_merge( $m, class_property_info( $name ) );
     }
 
     return $m;
-  }
-  else if (preg_match('#^:set #', $string)){
-    foreach(PHP_Shell_Options::getInstance()->getOptions()as $v){
+  } else if ( preg_match( '#^:set #', $string ) ) {
+    foreach( PHP_Shell_Options::getInstance()->getOptions()as $v ) {
       $m[] = $v;
     }
 
@@ -136,30 +131,30 @@ function complete($string, $show_parameter){
 
   $f = get_defined_functions();
 
-  foreach($f['internal'] as $v){
-    if (preg_match("/^{$string}/", $v)){
-      $m[] = function_info($v, true);
+  foreach( $f['internal'] as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
+      $m[] = function_info( $v, $show_parameter );
     }
   }
 
-  foreach($f['user'] as $v){
-    if (preg_match("/^{$string}/", $v)){
-      $m[] = function_info($v, true);
+  foreach( $f['user'] as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
+      $m[] = function_info( $v, $show_parameter );
     }
   }
 
   $c = get_declared_classes();
 
-  foreach($c as $v){
-    if (preg_match("/^{$string}/", $v)){
+  foreach( $c as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = $v.'::';
     }
   }
 
   $c = get_defined_constants();
 
-  foreach($c as $k => $v){
-    if (preg_match("/^{$string}/", $v)){
+  foreach( $c as $k => $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = $v;
     }
   }
@@ -167,7 +162,7 @@ function complete($string, $show_parameter){
   /* taken from http://de3.php.net/manual/en/reserved.php */
   $reserved[] = 'abstract';
   $reserved[] = 'and';
-  $reserved[] = ($show_parameter) ? 'array([ mixed $... ])' : 'array(';
+  $reserved[] = ( $show_parameter ) ? 'array([ mixed $... ])' : 'array(';
   $reserved[] = 'as';
   $reserved[] = 'break';
   $reserved[] = 'case';
@@ -177,21 +172,21 @@ function complete($string, $show_parameter){
   $reserved[] = 'continue';
   # $reserved[] = 'declare';
   $reserved[] = 'default';
-  $reserved[] = ($show_parameter) ? 'die([$status])' : 'die(';
+  $reserved[] = ( $show_parameter ) ? 'die([$status])' : 'die(';
   $reserved[] = 'do';
-  $reserved[] = ($show_parameter) ? 'echo(string $arg1 [, string $... ])' : 'echo(';
+  $reserved[] = ( $show_parameter ) ? 'echo(string $arg1 [, string $... ])' : 'echo(';
   $reserved[] = 'else';
   $reserved[] = 'elseif';
-  $reserved[] = ($show_parameter) ? 'empty(mixed $var)' : 'empty(';
+  $reserved[] = ( $show_parameter ) ? 'empty(mixed $var)' : 'empty(';
   # $reserved[] = 'enddeclare';
-  $reserved[] = ($show_parameter) ? 'eval(string $code_str)' : 'eval(';
+  $reserved[] = ( $show_parameter ) ? 'eval(string $code_str)' : 'eval(';
   $reserved[] = 'exception';
   $reserved[] = 'extends';
-  $reserved[] = ($show_parameter) ? 'exit([$status])' : 'exit(';
+  $reserved[] = ( $show_parameter ) ? 'exit([$status])' : 'exit(';
   $reserved[] = 'extends';
   $reserved[] = 'final';
-  $reserved[] = ($show_parameter) ? 'for (expr1; expr2; expr3)' : 'for (';
-  $reserved[] = ($show_parameter) ? 'foreach (array_expression as $key => $value | array_expression as $value)' : 'foreach (';
+  $reserved[] = ( $show_parameter ) ? 'for (expr1; expr2; expr3)' : 'for (';
+  $reserved[] = ( $show_parameter ) ? 'foreach (array_expression as $key => $value | array_expression as $value)' : 'foreach (';
   $reserved[] = 'function';
   $reserved[] = 'global';
   $reserved[] = 'if';
@@ -199,11 +194,11 @@ function complete($string, $show_parameter){
   $reserved[] = 'include "';
   $reserved[] = 'include_once "';
   $reserved[] = 'interface';
-  $reserved[] = ($show_parameter) ? 'isset(mixed $var [, mixed $var [, $... ]])' : 'isset(';
-  $reserved[] = ($show_parameter) ? 'list(mixed $varname [, mixed $... ])' : 'list(';
+  $reserved[] = ( $show_parameter ) ? 'isset(mixed $var [, mixed $var [, $... ]])' : 'isset(';
+  $reserved[] = ( $show_parameter ) ? 'list(mixed $varname [, mixed $... ])' : 'list(';
   $reserved[] = 'new';
   $reserved[] = 'or';
-  $reserved[] = ($show_parameter) ? 'print(string $arg)' : 'print(';
+  $reserved[] = ( $show_parameter ) ? 'print(string $arg)' : 'print(';
   $reserved[] = 'private';
   $reserved[] = 'protected';
   $reserved[] = 'public';
@@ -211,10 +206,10 @@ function complete($string, $show_parameter){
   $reserved[] = 'require_once "';
   $reserved[] = 'return';
   $reserved[] = 'static';
-  $reserved[] = ($show_parameter) ? 'switch (expr)' : 'switch (';
+  $reserved[] = ( $show_parameter ) ? 'switch (expr)' : 'switch (';
   $reserved[] = 'throw';
   $reserved[] = 'try';
-  $reserved[] = ($show_parameter) ? 'unset(mixed $var [, mixed $var [, mixed $... ]])' : 'unset (';
+  $reserved[] = ( $show_parameter ) ? 'unset(mixed $var [, mixed $var [, mixed $... ]])' : 'unset (';
   # $reserved[] = 'use';
   $reserved[] = 'var';
   $reserved[] = 'while';
@@ -226,8 +221,8 @@ function complete($string, $show_parameter){
   $reserved[] = '__METHOD__';
 
 
-  foreach($reserved as $v){
-    if (preg_match("/^{$string}/", $v)){
+  foreach( $reserved as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = $v;
     }
   }
@@ -247,107 +242,105 @@ function complete($string, $show_parameter){
 )
 )
  */
-function get_function_structure($function_name){
+function get_function_structure( $function_name ) {
   // variable to store class information
   $function_info;
 
-  $reflected_function = new ReflectionFunction($function_name);
+  $reflected_function = new ReflectionFunction( $function_name );
   // function name
   $function_info['name'] = $reflected_function->getName();
 
   // loop through all the class method
-  foreach($reflected_function->getParameters()as $function_parameter){
+  foreach( $reflected_function->getParameters()as $function_parameter ) {
     // method name, add &, if it is pass by reference
-    $parameter_name = ($function_parameter->isPassedByReference()) ? '&' : '';
+    $parameter_name = ( $function_parameter->isPassedByReference() ) ? '&' : '';
     $parameter_name .= '$'.$function_parameter->getName();
 
-    $function_info['parameters'][$parameter_name] = array('optional' => $function_parameter->isOptional(),
+    $function_info['parameters'][$parameter_name] = array( 'optional' => $function_parameter->isOptional(),
     // if the function is not defined by the user, the reflection class cannot determine the default value for it's parameters
-    'default_value' => ($function_parameter->isOptional() &&
-      $reflected_function->isUserDefined()) ? $function_parameter
+    'default_value' => ( $function_parameter->isOptional() &&
+      $reflected_function->isUserDefined() ) ? $function_parameter
       ->getDefaultValue(): ''
-    );
+     );
   }
   return $function_info;
 }
 
 // This function will return a nicely formatted string describing the function
-function function_info($function_name, $show_parameter = true){
+function function_info( $function_name, $show_parameter = true ) {
   // load the function structure
-  $function_info = get_function_structure($function_name);
+  $function_info = get_function_structure( $function_name );
 
   $string = $function_info['name'];
 
-  if ($show_parameter){
+  if ( $show_parameter ) {
     $string .= '(';
 
     $params;
-    if (isset($function_info['parameters']) && !empty($function_info['parameters'])){
-      foreach($function_info['parameters'] as $parameter_name => $parameter_info){
-        if ($parameter_info['optional']){
+    if ( isset( $function_info['parameters'] ) && !empty( $function_info['parameters'] ) ) {
+      foreach( $function_info['parameters'] as $parameter_name => $parameter_info ) {
+        if ( $parameter_info['optional'] ) {
           $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
-        }
-        else{
+        } else {
           $params[] = $parameter_name;
         }
       }
 
-      $string .= (count($params)) ? implode(', ', $params): '';
+      $string .= ( count( $params ) ) ? implode( ', ', $params ): '';
     }
 
     $string .= ')';
-  }
-  else{
+  } else {
     $string .= '(';
   }
 
   return $string;
 }
 
-function get_class_structure($class_name){
+function get_class_structure( $class_name ) {
   // variable to store class information
   $class_info;
 
-  $reflected_class = new ReflectionClass($class_name);
+  $reflected_class = new ReflectionClass( $class_name );
   // class name
   $class_info['name'] = $reflected_class->getName();
 
   // loop through and store add parents
   $reflected_parent_class = $reflected_class->getParentClass();
-  if (isset($reflected_parent_class) && !empty($reflected_parent_class)){
-    foreach($reflected_parent_class as $class_parent){
+  if ( isset( $reflected_parent_class ) && !empty( $reflected_parent_class ) ) {
+    foreach( $reflected_parent_class as $class_parent ) {
       $class_info['parents'][] = $class_parent;
     }
   }
 
-  foreach($reflected_class->getProperties()as $property){
+  foreach( $reflected_class->getProperties()as $property ) {
     // property name and it's modifier
-    $class_info['properties'][$property->name]['modifiers'] = Reflection::getModifierNames($property->getModifiers());
+    $class_info['properties'][$property->name]['modifiers'] = Reflection::getModifierNames( $property->getModifiers() );
   }
 
-  foreach($reflected_class->getDefaultProperties()as $property_name => $default_value){
+  foreach( $reflected_class->getDefaultProperties()as $property_name => $default_value ) {
     // property name and it's modifier
     // property default value
     $class_info['properties'][$property_name]['default_value'] = $default_value;
   }
 
   // loop through all the class method
-  foreach($reflected_class->getMethods()as $method){
+  foreach( $reflected_class->getMethods()as $method ) {
     // method name and it's modifier
-    $class_info['methods'][$method->name]['modifiers'] = Reflection::getModifierNames($method->getModifiers());
+    $class_info['methods'][$method->name]['modifiers'] = Reflection::getModifierNames( $method->getModifiers() );
 
 
     // loop through each of the method parameter
-    foreach($method->getParameters()as $method_parameter){
+    foreach( $method->getParameters()as $method_parameter ) {
       // parameter name, add &, if it is pass by reference
-      $parameter_name = ($method_parameter->isPassedByReference()) ? '&' : '';
+      $parameter_name = ( $method_parameter->isPassedByReference() ) ? '&' : '';
       $parameter_name .= '$'.$method_parameter->getName();
 
-      $class_info['methods'][$method->name]['parameters'][$parameter_name] = array('optional' => $method_parameter->isOptional(),
+      $class_info['methods'][$method->name]['parameters'][$parameter_name] = array( 'optional' => $method_parameter->isOptional(),
       // if the function is not defined by the user, the reflection class cannot determine the default value for it's parameters
-      'default_value' => ($method_parameter->isOptional() && $method
-        ->isUserDefined()) ? $method_parameter->getDefaultValue(): ''
-      );
+      'default_value' => ( $method_parameter->isOptional() && $method
+        ->isUserDefined() ) ? $method_parameter->getDefaultValue(): ''
+       );
     }
   }
   return $class_info;
@@ -355,79 +348,78 @@ function get_class_structure($class_name){
 
 /*
 function class_info($class_name, $show_parameter = true){
-  // load the class structure
-  $class_info = get_class_structure($class_name);
+// load the class structure
+$class_info = get_class_structure($class_name);
 
-  $string = "\n".$class_info['name'];
+$string = "\n".$class_info['name'];
 
-  if ($show_parameter){
-    $string .= '::';
+if ($show_parameter){
+$string .= '::';
 
-    if (isset($class_info['parents']) && !empty($class_info['parents'])){
-      $string .= 'inherit from '.''.implode(', ', $class_info['parents']);
-    }
+if (isset($class_info['parents']) && !empty($class_info['parents'])){
+$string .= 'inherit from '.''.implode(', ', $class_info['parents']);
+}
 
-    $string .= "\n";
+$string .= "\n";
 
-    if (isset($class_info['methods']) && !empty($class_info['methods'])){
-      // loop through all the methods
-      foreach($class_info['methods'] as $method_name => $method_info){
-        $string .= implode(' ', $method_info['modifiers']).' '.$method_name.'(';
+if (isset($class_info['methods']) && !empty($class_info['methods'])){
+// loop through all the methods
+foreach($class_info['methods'] as $method_name => $method_info){
+$string .= implode(' ', $method_info['modifiers']).' '.$method_name.'(';
 
-        // loop through all the method parameters
-        $params;
+// loop through all the method parameters
+$params;
 
-        if (isset($method_info['parameters']) && !empty($method_info['parameters'])){
-          foreach($method_info['parameters'] as $parameter_name => $parameter_info){
-            if ($parameter_info['optional']){
-              $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
-            }
-            else{
-              $params[] = $parameter_name;
-            }
-          }
-          $string .= (count($params)) ? implode(', ', $params): '';
-        }
+if (isset($method_info['parameters']) && !empty($method_info['parameters'])){
+foreach($method_info['parameters'] as $parameter_name => $parameter_info){
+if ($parameter_info['optional']){
+$params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
+}
+else{
+$params[] = $parameter_name;
+}
+}
+$string .= (count($params)) ? implode(', ', $params): '';
+}
 
 
-        $string .= ')'."\n";
+$string .= ')'."\n";
 
-      }
+}
 
-    }
-  }
+}
+}
 
-  return $string .= "\n".'END OF CLASS '.$class_info['name']."\n\n\n";
+return $string .= "\n".'END OF CLASS '.$class_info['name']."\n\n\n";
 }
-*/
+ */
 
-function class_method_info($class_name, $method_name, $show_parameter){
+function class_method_info( $class_name, $method_name, $show_parameter ) {
   // load the class structure
-  $class_info = get_class_structure($class_name);
+  $class_info = get_class_structure( $class_name );
 
   $string;
 
-  if (isset($class_info['methods']) && !empty($class_info['methods'])){
+  if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
 
     $method_info = $class_info['methods'][$method_name];
 
-    $string = implode(' ', $method_info['modifiers']).' '.$method_name.'(';
+    $string = implode( ' ', $method_info['modifiers'] ).' '.$method_name.'(';
 
-    if ($show_parameter){
+    if ( $show_parameter ) {
 
       // loop through all the method parameters
       $params;
 
-      if (isset($method_info['parameters']) && !empty($method_info['parameters'])){
-        foreach($method_info['parameters'] as $parameter_name => $parameter_info){
-          if ($parameter_info['optional']){
+      if ( isset( $method_info['parameters'] ) && !empty( $method_info['parameters'] ) ) {
+        foreach( $method_info['parameters'] as $parameter_name => $parameter_info ) {
+          if ( $parameter_info['optional'] ) {
             $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
-          }
-          else{
+          } else {
             $params[] = $parameter_name;
           }
         }
-        $string .= (count($params)) ? implode(', ', $params): '';
+        $string .= ( count( $params ) ) ? implode( ', ', $params ): '';
       }
     }
     $string .= ')';
@@ -435,16 +427,16 @@ function class_method_info($class_name, $method_name, $show_parameter){
   return $string;
 }
 
-function class_property_info($class_name){
+function class_property_info( $class_name ) {
   // load the class structure
-  $properties_info = get_class_structure($class_name);
+  $properties_info = get_class_structure( $class_name );
 
   $a = array();
 
-  if (isset($properties_info['properties']) && !empty($properties_info['properties'])){
-    foreach($properties_info['properties'] as $property_name => $property_info){
-      $s = implode(' ', $properties_info['properties'][$property_name]['modifiers']).' '.$property_name;
-      $s .= (isset($properties_info['properties'][$property_name]['default_value'])) ? ' = \''.$properties_info['properties'][$property_name]['default_value'].'\'': '';
+  if ( isset( $properties_info['properties'] ) && !empty( $properties_info['properties'] ) ) {
+    foreach( $properties_info['properties'] as $property_name => $property_info ) {
+      $s = implode( ' ', $properties_info['properties'][$property_name]['modifiers'] ).' '.$property_name;
+      $s .= ( isset( $properties_info['properties'][$property_name]['default_value'] ) ) ? ' = \''.$properties_info['properties'][$property_name]['default_value'].'\'': '';
       $a[] = $s;
     }
   }
diff --git a/console.js b/console.js
index efc4cbf..d931498 100644
--- a/console.js
+++ b/console.js
@@ -330,12 +330,10 @@
 		
 		$("#shell_show_parameter_chkbx").click(function(){
 			
-			if ($("#shell_show_parameter_chkbx").is(":checked"))
-			{
+			if ($("#shell_show_parameter_chkbx").is(":checked")) {
 				setCookie("wordpress_console_show_parameter", 1, 360);
 			}
-			else
-			{     
+			else {     
 				setCookie("wordpress_console_show_parameter", 0, 360);
 			}
 		});
diff --git a/readme.txt b/readme.txt
index c72b982..0a0b471 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: sant0sk1
 Donate link: http://jerodsanto.net
 Tags: admin, development, ajax, interactive, developer, shell, console
 Requires at least: 2.8
-Tested up to: 3.1.3
+Tested up to: 3.0.5
 Stable tag: trunk
 
 An interactive console for WordPress developers
@@ -14,9 +14,8 @@ This plugin adds a "Console" page to the administrator's menu which provides a J
 
 = New In This Version =
 
-1.  WordPress 3.1.3 compatibility
-2.  Show full parameters option
-3.  Bug fixes
+1.  WordPress 3.0.5 compatibility
+2.  Attempt to fix environment loading on non-standard installs
 
 **SECURITY NOTICE**
 
@@ -49,11 +48,6 @@ You should fork the project on [GitHub](http://github.com/sant0sk1/wordpress-con
 
 == Changelog ==
 
-= 0.3.6 =
-* WordPress 3.1.3 compatibility
-* show full parameters option
-* Bug fixes
-
 = 0.3.5 =
 * WordPress 3.0.5 compatibility
 * Attempt to fix environment loading on non-standard installs
diff --git a/wordpress-console.php b/wordpress-console.php
index b8e71e8..ddaf296 100644
--- a/wordpress-console.php
+++ b/wordpress-console.php
@@ -25,7 +25,7 @@ function is_ssl() {
 endif;
 
 class WordPressConsole {
-  public  $version = '0.3.6';
+  public  $version = '0.3.5';
   private $url;
   private $secret;
 

From 8997b36629b2dca0cc4a91ac37ea6277bc2fb2bf Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Fri, 1 Jul 2011 23:12:22 +0800
Subject: [PATCH 04/11] Revert back

---
 wordpress-console.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/wordpress-console.php b/wordpress-console.php
index ddaf296..8aca93c 100644
--- a/wordpress-console.php
+++ b/wordpress-console.php
@@ -62,11 +62,6 @@ function admin() { ?>
     <div class="wrap">
       <h2>WordPress Console: "?" for help menu</h2>
       <div id="wrapper">
-		<div id="shell_control_panel">
-			<div class="shell_controls">
-				<label>Show parameter: <input id="shell_show_parameter_chkbx" type="checkbox" name="show_parameter" /></label>
-			</div>
-		 <div>
       </div>
     </div><?php
   }

From 4395fe6ae7d9c4fee133c5cd0a19a05560421792 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Sat, 2 Jul 2011 08:18:17 +0800
Subject: [PATCH 05/11] Add show parameter feature on auto-complete result

---
 complete.php | 70 +++++++++-------------------------------------------
 1 file changed, 11 insertions(+), 59 deletions(-)

diff --git a/complete.php b/complete.php
index 8b63cd7..8afe568 100644
--- a/complete.php
+++ b/complete.php
@@ -16,11 +16,11 @@
     return ;
   }
 
-  $show_parameter = ( isset( $_POST['show_parameter'] ) && $_POST['show_parameter'] == 1 ) ? true : false;
-
   if ( !preg_match( '#(((?:\$)?(?:[0-9a-z_-])*)(?:(?:\[(?:[^\]]+)\]->)|(?:>|::))?)$#i', $partial, $m ) ) {
     die( json_encode( false ) );
   }
+  
+  $show_parameter = ( isset( $_POST['show_parameter'] ) && $_POST['show_parameter'] == 1 ) ? true : false;
 
   $candidates = complete( $m[0], $show_parameter );
   sort( $candidates );
@@ -33,7 +33,7 @@
 
 // returns array of possible matches
 function complete( $string, $show_parameter ) {
-  /**
+   /**
    * parse the line-buffer backwards to see if we have a
    * - constant
    * - function
@@ -233,14 +233,14 @@ function complete( $string, $show_parameter ) {
 /*
 This function will return an array that describe the class structure
 array(
-'name' => 'function_name',
-'parameters' => array(
-'$parameter1' => array(
-'optional' => bool,
-'default_value' => ''
-),...
-)
-)
+  'name' => 'function_name',
+  'parameters' => array(
+                       '$parameter1' => array(
+                                             'optional' => bool,
+                                             'default_value' => ''
+                                            ),...
+                        )
+    )
  */
 function get_function_structure( $function_name ) {
   // variable to store class information
@@ -346,54 +346,6 @@ function get_class_structure( $class_name ) {
   return $class_info;
 }
 
-/*
-function class_info($class_name, $show_parameter = true){
-// load the class structure
-$class_info = get_class_structure($class_name);
-
-$string = "\n".$class_info['name'];
-
-if ($show_parameter){
-$string .= '::';
-
-if (isset($class_info['parents']) && !empty($class_info['parents'])){
-$string .= 'inherit from '.''.implode(', ', $class_info['parents']);
-}
-
-$string .= "\n";
-
-if (isset($class_info['methods']) && !empty($class_info['methods'])){
-// loop through all the methods
-foreach($class_info['methods'] as $method_name => $method_info){
-$string .= implode(' ', $method_info['modifiers']).' '.$method_name.'(';
-
-// loop through all the method parameters
-$params;
-
-if (isset($method_info['parameters']) && !empty($method_info['parameters'])){
-foreach($method_info['parameters'] as $parameter_name => $parameter_info){
-if ($parameter_info['optional']){
-$params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
-}
-else{
-$params[] = $parameter_name;
-}
-}
-$string .= (count($params)) ? implode(', ', $params): '';
-}
-
-
-$string .= ')'."\n";
-
-}
-
-}
-}
-
-return $string .= "\n".'END OF CLASS '.$class_info['name']."\n\n\n";
-}
- */
-
 function class_method_info( $class_name, $method_name, $show_parameter ) {
   // load the class structure
   $class_info = get_class_structure( $class_name );

From 46be160e5ee9c40442d1ae16756c227fc2fef949 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Sat, 2 Jul 2011 09:14:44 +0800
Subject: [PATCH 06/11] Add show parameter feature on Auto-complete

---
 complete.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/complete.php b/complete.php
index 8afe568..5c3c4a7 100644
--- a/complete.php
+++ b/complete.php
@@ -25,9 +25,7 @@
   $candidates = complete( $m[0], $show_parameter );
   sort( $candidates );
   die( json_encode( ( array )$candidates ) );
-}
-
- else {
+} else {
   error( 'Error initializing session.' );
 }
 

From ae1f34b3bfe78d1c6156b3d6b5e230a59a10bb03 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Sat, 2 Jul 2011 10:10:27 +0800
Subject: [PATCH 07/11] Cleaning up and adding comment

---
 complete.php | 49 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/complete.php b/complete.php
index 5c3c4a7..3631887 100644
--- a/complete.php
+++ b/complete.php
@@ -56,7 +56,7 @@ function complete( $string, $show_parameter ) {
       if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
         $m = array_merge( $m, class_property_info( $GLOBALS[$name] ) );
       }
-
+      // return the methods and properties of the object
       return $m;
     }
   } else if ( preg_match( '#\$([A-Za-z0-9_]+)\[([^\]]+)\]->#', $string, $a ) ) {
@@ -75,6 +75,7 @@ function complete( $string, $show_parameter ) {
       if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
         $m = array_merge( $m, class_property_info( $GLOBALS[$name][$a[2]] ) );
       }
+	  // return the methods and properties of the object
       return $m;
     }
   } else if ( preg_match( '#([A-Za-z0-9_]+)::#', $string, $a ) ) {
@@ -94,7 +95,7 @@ function complete( $string, $show_parameter ) {
 
         $m = array_merge( $m, class_property_info( $name ) );
       }
-
+      // return the methods and properties of the object
       return $m;
     }
   } else if ( preg_match( '#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string ) ) {
@@ -117,7 +118,7 @@ function complete( $string, $show_parameter ) {
     if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
       $m = array_merge( $m, class_property_info( $name ) );
     }
-
+    // return the methods and properties of the class
     return $m;
   } else if ( preg_match( '#^:set #', $string ) ) {
     foreach( PHP_Shell_Options::getInstance()->getOptions()as $v ) {
@@ -128,13 +129,13 @@ function complete( $string, $show_parameter ) {
   }
 
   $f = get_defined_functions();
-
+  // loop through all the internal functions, only return those that match the search string
   foreach( $f['internal'] as $v ) {
     if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = function_info( $v, $show_parameter );
     }
   }
-
+  // loop through all the user functions, only return those that match the search string
   foreach( $f['user'] as $v ) {
     if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = function_info( $v, $show_parameter );
@@ -142,7 +143,7 @@ function complete( $string, $show_parameter ) {
   }
 
   $c = get_declared_classes();
-
+  // loop through all the declared classes only return those that match the search string
   foreach( $c as $v ) {
     if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = $v.'::';
@@ -150,7 +151,7 @@ function complete( $string, $show_parameter ) {
   }
 
   $c = get_defined_constants();
-
+  // loop through all the defined constants, only return those that match the search string
   foreach( $c as $k => $v ) {
     if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = $v;
@@ -218,7 +219,7 @@ function complete( $string, $show_parameter ) {
   $reserved[] = '__LINE__';
   $reserved[] = '__METHOD__';
 
-
+  // loop through all the reserved keywords, only return those that match the search string
   foreach( $reserved as $v ) {
     if ( preg_match( "/^{$string}/", $v ) ) {
       $m[] = $v;
@@ -295,6 +296,36 @@ function function_info( $function_name, $show_parameter = true ) {
   return $string;
 }
 
+/*
+	This function will return an array that describe the class structure
+	array(
+		'name' => 'class_name',
+		'parents' =>  array(
+							'type',...
+							),
+		'properties' => array(
+							array(
+								'property1' => array(
+													
+												),...
+												),...
+							}
+						,
+		'methods' => array(
+						'method1' => array(
+										'modifiers' => array(
+															'type',...
+															),
+										//'inherited' => 'parent'
+										'parameters' => array(
+														'$parameter1' => array(
+																		'optional' => bool,
+																		'default_value' => ''
+																	),...
+													)
+					),...
+		)
+*/
 function get_class_structure( $class_name ) {
   // variable to store class information
   $class_info;
@@ -344,6 +375,7 @@ function get_class_structure( $class_name ) {
   return $class_info;
 }
 
+// return a nicely formatted string describing a particular class method
 function class_method_info( $class_name, $method_name, $show_parameter ) {
   // load the class structure
   $class_info = get_class_structure( $class_name );
@@ -377,6 +409,7 @@ function class_method_info( $class_name, $method_name, $show_parameter ) {
   return $string;
 }
 
+// return a nicely formatted string describing a particular class methods and properties
 function class_property_info( $class_name ) {
   // load the class structure
   $properties_info = get_class_structure( $class_name );

From e4474539b5da99b236249586802097c84b1f309f Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Sat, 2 Jul 2011 10:13:12 +0800
Subject: [PATCH 08/11] Cleaning up and adding comments

---
 complete.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/complete.php b/complete.php
index 3631887..2eff19c 100644
--- a/complete.php
+++ b/complete.php
@@ -230,7 +230,7 @@ function complete( $string, $show_parameter ) {
 }
 
 /*
-This function will return an array that describe the class structure
+This function will return an array that describe the function
 array(
   'name' => 'function_name',
   'parameters' => array(
@@ -316,7 +316,6 @@ function function_info( $function_name, $show_parameter = true ) {
 										'modifiers' => array(
 															'type',...
 															),
-										//'inherited' => 'parent'
 										'parameters' => array(
 														'$parameter1' => array(
 																		'optional' => bool,

From 4c113ade8b8237f61872400cb66e1b6f34fcc2a7 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Sat, 2 Jul 2011 10:18:45 +0800
Subject: [PATCH 09/11] checkbox for the show parameter option

---
 wordpress-console.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wordpress-console.php b/wordpress-console.php
index 8aca93c..a378a9f 100644
--- a/wordpress-console.php
+++ b/wordpress-console.php
@@ -62,6 +62,11 @@ function admin() { ?>
     <div class="wrap">
       <h2>WordPress Console: "?" for help menu</h2>
       <div id="wrapper">
+			<div id="shell_control_panel">
+				<div class="shell_controls">
+					<label>Show parameter: <input id="shell_show_parameter_chkbx" type="checkbox" name="show_parameter" /></label>
+				</div>
+			<div>
       </div>
     </div><?php
   }

From 3d66fdc1ef832c8f85915c47da1618aed78fe489 Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Sun, 3 Jul 2011 09:20:18 +0800
Subject: [PATCH 10/11] fix a bug where the globals are not filter out

---
 complete.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/complete.php b/complete.php
index 2eff19c..281c0b5 100644
--- a/complete.php
+++ b/complete.php
@@ -98,9 +98,13 @@ function complete( $string, $show_parameter ) {
       // return the methods and properties of the object
       return $m;
     }
-  } else if ( preg_match( '#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string ) ) {
-    $m = array_keys( $GLOBALS );
-
+  } else if ( preg_match( '#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string, $g ) ) {
+      // loop through all the globals, only return those that match the search string
+      foreach( array_keys( $GLOBALS ) as $v ) {
+        if ( preg_match( "/^{$g[1]}/", $v ) ) {
+          $m[] = $v;
+        }
+      }
     return $m;
   } else if ( preg_match( '#new #', $string ) ) {
     $c = get_declared_classes();

From 2ac21ae85c4632034d514c448e44ebe9e7475ebb Mon Sep 17 00:00:00 2001
From: Johnny Lim <lim.johnny88@gmail.com>
Date: Fri, 1 Jul 2011 03:09:18 +0800
Subject: [PATCH 11/11] Add show parameter feature on auto-complete result
 reload now will unset $_SESSION['code']

---
 complete.php          | 526 ++++++++++++++++++++++++++++++------------
 console.css           |  10 +
 console.js            |  64 ++++-
 reload.php            |   4 +-
 wordpress-console.php |   5 +
 5 files changed, 453 insertions(+), 156 deletions(-)

diff --git a/complete.php b/complete.php
index e6fdee7..281c0b5 100644
--- a/complete.php
+++ b/complete.php
@@ -1,206 +1,432 @@
 <?php
 require( 'common.php' );
 
-if ( isset($_POST['partial'] ) ) {
-  $secret = get_option('wordpress-console-secret');
+if ( isset( $_POST['partial'] ) ) {
+  $secret = get_option( 'wordpress-console-secret' );
   if ( !$secret ) {
-    return;
+    return ;
   }
 
   if ( !isset( $_POST['signature'] ) || !$_POST['signature'] ) {
-    return;
+    return ;
   }
 
   $partial = stripslashes( $_POST['partial'] );
   if ( hash_hmac( 'sha1', $partial, $secret ) != $_POST['signature'] ) {
-    return;
+    return ;
   }
 
-  if ( !preg_match( '#([0-9a-z_-]+)$#i', $partial, $m ) ) {
+  if ( !preg_match( '#(((?:\$)?(?:[0-9a-z_-])*)(?:(?:\[(?:[^\]]+)\]->)|(?:>|::))?)$#i', $partial, $m ) ) {
     die( json_encode( false ) );
   }
+  
+  $show_parameter = ( isset( $_POST['show_parameter'] ) && $_POST['show_parameter'] == 1 ) ? true : false;
 
-  $candidates = preg_grep( "/^{$m[1]}/", complete( $m[1] ) );
+  $candidates = complete( $m[0], $show_parameter );
   sort( $candidates );
-  die( json_encode( ( array ) $candidates ) );
+  die( json_encode( ( array )$candidates ) );
 } else {
   error( 'Error initializing session.' );
 }
 
 // returns array of possible matches
-function complete( $string ) {
-    /**
-    * parse the line-buffer backwards to see if we have a
-    * - constant
-    * - function
-    * - variable
-    */
+function complete( $string, $show_parameter ) {
+   /**
+   * parse the line-buffer backwards to see if we have a
+   * - constant
+   * - function
+   * - variable
+   */
+
+  $m = array();
+
+  if ( preg_match( '#\$([A-Za-z0-9_]+)->#', $string, $a ) ) {
+    /* check for $o->... */
+    $name = $a[1];
+
+    if ( isset( $GLOBALS[$name] ) && is_object( $GLOBALS[$name] ) ) {
+      $class_info = get_class_structure( $GLOBALS[$name] );
+
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $GLOBALS[$name], $method_name, $show_parameter );
+        }
+      }
 
-    $m = array();
+      if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
+        $m = array_merge( $m, class_property_info( $GLOBALS[$name] ) );
+      }
+      // return the methods and properties of the object
+      return $m;
+    }
+  } else if ( preg_match( '#\$([A-Za-z0-9_]+)\[([^\]]+)\]->#', $string, $a ) ) {
+    /* check for $o[...]->... */
+    $name = $a[1];
 
-    if ( preg_match( '#\$([A-Za-z0-9_]+)->#', $string, $a ) ) {
-        /* check for $o->... */
-        $name = $a[1];
+    if ( isset( $GLOBALS[$name] ) && is_array( $GLOBALS[$name] ) && isset( $GLOBALS[$name][$a[2]] ) ) {
+      $class_info = get_class_structure( $GLOBALS[$name][$a[2]] );
 
-        if ( isset( $GLOBALS[$name] ) && is_object( $GLOBALS[$name] ) ) {
-            $c = get_class_methods( $GLOBALS[$name] );
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $GLOBALS[$name][$a[2]], $method_name, $show_parameter );
+        }
+      }
 
-            foreach ( $c as $v ) {
-                $m[] = $v.'(';
-            }
-            $c = get_class_vars( get_class( $GLOBALS[$name] ) );
+      if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
+        $m = array_merge( $m, class_property_info( $GLOBALS[$name][$a[2]] ) );
+      }
+	  // return the methods and properties of the object
+      return $m;
+    }
+  } else if ( preg_match( '#([A-Za-z0-9_]+)::#', $string, $a ) ) {
+    /* check for Class:: */
+    $name = $a[1];
 
-            foreach ( $c as $k => $v ) {
-                $m[] = $k;
-            }
+    if ( class_exists( $name, false ) ) {
+      $class_info = get_class_structure( $name );
 
-            return $m;
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $name, $method_name, $show_parameter );
         }
-    } else if ( preg_match( '#\$([A-Za-z0-9_]+)\[([^\]]+)\]->#', $string, $a ) ) {
-        /* check for $o[...]->... */
-        $name = $a[1];
+      }
 
-        if ( isset( $GLOBALS[$name] ) &&
-            is_array( $GLOBALS[$name] ) &&
-            isset( $GLOBALS[$name][$a[2]] ) ) {
+      if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
 
-            $c = get_class_methods( $GLOBALS[$name][$a[2]] );
+        $m = array_merge( $m, class_property_info( $name ) );
+      }
+      // return the methods and properties of the object
+      return $m;
+    }
+  } else if ( preg_match( '#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string, $g ) ) {
+      // loop through all the globals, only return those that match the search string
+      foreach( array_keys( $GLOBALS ) as $v ) {
+        if ( preg_match( "/^{$g[1]}/", $v ) ) {
+          $m[] = $v;
+        }
+      }
+    return $m;
+  } else if ( preg_match( '#new #', $string ) ) {
+    $c = get_declared_classes();
 
-            foreach ( $c as $v ) {
-                $m[] = $v.'(';
-            }
-            $c = get_class_vars( get_class( $GLOBALS[$name][$a[2]] ) );
+    foreach( $c as $name ) {
+      $class_info = get_class_structure( $name );
 
-            foreach ( $c as $k => $v ) {
-                $m[] = $k;
-            }
-            return $m;
+      if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+        foreach( $class_info['methods'] as $method_name => $method_info ) {
+          $m[] = class_method_info( $name, $method_name, $show_parameter );
         }
+      }
+    }
 
-    } else if ( preg_match( '#([A-Za-z0-9_]+)::#', $string, $a ) ) {
-        /* check for Class:: */
-        $name = $a[1];
+    if ( isset( $class_info['properties'] ) && !empty( $class_info['properties'] ) ) {
+      $m = array_merge( $m, class_property_info( $name ) );
+    }
+    // return the methods and properties of the class
+    return $m;
+  } else if ( preg_match( '#^:set #', $string ) ) {
+    foreach( PHP_Shell_Options::getInstance()->getOptions()as $v ) {
+      $m[] = $v;
+    }
 
-        if ( class_exists( $name, false ) ) {
-            $c = get_class_methods( $name );
+    return $m;
+  }
 
-            foreach ( $c as $v ) {
-                $m[] = sprintf( '%s::%s(', $name, $v );
-            }
+  $f = get_defined_functions();
+  // loop through all the internal functions, only return those that match the search string
+  foreach( $f['internal'] as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
+      $m[] = function_info( $v, $show_parameter );
+    }
+  }
+  // loop through all the user functions, only return those that match the search string
+  foreach( $f['user'] as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
+      $m[] = function_info( $v, $show_parameter );
+    }
+  }
 
-            $cl = new ReflectionClass( $name );
-            $c = $cl->getConstants();
+  $c = get_declared_classes();
+  // loop through all the declared classes only return those that match the search string
+  foreach( $c as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
+      $m[] = $v.'::';
+    }
+  }
 
-            foreach ( $c as $k => $v ) {
-                $m[] = sprintf( '%s::%s', $name, $k );
-            }
+  $c = get_defined_constants();
+  // loop through all the defined constants, only return those that match the search string
+  foreach( $c as $k => $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
+      $m[] = $v;
+    }
+  }
 
-            return $m;
-        }
-    } else if ( preg_match( '#\$([a-zA-Z]?[a-zA-Z0-9_]*)$#', $string ) ) {
-        $m = array_keys( $GLOBALS );
+  /* taken from http://de3.php.net/manual/en/reserved.php */
+  $reserved[] = 'abstract';
+  $reserved[] = 'and';
+  $reserved[] = ( $show_parameter ) ? 'array([ mixed $... ])' : 'array(';
+  $reserved[] = 'as';
+  $reserved[] = 'break';
+  $reserved[] = 'case';
+  $reserved[] = 'catch';
+  $reserved[] = 'class';
+  $reserved[] = 'const';
+  $reserved[] = 'continue';
+  # $reserved[] = 'declare';
+  $reserved[] = 'default';
+  $reserved[] = ( $show_parameter ) ? 'die([$status])' : 'die(';
+  $reserved[] = 'do';
+  $reserved[] = ( $show_parameter ) ? 'echo(string $arg1 [, string $... ])' : 'echo(';
+  $reserved[] = 'else';
+  $reserved[] = 'elseif';
+  $reserved[] = ( $show_parameter ) ? 'empty(mixed $var)' : 'empty(';
+  # $reserved[] = 'enddeclare';
+  $reserved[] = ( $show_parameter ) ? 'eval(string $code_str)' : 'eval(';
+  $reserved[] = 'exception';
+  $reserved[] = 'extends';
+  $reserved[] = ( $show_parameter ) ? 'exit([$status])' : 'exit(';
+  $reserved[] = 'extends';
+  $reserved[] = 'final';
+  $reserved[] = ( $show_parameter ) ? 'for (expr1; expr2; expr3)' : 'for (';
+  $reserved[] = ( $show_parameter ) ? 'foreach (array_expression as $key => $value | array_expression as $value)' : 'foreach (';
+  $reserved[] = 'function';
+  $reserved[] = 'global';
+  $reserved[] = 'if';
+  $reserved[] = 'implements';
+  $reserved[] = 'include "';
+  $reserved[] = 'include_once "';
+  $reserved[] = 'interface';
+  $reserved[] = ( $show_parameter ) ? 'isset(mixed $var [, mixed $var [, $... ]])' : 'isset(';
+  $reserved[] = ( $show_parameter ) ? 'list(mixed $varname [, mixed $... ])' : 'list(';
+  $reserved[] = 'new';
+  $reserved[] = 'or';
+  $reserved[] = ( $show_parameter ) ? 'print(string $arg)' : 'print(';
+  $reserved[] = 'private';
+  $reserved[] = 'protected';
+  $reserved[] = 'public';
+  $reserved[] = 'require "';
+  $reserved[] = 'require_once "';
+  $reserved[] = 'return';
+  $reserved[] = 'static';
+  $reserved[] = ( $show_parameter ) ? 'switch (expr)' : 'switch (';
+  $reserved[] = 'throw';
+  $reserved[] = 'try';
+  $reserved[] = ( $show_parameter ) ? 'unset(mixed $var [, mixed $var [, mixed $... ]])' : 'unset (';
+  # $reserved[] = 'use';
+  $reserved[] = 'var';
+  $reserved[] = 'while';
+  $reserved[] = 'xor';
+  $reserved[] = '__FILE__';
+  $reserved[] = '__FUNCTION__';
+  $reserved[] = '__CLASS__';
+  $reserved[] = '__LINE__';
+  $reserved[] = '__METHOD__';
+
+  // loop through all the reserved keywords, only return those that match the search string
+  foreach( $reserved as $v ) {
+    if ( preg_match( "/^{$string}/", $v ) ) {
+      $m[] = $v;
+    }
+  }
 
-        return $m;
-    } else if ( preg_match( '#new #', $string ) ) {
-        $c = get_declared_classes();
+  return $m;
+}
 
-        foreach ( $c as $v ) {
-            $m[] = $v.'(';
-        }
+/*
+This function will return an array that describe the function
+array(
+  'name' => 'function_name',
+  'parameters' => array(
+                       '$parameter1' => array(
+                                             'optional' => bool,
+                                             'default_value' => ''
+                                            ),...
+                        )
+    )
+ */
+function get_function_structure( $function_name ) {
+  // variable to store class information
+  $function_info;
+
+  $reflected_function = new ReflectionFunction( $function_name );
+  // function name
+  $function_info['name'] = $reflected_function->getName();
+
+  // loop through all the class method
+  foreach( $reflected_function->getParameters()as $function_parameter ) {
+    // method name, add &, if it is pass by reference
+    $parameter_name = ( $function_parameter->isPassedByReference() ) ? '&' : '';
+    $parameter_name .= '$'.$function_parameter->getName();
+
+    $function_info['parameters'][$parameter_name] = array( 'optional' => $function_parameter->isOptional(),
+    // if the function is not defined by the user, the reflection class cannot determine the default value for it's parameters
+    'default_value' => ( $function_parameter->isOptional() &&
+      $reflected_function->isUserDefined() ) ? $function_parameter
+      ->getDefaultValue(): ''
+     );
+  }
+  return $function_info;
+}
+
+// This function will return a nicely formatted string describing the function
+function function_info( $function_name, $show_parameter = true ) {
+  // load the function structure
+  $function_info = get_function_structure( $function_name );
+
+  $string = $function_info['name'];
 
-        return $m;
-    } else if ( preg_match( '#^:set #', $string ) ) {
-        foreach ( PHP_Shell_Options::getInstance()->getOptions() as $v ) {
-            $m[] = $v;
+  if ( $show_parameter ) {
+    $string .= '(';
+
+    $params;
+    if ( isset( $function_info['parameters'] ) && !empty( $function_info['parameters'] ) ) {
+      foreach( $function_info['parameters'] as $parameter_name => $parameter_info ) {
+        if ( $parameter_info['optional'] ) {
+          $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
+        } else {
+          $params[] = $parameter_name;
         }
+      }
 
-        return $m;
+      $string .= ( count( $params ) ) ? implode( ', ', $params ): '';
     }
 
-    $f = get_defined_functions();
+    $string .= ')';
+  } else {
+    $string .= '(';
+  }
+
+  return $string;
+}
 
-    foreach ( $f['internal'] as $v ) {
-        $m[] = $v.'(';
+/*
+	This function will return an array that describe the class structure
+	array(
+		'name' => 'class_name',
+		'parents' =>  array(
+							'type',...
+							),
+		'properties' => array(
+							array(
+								'property1' => array(
+													
+												),...
+												),...
+							}
+						,
+		'methods' => array(
+						'method1' => array(
+										'modifiers' => array(
+															'type',...
+															),
+										'parameters' => array(
+														'$parameter1' => array(
+																		'optional' => bool,
+																		'default_value' => ''
+																	),...
+													)
+					),...
+		)
+*/
+function get_class_structure( $class_name ) {
+  // variable to store class information
+  $class_info;
+
+  $reflected_class = new ReflectionClass( $class_name );
+  // class name
+  $class_info['name'] = $reflected_class->getName();
+
+  // loop through and store add parents
+  $reflected_parent_class = $reflected_class->getParentClass();
+  if ( isset( $reflected_parent_class ) && !empty( $reflected_parent_class ) ) {
+    foreach( $reflected_parent_class as $class_parent ) {
+      $class_info['parents'][] = $class_parent;
     }
+  }
+
+  foreach( $reflected_class->getProperties()as $property ) {
+    // property name and it's modifier
+    $class_info['properties'][$property->name]['modifiers'] = Reflection::getModifierNames( $property->getModifiers() );
+  }
 
-    foreach ( $f['user'] as $v ) {
-        $m[] = $v.'(';
+  foreach( $reflected_class->getDefaultProperties()as $property_name => $default_value ) {
+    // property name and it's modifier
+    // property default value
+    $class_info['properties'][$property_name]['default_value'] = $default_value;
+  }
+
+  // loop through all the class method
+  foreach( $reflected_class->getMethods()as $method ) {
+    // method name and it's modifier
+    $class_info['methods'][$method->name]['modifiers'] = Reflection::getModifierNames( $method->getModifiers() );
+
+
+    // loop through each of the method parameter
+    foreach( $method->getParameters()as $method_parameter ) {
+      // parameter name, add &, if it is pass by reference
+      $parameter_name = ( $method_parameter->isPassedByReference() ) ? '&' : '';
+      $parameter_name .= '$'.$method_parameter->getName();
+
+      $class_info['methods'][$method->name]['parameters'][$parameter_name] = array( 'optional' => $method_parameter->isOptional(),
+      // if the function is not defined by the user, the reflection class cannot determine the default value for it's parameters
+      'default_value' => ( $method_parameter->isOptional() && $method
+        ->isUserDefined() ) ? $method_parameter->getDefaultValue(): ''
+       );
     }
+  }
+  return $class_info;
+}
 
-    $c = get_declared_classes();
+// return a nicely formatted string describing a particular class method
+function class_method_info( $class_name, $method_name, $show_parameter ) {
+  // load the class structure
+  $class_info = get_class_structure( $class_name );
 
-    foreach ( $c as $v ) {
-        $m[] = $v.'::';
-    }
-
-    $c = get_defined_constants();
-
-    foreach ( $c as $k => $v ) {
-        $m[] = $k;
-    }
-
-    /* taken from http://de3.php.net/manual/en/reserved.php */
-    $m[] = 'abstract';
-    $m[] = 'and';
-    $m[] = 'array(';
-    $m[] = 'as';
-    $m[] = 'break';
-    $m[] = 'case';
-    $m[] = 'catch';
-    $m[] = 'class';
-    $m[] = 'const';
-    $m[] = 'continue';
-    # $m[] = 'declare';
-    $m[] = 'default';
-    $m[] = 'die(';
-    $m[] = 'do';
-    $m[] = 'echo(';
-    $m[] = 'else';
-    $m[] = 'elseif';
-    $m[] = 'empty(';
-    # $m[] = 'enddeclare';
-    $m[] = 'eval(';
-    $m[] = 'exception';
-    $m[] = 'extends';
-    $m[] = 'exit(';
-    $m[] = 'extends';
-    $m[] = 'final';
-    $m[] = 'for (';
-    $m[] = 'foreach (';
-    $m[] = 'function';
-    $m[] = 'global';
-    $m[] = 'if';
-    $m[] = 'implements';
-    $m[] = 'include "';
-    $m[] = 'include_once "';
-    $m[] = 'interface';
-    $m[] = 'isset(';
-    $m[] = 'list(';
-    $m[] = 'new';
-    $m[] = 'or';
-    $m[] = 'print(';
-    $m[] = 'private';
-    $m[] = 'protected';
-    $m[] = 'public';
-    $m[] = 'require "';
-    $m[] = 'require_once "';
-    $m[] = 'return';
-    $m[] = 'static';
-    $m[] = 'switch (';
-    $m[] = 'throw';
-    $m[] = 'try';
-    $m[] = 'unset(';
-    # $m[] = 'use';
-    $m[] = 'var';
-    $m[] = 'while';
-    $m[] = 'xor';
-    $m[] = '__FILE__';
-    $m[] = '__FUNCTION__';
-    $m[] = '__CLASS__';
-    $m[] = '__LINE__';
-    $m[] = '__METHOD__';
+  $string;
 
-    return $m;
+  if ( isset( $class_info['methods'] ) && !empty( $class_info['methods'] ) ) {
+
+    $method_info = $class_info['methods'][$method_name];
+
+    $string = implode( ' ', $method_info['modifiers'] ).' '.$method_name.'(';
+
+    if ( $show_parameter ) {
+
+      // loop through all the method parameters
+      $params;
+
+      if ( isset( $method_info['parameters'] ) && !empty( $method_info['parameters'] ) ) {
+        foreach( $method_info['parameters'] as $parameter_name => $parameter_info ) {
+          if ( $parameter_info['optional'] ) {
+            $params[] = '['.$parameter_name.' = \''.$parameter_info['default_value'].'\']';
+          } else {
+            $params[] = $parameter_name;
+          }
+        }
+        $string .= ( count( $params ) ) ? implode( ', ', $params ): '';
+      }
+    }
+    $string .= ')';
+  }
+  return $string;
+}
+
+// return a nicely formatted string describing a particular class methods and properties
+function class_property_info( $class_name ) {
+  // load the class structure
+  $properties_info = get_class_structure( $class_name );
+
+  $a = array();
+
+  if ( isset( $properties_info['properties'] ) && !empty( $properties_info['properties'] ) ) {
+    foreach( $properties_info['properties'] as $property_name => $property_info ) {
+      $s = implode( ' ', $properties_info['properties'][$property_name]['modifiers'] ).' '.$property_name;
+      $s .= ( isset( $properties_info['properties'][$property_name]['default_value'] ) ) ? ' = \''.$properties_info['properties'][$property_name]['default_value'].'\'': '';
+      $a[] = $s;
+    }
+  }
+  return $a;
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/console.css b/console.css
index 3bffe82..b525d4d 100644
--- a/console.css
+++ b/console.css
@@ -56,4 +56,14 @@
 #wrapper #shell a:link,
 #wrapper #shell a:visited {
   color: #FFFFFF;
+}
+#wrapper #shell_control_panel {
+  font-family: Tahoma,Arial;
+  font-size: 10pt;
+  text-align:right;
+  color: #333;
+  background: none repeat scroll 0 0 #E6E8F2;
+  border-top: 1px solid #EEEFEE;
+  border-bottom: 1px solid #EEEFEE;
+  padding: 2px;
 }
\ No newline at end of file
diff --git a/console.js b/console.js
index 12f89a8..d931498 100644
--- a/console.js
+++ b/console.js
@@ -86,10 +86,11 @@
                   } else if (j.length == 1) {
                     input.val(j).focus();
                   } else {
-                    // print 3-column listing of array values
+                    // print 3-column listing of array values, 1-column is return full parameter
                     buffer_to_longest(j);
                     while (j.length > 0) {
-                      var line = j.splice(0,3);
+					  var column = (getCookie("wordpress_console_show_parameter") == 1) ? 1 : 3 ;
+                      var line = j.splice(0,column);
                       self.print(line.join(" "));
                     }
                     self.doPrompt();
@@ -150,7 +151,9 @@
           case "help": case "?":
             self.print("\nWhat's New:\n" +
             "  Keyboard shortcuts: ctrl+l = clear, ctrl+a = goto start, ctrl+e = goto end\n" +
-            "  Admin functions: add_user(), wp_delete_user(), and friends!\n" +
+			"  Press Tab key for auto completion\n" +
+            "  Admin functions: add_user(), wp_delete_user(), and friends, support native PHP as well!\n" +
+			"  'ClassName::' without the quotes + Tab Key will return result for the class\n" + 
             "\n" +
             "Special Commands:\n" +
             "  clear  (c) = clears the console output\n" +
@@ -216,7 +219,8 @@
         type:     "POST",
         dataType: "json",
         data: {
-          "root": self.root
+          "root": self.root,
+		  'show_parameter': getCookie("wordpress_console_show_parameter"),
         }
       };
       var key = null;
@@ -316,8 +320,58 @@
       range.select();
     }
   }
-
+  
   $(function() {
     window.wpConsole = new $.wpConsole();
   });
+  
+	$(document).ready(function() {
+		$("#shell_show_parameter_chkbx").checked = getCookie("wordpress_console_show_parameter");
+		
+		$("#shell_show_parameter_chkbx").click(function(){
+			
+			if ($("#shell_show_parameter_chkbx").is(":checked")) {
+				setCookie("wordpress_console_show_parameter", 1, 360);
+			}
+			else {     
+				setCookie("wordpress_console_show_parameter", 0, 360);
+			}
+		});
+	});
+  
+	function setCookie(c_name, value, expiredays) {
+		var exdate = new Date();
+		exdate.setDate(exdate.getDate() + expiredays);
+		
+		document.cookie = c_name + "=" + escape(value) + ((expiredays==null) ? "" : ";expires=" + exdate.toGMTString());
+		
+		c_name = null;
+		value = null;
+		expiredays = null;
+		exdate = null;
+	}
+
+	function getCookie(c_name) {
+		var value = " ";
+
+		if (document.cookie.length > 0) {
+			var c_start = document.cookie.indexOf(c_name + "=");
+			if (c_start != -1) {
+				c_start = c_start + c_name.length + 1;
+				var c_end = document.cookie.indexOf(";", c_start);
+				if (c_end == -1) {
+					c_end = document.cookie.length;
+				}
+				value = unescape(document.cookie.substring(c_start, c_end));
+				c_end = null;
+			}
+			c_start = null;
+		}
+		
+		c_name = null;
+		
+		return value;
+	}
+  
 })(jQuery);
+
diff --git a/reload.php b/reload.php
index 605e49d..2a07853 100644
--- a/reload.php
+++ b/reload.php
@@ -7,6 +7,8 @@
 if (isset($_SESSION['partial'])) {
   unset($_SESSION['partial']);
 }
-
+if (isset($_SESSION['code'])) {
+  unset($_SESSION['code']);
+}
 print json_encode(array('output' => "Success!"));
 ?>
\ No newline at end of file
diff --git a/wordpress-console.php b/wordpress-console.php
index 8aca93c..a378a9f 100644
--- a/wordpress-console.php
+++ b/wordpress-console.php
@@ -62,6 +62,11 @@ function admin() { ?>
     <div class="wrap">
       <h2>WordPress Console: "?" for help menu</h2>
       <div id="wrapper">
+			<div id="shell_control_panel">
+				<div class="shell_controls">
+					<label>Show parameter: <input id="shell_show_parameter_chkbx" type="checkbox" name="show_parameter" /></label>
+				</div>
+			<div>
       </div>
     </div><?php
   }