chamilo / chamilo-lms

main/inc/lib/pear/Text/Diff.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         }
 
         //require_once 'Text/Diff/Engine/' . $engine . '.php';
-        $class = 'Text_Diff_Engine_' . $engine;
+        $class = 'Text_Diff_Engine_'.$engine;
         $diff_engine = new $class();
 
         $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);

Indentation +2 added lines, -2 removed lines

@@ -227,7 +227,7 @@ 
     function _getTempDir()
     {
         $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
-                               'c:\windows\temp', 'c:\winnt\temp');
+                                'c:\windows\temp', 'c:\winnt\temp');
 
         /* Try PHP's upload_tmp_dir directive. */
         $tmp = ini_get('upload_tmp_dir');
@@ -309,7 +309,7 @@ 
      *                                  of elements as $to_lines.
      */
     function Text_MappedDiff($from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines)
+                                $mapped_from_lines, $mapped_to_lines)
     {
         assert(count($from_lines) == count($mapped_from_lines));
         assert(count($to_lines) == count($mapped_to_lines));

main/inc/lib/pear/Text/Diff/ThreeWay.php

Indentation +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
         }
 
         $this->_edits = $this->_diff3($engine->diff($orig, $final1),
-                                      $engine->diff($orig, $final2));
+                                        $engine->diff($orig, $final2));
     }
 
     /**
@@ -58,11 +58,11 @@ 
             if ($edit->isConflict()) {
                 /* FIXME: this should probably be moved somewhere else. */
                 $lines = array_merge($lines,
-                                     array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')),
-                                     $edit->final1,
-                                     array("======="),
-                                     $edit->final2,
-                                     array('>>>>>>>' . ($label2 ? ' ' . $label2 : '')));
+                                        array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')),
+                                        $edit->final1,
+                                        array("======="),
+                                        $edit->final2,
+                                        array('>>>>>>>' . ($label2 ? ' ' . $label2 : '')));
                 $this->_conflictingBlocks++;
             } else {
                 $lines = array_merge($lines, $edit->merged());

Spacing +4 added lines, -4 removed lines

@@ -58,11 +58,11 @@ 
             if ($edit->isConflict()) {
                 /* FIXME: this should probably be moved somewhere else. */
                 $lines = array_merge($lines,
-                                     array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')),
+                                     array('<<<<<<<'.($label1 ? ' '.$label1 : '')),
                                      $edit->final1,
                                      array("======="),
                                      $edit->final2,
-                                     array('>>>>>>>' . ($label2 ? ' ' . $label2 : '')));
+                                     array('>>>>>>>'.($label2 ? ' '.$label2 : '')));
                 $this->_conflictingBlocks++;
             } else {
                 $lines = array_merge($lines, $edit->merged());
@@ -126,11 +126,11 @@ 
                     }
                 }
 
-                if ($e1 && ! $e1->orig) {
+                if ($e1 && !$e1->orig) {
                     $bb->out1($e1->final);
                     $e1 = next($edits1);
                 }
-                if ($e2 && ! $e2->orig) {
+                if ($e2 && !$e2->orig) {
                     $bb->out2($e2->final);
                     $e2 = next($edits2);
                 }

main/inc/lib/pear/Text/Diff/Renderer/context.php

Spacing +2 added lines, -2 removed lines

@@ -35,10 +35,10 @@
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen != 1) {
-            $xbeg .= ',' . $xlen;
+            $xbeg .= ','.$xlen;
         }
         if ($ylen != 1) {
-            $ybeg .= ',' . $ylen;
+            $ybeg .= ','.$ylen;
         }
         $this->_second_block = "--- $ybeg ----\n";
         return "***************\n*** $xbeg ****";

main/inc/lib/pear/Text/Diff/Renderer/unified.php

Spacing +3 added lines, -3 removed lines

@@ -34,10 +34,10 @@ 
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen != 1) {
-            $xbeg .= ',' . $xlen;
+            $xbeg .= ','.$xlen;
         }
         if ($ylen != 1) {
-            $ybeg .= ',' . $ylen;
+            $ybeg .= ','.$ylen;
         }
         return "@@ -$xbeg +$ybeg @@";
     }
@@ -59,7 +59,7 @@ 
 
     function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . $this->_added($final);
+        return $this->_deleted($orig).$this->_added($final);
     }
 
 }

