pradosoft / prado

framework/3rdParty/FirePHPCore/fb.php

Doc Comments +1 added lines, -3 removed lines

@@ -50,7 +50,6 @@ 
  * "Server" request tab.
  * 
  * @see http://www.firephp.org/Wiki/Reference/Fb
- * @param mixed $Object
  * @return true
  * @throws Exception
  */
@@ -130,7 +129,6 @@ 
    * Log object to firebug
    * 
    * @see http://www.firephp.org/Wiki/Reference/Fb
-   * @param mixed $Object
    * @return true
    * @throws Exception
    */
@@ -150,7 +148,7 @@ 
    *
    * @param string $Name
    * @param array $Options OPTIONAL Instructions on how to log the group
-   * @return true
+   * @return boolean
    */
   public static function group($Name, $Options=null) {
     $instance = FirePHP::getInstance(true);

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
  * @package     FirePHP
  */
 
-require_once dirname(__FILE__).'/FirePHP.class.php';
+require_once dirname(__FILE__) . '/FirePHP.class.php';
 
 /**
  * Sends the given data to the FirePHP Firefox Extension.
@@ -59,7 +59,7 @@ 
   $instance = FirePHP::getInstance(true);
   
   $args = func_get_args();
-  return call_user_func_array(array($instance,'fb'),$args);
+  return call_user_func_array(array($instance, 'fb'), $args);
 }
 
 
@@ -138,7 +138,7 @@ 
   {
     $instance = FirePHP::getInstance(true);
     $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
+    return call_user_func_array(array($instance, 'fb'), $args);
   }
 
   /**
@@ -152,7 +152,7 @@ 
    * @param array $Options OPTIONAL Instructions on how to log the group
    * @return true
    */
-  public static function group($Name, $Options=null) {
+  public static function group($Name, $Options = null) {
     $instance = FirePHP::getInstance(true);
     return $instance->group($Name, $Options);
   }
@@ -176,7 +176,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function log($Object, $Label=null) {
+  public static function log($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::LOG);
   } 
 
@@ -189,7 +189,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function info($Object, $Label=null) {
+  public static function info($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::INFO);
   } 
 
@@ -202,7 +202,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function warn($Object, $Label=null) {
+  public static function warn($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::WARN);
   } 
 
@@ -215,7 +215,7 @@ 
    * @return true
    * @throws Exception
    */
-  public static function error($Object, $Label=null) {
+  public static function error($Object, $Label = null) {
     return self::send($Object, $Label, FirePHP::ERROR);
   } 
 

framework/3rdParty/FirePHPCore/FirePHP.class.php

Doc Comments +14 added lines, -15 removed lines

@@ -226,7 +226,7 @@ 
   /**
    * When the object gets serialized only include specific object members.
    * 
-   * @return array
+   * @return string[]
    */  
   public function __sleep() {
     return array('options','objectFilters','enabled');
@@ -316,7 +316,7 @@ 
    * 
    * Will throw exceptions for each php error.
    * 
-   * @return mixed Returns a string containing the previously defined error handler (if any)
+   * @return null|callable Returns a string containing the previously defined error handler (if any)
    */
   public function registerErrorHandler($throwErrorExceptions=true)
   {
@@ -362,7 +362,7 @@ 
   /**
    * Register FirePHP as your exception handler
    * 
-   * @return mixed Returns the name of the previously defined exception handler,
+   * @return callable Returns the name of the previously defined exception handler,
    *               or NULL on error.
    *               If no previous handler was defined, NULL is also returned.
    */
@@ -467,7 +467,7 @@ 
    *
    * @param string $Name
    * @param array $Options OPTIONAL Instructions on how to log the group
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function group($Name, $Options=null) {
@@ -491,7 +491,7 @@ 
   /**
    * Ends a group you have started before
    *
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function groupEnd() {
@@ -502,9 +502,9 @@ 
    * Log object with label to firebug console
    *
    * @see FirePHP::LOG
-   * @param mixes $Object
+   * @param string $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function log($Object, $Label=null) {
@@ -517,7 +517,7 @@ 
    * @see FirePHP::INFO
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function info($Object, $Label=null) {
@@ -530,7 +530,7 @@ 
    * @see FirePHP::WARN
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function warn($Object, $Label=null) {
@@ -543,7 +543,7 @@ 
    * @see FirePHP::ERROR
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function error($Object, $Label=null) {
@@ -556,7 +556,7 @@ 
    * @see FirePHP::DUMP
    * @param string $Key
    * @param mixed $Variable
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function dump($Key, $Variable) {
@@ -568,7 +568,7 @@ 
    *
    * @see FirePHP::TRACE
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function trace($Label) {
@@ -581,7 +581,7 @@ 
    * @see FirePHP::TABLE
    * @param string $Label
    * @param string $Table
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function table($Label, $Table) {
@@ -607,7 +607,7 @@ 
    * 
    * @see http://www.firephp.org/Wiki/Reference/Fb
    * @param mixed $Object The variable to be logged
-   * @return true Return TRUE if message was added to headers, FALSE otherwise
+   * @return boolean Return TRUE if message was added to headers, FALSE otherwise
    * @throws Exception
    */
   public function fb($Object) {
@@ -1005,7 +1005,6 @@ 
    * protected and private visibility
    * 
    * @param Object $Object The object to be encoded
-   * @param int $Depth The current traversal depth
    * @return array All members of the object
    */
   protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)

Spacing +185 added lines, -185 removed lines

@@ -229,7 +229,7 @@ 
    * @return array
    */  
   public function __sleep() {
-    return array('options','objectFilters','enabled');
+    return array('options', 'objectFilters', 'enabled');
   }
     
   /**
@@ -238,8 +238,8 @@ 
    * @param boolean $AutoCreate
    * @return FirePHP
    */
-  public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
+  public static function getInstance($AutoCreate = false) {
+    if ($AutoCreate === true && !self::$instance) {
       self::init();
     }
     return self::$instance;
@@ -299,7 +299,7 @@ 
    * @return void
    */
   public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
+    $this->options = array_merge($this->options, $Options);
   }
   
   /**
@@ -318,7 +318,7 @@ 
    * 
    * @return mixed Returns a string containing the previously defined error handler (if any)
    */
-  public function registerErrorHandler($throwErrorExceptions=true)
+  public function registerErrorHandler($throwErrorExceptions = true)
   {
     //NOTE: The following errors will not be caught by this error handler:
     //      E_ERROR, E_PARSE, E_CORE_ERROR,
@@ -327,7 +327,7 @@ 
     
     $this->throwErrorExceptions = $throwErrorExceptions;
     
-    return set_error_handler(array($this,'errorHandler'));     
+    return set_error_handler(array($this, 'errorHandler'));     
   }
 
   /**
@@ -351,7 +351,7 @@ 
     if (error_reporting() & $errno) {
 
       $exception = new ErrorException($errstr, 0, $errno, $errfile, $errline);
-      if($this->throwErrorExceptions) {
+      if ($this->throwErrorExceptions) {
         throw $exception;
       } else {
         $this->fb($exception);
@@ -368,7 +368,7 @@ 
    */
   public function registerExceptionHandler()
   {
-    return set_exception_handler(array($this,'exceptionHandler'));     
+    return set_exception_handler(array($this, 'exceptionHandler'));     
   }
   
   /**
@@ -397,12 +397,12 @@ 
    * @param boolean $throwAssertionExceptions
    * @return mixed Returns the original setting or FALSE on errors
    */
-  public function registerAssertionHandler($convertAssertionErrorsToExceptions=true, $throwAssertionExceptions=false)
+  public function registerAssertionHandler($convertAssertionErrorsToExceptions = true, $throwAssertionExceptions = false)
   {
     $this->convertAssertionErrorsToExceptions = $convertAssertionErrorsToExceptions;
     $this->throwAssertionExceptions = $throwAssertionExceptions;
     
-    if($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
+    if ($throwAssertionExceptions && !$convertAssertionErrorsToExceptions) {
       throw $this->newException('Cannot throw assertion exceptions as assertion errors are not being converted to exceptions!');
     }
     
@@ -421,11 +421,11 @@ 
   public function assertionHandler($file, $line, $code)
   {
 
-    if($this->convertAssertionErrorsToExceptions) {
+    if ($this->convertAssertionErrorsToExceptions) {
       
-      $exception = new ErrorException('Assertion Failed - Code[ '.$code.' ]', 0, null, $file, $line);
+      $exception = new ErrorException('Assertion Failed - Code[ ' . $code . ' ]', 0, null, $file, $line);
 
-      if($this->throwAssertionExceptions) {
+      if ($this->throwAssertionExceptions) {
         throw $exception;
       } else {
         $this->fb($exception);
@@ -433,7 +433,7 @@ 
     
     } else {
     
-      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file,'Line'=>$line));
+      $this->fb($code, 'Assertion Failed', FirePHP::ERROR, array('File'=>$file, 'Line'=>$line));
     
     }
   }  
@@ -470,18 +470,18 @@ 
    * @return true
    * @throws Exception
    */
-  public function group($Name, $Options=null) {
+  public function group($Name, $Options = null) {
     
-    if(!$Name) {
+    if (!$Name) {
       throw $this->newException('You must specify a label for the group!');
     }
     
-    if($Options) {
-      if(!is_array($Options)) {
+    if ($Options) {
+      if (!is_array($Options)) {
         throw $this->newException('Options must be defined as an array!');
       }
-      if(array_key_exists('Collapsed', $Options)) {
-        $Options['Collapsed'] = ($Options['Collapsed'])?'true':'false';
+      if (array_key_exists('Collapsed', $Options)) {
+        $Options['Collapsed'] = ($Options['Collapsed']) ? 'true' : 'false';
       }
     }
     
@@ -507,7 +507,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function log($Object, $Label=null) {
+  public function log($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::LOG);
   } 
 
@@ -520,7 +520,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function info($Object, $Label=null) {
+  public function info($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::INFO);
   } 
 
@@ -533,7 +533,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function warn($Object, $Label=null) {
+  public function warn($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::WARN);
   } 
 
@@ -546,7 +546,7 @@ 
    * @return true
    * @throws Exception
    */
-  public function error($Object, $Label=null) {
+  public function error($Object, $Label = null) {
     return $this->fb($Object, $Label, FirePHP::ERROR);
   } 
 
@@ -595,8 +595,8 @@ 
    */
   public function detectClientExtension() {
     /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
+    if (!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si', $this->getUserAgent(), $m) ||
+       !version_compare($m[1][0], '0.0.6', '>=')) {
       return false;
     }
     return true;    
@@ -612,17 +612,17 @@ 
    */
   public function fb($Object) {
   
-    if(!$this->enabled) {
+    if (!$this->enabled) {
       return false;
     }
   
     if (headers_sent($filename, $linenum)) {
       // If we are logging from within the exception handler we cannot throw another exception
-      if($this->inExceptionHandler) {
+      if ($this->inExceptionHandler) {
         // Simply echo the error out to the page
-        echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>'.$filename.'</b> on line <b>'.$linenum.'</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
+        echo '<div style="border: 2px solid red; font-family: Arial; font-size: 12px; background-color: lightgray; padding: 5px;"><span style="color: red; font-weight: bold;">FirePHP ERROR:</span> Headers already sent in <b>' . $filename . '</b> on line <b>' . $linenum . '</b>. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.</div>';
       } else {
-        throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
+        throw $this->newException('Headers already sent in ' . $filename . ' on line ' . $linenum . '. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
       }
     }
   
@@ -630,10 +630,10 @@ 
     $Label = null;
     $Options = array();
   
-    if(func_num_args()==1) {
+    if (func_num_args() == 1) {
     } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
+    if (func_num_args() == 2) {
+      switch (func_get_arg(1)) {
         case self::LOG:
         case self::INFO:
         case self::WARN:
@@ -651,11 +651,11 @@ 
           break;
       }
     } else
-    if(func_num_args()==3) {
+    if (func_num_args() == 3) {
       $Type = func_get_arg(2);
       $Label = func_get_arg(1);
     } else
-    if(func_num_args()==4) {
+    if (func_num_args() == 4) {
       $Type = func_get_arg(2);
       $Label = func_get_arg(1);
       $Options = func_get_arg(3);
@@ -664,27 +664,27 @@ 
     }
   
   
-    if(!$this->detectClientExtension()) {
+    if (!$this->detectClientExtension()) {
       return false;
     }
   
     $meta = array();
     $skipFinalObjectEncode = false;
   
-    if($Object instanceof Exception) {
+    if ($Object instanceof Exception) {
 
       $meta['file'] = $this->_escapeTraceFile($Object->getFile());
       $meta['line'] = $Object->getLine();
       
       $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
+      if ($Object instanceof ErrorException
          && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
+         && $trace[0]['function'] == 'errorHandler'
          && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
+         && $trace[0]['class'] == 'FirePHP') {
            
         $severity = false;
-        switch($Object->getSeverity()) {
+        switch ($Object->getSeverity()) {
           case E_WARNING: $severity = 'E_WARNING'; break;
           case E_NOTICE: $severity = 'E_NOTICE'; break;
           case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
@@ -697,11 +697,11 @@ 
         }
            
         $Object = array('Class'=>get_class($Object),
-                        'Message'=>$severity.': '.$Object->getMessage(),
+                        'Message'=>$severity . ': ' . $Object->getMessage(),
                         'File'=>$this->_escapeTraceFile($Object->getFile()),
                         'Line'=>$Object->getLine(),
                         'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
+                        'Trace'=>$this->_escapeTrace(array_splice($trace, 2)));
         $skipFinalObjectEncode = true;
       } else {
         $Object = array('Class'=>get_class($Object),
@@ -715,49 +715,49 @@ 
       $Type = self::EXCEPTION;
       
     } else
-    if($Type==self::TRACE) {
+    if ($Type == self::TRACE) {
       
       $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
+      if (!$trace) return false;
+      for ($i = 0; $i < sizeof($trace); $i++) {
 
-        if(isset($trace[$i]['class'])
+        if (isset($trace[$i]['class'])
            && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+           && ($trace[$i]['class'] == 'FirePHP'
+               || $trace[$i]['class'] == 'FB')
+           && (substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php'
+               || substr($this->_standardizePath($trace[$i]['file']), -29, 29) == 'FirePHPCore/FirePHP.class.php')) {
           /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
         } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+        if (isset($trace[$i]['class'])
+           && isset($trace[$i + 1]['file'])
+           && $trace[$i]['class'] == 'FirePHP'
+           && substr($this->_standardizePath($trace[$i + 1]['file']), -18, 18) == 'FirePHPCore/fb.php') {
           /* Skip fb() */
         } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
+        if ($trace[$i]['function'] == 'fb'
+           || $trace[$i]['function'] == 'trace'
+           || $trace[$i]['function'] == 'send') {
+          $Object = array('Class'=>isset($trace[$i]['class']) ? $trace[$i]['class'] : '',
+                          'Type'=>isset($trace[$i]['type']) ? $trace[$i]['type'] : '',
+                          'Function'=>isset($trace[$i]['function']) ? $trace[$i]['function'] : '',
                           'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
+                          'File'=>isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '',
+                          'Line'=>isset($trace[$i]['line']) ? $trace[$i]['line'] : '',
+                          'Args'=>isset($trace[$i]['args']) ? $this->encodeObject($trace[$i]['args']) : '',
+                          'Trace'=>$this->_escapeTrace(array_splice($trace, $i + 1)));
 
           $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+          $meta['file'] = isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '';
+          $meta['line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
           break;
         }
       }
 
     } else
-    if($Type==self::TABLE) {
+    if ($Type == self::TABLE) {
       
-      if(isset($Object[0]) && is_string($Object[0])) {
+      if (isset($Object[0]) && is_string($Object[0])) {
         $Object[1] = $this->encodeTable($Object[1]);
       } else {
         $Object = $this->encodeTable($Object);
@@ -766,44 +766,44 @@ 
       $skipFinalObjectEncode = true;
       
     } else
-    if($Type==self::GROUP_START) {
+    if ($Type == self::GROUP_START) {
       
-      if(!$Label) {
+      if (!$Label) {
         throw $this->newException('You must specify a label for the group!');
       }
       
     } else {
-      if($Type===null) {
+      if ($Type === null) {
         $Type = self::LOG;
       }
     }
     
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
+    if ($this->options['includeLineNumbers']) {
+      if (!isset($meta['file']) || !isset($meta['line'])) {
 
         $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
+        for ($i = 0; $trace && $i < sizeof($trace); $i++) {
   
-          if(isset($trace[$i]['class'])
+          if (isset($trace[$i]['class'])
              && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
+             && ($trace[$i]['class'] == 'FirePHP'
+                 || $trace[$i]['class'] == 'FB')
+             && (substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php'
+                 || substr($this->_standardizePath($trace[$i]['file']), -29, 29) == 'FirePHPCore/FirePHP.class.php')) {
             /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
           } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
+          if (isset($trace[$i]['class'])
+             && isset($trace[$i + 1]['file'])
+             && $trace[$i]['class'] == 'FirePHP'
+             && substr($this->_standardizePath($trace[$i + 1]['file']), -18, 18) == 'FirePHPCore/fb.php') {
             /* Skip fb() */
           } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
+          if (isset($trace[$i]['file'])
+             && substr($this->_standardizePath($trace[$i]['file']), -18, 18) == 'FirePHPCore/fb.php') {
             /* Skip FB::fb() */
           } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
+            $meta['file'] = isset($trace[$i]['file']) ? $this->_escapeTraceFile($trace[$i]['file']) : '';
+            $meta['line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
             break;
           }
         }      
@@ -814,49 +814,49 @@ 
       unset($meta['line']);
     }
 
-  	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
-  	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
+  	$this->setHeader('X-Wf-Protocol-1', 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+  	$this->setHeader('X-Wf-1-Plugin-1', 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/' . self::VERSION);
  
     $structure_index = 1;
-    if($Type==self::DUMP) {
+    if ($Type == self::DUMP) {
       $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+    	$this->setHeader('X-Wf-1-Structure-2', 'http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
     } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+    	$this->setHeader('X-Wf-1-Structure-1', 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
     }
   
-    if($Type==self::DUMP) {
-    	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
+    if ($Type == self::DUMP) {
+    	$msg = '{"' . $Label . '":' . $this->jsonEncode($Object, $skipFinalObjectEncode) . '}';
     } else {
       $msg_meta = $Options;
       $msg_meta['Type'] = $Type;
-      if($Label!==null) {
+      if ($Label !== null) {
         $msg_meta['Label'] = $Label;
       }
-      if(isset($meta['file']) && !isset($msg_meta['File'])) {
+      if (isset($meta['file']) && !isset($msg_meta['File'])) {
         $msg_meta['File'] = $meta['file'];
       }
-      if(isset($meta['line']) && !isset($msg_meta['Line'])) {
+      if (isset($meta['line']) && !isset($msg_meta['Line'])) {
         $msg_meta['Line'] = $meta['line'];
       }
-    	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
+    	$msg = '[' . $this->jsonEncode($msg_meta) . ',' . $this->jsonEncode($Object, $skipFinalObjectEncode) . ']';
     }
     
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
+    $parts = explode("\n", chunk_split($msg, 5000, "\n"));
 
-    for( $i=0 ; $i<count($parts) ; $i++) {
+    for ($i = 0; $i < count($parts); $i++) {
         
         $part = $parts[$i];
         if ($part) {
             
-            if(count($parts)>2) {
+            if (count($parts) > 2) {
               // Message needs to be split into multiple parts
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
+              $this->setHeader('X-Wf-1-' . $structure_index . '-' . '1-' . $this->messageIndex,
+                               (($i == 0) ? strlen($msg) : '')
                                . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
+                               . (($i < count($parts) - 2) ? '\\' : ''));
             } else {
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
+              $this->setHeader('X-Wf-1-' . $structure_index . '-' . '1-' . $this->messageIndex,
                                strlen($part) . '|' . $part . '|');
             }
             
@@ -868,7 +868,7 @@ 
         }
     }
 
-  	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
+  	$this->setHeader('X-Wf-1-Index', $this->messageIndex - 1);
 
     return true;
   }
@@ -880,7 +880,7 @@ 
    * @return string
    */
   protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
+    return preg_replace('/\\\\+/', '/', $Path);    
   }
   
   /**
@@ -890,12 +890,12 @@ 
    * @return array
    */
   protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
+    if (!$Trace) return $Trace;
+    for ($i = 0; $i < sizeof($Trace); $i++) {
+      if (isset($Trace[$i]['file'])) {
         $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
       }
-      if(isset($Trace[$i]['args'])) {
+      if (isset($Trace[$i]['args'])) {
         $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
       }
     }
@@ -910,10 +910,10 @@ 
    */
   protected function _escapeTraceFile($File) {
     /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
+    if (strpos($File, '\\')) {
       /* First strip down to single \ */
       
-      $file = preg_replace('/\\\\+/','\\',$File);
+      $file = preg_replace('/\\\\+/', '\\', $File);
       
       return $file;
     }
@@ -927,7 +927,7 @@ 
    * @param string_type $Value
    */
   protected function setHeader($Name, $Value) {
-    return header($Name.': '.$Value);
+    return header($Name . ': ' . $Value);
   }
 
   /**
@@ -936,7 +936,7 @@ 
    * @return string|false
    */
   protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+    if (!isset($_SERVER['HTTP_USER_AGENT'])) return false;
     return $_SERVER['HTTP_USER_AGENT'];
   }
 
@@ -958,14 +958,14 @@ 
    * @param object $Object The object to be encoded
    * @return string The JSON string
    */
-  public function jsonEncode($Object, $skipObjectEncode=false)
+  public function jsonEncode($Object, $skipObjectEncode = false)
   {
-    if(!$skipObjectEncode) {
+    if (!$skipObjectEncode) {
       $Object = $this->encodeObject($Object);
     }
     
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
+    if (function_exists('json_encode')
+       && $this->options['useNativeJsonEncode'] != false) {
 
       return json_encode($Object);
     } else {
@@ -981,15 +981,15 @@ 
    */  
   protected function encodeTable($Table) {
     
-    if(!$Table) return $Table;
+    if (!$Table) return $Table;
     
     $new_table = array();
-    foreach($Table as $row) {
+    foreach ($Table as $row) {
   
-      if(is_array($row)) {
+      if (is_array($row)) {
         $new_row = array();
         
-        foreach($row as $item) {
+        foreach ($row as $item) {
           $new_row[] = $this->encodeObject($item);
         }
         
@@ -1014,18 +1014,18 @@ 
 
     if (is_resource($Object)) {
 
-      return '** '.(string)$Object.' **';
+      return '** ' . (string) $Object . ' **';
 
     } else    
     if (is_object($Object)) {
 
         if ($ObjectDepth > $this->options['maxObjectDepth']) {
-          return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
+          return '** Max Object Depth (' . $this->options['maxObjectDepth'] . ') **';
         }
         
         foreach ($this->objectStack as $refVal) {
             if ($refVal === $Object) {
-                return '** Recursion ('.get_class($Object).') **';
+                return '** Recursion (' . get_class($Object) . ') **';
             }
         }
         array_push($this->objectStack, $Object);
@@ -1034,45 +1034,45 @@ 
 
         $reflectionClass = new ReflectionClass($class);  
         $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
+        foreach ($reflectionClass->getProperties() as $property) {
           $properties[$property->getName()] = $property;
         }
             
-        $members = (array)$Object;
+        $members = (array) $Object;
             
-        foreach( $properties as $raw_name => $property ) {
+        foreach ($properties as $raw_name => $property) {
           
           $name = $raw_name;
-          if($property->isStatic()) {
-            $name = 'static:'.$name;
+          if ($property->isStatic()) {
+            $name = 'static:' . $name;
           }
-          if($property->isPublic()) {
-            $name = 'public:'.$name;
+          if ($property->isPublic()) {
+            $name = 'public:' . $name;
           } else
-          if($property->isPrivate()) {
-            $name = 'private:'.$name;
-            $raw_name = "\0".$class."\0".$raw_name;
+          if ($property->isPrivate()) {
+            $name = 'private:' . $name;
+            $raw_name = "\0" . $class . "\0" . $raw_name;
           } else
-          if($property->isProtected()) {
-            $name = 'protected:'.$name;
-            $raw_name = "\0".'*'."\0".$raw_name;
+          if ($property->isProtected()) {
+            $name = 'protected:' . $name;
+            $raw_name = "\0" . '*' . "\0" . $raw_name;
           }
           
-          if(!(isset($this->objectFilters[$class])
+          if (!(isset($this->objectFilters[$class])
                && is_array($this->objectFilters[$class])
-               && in_array($raw_name,$this->objectFilters[$class]))) {
+               && in_array($raw_name, $this->objectFilters[$class]))) {
 
-            if(array_key_exists($raw_name,$members)
+            if (array_key_exists($raw_name, $members)
                && !$property->isStatic()) {
               
               $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
             
             } else {
-              if(method_exists($property,'setAccessible')) {
+              if (method_exists($property, 'setAccessible')) {
                 $property->setAccessible(true);
                 $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
               } else
-              if($property->isPublic()) {
+              if ($property->isPublic()) {
                 $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
               } else {
                 $return[$name] = '** Need PHP 5.3 to get value **';
@@ -1085,7 +1085,7 @@ 
         
         // Include all members that are not defined in the class
         // but exist in the object
-        foreach( $members as $raw_name => $value ) {
+        foreach ($members as $raw_name => $value) {
           
           $name = $raw_name;
           
@@ -1094,12 +1094,12 @@ 
             $name = $parts[2];
           }
           
-          if(!isset($properties[$name])) {
-            $name = 'undeclared:'.$name;
+          if (!isset($properties[$name])) {
+            $name = 'undeclared:' . $name;
               
-            if(!(isset($this->objectFilters[$class])
+            if (!(isset($this->objectFilters[$class])
                  && is_array($this->objectFilters[$class])
-                 && in_array($raw_name,$this->objectFilters[$class]))) {
+                 && in_array($raw_name, $this->objectFilters[$class]))) {
               
               $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
             } else {
@@ -1113,7 +1113,7 @@ 
     } elseif (is_array($Object)) {
 
         if ($ArrayDepth > $this->options['maxArrayDepth']) {
-          return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
+          return '** Max Array Depth (' . $this->options['maxArrayDepth'] . ') **';
         }
       
         foreach ($Object as $key => $val) {
@@ -1122,16 +1122,16 @@ 
           // if the recursion is not reset here as it contains
           // a reference to itself. This is the only way I have come up
           // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
+          if ($key == 'GLOBALS'
              && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
+             && array_key_exists('GLOBALS', $val)) {
             $val['GLOBALS'] = '** Recursion (GLOBALS) **';
           }
           
           $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
         }
     } else {
-      if(self::is_utf8($Object)) {
+      if (self::is_utf8($Object)) {
         return $Object;
       } else {
         return utf8_encode($Object);
@@ -1147,24 +1147,24 @@ 
    * @return boolean
    */
   protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
+    $c = 0; $b = 0;
+    $bits = 0;
+    $len = strlen($str);
+    for ($i = 0; $i < $len; $i++) {
+        $c = ord($str[$i]);
+        if ($c > 128) {
+            if (($c >= 254)) return false;
+            elseif ($c >= 252) $bits = 6;
+            elseif ($c >= 248) $bits = 5;
+            elseif ($c >= 240) $bits = 4;
+            elseif ($c >= 224) $bits = 3;
+            elseif ($c >= 192) $bits = 2;
             else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
+            if (($i + $bits) > $len) return false;
+            while ($bits > 1) {
                 $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
+                $b = ord($str[$i]);
+                if ($b < 128 || $b > 191) return false;
                 $bits--;
             }
         }
@@ -1249,11 +1249,11 @@ 
   private function json_utf82utf16($utf8)
   {
       // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
+      if (function_exists('mb_convert_encoding')) {
           return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
       }
 
-      switch(strlen($utf8)) {
+      switch (strlen($utf8)) {
           case 1:
               // this case should never be reached, because we are in ASCII range
               // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -1293,8 +1293,8 @@ 
   private function json_encode($var)
   {
     
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
+    if (is_object($var)) {
+      if (in_array($var, $this->json_objectStack)) {
         return '"** Recursion **"';
       }
     }
@@ -1347,7 +1347,7 @@ 
                       case $ord_var_c == 0x2F:
                       case $ord_var_c == 0x5C:
                           // double quote, slash, slosh
-                          $ascii .= '\\'.$var{$c};
+                          $ascii .= '\\' . $var{$c};
                           break;
 
                       case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
@@ -1416,7 +1416,7 @@ 
                   }
               }
 
-              return '"'.$ascii.'"';
+              return '"' . $ascii . '"';
 
           case 'array':
              /*
@@ -1448,8 +1448,8 @@ 
 
                   array_pop($this->json_objectStack);
 
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
+                  foreach ($properties as $property) {
+                      if ($property instanceof Exception) {
                           return $property;
                       }
                   }
@@ -1464,8 +1464,8 @@ 
 
               array_pop($this->json_objectStack);
 
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
+              foreach ($elements as $element) {
+                  if ($element instanceof Exception) {
                       return $element;
                   }
               }
@@ -1483,8 +1483,8 @@ 
 
               array_pop($this->json_objectStack);
               
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
+              foreach ($properties as $property) {
+                  if ($property instanceof Exception) {
                       return $property;
                   }
               }
@@ -1511,15 +1511,15 @@ 
       // if the recursion is not reset here as it contains
       // a reference to itself. This is the only way I have come up
       // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
+      if ($name == 'GLOBALS'
          && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
+         && array_key_exists('GLOBALS', $value)) {
         $value['GLOBALS'] = '** Recursion **';
       }
     
       $encoded_value = $this->json_encode($value);
 
-      if($encoded_value instanceof Exception) {
+      if ($encoded_value instanceof Exception) {
           return $encoded_value;
       }
 

framework/3rdParty/PhpShell/PHP/Shell/Extensions.php

Doc Comments +4 added lines

@@ -13,6 +13,10 @@
 *  
 */
 interface PHP_Shell_Extension {
+
+    /**
+     * @return void
+     */
     public function register();
 }
 

framework/3rdParty/PhpShell/PHP/Shell/Options.php

Doc Comments +2 added lines

@@ -97,6 +97,8 @@
     * calls the setor for the :set <option>
     *
     *
+    * @param string $key
+    * @param string|null $value
     */
     private function execute($key, $value) {
         /* did we hit a alias (bg for backgroud) ? */

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(dirname(__FILE__)."/Extensions.php"); /* for the PHP_Shell_Interface */
+require_once(dirname(__FILE__) . "/Extensions.php"); /* for the PHP_Shell_Interface */
 
 /**
 *
@@ -107,7 +107,7 @@ 
         }
 
         if (!isset($this->options[$opt_key])) {
-            print (':set '.$key.' failed: unknown key');
+            print (':set ' . $key . ' failed: unknown key');
             return;
         }
 

framework/3rdParty/ReCaptcha/recaptchalib.php

Doc Comments +6 added lines

@@ -211,6 +211,9 @@ 
 
 /* Mailhide related code */
 
+/**
+ * @param string $ky
+ */
 function _recaptcha_aes_encrypt($val,$ky) {
 	if (! function_exists ("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
@@ -222,6 +225,9 @@ 
 }
 
 
+/**
+ * @param null|string $x
+ */
 function _recaptcha_mailhide_urlbase64 ($x) {
 	return strtr(base64_encode ($x), '+/', '-_');
 }

Spacing +38 added lines, -38 removed lines

@@ -44,13 +44,13 @@ 
  * @param $data - array of string elements to be encoded
  * @return string - encoded request
  */
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode($data) {
         $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        foreach ($data as $key => $value)
+                $req .= $key . '=' . urlencode(stripslashes($value)) . '&';
 
         // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
+        $req = substr($req, 0, strlen($req) - 1);
         return $req;
 }
 
@@ -66,7 +66,7 @@ 
  */
 function _recaptcha_http_post($host, $path, $data, $port = 80) {
 
-        $req = _recaptcha_qsencode ($data);
+        $req = _recaptcha_qsencode($data);
 
         $http_request  = "POST $path HTTP/1.0\r\n";
         $http_request .= "Host: $host\r\n";
@@ -77,13 +77,13 @@ 
         $http_request .= $req;
 
         $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+        if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
                 die ('Could not open socket');
         }
 
         fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
+        while (!feof($fs))
                 $response .= fgets($fs, 1160); // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
@@ -103,7 +103,7 @@ 
 
  * @return string - The HTML to be embedded in the user's form.
  */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+function recaptcha_get_html($pubkey, $error = null, $use_ssl = false)
 {
 	if ($pubkey == null || $pubkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -119,7 +119,7 @@ 
         if ($error) {
            $errorpart = "&amp;error=" . $error;
         }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+        return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
 	<noscript>
   		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
@@ -149,7 +149,7 @@ 
   * @param array $extra_params an array of extra variables to post to the server
   * @return ReCaptchaResponse
   */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
 	if ($privkey == null || $privkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -169,8 +169,8 @@ 
                 return $recaptcha_response;
         }
 
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
+        $response = _recaptcha_http_post(RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+                                          array(
                                                  'privatekey' => $privkey,
                                                  'remoteip' => $remoteip,
                                                  'challenge' => $challenge,
@@ -178,10 +178,10 @@ 
                                                  ) + $extra_params
                                           );
 
-        $answers = explode ("\n", $response [1]);
+        $answers = explode("\n", $response [1]);
         $recaptcha_response = new ReCaptchaResponse();
 
-        if (trim ($answers [0]) == 'true') {
+        if (trim($answers [0]) == 'true') {
                 $recaptcha_response->is_valid = true;
         }
         else {
@@ -199,31 +199,31 @@ 
  * @param string $domain The domain where the page is hosted
  * @param string $appname The name of your application
  */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+function recaptcha_get_signup_url($domain = null, $appname = null) {
+	return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode(array('domains' => $domain, 'app' => $appname));
 }
 
 function _recaptcha_aes_pad($val) {
 	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+	$numpad = $block_size - (strlen($val) % $block_size);
+	return str_pad($val, strlen($val) + $numpad, chr($numpad));
 }
 
 /* Mailhide related code */
 
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
+function _recaptcha_aes_encrypt($val, $ky) {
+	if (!function_exists("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
 	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
+	$mode = MCRYPT_MODE_CBC;   
+	$enc = MCRYPT_RIJNDAEL_128;
+	$val = _recaptcha_aes_pad($val);
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
 
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
+function _recaptcha_mailhide_urlbase64($x) {
+	return strtr(base64_encode($x), '+/', '-_');
 }
 
 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
@@ -235,9 +235,9 @@ 
 	
 
 	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+	$cryptmail = _recaptcha_aes_encrypt($email, $ky);
 	
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64($cryptmail);
 }
 
 /**
@@ -245,15 +245,15 @@ 
  * eg, given johndoe@example,com return ["john", "example.com"].
  * the email is then displayed as john...@example.com
  */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
+function _recaptcha_mailhide_email_parts($email) {
+	$arr = preg_split("/@/", $email);
 
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
+	if (strlen($arr[0]) <= 4) {
+		$arr[0] = substr($arr[0], 0, 1);
+	} else if (strlen($arr[0]) <= 6) {
+		$arr[0] = substr($arr[0], 0, 3);
 	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
+		$arr[0] = substr($arr[0], 0, 4);
 	}
 	return $arr;
 }
@@ -265,11 +265,11 @@ 
  * http://www.google.com/recaptcha/mailhide/apikey
  */
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+	$emailparts = _recaptcha_mailhide_email_parts($email);
+	$url = recaptcha_mailhide_url($pubkey, $privkey, $email);
 	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+	return htmlentities($emailparts[0]) . "<a href='" . htmlentities($url) .
+		"' onclick=\"window.open('" . htmlentities($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities($emailparts [1]);
 
 }
 

framework/3rdParty/SafeHtml/HTMLSax3.php

Doc Comments +12 added lines, -3 removed lines

@@ -196,7 +196,7 @@ 
     /**
     * Returns the next character from the XML document or void if at end
     * @access protected
-    * @return mixed
+    * @return string|null
     */
     function scanCharacter() {
         if ($this->position < $this->length) {
@@ -332,6 +332,7 @@ 
     * parser options
     * @var TSax3 instance of user front end class
     * @access protected
+    * @param TSax3 $htmlsax
     */
     function __construct(& $htmlsax) {
         parent::__construct($htmlsax);
@@ -397,6 +398,7 @@ 
     * parser options
     * @var TSax3 instance of user front end class
     * @access protected
+    * @param TSax3 $htmlsax
     */
     function __construct(& $htmlsax) {
         parent::__construct($htmlsax);
@@ -508,7 +510,7 @@ 
     * if supplied argument is not an object.
     * @param object handler object containing SAX callback methods
     * @access public
-    * @return mixed
+    * @return boolean|null
     */
     function set_object(&$object) {
         if ( is_object($object) ) {
@@ -546,7 +548,7 @@ 
     * @param string name of parser option
     * @param int (optional) 1 to switch on, 0 for off
     * @access public
-    * @return boolean
+    * @return boolean|null
     */
     function set_option($name, $value=1) {
         if ( array_key_exists($name,$this->state_parser->parser_options) ) {
@@ -568,6 +570,7 @@ 
     * function myDataHander(& $parser,$data){}
     * </pre>
     * @param string name of method
+    * @param string $data_method
     * @access public
     * @return void
     * @see set_object
@@ -591,6 +594,8 @@ 
     * </pre>
     * @param string name of open method
     * @param string name of close method
+    * @param string $opening_method
+    * @param string $closing_method
     * @access public
     * @return void
     * @see set_object
@@ -610,6 +615,7 @@ 
     * function myPIHander(& $parser,$target, $data){}
     * </pre>
     * @param string name of method
+    * @param string $pi_method
     * @access public
     * @return void
     * @see set_object
@@ -628,6 +634,7 @@ 
     * function myEscapeHander(& $parser, $data){}
     * </pre>
     * @param string name of method
+    * @param string $escape_method
     * @access public
     * @return void
     * @see set_object
@@ -645,6 +652,7 @@ 
     * function myJaspHander(& $parser, $data){}
     * </pre>
     * @param string name of method
+    * @param string $jasp_method
     * @access public
     * @return void
     * @see set_object
@@ -684,6 +692,7 @@ 
     /**
     * Start parsing some XML
     * @param string XML document
+    * @param string $data
     * @access public
     * @return void
     */

Spacing +30 added lines, -30 removed lines

@@ -29,8 +29,8 @@ 
 * Required classes
 */
 
-require_once(dirname(__FILE__).'/HTMLSax3/States.php');
-require_once(dirname(__FILE__).'/HTMLSax3/Decorators.php');
+require_once(dirname(__FILE__) . '/HTMLSax3/States.php');
+require_once(dirname(__FILE__) . '/HTMLSax3/Decorators.php');
 
 /**
 * Base State Parser
@@ -246,56 +246,56 @@ 
     * @return void
     */
     function parse($data) {
-        if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
+        if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES'] == 1) {
             $decorator = new TSax3_Trim(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'trimData';
         }
-        if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
+        if ($this->parser_options['XML_OPTION_CASE_FOLDING'] == 1) {
             $open_decor = new TSax3_CaseFolding(
                 $this->handler_object_element,
                 $this->handler_method_opening,
                 $this->handler_method_closing);
-            $this->handler_object_element =& $open_decor;
-            $this->handler_method_opening ='foldOpen';
-            $this->handler_method_closing ='foldClose';
+            $this->handler_object_element = & $open_decor;
+            $this->handler_method_opening = 'foldOpen';
+            $this->handler_method_closing = 'foldClose';
         }
-        if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) {
+        if ($this->parser_options['XML_OPTION_LINEFEED_BREAK'] == 1) {
             $decorator = new TSax3_Linefeed(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
+        if ($this->parser_options['XML_OPTION_TAB_BREAK'] == 1) {
             $decorator = new TSax3_Tab(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
+        if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] == 1) {
             $decorator = new TSax3_Entities_Unparsed(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
+        if ($this->parser_options['XML_OPTION_ENTITIES_PARSED'] == 1) {
             $decorator = new TSax3_Entities_Parsed(
                 $this->handler_object_data,
                 $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
+            $this->handler_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
         // Note switched on by default
-        if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
+        if ($this->parser_options['XML_OPTION_STRIP_ESCAPES'] == 1) {
             $decorator = new TSax3_Escape_Stripper(
                 $this->handler_object_escape,
                 $this->handler_method_escape);
-            $this->handler_object_escape =& $decorator;
+            $this->handler_object_escape = & $decorator;
             $this->handler_method_escape = 'strip';
         }
         $this->rawtext = $data;
@@ -511,12 +511,12 @@ 
     * @return mixed
     */
     function set_object(&$object) {
-        if ( is_object($object) ) {
-            $this->state_parser->handler_default =& $object;
+        if (is_object($object)) {
+            $this->state_parser->handler_default = & $object;
             return true;
         } else {
             require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_object requires '.
+            PEAR::raiseError('TSax3::set_object requires ' .
                 'an object instance');
         }
     }
@@ -548,13 +548,13 @@ 
     * @access public
     * @return boolean
     */
-    function set_option($name, $value=1) {
-        if ( array_key_exists($name,$this->state_parser->parser_options) ) {
+    function set_option($name, $value = 1) {
+        if (array_key_exists($name, $this->state_parser->parser_options)) {
             $this->state_parser->parser_options[$name] = $value;
             return true;
         } else {
             require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_option('.$name.') illegal');
+            PEAR::raiseError('TSax3::set_option(' . $name . ') illegal');
         }
     }
 
@@ -573,7 +573,7 @@ 
     * @see set_object
     */
     function set_data_handler($data_method) {
-        $this->state_parser->handler_object_data =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_data = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_data = $data_method;
     }
 
@@ -596,7 +596,7 @@ 
     * @see set_object
     */
     function set_element_handler($opening_method, $closing_method) {
-        $this->state_parser->handler_object_element =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_element = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_opening = $opening_method;
         $this->state_parser->handler_method_closing = $closing_method;
     }
@@ -615,7 +615,7 @@ 
     * @see set_object
     */
     function set_pi_handler($pi_method) {
-        $this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_pi = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_pi = $pi_method;
     }
 
@@ -633,7 +633,7 @@ 
     * @see set_object
     */
     function set_escape_handler($escape_method) {
-        $this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_escape = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_escape = $escape_method;
     }
 
@@ -649,8 +649,8 @@ 
     * @return void
     * @see set_object
     */
-    function set_jasp_handler ($jasp_method) {
-        $this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
+    function set_jasp_handler($jasp_method) {
+        $this->state_parser->handler_object_jasp = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_jasp = $jasp_method;
     }
 

framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php

Doc Comments +12 added lines

@@ -48,6 +48,7 @@ 
     * Constructs TSax3_Trim
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -96,6 +97,8 @@ 
     * @param object handler object being decorated
     * @param string original open handler method
     * @param string original close handler method
+    * @param string $orig_open_method
+    * @param string $orig_close_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
@@ -146,6 +149,7 @@ 
     * Constructs TSax3_LineFeed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -188,6 +192,7 @@ 
     * Constructs TSax3_Tab
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -231,6 +236,7 @@ 
     * Constructs TSax3_Entities_Parsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -255,6 +261,10 @@ 
 * Compatibility with older PHP versions
 */
 if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) {
+
+    /**
+     * @param integer $style
+     */
     function html_entity_decode($str, $style=ENT_NOQUOTES) {
         return strtr($str,
             array_flip(get_html_translation_table(HTML_ENTITIES,$style)));
@@ -283,6 +293,7 @@ 
     * Constructs TSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -326,6 +337,7 @@ 
     * Constructs TSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {

Spacing +27 added lines, -27 removed lines

@@ -51,7 +51,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -99,7 +99,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_open_method = $orig_open_method;
         $this->orig_close_method = $orig_close_method;
     }
@@ -110,7 +110,7 @@ 
     * @param array tag attributes
     * @access protected
     */
-    function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) {
+    function foldOpen(&$parser, $tag, $attrs = array(), $empty = FALSE) {
         $this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty);
     }
     /**
@@ -149,7 +149,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -159,8 +159,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = explode("\n",$data);
-        foreach ( $data as $chunk ) {
+        $data = explode("\n", $data);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($parser, $chunk);
         }
     }
@@ -191,7 +191,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -201,8 +201,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = explode("\t",$data);
-        foreach ( $data as $chunk ) {
+        $data = explode("\t", $data);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($this, $chunk);
         }
     }
@@ -234,7 +234,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -244,9 +244,9 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        foreach ( $data as $chunk ) {
-            $chunk = html_entity_decode($chunk,ENT_NOQUOTES);
+        $data = preg_split('/(&.+?;)/', $data, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        foreach ($data as $chunk) {
+            $chunk = html_entity_decode($chunk, ENT_NOQUOTES);
             $this->orig_obj->{$this->orig_method}($this, $chunk);
         }
     }
@@ -254,10 +254,10 @@ 
 /**
 * Compatibility with older PHP versions
 */
-if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) {
-    function html_entity_decode($str, $style=ENT_NOQUOTES) {
+if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode')) {
+    function html_entity_decode($str, $style = ENT_NOQUOTES) {
         return strtr($str,
-            array_flip(get_html_translation_table(HTML_ENTITIES,$style)));
+            array_flip(get_html_translation_table(HTML_ENTITIES, $style)));
     }
 }
 /**
@@ -286,7 +286,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -296,8 +296,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        foreach ( $data as $chunk ) {
+        $data = preg_split('/(&.+?;)/', $data, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($this, $chunk);
         }
     }
@@ -329,7 +329,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -340,20 +340,20 @@ 
     */
     function strip(&$parser, $data) {
         // Check for HTML comments first
-        if ( substr($data,0,2) == '--' ) {
+        if (substr($data, 0, 2) == '--') {
             $patterns = array(
-                '/^\-\-/',          // Opening comment: --
-                '/\-\-$/',          // Closing comment: --
+                '/^\-\-/', // Opening comment: --
+                '/\-\-$/', // Closing comment: --
             );
-            $data = preg_replace($patterns,'',$data);
+            $data = preg_replace($patterns, '', $data);
 
         // Check for XML CDATA sections (note: don't do both!)
-        } else if ( substr($data,0,1) == '[' ) {
+        } else if (substr($data, 0, 1) == '[') {
             $patterns = array(
                 '/^\[.*CDATA.*\[/s', // Opening CDATA
-                '/\].*\]$/s',       // Closing CDATA
+                '/\].*\]$/s', // Closing CDATA
                 );
-            $data = preg_replace($patterns,'',$data);
+            $data = preg_replace($patterns, '', $data);
         }
 
         $this->orig_obj->{$this->orig_method}($this, $data);

framework/3rdParty/SafeHtml/TSafeHtmlParser.php

Doc Comments +1 added lines, -1 removed lines

@@ -480,7 +480,7 @@
     /**
      * Closing tag handler - called from HTMLSax
      *
-     * @param object $parsers HTML parser
+     * @param object $parser HTML parser
      * @param string $name    tag name
      * @return boolean
      * @access private

Spacing +39 added lines, -39 removed lines

@@ -135,7 +135,7 @@ 
      * @var array
      * @access public
      */
-    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr', );
+    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr',);
 
     /**
      * List of dangerous tags (such tags will be deleted)
@@ -144,10 +144,10 @@ 
      * @access public
      */
     public $deleteTags = array(
-        'applet', 'base',   'basefont', 'bgsound', 'blink',  'body',
-        'embed',  'frame',  'frameset', 'head',    'html',   'ilayer',
-        'iframe', 'layer',  'link',     'meta',    'object', 'style',
-        'title',  'script',
+        'applet', 'base', 'basefont', 'bgsound', 'blink', 'body',
+        'embed', 'frame', 'frameset', 'head', 'html', 'ilayer',
+        'iframe', 'layer', 'link', 'meta', 'object', 'style',
+        'title', 'script',
         );
 
     /**
@@ -157,7 +157,7 @@ 
      * @var array
      * @access public
      */
-    public $deleteTagsContent = array('script', 'style', 'title', 'xml', );
+    public $deleteTagsContent = array('script', 'style', 'title', 'xml',);
 
     /**
      * Type of protocols filtering ('white' or 'black')
@@ -174,11 +174,11 @@ 
      * @access public
      */
     public $blackProtocols = array(
-        'about',   'chrome',     'data',       'disk',     'hcp',
-        'help',    'javascript', 'livescript', 'lynxcgi',  'lynxexec',
-        'ms-help', 'ms-its',     'mhtml',      'mocha',    'opera',
-        'res',     'resource',   'shell',      'vbscript', 'view-source',
-        'vnd.ms.radio',          'wysiwyg',
+        'about', 'chrome', 'data', 'disk', 'hcp',
+        'help', 'javascript', 'livescript', 'lynxcgi', 'lynxexec',
+        'ms-help', 'ms-its', 'mhtml', 'mocha', 'opera',
+        'res', 'resource', 'shell', 'vbscript', 'view-source',
+        'vnd.ms.radio', 'wysiwyg',
         );
 
     /**
@@ -188,9 +188,9 @@ 
      * @access public
      */
     public $whiteProtocols = array(
-        'ed2k',   'file', 'ftp',  'gopher', 'http',  'https',
-        'irc',    'mailto', 'news', 'nntp', 'telnet', 'webcal',
-        'xmpp',   'callto',
+        'ed2k', 'file', 'ftp', 'gopher', 'http', 'https',
+        'irc', 'mailto', 'news', 'nntp', 'telnet', 'webcal',
+        'xmpp', 'callto',
         );
 
     /**
@@ -213,8 +213,8 @@ 
      * @access public
      */
     public $cssKeywords = array(
-        'absolute', 'behavior',       'behaviour',   'content', 'expression',
-        'fixed',    'include-source', 'moz-binding',
+        'absolute', 'behavior', 'behaviour', 'content', 'expression',
+        'fixed', 'include-source', 'moz-binding',
         );
 
     /**
@@ -235,11 +235,11 @@ 
      * @access public
      */
     public $closeParagraph = array(
-        'address', 'blockquote', 'center', 'dd',      'dir',       'div',
-        'dl',      'dt',         'h1',     'h2',      'h3',        'h4',
-        'h5',      'h6',         'hr',     'isindex', 'listing',   'marquee',
-        'menu',    'multicol',   'ol',     'p',       'plaintext', 'pre',
-        'table',   'ul',         'xmp',
+        'address', 'blockquote', 'center', 'dd', 'dir', 'div',
+        'dl', 'dt', 'h1', 'h2', 'h3', 'h4',
+        'h5', 'h6', 'hr', 'isindex', 'listing', 'marquee',
+        'menu', 'multicol', 'ol', 'p', 'plaintext', 'pre',
+        'table', 'ul', 'xmp',
         );
 
     /**
@@ -250,7 +250,7 @@ 
      */
     public $tableTags = array(
         'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead',   'tr',
+        'thead', 'tr',
         );
 
     /**
@@ -259,7 +259,7 @@ 
      * @var array
      * @access public
      */
-    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl', );
+    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl',);
 
     /**
      * List of dangerous attributes
@@ -276,7 +276,7 @@ 
      * @var array
      * @access public
      */
-    public $attributesNS = array('xml:lang', );
+    public $attributesNS = array('xml:lang',);
 
     /**
      * Constructs class
@@ -288,7 +288,7 @@ 
         //making regular expressions based on Proto & CSS arrays
         foreach ($this->blackProtocols as $proto) {
             $preg = "/[\s\x01-\x1F]*";
-            for ($i=0; $i<strlen($proto); $i++) {
+            for ($i = 0; $i < strlen($proto); $i++) {
                 $preg .= $proto{$i} . "[\s\x01-\x1F]*";
             }
             $preg .= ":/i";
@@ -308,7 +308,7 @@ 
      * @return boolean
      * @access private
      */
-    private function _writeAttrs ($attrs)
+    private function _writeAttrs($attrs)
     {
         if (is_array($attrs)) {
             foreach ($attrs as $name => $value) {
@@ -366,7 +366,7 @@ 
 
                 $tempval = preg_replace_callback(
                         '/&#(\d+);?/m',
-                        function ($matches) {
+                        function($matches) {
                             return chr($matches[0]);
                         },
                         $value
@@ -374,7 +374,7 @@ 
 
                 $tempval = preg_replace_callback(
                         '/&#x([0-9a-f]+);?/mi',
-                        function ($matches) {
+                        function($matches) {
                             return chr(hexdec($matches[0]));
                         },
                         $tempval
@@ -418,7 +418,7 @@ 
 
         if (in_array($name, $this->deleteTagsContent)) {
             array_push($this->_dcStack, $name);
-            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name]+1 : 1;
+            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name] + 1 : 1;
         }
         if (count($this->_dcStack) != 0) {
             return true;
@@ -456,7 +456,7 @@ 
 
         // LISTS: we should close <li> if <li> of the same level opening
         if ($name == 'li' && count($this->_liStack) &&
-            $this->_listScope == $this->_liStack[count($this->_liStack)-1])
+            $this->_listScope == $this->_liStack[count($this->_liStack) - 1])
         {
             $this->_closeHandler($parser, 'li');
         }
@@ -472,8 +472,8 @@ 
         $this->_xhtml .= '<' . $name;
         $this->_writeAttrs($attrs);
         $this->_xhtml .= '>';
-        array_push($this->_stack,$name);
-        $this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name]+1 : 1;
+        array_push($this->_stack, $name);
+        $this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name] + 1 : 1;
         return true;
     }
 
@@ -574,7 +574,7 @@ 
      * @return string Processed (X)HTML document
      * @access public
      */
-    public function getXHTML ()
+    public function getXHTML()
     {
         while ($tag = array_pop($this->_stack)) {
             $this->_closeTag($tag);
@@ -602,12 +602,12 @@ 
      * @return string Processed (X)HTML document
      * @access public
      */
-    public function parse($doc, $isUTF7=false)
+    public function parse($doc, $isUTF7 = false)
     {
 	   $this->clear();
 
        // Save all '<' symbols
-       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string)$doc);
+       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string) $doc);
 
        // Web documents shouldn't contains \x00 symbol
        $doc = str_replace("\x00", '', $doc);
@@ -616,16 +616,16 @@ 
        $doc = str_replace("\xC0\xBC", '&lt;', $doc);
 
        // UTF-7 encoding ASCII decode
-       if($isUTF7)
+       if ($isUTF7)
             $doc = $this->repackUTF7($doc);
 
        // Instantiate the parser
-       $parser= new TSax3();
+       $parser = new TSax3();
 
        // Set up the parser
        $parser->set_object($this);
 
-       $parser->set_element_handler('_openHandler','_closeHandler');
+       $parser->set_element_handler('_openHandler', '_closeHandler');
        $parser->set_data_handler('_dataHandler');
        $parser->set_escape_handler('_escapeHandler');
 
@@ -671,7 +671,7 @@ 
      */
     private function repackUTF7Back($str)
     {
-       return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
+       return $str[1] . '+' . rtrim(base64_encode($str[2]), '=') . '-';
     }
 }
 

framework/3rdParty/TextHighlighter/Text/Highlighter.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,6 @@ 
      * Called by subclssses' constructors to enable/disable
      * optional highlighter rules
      *
-     * @param array $defines  Conditional defines
      *
      * @access protected
      */
@@ -232,6 +231,7 @@ 
      * Helper function to find matching brackets
      *
      * @access private
+     * @param string $str
      */
     function _matchingBrackets($str)
     {

Spacing +20 added lines, -20 removed lines

@@ -32,12 +32,12 @@ 
     /**
      * use numbered list
      */
-    define ('HL_NUMBERS_LI'    ,    1);
+    define('HL_NUMBERS_LI', 1);
     /**
      * Use 2-column table with line numbers in left column and code in  right column.
      * Forces $options['tag'] = HL_TAG_PRE
      */
-    define ('HL_NUMBERS_TABLE'    , 2);
+    define('HL_NUMBERS_TABLE', 2);
     /**#@-*/
 }
 
@@ -46,7 +46,7 @@ 
 /**
  * for our purpose, it is infinity
  */
-define ('HL_INFINITY',      1000000000);
+define('HL_INFINITY', 1000000000);
 
 // }}}
 
@@ -163,7 +163,7 @@ 
             $defines = array();
         }
         foreach ($this->_conditions as $name => $actions) {
-            foreach($actions as $action) {
+            foreach ($actions as $action) {
                 $present = in_array($name, $defines);
                 if (!$action[1]) {
                     $present = !$present;
@@ -197,7 +197,7 @@ 
     public static function factory($lang, $options = array())
     {
         $lang = strtoupper($lang);
-        $langFile = dirname(__FILE__)."/Highlighter/$lang.php";
+        $langFile = dirname(__FILE__) . "/Highlighter/$lang.php";
         if (is_file($langFile))
         	include_once $langFile;
         else
@@ -256,7 +256,7 @@ 
         } else {
             $endpos = -1;
         }
-        preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
+        preg_match($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
         $n = 1;
 
 
@@ -264,7 +264,7 @@ 
             if (!isset($m[$n])) {
                 break;
             }
-            if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
+            if ($m[$n][1] > -1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
                 if ($this->_states[$this->_state][$i] != -1) {
                     $this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
                 } else {
@@ -272,17 +272,17 @@ 
                     if (isset($this->_parts[$this->_state][$i])) {
                         $parts = array();
                         $partpos = $m[$n][1];
-                        for ($j=1; $j<=$count; $j++) {
-                            if ($m[$j+$n][1] < 0) {
+                        for ($j = 1; $j <= $count; $j++) {
+                            if ($m[$j + $n][1] < 0) {
                                 continue;
                             }
                             if (isset($this->_parts[$this->_state][$i][$j])) {
-                                if ($m[$j+$n][1] > $partpos) {
-                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
+                                if ($m[$j + $n][1] > $partpos) {
+                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j + $n][1] - $partpos)));
                                 }
-                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
+                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j + $n][0]));
                             }
-                            $partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
+                            $partpos = $m[$j + $n][1] + strlen($m[$j + $n][0]);
                         }
                         if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
                             array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
@@ -302,7 +302,7 @@ 
                     }
                 }
                 if ($m[$n][1] > $this->_pos) {
-                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
+                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1] - $this->_pos));
                 }
                 $this->_pos = $m[$n][1] + strlen($m[$n][0]);
                 if ($this->_states[$this->_state][$i] != -1) {
@@ -313,13 +313,13 @@ 
                     $this->_state = $this->_states[$this->_state][$i];
                     $this->_endpattern = $this->_end[$this->_state];
                     if ($this->_subst[$l][$i]) {
-                        for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
-                            if (!isset($m[$i+$k])) {
+                        for ($k = 0; $k <= $this->_counts[$l][$i]; $k++) {
+                            if (!isset($m[$i + $k])) {
                                 break;
                             }
-                            $quoted = preg_quote($m[$n+$k][0], '/');
-                            $this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
-                            $this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
+                            $quoted = preg_quote($m[$n + $k][0], '/');
+                            $this->_endpattern = str_replace('%' . $k . '%', $quoted, $this->_endpattern);
+                            $this->_endpattern = str_replace('%b' . $k . '%', $this->_matchingBrackets($quoted), $this->_endpattern);
                         }
                     }
                 }
@@ -331,7 +331,7 @@ 
         if ($endpos > -1) {
             $this->_tokenStack[] = array($this->_lastdelim, $endmatch);
             if ($endpos > $this->_pos) {
-                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
+                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos - $this->_pos));
             }
             list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
             $this->_pos = $endpos + strlen($endmatch);