main/inc/lib/pear/Text/Diff/Mapped.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      *                                  of elements as $to_lines.
      */
     function Text_Diff_Mapped($from_lines, $to_lines,
-                              $mapped_from_lines, $mapped_to_lines)
+                                $mapped_from_lines, $mapped_to_lines)
     {
         assert(count($from_lines) == count($mapped_from_lines));
         assert(count($to_lines) == count($mapped_to_lines));

main/inc/lib/pear/Text/Diff/Engine/xdiff.php

Switch Indentation +9 added lines, -9 removed lines

@@ -46,17 +46,17 @@
                 continue;
             }
             switch ($line[0]) {
-            case ' ':
-                $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+                case ' ':
+                    $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
+                    break;
 
-            case '+':
-                $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+                case '+':
+                    $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
+                    break;
 
-            case '-':
-                $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
+                case '-':
+                    $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
+                    break;
             }
         }
 

main/inc/lib/pear/Text/Diff/Engine/shell.php

Indentation +2 added lines, -2 removed lines

@@ -124,9 +124,9 @@
             array_push($edits,
                 new Text_Diff_Op_copy(
                     $this->_getLines($from_lines, $from_line_no,
-                                     $from_line_no + count($from_lines) - 1),
+                                        $from_line_no + count($from_lines) - 1),
                     $this->_getLines($to_lines, $to_line_no,
-                                     $to_line_no + count($to_lines) - 1)));
+                                        $to_line_no + count($to_lines) - 1)));
         }
 
         return $edits;

Switch Indentation +23 added lines, -23 removed lines

@@ -93,29 +93,29 @@
             }
 
             switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
+                case 'd':
+                    // deleted lines
+                    array_push($edits,
+                        new Text_Diff_Op_delete(
+                            $this->_getLines($from_lines, $from_line_no, $match[2])));
+                    $to_line_no++;
+                    break;
+
+                case 'c':
+                    // changed lines
+                    array_push($edits,
+                        new Text_Diff_Op_change(
+                            $this->_getLines($from_lines, $from_line_no, $match[2]),
+                            $this->_getLines($to_lines, $to_line_no, $match[5])));
+                    break;
+
+                case 'a':
+                    // added lines
+                    array_push($edits,
+                        new Text_Diff_Op_add(
+                            $this->_getLines($to_lines, $to_line_no, $match[5])));
+                    $from_line_no++;
+                    break;
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         $fp = fopen($to_file, 'w');
         fwrite($fp, implode("\n", $to_lines));
         fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+        $diff = shell_exec($this->_diffCommand.' '.$from_file.' '.$to_file);
         unlink($from_file);
         unlink($to_file);
 

main/inc/lib/pear/PEAR5.php

Indentation +11 added lines, -11 removed lines

@@ -6,17 +6,17 @@
 class PEAR5
 {
     /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
+     * If you have a class that's mostly/entirely static, and you need static
+     * properties, you can use this method to simulate them. Eg. in your method(s)
+     * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
+     * You MUST use a reference, or they will not persist!
+     *
+     * @access public
+     * @param  string $class  The calling classname, to prevent clashes
+     * @param  string $var    The variable to retrieve.
+     * @return mixed   A reference to the variable. If not set it will be
+     *                 auto initialised to NULL.
+     */
     static function &getStaticProperty($class, $var)
     {
         static $properties;

main/inc/lib/pear/PEAR.php

Spacing +13 added lines, -14 removed lines

@@ -26,11 +26,11 @@ 
 /**#@+
  * ERROR constants
  */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
+define('PEAR_ERROR_RETURN', 1);
+define('PEAR_ERROR_PRINT', 2);
+define('PEAR_ERROR_TRIGGER', 4);
+define('PEAR_ERROR_DIE', 8);
+define('PEAR_ERROR_CALLBACK', 16);
 /**
  * WARNING: obsolete
  * @deprecated
@@ -42,12 +42,12 @@ 
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
+    define('OS_UNIX', false);
+    define('PEAR_OS', 'Windows');
 } else {
     define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
+    define('OS_UNIX', true);
+    define('PEAR_OS', 'Unix'); // blatant assumption
 }
 
 $GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
@@ -451,9 +451,9 @@ 
             // $error_code is a non-empty array here;
             // we walk through it trying to unset all
             // values
-            foreach($error_code as $key => $error) {
+            foreach ($error_code as $key => $error) {
                 if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
+                    $deleted = true;
                 } else {
                     $deleted = false;
                 }
@@ -986,7 +986,7 @@ 
      */
     function getMessage()
     {
-        return ($this->error_message_prefix . $this->message);
+        return ($this->error_message_prefix.$this->message);
     }
 
 
@@ -1103,8 +1103,7 @@ 
         if ($this->mode & PEAR_ERROR_CALLBACK) {
             if (is_array($this->callback)) {
                 $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
+                    strtolower(get_class($this->callback[0])) : $this->callback[0]).'::'.
                     $this->callback[1];
             } else {
                 $callback = $this->callback;

Indentation +51 added lines, -51 removed lines

@@ -205,17 +205,17 @@ 
     // {{{ getStaticProperty()
 
     /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
+     * If you have a class that's mostly/entirely static, and you need static
+     * properties, you can use this method to simulate them. Eg. in your method(s)
+     * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
+     * You MUST use a reference, or they will not persist!
+     *
+     * @access public
+     * @param  string $class  The calling classname, to prevent clashes
+     * @param  string $var    The variable to retrieve.
+     * @return mixed   A reference to the variable. If not set it will be
+     *                 auto initialised to NULL.
+     */
     function &getStaticProperty($class, $var)
     {
         static $properties;
@@ -234,14 +234,14 @@ 
     // {{{ registerShutdownFunc()
 
     /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
+     * Use this function to register a shutdown method for static
+     * classes.
+     *
+     * @access public
+     * @param  mixed $func  The function name (or array of class/method) to call
+     * @param  mixed $args  The arguments to pass to the function
+     * @return void
+     */
     function registerShutdownFunc($func, $args = array())
     {
         // if we are called statically, there is a potential
@@ -513,12 +513,12 @@ 
      * @since PHP 4.0.5
      */
     function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
+                            $code = null,
+                            $mode = null,
+                            $options = null,
+                            $userinfo = null,
+                            $error_class = null,
+                            $skipmsg = false)
     {
         // The error is yet a PEAR error object
         if (is_object($message)) {
@@ -584,8 +584,8 @@ 
      *
      */
     function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
+                            $code = null,
+                            $userinfo = null)
     {
         if (isset($this) && is_a($this, 'PEAR')) {
             $a = &$this->raiseError($message, $code, null, null, $userinfo);
@@ -707,12 +707,12 @@ 
     // {{{ popErrorHandling()
 
     /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
+     * Pop the last error handler used
+     *
+     * @return bool Always true
+     *
+     * @see PEAR::pushErrorHandling
+     */
     function popErrorHandling()
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
@@ -731,12 +731,12 @@ 
     // {{{ loadExtension()
 
     /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
+     * OS independant PHP extension load. Remember to take care
+     * on the correct extension name for case sensitive OSes.
+     *
+     * @param string $ext The extension name
+     * @return bool Success or not on the dl() call
+     */
     function loadExtension($ext)
     {
         if (!extension_loaded($ext)) {
@@ -999,10 +999,10 @@ 
      * @return int error code
      * @access public
      */
-     function getCode()
-     {
+        function getCode()
+        {
         return $this->code;
-     }
+        }
 
     // }}}
     // {{{ getType()
@@ -1110,10 +1110,10 @@ 
                 $callback = $this->callback;
             }
             return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
+                            'callback=%s prefix="%s" info="%s"]',
+                            strtolower(get_class($this)), $this->message, $this->code,
+                            $callback, $this->error_message_prefix,
+                            $this->userinfo);
         }
         if ($this->mode & PEAR_ERROR_PRINT) {
             $modes[] = 'print';
@@ -1128,11 +1128,11 @@ 
             $modes[] = 'return';
         }
         return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
+                        'prefix="%s" info="%s"]',
+                        strtolower(get_class($this)), $this->message, $this->code,
+                        implode("|", $modes), $levels[$this->level],
+                        $this->error_message_prefix,
+                        $this->userinfo);
     }
 
     // }}}

Doc Comments +2 added lines, -1 removed lines

@@ -490,7 +490,7 @@ 
      *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
      *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
      *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
+     * @param integer|null $options If $mode is PEAR_ERROR_TRIGGER, this parameter
      *                  specifies the PHP-internal error level (one of
      *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
      *                  If $mode is PEAR_ERROR_CALLBACK, this
@@ -581,6 +581,7 @@ 
      * message, code and userinfo are enough.
      *
      * @param string $message
+     * @param integer $code
      *
      */
     function &throwError($message = null,