chamilo / chamilo-lms

main/inc/lib/pear/HTML/QuickForm/submit.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      * Freeze the element so that only its value is returned
      *
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     function freeze()
     {

Indentation +4 added lines, -4 removed lines

@@ -70,10 +70,10 @@
     // }}}
     // {{{ exportValue()
 
-   /**
-    * Only return the value if it is found within $submitValues (i.e. if
-    * this particular submit button was clicked)
-    */
+    /**
+     * Only return the value if it is found within $submitValues (i.e. if
+     * this particular submit button was clicked)
+     */
     function exportValue(&$submitValues, $assoc = false)
     {
         return $this->_prepareValue($this->_findValue($submitValues), $assoc);

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * @access    public
      * @return    void
      */
-    public function __construct($elementName=null, $value=null, $attributes=null)
+    public function __construct($elementName = null, $value = null, $attributes = null)
     {
         parent::__construct($elementName, null, $attributes);
         $this->setValue($value);

main/inc/lib/pear/HTML/QuickForm/textarea.php

Doc Comments +2 added lines

@@ -54,6 +54,8 @@
      * @param     string    Input field name attribute
      * @param     mixed     Label(s) for a field
      * @param     mixed     Either a typical HTML attribute string or an associative array
+     * @param string $elementName
+     * @param string $elementLabel
      * @since     1.0
      * @access    public
      * @return    void

Indentation +7 added lines, -7 removed lines

@@ -194,13 +194,13 @@
             return $this->getFrozenHtml();
         } else {
             return $this->_getTabs() .
-                   '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
-                   // because we wrap the form later we don't want the text indented
-                   // Modified by Ivan Tcholakov, 16-MAR-2010.
-                   //preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) .
-                   preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())) .
-                   //
-                   '</textarea>';
+                    '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
+                    // because we wrap the form later we don't want the text indented
+                    // Modified by Ivan Tcholakov, 16-MAR-2010.
+                    //preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) .
+                    preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())) .
+                    //
+                    '</textarea>';
         }
     }
 

Spacing +6 added lines, -6 removed lines

@@ -58,7 +58,7 @@ 
      * @access    public
      * @return    void
      */
-    public function __construct($elementName=null, $elementLabel=null, $attributes=null)
+    public function __construct($elementName = null, $elementLabel = null, $attributes = null)
     {
         $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : 'form-control';
         $columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null;
@@ -193,12 +193,12 @@ 
         if ($this->_flagFrozen) {
             return $this->getFrozenHtml();
         } else {
-            return $this->_getTabs() .
-                   '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
+            return $this->_getTabs().
+                   '<textarea'.$this->_getAttrString($this->_attributes).'>'.
                    // because we wrap the form later we don't want the text indented
                    // Modified by Ivan Tcholakov, 16-MAR-2010.
                    //preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) .
-                   preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())) .
+                   preg_replace("/(\r\n|\n|\r)/", '&#010;', @htmlspecialchars($this->_value, ENT_COMPAT, HTML_Common::charset())).
                    //
                    '</textarea>';
         }
@@ -218,11 +218,11 @@ 
         $value = @htmlspecialchars($this->getValue(), ENT_COMPAT, HTML_Common::charset());
         //
         if ($this->getAttribute('wrap') == 'off') {
-            $html = $this->_getTabs() . '<pre>' . $value."</pre>\n";
+            $html = $this->_getTabs().'<pre>'.$value."</pre>\n";
         } else {
             $html = nl2br($value)."\n";
         }
-        return $html . $this->_getPersistantData();
+        return $html.$this->_getPersistantData();
     }
     
     /**

main/inc/lib/pear/HTML/Table.php

Doc Comments +2 added lines, -2 removed lines

@@ -665,7 +665,7 @@ 
      * Adds a table row and returns the row identifier
      * @param    array     $contents     (optional) Must be a indexed array of
      *                                   valid cell contents
-     * @param    mixed     $attributes   (optional) Associative array or string
+     * @param    string     $attributes   (optional) Associative array or string
      *                                   of table row attributes. This can also
      *                                   be an array of attributes, in which
      *                                   case the attributes will be repeated
@@ -719,7 +719,7 @@ 
     /**
      * Updates the row attributes for an existing row
      * @param    int      $row          Row index
-     * @param    mixed    $attributes   Associative array or string of table row
+     * @param    string    $attributes   Associative array or string of table row
      *                                  attributes
      * @param    bool     $inTR         false if attributes are to be applied in
      *                                  TD tags; true if attributes are to be

Spacing +26 added lines, -26 removed lines

@@ -164,8 +164,8 @@ 
      */
     function HTML_Table($attributes = null, $tabOffset = 0, $useTGroups = false)
     {
-        parent::__construct($attributes, (int)$tabOffset);
-        $this->_useTGroups = (boolean)$useTGroups;
+        parent::__construct($attributes, (int) $tabOffset);
+        $this->_useTGroups = (boolean) $useTGroups;
         $this->addBody();
         if ($this->_useTGroups) {
             $this->_thead = new HTML_Table_Storage($tabOffset, $this->_useTGroups);
@@ -272,12 +272,12 @@ 
     function _adjustTbodyCount($body, $method)
     {
         if ($this->_autoGrow) {
-            while ($this->_tbodyCount <= (int)$body) {
+            while ($this->_tbodyCount <= (int) $body) {
                 $this->addBody();
             }
         } else {
-            return PEAR::raiseError('Invalid body reference[' .
-                $body . '] in HTML_Table::' . $method);
+            return PEAR::raiseError('Invalid body reference['.
+                $body.'] in HTML_Table::'.$method);
         }
     }
 
@@ -939,26 +939,26 @@ 
             $tBodyMaxColCount = max($tBodyColCounts);
         }
         if ($this->_comment) {
-            $strHtml .= $tabs . "<!-- $this->_comment -->" . $lnEnd;
+            $strHtml .= $tabs."<!-- $this->_comment -->".$lnEnd;
         }
         if ($this->getRowCount() > 0 && $tBodyMaxColCount > 0) {
             $strHtml .=
-                $tabs . '<table' . $this->_getAttrString($this->_attributes) . '>' . $lnEnd;
+                $tabs.'<table'.$this->_getAttrString($this->_attributes).'>'.$lnEnd;
             if (!empty($this->_caption)) {
                 $attr = $this->_caption['attr'];
                 $contents = $this->_caption['contents'];
-                $strHtml .= $tabs . $tab . '<caption' . $this->_getAttrString($attr) . '>';
+                $strHtml .= $tabs.$tab.'<caption'.$this->_getAttrString($attr).'>';
                 if (is_array($contents)) {
                     $contents = implode(', ', $contents);
                 }
                 $strHtml .= $contents;
-                $strHtml .= '</caption>' . $lnEnd;
+                $strHtml .= '</caption>'.$lnEnd;
             }
             if (!empty($this->_colgroup)) {
                 foreach ($this->_colgroup as $g => $col) {
                     $attr = $this->_colgroup[$g]['attr'];
                     $contents = $this->_colgroup[$g]['contents'];
-                    $strHtml .= $tabs . $tab . '<colgroup' . $this->_getAttrString($attr) . '>';
+                    $strHtml .= $tabs.$tab.'<colgroup'.$this->_getAttrString($attr).'>';
                     if (!empty($contents)) {
                         $strHtml .= $lnEnd;
                         if (!is_array($contents)) {
@@ -966,11 +966,11 @@ 
                         }
                         foreach ($contents as $a => $colAttr) {
                             $attr = $this->_parseAttributes($colAttr);
-                            $strHtml .= $tabs . $tab . $tab . '<col' . $this->_getAttrString($attr) . ' />' . $lnEnd;
+                            $strHtml .= $tabs.$tab.$tab.'<col'.$this->_getAttrString($attr).' />'.$lnEnd;
                         }
-                        $strHtml .= $tabs . $tab;
+                        $strHtml .= $tabs.$tab;
                     }
-                    $strHtml .= '</colgroup>' . $lnEnd;
+                    $strHtml .= '</colgroup>'.$lnEnd;
                 }
             }
             if ($this->_useTGroups) {
@@ -986,31 +986,31 @@ 
                 if ($this->_thead !== null) {
                     $this->_thead->setColCount($maxColCount);
                     if ($this->_thead->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<thead' .
-                                    $this->_getAttrString($this->_thead->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<thead'.
+                                    $this->_getAttrString($this->_thead->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_thead->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</thead>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</thead>'.$lnEnd;
                     }
                 }
                 if ($this->_tfoot !== null) {
                     $this->_tfoot->setColCount($maxColCount);
                     if ($this->_tfoot->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<tfoot' .
-                                    $this->_getAttrString($this->_tfoot->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<tfoot'.
+                                    $this->_getAttrString($this->_tfoot->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_tfoot->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</tfoot>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</tfoot>'.$lnEnd;
                     }
                 }
                 for ($i = 0; $i < $this->_tbodyCount; $i++) {
                     $this->_tbodies[$i]->setColCount($maxColCount);
                     if ($this->_tbodies[$i]->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<tbody' .
-                                    $this->_getAttrString($this->_tbodies[$i]->_attributes) .
-                                    '>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'<tbody'.
+                                    $this->_getAttrString($this->_tbodies[$i]->_attributes).
+                                    '>'.$lnEnd;
                         $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab);
-                        $strHtml .= $tabs . $tab . '</tbody>' . $lnEnd;
+                        $strHtml .= $tabs.$tab.'</tbody>'.$lnEnd;
                     }
                 }
             } else {
@@ -1019,7 +1019,7 @@ 
                     $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab);
                 }
             }
-            $strHtml .= $tabs . '</table>' . $lnEnd;
+            $strHtml .= $tabs.'</table>'.$lnEnd;
         }
         return $strHtml;
     }

Indentation +2 added lines, -3 removed lines

@@ -48,7 +48,6 @@ 
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
  *
  * @category   HTML
  * @package    HTML_Table
@@ -256,7 +255,7 @@ 
 
         $body = $this->_tbodyCount++;
         $this->_tbodies[$body] = new HTML_Table_Storage($this->_tabOffset,
-                                                         $this->_useTGroups);
+                                                            $this->_useTGroups);
         $this->_tbodies[$body]->setAutoFill($this->_autoFill);
         $this->_tbodies[$body]->setAttributes($attributes);
         return $body;
@@ -308,7 +307,7 @@ 
         if (isset($colgroup)) {
             $attributes = $this->_parseAttributes($attributes);
             $this->_colgroup[] = array('attr' => $attributes,
-                                       'contents' => $colgroup);
+                                        'contents' => $colgroup);
         } else {
             $this->_colgroup = array();
         }

main/inc/lib/pear/HTML/Table/Storage.php

Doc Comments +2 added lines, -3 removed lines

@@ -165,7 +165,7 @@ 
     /**
      * Returns the autoFill value
      * @access   public
-     * @return   mixed
+     * @return   string
      */
     function getAutoFill()
     {
@@ -174,7 +174,6 @@ 
 
     /**
      * Sets the autoGrow value
-     * @param    bool   $fill
      * @access   public
      */
     function setAutoGrow($grow)
@@ -185,7 +184,7 @@ 
     /**
      * Returns the autoGrow value
      * @access   public
-     * @return   mixed
+     * @return   boolean
      */
     function getAutoGrow()
     {

Spacing +20 added lines, -20 removed lines

@@ -128,8 +128,8 @@ 
      */
     function HTML_Table_Storage($tabOffset = 0, $useTGroups = false)
     {
-        parent::__construct(null, (int)$tabOffset);
-        $this->_useTGroups = (boolean)$useTGroups;
+        parent::__construct(null, (int) $tabOffset);
+        $this->_useTGroups = (boolean) $useTGroups;
     }
 
     /**
@@ -288,7 +288,7 @@ 
      */
     function setCellAttributes($row, $col, $attributes)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
@@ -314,7 +314,7 @@ 
      */
     function updateCellAttributes($row, $col, $attributes)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
@@ -337,13 +337,13 @@ 
      */
     function getCellAttributes($row, $col)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] != '__SPANNED__'
         ) {
             return $this->_structure[$row][$col]['attr'];
         } elseif (!isset($this->_structure[$row][$col])) {
-            return PEAR::raiseError('Invalid table cell reference[' .
-                $row . '][' . $col . '] in HTML_Table::getCellAttributes');
+            return PEAR::raiseError('Invalid table cell reference['.
+                $row.']['.$col.'] in HTML_Table::getCellAttributes');
         }
         return;
     }
@@ -405,7 +405,7 @@ 
      */
     function _setSingleCellContents($row, $col, $contents, $type = 'TD')
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
@@ -427,14 +427,14 @@ 
      */
     function getCellContents($row, $col)
     {
-        if (   isset($this->_structure[$row][$col])
+        if (isset($this->_structure[$row][$col])
             && $this->_structure[$row][$col] == '__SPANNED__'
         ) {
             return;
         }
         if (!isset($this->_structure[$row][$col])) {
-            return PEAR::raiseError('Invalid table cell reference[' .
-                $row . '][' . $col . '] in HTML_Table::getCellContents');
+            return PEAR::raiseError('Invalid table cell reference['.
+                $row.']['.$col.'] in HTML_Table::getCellContents');
         }
         return $this->_structure[$row][$col]['contents'];
     }
@@ -477,7 +477,7 @@ 
         $inTR = false)
     {
         if (isset($contents) && !is_array($contents)) {
-            return PEAR::raiseError('First parameter to HTML_Table::addRow ' .
+            return PEAR::raiseError('First parameter to HTML_Table::addRow '.
                 'must be an array');
         }
         if (is_null($contents)) {
@@ -620,7 +620,7 @@ 
     function addCol($contents = null, $attributes = null, $type = 'td')
     {
         if (isset($contents) && !is_array($contents)) {
-            return PEAR::raiseError('First parameter to HTML_Table::addCol ' .
+            return PEAR::raiseError('First parameter to HTML_Table::addCol '.
                 'must be an array');
         }
         if (is_null($contents)) {
@@ -727,13 +727,13 @@ 
             $extraTab = '';
         }
         if ($this->_cols > 0) {
-            for ($i = 0 ; $i < $this->_rows ; $i++) {
+            for ($i = 0; $i < $this->_rows; $i++) {
                 $attr = '';
                 if (isset($this->_structure[$i]['attr'])) {
                     $attr = $this->_getAttrString($this->_structure[$i]['attr']);
                 }
-                $strHtml .= $tabs .$tab . $extraTab . '<tr'.$attr.'>' . $lnEnd;
-                for ($j = 0 ; $j < $this->_cols ; $j++) {
+                $strHtml .= $tabs.$tab.$extraTab.'<tr'.$attr.'>'.$lnEnd;
+                for ($j = 0; $j < $this->_cols; $j++) {
                     $attr     = '';
                     $contents = '';
                     $type     = 'td';
@@ -753,7 +753,7 @@ 
                     if (is_object($contents)) {
                         // changes indent and line end settings on nested tables
                         if (is_subclass_of($contents, 'html_common')) {
-                            $contents->setTab($tab . $extraTab);
+                            $contents->setTab($tab.$extraTab);
                             $contents->setTabOffset($this->_tabOffset + 3);
                             $contents->_nestLevel = $this->_nestLevel + 1;
                             $contents->setLineEnd($this->_getLineEnd());
@@ -768,7 +768,7 @@ 
                         $contents = implode(', ', $contents);
                     }
 
-                    $typeContent = $tabs . $tab . $tab . $extraTab . "<$type" . $this->_getAttrString($attr) . '>';
+                    $typeContent = $tabs.$tab.$tab.$extraTab."<$type".$this->_getAttrString($attr).'>';
 
                     if (empty($contents)) {
                         if (isset($this->_autoFill) && $this->_autoFill) {
@@ -777,14 +777,14 @@ 
                     } else {
                         $typeContent .= $contents;
                     }
-                    $typeContent .= "</$type>" . $lnEnd;
+                    $typeContent .= "</$type>".$lnEnd;
 
                     if (!empty($contents)) {
                         $strHtml .= $typeContent;
                     }
 
                 }
-                $strHtml .= $tabs . $tab . $extraTab . '</tr>' . $lnEnd;
+                $strHtml .= $tabs.$tab.$extraTab.'</tr>'.$lnEnd;
             }
         }
         return $strHtml;

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

Doc Comments +4 added lines, -4 removed lines

@@ -328,8 +328,8 @@ 
      * the Image_Text object after changing options. For possible options, please
      * take a look at the class options array!
      *
-     * @param array|string $option A single option name or the options array.
-     * @param mixed        $value  Option value if $option is string.
+     * @param string $option A single option name or the options array.
+     * @param string        $value  Option value if $option is string.
      *
      * @return void
      * @see    Image_Text::Image_Text()
@@ -982,7 +982,7 @@ 
      * @param bool $save Save or not the image on printout.
      * @param bool $free Free the image on exit.
      *
-     * @return  bool         True on success
+     * @return  boolean|null         True on success
      * @see Image_Text::save()
      * @throws Image_Text_Exception
      */
@@ -1133,7 +1133,7 @@ 
      * @param string $scolor string of colorcode.
      *
      * @see Image_Text::IMAGE_TEXT_REGEX_HTMLCOLOR
-     * @return bool|array false if string can't be converted to array
+     * @return resource false if string can't be converted to array
      */
     public static function convertString2RGB($scolor)
     {

Switch Indentation +94 added lines, -94 removed lines

@@ -346,19 +346,19 @@ 
         }
         foreach ($option as $opt => $val) {
             switch ($opt) {
-            case 'color':
-                $this->setColors($val);
-                break;
-            case 'text':
-                if (is_array($val)) {
-                    $this->_text = implode('\n', $val);
-                } else {
-                    $this->_text = $val;
-                }
-                break;
-            default:
-                $this->_options[$opt] = $val;
-                break;
+                case 'color':
+                    $this->setColors($val);
+                    break;
+                case 'text':
+                    if (is_array($val)) {
+                        $this->_text = implode('\n', $val);
+                    } else {
+                        $this->_text = $val;
+                    }
+                    break;
+                default:
+                    $this->_options[$opt] = $val;
+                    break;
             }
             if (isset($reInits[$opt])) {
                 $this->_init = false;
@@ -511,45 +511,45 @@ 
         $image_canvas = false;
         switch (true) {
 
-        case (empty($this->_options['canvas'])):
-            // Create new image from width && height of the clipping
-            $this->_img = imagecreatetruecolor(
-                $this->_options['width'], $this->_options['height']
-            );
-            if (!$this->_img) {
-                throw new Image_Text_Exception('Could not create image canvas.');
-            }
-            break;
+            case (empty($this->_options['canvas'])):
+                // Create new image from width && height of the clipping
+                $this->_img = imagecreatetruecolor(
+                    $this->_options['width'], $this->_options['height']
+                );
+                if (!$this->_img) {
+                    throw new Image_Text_Exception('Could not create image canvas.');
+                }
+                break;
 
-        case (is_resource($this->_options['canvas']) &&
-            get_resource_type($this->_options['canvas']) == 'gd'):
-            // The canvas is an image resource
-            $image_canvas = true;
-            $this->_img = $this->_options['canvas'];
-            break;
+            case (is_resource($this->_options['canvas']) &&
+                get_resource_type($this->_options['canvas']) == 'gd'):
+                // The canvas is an image resource
+                $image_canvas = true;
+                $this->_img = $this->_options['canvas'];
+                break;
 
-        case (is_array($this->_options['canvas']) &&
-            isset($this->_options['canvas']['width']) &&
-            isset($this->_options['canvas']['height'])):
+            case (is_array($this->_options['canvas']) &&
+                isset($this->_options['canvas']['width']) &&
+                isset($this->_options['canvas']['height'])):
 
-            // Canvas must be a width and height measure
-            $this->_img = imagecreatetruecolor(
-                $this->_options['canvas']['width'],
-                $this->_options['canvas']['height']
-            );
-            break;
+                // Canvas must be a width and height measure
+                $this->_img = imagecreatetruecolor(
+                    $this->_options['canvas']['width'],
+                    $this->_options['canvas']['height']
+                );
+                break;
 
-        case (is_array($this->_options['canvas']) &&
-            isset($this->_options['canvas']['size']) &&
-            ($this->_options['canvas']['size'] = 'auto')):
+            case (is_array($this->_options['canvas']) &&
+                isset($this->_options['canvas']['size']) &&
+                ($this->_options['canvas']['size'] = 'auto')):
 
-        case (is_string($this->_options['canvas']) &&
-            ($this->_options['canvas'] = 'auto')):
-            $this->_mode = 'auto';
-            break;
+            case (is_string($this->_options['canvas']) &&
+                ($this->_options['canvas'] = 'auto')):
+                $this->_mode = 'auto';
+                break;
 
-        default:
-            throw new Image_Text_Exception('Could not create image canvas.');
+            default:
+                throw new Image_Text_Exception('Could not create image canvas.');
         }
 
         if ($this->_img) {
@@ -889,19 +889,19 @@ 
         $cosR = cos($radians);
 
         switch ($this->_options['valign']) {
-        case self::IMAGE_TEXT_ALIGN_TOP:
-            $valign_space = 0;
-            break;
-        case self::IMAGE_TEXT_ALIGN_MIDDLE:
-            $valign_space = ($this->_options['height']
-                    - $this->_realTextSize['height']) / 2;
-            break;
-        case self::IMAGE_TEXT_ALIGN_BOTTOM:
-            $valign_space = $this->_options['height']
-                - $this->_realTextSize['height'];
-            break;
-        default:
-            $valign_space = 0;
+            case self::IMAGE_TEXT_ALIGN_TOP:
+                $valign_space = 0;
+                break;
+            case self::IMAGE_TEXT_ALIGN_MIDDLE:
+                $valign_space = ($this->_options['height']
+                        - $this->_realTextSize['height']) / 2;
+                break;
+            case self::IMAGE_TEXT_ALIGN_BOTTOM:
+                $valign_space = $this->_options['height']
+                    - $this->_realTextSize['height'];
+                break;
+            default:
+                $valign_space = 0;
         }
 
         $space = (1 + $line_spacing) * $size;
@@ -932,18 +932,18 @@ 
             // Calc the position using the block width, the current line width and
             // obviously the angle. That gives us the offset to slide the line.
             switch ($align) {
-            case self::IMAGE_TEXT_ALIGN_LEFT:
-                $hyp = 0;
-                break;
-            case self::IMAGE_TEXT_ALIGN_RIGHT:
-                $hyp = $block_width - $line_width - $left_margin;
-                break;
-            case self::IMAGE_TEXT_ALIGN_CENTER:
-                $hyp = ($block_width - $line_width) / 2 - $left_margin;
-                break;
-            default:
-                $hyp = 0;
-                break;
+                case self::IMAGE_TEXT_ALIGN_LEFT:
+                    $hyp = 0;
+                    break;
+                case self::IMAGE_TEXT_ALIGN_RIGHT:
+                    $hyp = $block_width - $line_width - $left_margin;
+                    break;
+                case self::IMAGE_TEXT_ALIGN_CENTER:
+                    $hyp = ($block_width - $line_width) / 2 - $left_margin;
+                    break;
+                default:
+                    $hyp = 0;
+                    break;
             }
 
             $posx = $new_posx + $cosR * $hyp;
@@ -997,17 +997,17 @@ 
             throw new Image_Text_Exception('Header already sent.');
         }
         switch ($this->_options['image_type']) {
-        case IMAGETYPE_PNG:
-            $imgout = 'imagepng';
-            break;
-        case IMAGETYPE_JPEG:
-            $imgout = 'imagejpeg';
-            break;
-        case IMAGETYPE_BMP:
-            $imgout = 'imagebmp';
-            break;
-        default:
-            throw new Image_Text_Exception('Unsupported image type.');
+            case IMAGETYPE_PNG:
+                $imgout = 'imagepng';
+                break;
+            case IMAGETYPE_JPEG:
+                $imgout = 'imagejpeg';
+                break;
+            case IMAGETYPE_BMP:
+                $imgout = 'imagebmp';
+                break;
+            default:
+                throw new Image_Text_Exception('Unsupported image type.');
         }
         if ($save) {
             $imgout($this->_img);
@@ -1048,18 +1048,18 @@ 
         }
 
         switch ($this->_options['image_type']) {
-        case IMAGETYPE_PNG:
-            $imgout = 'imagepng';
-            break;
-        case IMAGETYPE_JPEG:
-            $imgout = 'imagejpeg';
-            break;
-        case IMAGETYPE_BMP:
-            $imgout = 'imagebmp';
-            break;
-        default:
-            throw new Image_Text_Exception('Unsupported image type.');
-            break;
+            case IMAGETYPE_PNG:
+                $imgout = 'imagepng';
+                break;
+            case IMAGETYPE_JPEG:
+                $imgout = 'imagejpeg';
+                break;
+            case IMAGETYPE_BMP:
+                $imgout = 'imagebmp';
+                break;
+            default:
+                throw new Image_Text_Exception('Unsupported image type.');
+                break;
         }
 
         $res = $imgout($this->_img, $destFile);

Spacing +6 added lines, -6 removed lines

@@ -683,7 +683,7 @@ 
         $space = (1 + $this->_options['line_spacing'])
             * $this->_options['font_size'];
 
-        $max_lines = (int)$this->_options['max_lines'];
+        $max_lines = (int) $this->_options['max_lines'];
 
         if (($max_lines < 1) && !$force) {
             return false;
@@ -732,7 +732,7 @@ 
                     'color' => $c
                 );
                 $text_width = max($text_width, ($bounds[2] - $bounds[0]));
-                $text_height += (int)$space;
+                $text_height += (int) $space;
                 if (($text_height > $block_height) && !$force) {
                     return false;
                 }
@@ -749,7 +749,7 @@ 
                 $text_line_next = $token;
                 $beginning_of_line = false;
             } else {
-                $text_line_next = $text_line . ' ' . $token;
+                $text_line_next = $text_line.' '.$token;
             }
             $bounds = imagettfbbox($size, 0, $font, $text_line_next);
             $prev_width = isset($prev_width) ? $width : 0;
@@ -776,7 +776,7 @@ 
                     'color' => $c
                 );
                 $text_width = max($text_width, ($bounds[2] - $bounds[0]));
-                $text_height += (int)$space;
+                $text_height += (int) $space;
                 if (($text_height > $block_height) && !$force) {
                     return false;
                 }
@@ -990,7 +990,7 @@ 
     {
         if (!headers_sent()) {
             header(
-                "Content-type: " .
+                "Content-type: ".
                 image_type_to_mime_type($this->_options['image_type'])
             );
         } else {
@@ -1121,7 +1121,7 @@ 
                 $y += $vC[1];
             }
         }
-        return array('x' => (int)round($x, 0), 'y' => (int)round($y, 0));
+        return array('x' => (int) round($x, 0), 'y' => (int) round($y, 0));
     }
 
     /**

main/inc/lib/pear/OLE/OLE.php

Doc Comments +1 added lines, -1 removed lines

@@ -286,7 +286,7 @@
     *
     * @access private
     * @param integer $blockId the block id of the first block
-    * @return mixed true on success, PEAR_Error on failure
+    * @return boolean true on success, PEAR_Error on failure
     */
     function _readPpsWks($blockId)
     {

Indentation +104 added lines, -104 removed lines

@@ -49,74 +49,74 @@ 
 {
 
     /**
-    * The file handle for reading an OLE container
-    * @var resource
-    */
+     * The file handle for reading an OLE container
+     * @var resource
+     */
     var $_file_handle;
 
     /**
-    * Array of PPS's found on the OLE container
-    * @var array
-    */
+     * Array of PPS's found on the OLE container
+     * @var array
+     */
     var $_list;
 
     /**
-    * Root directory of OLE container
-    * @var OLE_PPS_Root
-    */
+     * Root directory of OLE container
+     * @var OLE_PPS_Root
+     */
     var $root;
 
     /**
-    * Big Block Allocation Table
-    * @var array  (blockId => nextBlockId)
-    */
+     * Big Block Allocation Table
+     * @var array  (blockId => nextBlockId)
+     */
     var $bbat;
 
     /**
-    * Short Block Allocation Table
-    * @var array  (blockId => nextBlockId)
-    */
+     * Short Block Allocation Table
+     * @var array  (blockId => nextBlockId)
+     */
     var $sbat;
 
     /**
-    * Size of big blocks. This is usually 512.
-    * @var  int  number of octets per block.
-    */
+     * Size of big blocks. This is usually 512.
+     * @var  int  number of octets per block.
+     */
     var $bigBlockSize;
 
     /**
-    * Size of small blocks. This is usually 64.
-    * @var  int  number of octets per block
-    */
+     * Size of small blocks. This is usually 64.
+     * @var  int  number of octets per block
+     */
     var $smallBlockSize;
 
     /**
-    * Creates a new OLE object
-    * @access public
-    */
+     * Creates a new OLE object
+     * @access public
+     */
     function OLE()
     {
         $this->_list = array();
     }
 
     /**
-    * Destructor (using PEAR)
-    * Just closes the file handle on the OLE file.
-    *
-    * @access private
-    */
+     * Destructor (using PEAR)
+     * Just closes the file handle on the OLE file.
+     *
+     * @access private
+     */
     function _OLE()
     {
         fclose($this->_file_handle);
     }
 
     /**
-    * Reads an OLE container from the contents of the file given.
-    *
-    * @access public
-    * @param string $file
-    * @return mixed true on success, PEAR_Error on failure
-    */
+     * Reads an OLE container from the contents of the file given.
+     *
+     * @access public
+     * @param string $file
+     * @return mixed true on success, PEAR_Error on failure
+     */
     function read($file)
     {
         $fh = @fopen($file, "r");
@@ -281,13 +281,13 @@ 
     }
 
     /**
-    * Gets information about all PPS's on the OLE container from the PPS WK's
-    * creates an OLE_PPS object for each one.
-    *
-    * @access private
-    * @param integer $blockId the block id of the first block
-    * @return mixed true on success, PEAR_Error on failure
-    */
+     * Gets information about all PPS's on the OLE container from the PPS WK's
+     * creates an OLE_PPS object for each one.
+     *
+     * @access private
+     * @param integer $blockId the block id of the first block
+     * @return mixed true on success, PEAR_Error on failure
+     */
     function _readPpsWks($blockId)
     {
         $fh = $this->getStream($blockId);
@@ -307,7 +307,7 @@ 
                 break;
             case OLE_PPS_TYPE_DIR:
                 $pps = new OLE_PPS(null, null, null, null, null,
-                                   null, null, null, null, array());
+                                    null, null, null, null, array());
                 break;
             case OLE_PPS_TYPE_FILE:
                 require_once 'OLE/PPS/File.php';
@@ -360,13 +360,13 @@ 
     }
 
     /**
-    * It checks whether the PPS tree is complete (all PPS's read)
-    * starting with the given PPS (not necessarily root)
-    *
-    * @access private
-    * @param integer $index The index of the PPS from which we are checking
-    * @return boolean Whether the PPS tree for the given PPS is complete
-    */
+     * It checks whether the PPS tree is complete (all PPS's read)
+     * starting with the given PPS (not necessarily root)
+     *
+     * @access private
+     * @param integer $index The index of the PPS from which we are checking
+     * @return boolean Whether the PPS tree for the given PPS is complete
+     */
     function _ppsTreeComplete($index)
     {
         return isset($this->_list[$index]) &&
@@ -380,12 +380,12 @@ 
     }
 
     /**
-    * Checks whether a PPS is a File PPS or not.
-    * If there is no PPS for the index given, it will return false.
-    * @param integer $index The index for the PPS
-    * @return bool true if it's a File PPS, false otherwise
-    * @access public
-    */
+     * Checks whether a PPS is a File PPS or not.
+     * If there is no PPS for the index given, it will return false.
+     * @param integer $index The index for the PPS
+     * @return bool true if it's a File PPS, false otherwise
+     * @access public
+     */
     function isFile($index)
     {
         if (isset($this->_list[$index])) {
@@ -395,12 +395,12 @@ 
     }
 
     /**
-    * Checks whether a PPS is a Root PPS or not.
-    * If there is no PPS for the index given, it will return false.
-    * @param integer $index The index for the PPS.
-    * @return bool true if it's a Root PPS, false otherwise
-    * @access public
-    */
+     * Checks whether a PPS is a Root PPS or not.
+     * If there is no PPS for the index given, it will return false.
+     * @param integer $index The index for the PPS.
+     * @return bool true if it's a Root PPS, false otherwise
+     * @access public
+     */
     function isRoot($index)
     {
         if (isset($this->_list[$index])) {
@@ -410,26 +410,26 @@ 
     }
 
     /**
-    * Gives the total number of PPS's found in the OLE container.
-    * @return integer The total number of PPS's found in the OLE container
-    * @access public
-    */
+     * Gives the total number of PPS's found in the OLE container.
+     * @return integer The total number of PPS's found in the OLE container
+     * @access public
+     */
     function ppsTotal()
     {
         return count($this->_list);
     }
 
     /**
-    * Gets data from a PPS
-    * If there is no PPS for the index given, it will return an empty string.
-    * @param integer $index    The index for the PPS
-    * @param integer $position The position from which to start reading
-    *                          (relative to the PPS)
-    * @param integer $length   The amount of bytes to read (at most)
-    * @return string The binary string containing the data requested
-    * @access public
-    * @see OLE_PPS_File::getStream()
-    */
+     * Gets data from a PPS
+     * If there is no PPS for the index given, it will return an empty string.
+     * @param integer $index    The index for the PPS
+     * @param integer $position The position from which to start reading
+     *                          (relative to the PPS)
+     * @param integer $length   The amount of bytes to read (at most)
+     * @return string The binary string containing the data requested
+     * @access public
+     * @see OLE_PPS_File::getStream()
+     */
     function getData($index, $position, $length)
     {
         // if position is not valid return empty string
@@ -446,12 +446,12 @@ 
     }
 
     /**
-    * Gets the data length from a PPS
-    * If there is no PPS for the index given, it will return 0.
-    * @param integer $index The index for the PPS
-    * @return integer The amount of bytes in data the PPS has
-    * @access public
-    */
+     * Gets the data length from a PPS
+     * If there is no PPS for the index given, it will return 0.
+     * @param integer $index The index for the PPS
+     * @return integer The amount of bytes in data the PPS has
+     * @access public
+     */
     function getDataLength($index)
     {
         if (isset($this->_list[$index])) {
@@ -461,13 +461,13 @@ 
     }
 
     /**
-    * Utility function to transform ASCII text to Unicode
-    *
-    * @access public
-    * @static
-    * @param string $ascii The ASCII string to transform
-    * @return string The string in Unicode
-    */
+     * Utility function to transform ASCII text to Unicode
+     *
+     * @access public
+     * @static
+     * @param string $ascii The ASCII string to transform
+     * @return string The string in Unicode
+     */
     function Asc2Ucs($ascii)
     {
         $rawname = '';
@@ -478,14 +478,14 @@ 
     }
 
     /**
-    * Utility function
-    * Returns a string for the OLE container with the date given
-    *
-    * @access public
-    * @static
-    * @param integer $date A timestamp
-    * @return string The string for the OLE container
-    */
+     * Utility function
+     * Returns a string for the OLE container with the date given
+     *
+     * @access public
+     * @static
+     * @param integer $date A timestamp
+     * @return string The string for the OLE container
+     */
     function LocalDate2OLE($date = null)
     {
         if (!isset($date)) {
@@ -500,7 +500,7 @@ 
         // calculate seconds
         $big_date = $days * 24 * 3600 +
             gmmktime(date("H",$date),date("i",$date),date("s",$date),
-                     date("m",$date),date("d",$date),date("Y",$date));
+                        date("m",$date),date("d",$date),date("Y",$date));
         // multiply just to make MS happy
         $big_date *= 10000000;
 
@@ -525,12 +525,12 @@ 
     }
 
     /**
-    * Returns a timestamp from an OLE container's date
-    * @param integer $string A binary string with the encoded date
-    * @return string The timestamp corresponding to the string
-    * @access public
-    * @static
-    */
+     * Returns a timestamp from an OLE container's date
+     * @param integer $string A binary string with the encoded date
+     * @return string The timestamp corresponding to the string
+     * @access public
+     * @static
+     */
     function OLE2LocalDate($string)
     {
         if (strlen($string) != 8) {

Switch Indentation +15 added lines, -15 removed lines

@@ -300,21 +300,21 @@
             $name = str_replace("\x00", "", $nameUtf16);
             $type = $this->_readInt1($fh);
             switch ($type) {
-            case OLE_PPS_TYPE_ROOT:
-                require_once 'OLE/PPS/Root.php';
-                $pps = new OLE_PPS_Root(null, null, array());
-                $this->root = $pps;
-                break;
-            case OLE_PPS_TYPE_DIR:
-                $pps = new OLE_PPS(null, null, null, null, null,
-                                   null, null, null, null, array());
-                break;
-            case OLE_PPS_TYPE_FILE:
-                require_once 'OLE/PPS/File.php';
-                $pps = new OLE_PPS_File($name);
-                break;
-            default:
-                continue;
+                case OLE_PPS_TYPE_ROOT:
+                    require_once 'OLE/PPS/Root.php';
+                    $pps = new OLE_PPS_Root(null, null, array());
+                    $this->root = $pps;
+                    break;
+                case OLE_PPS_TYPE_DIR:
+                    $pps = new OLE_PPS(null, null, null, null, null,
+                                       null, null, null, null, array());
+                    break;
+                case OLE_PPS_TYPE_FILE:
+                    require_once 'OLE/PPS/File.php';
+                    $pps = new OLE_PPS_File($name);
+                    break;
+                default:
+                    continue;
             }
             fseek($fh, 1, SEEK_CUR);
             $pps->Type    = $type;

Spacing +14 added lines, -14 removed lines

@@ -23,12 +23,12 @@ 
 /**
 * Constants for OLE package
 */
-define('OLE_PPS_TYPE_ROOT',        5);
-define('OLE_PPS_TYPE_DIR',         1);
-define('OLE_PPS_TYPE_FILE',        2);
+define('OLE_PPS_TYPE_ROOT', 5);
+define('OLE_PPS_TYPE_DIR', 1);
+define('OLE_PPS_TYPE_FILE', 2);
 define('OLE_DATA_SIZE_SMALL', 0x1000);
-define('OLE_LONG_INT_SIZE',        4);
-define('OLE_PPS_SIZE',          0x80);
+define('OLE_LONG_INT_SIZE', 4);
+define('OLE_PPS_SIZE', 0x80);
 
 /**
 * Array for storing OLE instances that are accessed from
@@ -183,7 +183,7 @@ 
         for ($i = 0; $i < $bbatBlockCount; $i++) {
             $pos = $this->_getBlockOffset($mbatBlocks[$i]);
             fseek($fh, $pos);
-            for ($j = 0 ; $j < $this->bigBlockSize / 4; $j++) {
+            for ($j = 0; $j < $this->bigBlockSize / 4; $j++) {
                 $this->bbat[] = $this->_readInt4($fh);
             }
         }
@@ -234,12 +234,12 @@ 
         $GLOBALS['_OLE_INSTANCES'][] = $this;
         $instanceId = end(array_keys($GLOBALS['_OLE_INSTANCES']));
 
-        $path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId;
+        $path = 'ole-chainedblockstream://oleInstanceId='.$instanceId;
         if (is_a($blockIdOrPps, 'OLE_PPS')) {
-            $path .= '&blockId=' . $blockIdOrPps->_StartBlock;
-            $path .= '&size=' . $blockIdOrPps->Size;
+            $path .= '&blockId='.$blockIdOrPps->_StartBlock;
+            $path .= '&size='.$blockIdOrPps->Size;
         } else {
-            $path .= '&blockId=' . $blockIdOrPps;
+            $path .= '&blockId='.$blockIdOrPps;
         }
         return fopen($path, 'r');
     }
@@ -472,7 +472,7 @@ 
     {
         $rawname = '';
         for ($i = 0; $i < strlen($ascii); $i++) {
-            $rawname .= $ascii{$i} . "\x00";
+            $rawname .= $ascii{$i}."\x00";
         }
         return $rawname;
     }
@@ -499,8 +499,8 @@ 
         $days = 134774;
         // calculate seconds
         $big_date = $days * 24 * 3600 +
-            gmmktime(date("H",$date),date("i",$date),date("s",$date),
-                     date("m",$date),date("d",$date),date("Y",$date));
+            gmmktime(date("H", $date), date("i", $date), date("s", $date),
+                     date("m", $date), date("d", $date), date("Y", $date));
         // multiply just to make MS happy
         $big_date *= 10000000;
 
@@ -538,7 +538,7 @@ 
         }
 
         // factor used for separating numbers into 4 bytes parts
-        $factor = pow(2,32);
+        $factor = pow(2, 32);
         $high_part = 0;
         for ($i = 0; $i < 4; $i++) {
             list(, $high_part) = unpack('C', $string{(7 - $i)});

main/inc/lib/pear/OLE/PPS/File.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     *
     * @access public
     * @param string $dir The dir to be used as temp dir
-    * @return true if given dir is valid, false otherwise
+    * @return boolean if given dir is valid, false otherwise
     */
     function setTempDir($dir)
     {

Indentation +25 added lines, -25 removed lines

@@ -30,18 +30,18 @@ 
 class OLE_PPS_File extends OLE_PPS
 {
     /**
-    * The temporary dir for storing the OLE file
-    * @var string
-    */
+     * The temporary dir for storing the OLE file
+     * @var string
+     */
     var $_tmp_dir;
 
     /**
-    * The constructor
-    *
-    * @access public
-    * @param string $name The name of the file (in Unicode)
-    * @see OLE::Asc2Ucs()
-    */
+     * The constructor
+     *
+     * @access public
+     * @param string $name The name of the file (in Unicode)
+     * @see OLE::Asc2Ucs()
+     */
     function OLE_PPS_File($name)
     {
         $this->_tmp_dir = '';
@@ -59,12 +59,12 @@ 
     }
 
     /**
-    * Sets the temp dir used for storing the OLE file
-    *
-    * @access public
-    * @param string $dir The dir to be used as temp dir
-    * @return true if given dir is valid, false otherwise
-    */
+     * Sets the temp dir used for storing the OLE file
+     *
+     * @access public
+     * @param string $dir The dir to be used as temp dir
+     * @return true if given dir is valid, false otherwise
+     */
     function setTempDir($dir)
     {
         if (is_dir($dir)) {
@@ -75,11 +75,11 @@ 
     }
 
     /**
-    * Initialization method. Has to be called right after OLE_PPS_File().
-    *
-    * @access public
-    * @return mixed true on success. PEAR_Error on failure
-    */
+     * Initialization method. Has to be called right after OLE_PPS_File().
+     *
+     * @access public
+     * @return mixed true on success. PEAR_Error on failure
+     */
     function init()
     {
         $this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_File");
@@ -96,11 +96,11 @@ 
     }
 
     /**
-    * Append data to PPS
-    *
-    * @access public
-    * @param string $data The data to append
-    */
+     * Append data to PPS
+     *
+     * @access public
+     * @param string $data The data to append
+     */
     function append($data)
     {
         if ($this->_PPS_FILE) {

main/inc/lib/pear/OLE/PPS/Root.php

Doc Comments +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     *
     * @access public
     * @param string $dir The dir to be used as temp dir
-    * @return true if given dir is valid, false otherwise
+    * @return boolean if given dir is valid, false otherwise
     */
     function setTempDir($dir)
     {
@@ -142,7 +142,7 @@ 
     *
     * @access private
     * @param array $raList Reference to an array of PPS's
-    * @return array The array of numbers
+    * @return double[] The array of numbers
     */
     function _calcSize(&$raList)
     {
@@ -180,7 +180,7 @@ 
     * @access private
     * @param integer $i2 The argument
     * @see save()
-    * @return integer
+    * @return double
     */
     function _adjust2($i2)
     {

Indentation +101 added lines, -101 removed lines

@@ -32,41 +32,41 @@ 
 class OLE_PPS_Root extends OLE_PPS
 {
     /**
-    * The temporary dir for storing the OLE file
-    * @var string
-    */
+     * The temporary dir for storing the OLE file
+     * @var string
+     */
     var $_tmp_dir;
 
     /**
-    * Constructor
-    *
-    * @access public
-    * @param integer $time_1st A timestamp
-    * @param integer $time_2nd A timestamp
-    */
+     * Constructor
+     *
+     * @access public
+     * @param integer $time_1st A timestamp
+     * @param integer $time_2nd A timestamp
+     */
     function OLE_PPS_Root($time_1st, $time_2nd, $raChild)
     {
         $this->_tmp_dir = '';
         $this->OLE_PPS(
-           null,
-           OLE::Asc2Ucs('Root Entry'),
-           OLE_PPS_TYPE_ROOT,
-           null,
-           null,
-           null,
-           $time_1st,
-           $time_2nd,
-           null,
-           $raChild);
+            null,
+            OLE::Asc2Ucs('Root Entry'),
+            OLE_PPS_TYPE_ROOT,
+            null,
+            null,
+            null,
+            $time_1st,
+            $time_2nd,
+            null,
+            $raChild);
     }
 
     /**
-    * Sets the temp dir used for storing the OLE file
-    *
-    * @access public
-    * @param string $dir The dir to be used as temp dir
-    * @return true if given dir is valid, false otherwise
-    */
+     * Sets the temp dir used for storing the OLE file
+     *
+     * @access public
+     * @param string $dir The dir to be used as temp dir
+     * @return true if given dir is valid, false otherwise
+     */
     function setTempDir($dir)
     {
         if (is_dir($dir)) {
@@ -77,21 +77,21 @@ 
     }
 
     /**
-    * Method for saving the whole OLE container (including files).
-    * In fact, if called with an empty argument (or '-'), it saves to a
-    * temporary file and then outputs it's contents to stdout.
-    *
-    * @param string $filename The name of the file where to save the OLE container
-    * @access public
-    * @return mixed true on success, PEAR_Error on failure
-    */
+     * Method for saving the whole OLE container (including files).
+     * In fact, if called with an empty argument (or '-'), it saves to a
+     * temporary file and then outputs it's contents to stdout.
+     *
+     * @param string $filename The name of the file where to save the OLE container
+     * @access public
+     * @return mixed true on success, PEAR_Error on failure
+     */
     function save($filename)
     {
         // Initial Setting for saving
         $this->_BIG_BLOCK_SIZE  = pow(2,
-                      ((isset($this->_BIG_BLOCK_SIZE))? $this->_adjust2($this->_BIG_BLOCK_SIZE)  : 9));
+                        ((isset($this->_BIG_BLOCK_SIZE))? $this->_adjust2($this->_BIG_BLOCK_SIZE)  : 9));
         $this->_SMALL_BLOCK_SIZE= pow(2,
-                      ((isset($this->_SMALL_BLOCK_SIZE))?  $this->_adjust2($this->_SMALL_BLOCK_SIZE): 6));
+                        ((isset($this->_SMALL_BLOCK_SIZE))?  $this->_adjust2($this->_SMALL_BLOCK_SIZE): 6));
 
         // Open temp file if we are sending output to stdout
         if (($filename == '-') || ($filename == '')) {
@@ -138,12 +138,12 @@ 
     }
 
     /**
-    * Calculate some numbers
-    *
-    * @access private
-    * @param array $raList Reference to an array of PPS's
-    * @return array The array of numbers
-    */
+     * Calculate some numbers
+     *
+     * @access private
+     * @param array $raList Reference to an array of PPS's
+     * @return array The array of numbers
+     */
     function _calcSize(&$raList)
     {
         // Calculate Basic Setting
@@ -175,13 +175,13 @@ 
     }
 
     /**
-    * Helper function for caculating a magic value for block sizes
-    *
-    * @access private
-    * @param integer $i2 The argument
-    * @see save()
-    * @return integer
-    */
+     * Helper function for caculating a magic value for block sizes
+     *
+     * @access private
+     * @param integer $i2 The argument
+     * @see save()
+     * @return integer
+     */
     function _adjust2($i2)
     {
         $iWk = log($i2)/log(2);
@@ -189,13 +189,13 @@ 
     }
 
     /**
-    * Save OLE header
-    *
-    * @access private
-    * @param integer $iSBDcnt
-    * @param integer $iBBcnt
-    * @param integer $iPPScnt
-    */
+     * Save OLE header
+     *
+     * @access private
+     * @param integer $iSBDcnt
+     * @param integer $iBBcnt
+     * @param integer $iPPScnt
+     */
     function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt)
     {
         $FILE = $this->_FILEH_;
@@ -225,32 +225,32 @@ 
 
         // Save Header
         fwrite($FILE,
-                  "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
-                  . "\x00\x00\x00\x00"
-                  . "\x00\x00\x00\x00"
-                  . "\x00\x00\x00\x00"
-                  . "\x00\x00\x00\x00"
-                  . pack("v", 0x3b)
-                  . pack("v", 0x03)
-                  . pack("v", -2)
-                  . pack("v", 9)
-                  . pack("v", 6)
-                  . pack("v", 0)
-                  . "\x00\x00\x00\x00"
-                  . "\x00\x00\x00\x00"
-                  . pack("V", $iBdCnt)
-                  . pack("V", $iBBcnt+$iSBDcnt) //ROOT START
-                  . pack("V", 0)
-                  . pack("V", 0x1000)
-                  . pack("V", 0)                  //Small Block Depot
-                  . pack("V", 1)
-          );
+                    "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
+                    . "\x00\x00\x00\x00"
+                    . "\x00\x00\x00\x00"
+                    . "\x00\x00\x00\x00"
+                    . "\x00\x00\x00\x00"
+                    . pack("v", 0x3b)
+                    . pack("v", 0x03)
+                    . pack("v", -2)
+                    . pack("v", 9)
+                    . pack("v", 6)
+                    . pack("v", 0)
+                    . "\x00\x00\x00\x00"
+                    . "\x00\x00\x00\x00"
+                    . pack("V", $iBdCnt)
+                    . pack("V", $iBBcnt+$iSBDcnt) //ROOT START
+                    . pack("V", 0)
+                    . pack("V", 0x1000)
+                    . pack("V", 0)                  //Small Block Depot
+                    . pack("V", 1)
+            );
         // Extra BDList Start, Count
         if ($iBdCnt < $i1stBdL) {
             fwrite($FILE,
-                      pack("V", -2).      // Extra BDList Start
-                      pack("V", 0)        // Extra BDList Count
-                  );
+                        pack("V", -2).      // Extra BDList Start
+                        pack("V", 0)        // Extra BDList Count
+                    );
         } else {
             fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL));
         }
@@ -267,12 +267,12 @@ 
     }
 
     /**
-    * Saving big data (PPS's with data bigger than OLE_DATA_SIZE_SMALL)
-    *
-    * @access private
-    * @param integer $iStBlk
-    * @param array &$raList Reference to array of PPS's
-    */
+     * Saving big data (PPS's with data bigger than OLE_DATA_SIZE_SMALL)
+     *
+     * @access private
+     * @param integer $iStBlk
+     * @param array &$raList Reference to array of PPS's
+     */
     function _saveBigData($iStBlk, &$raList)
     {
         $FILE = $this->_FILEH_;
@@ -318,11 +318,11 @@ 
     }
 
     /**
-    * get small data (PPS's with data smaller than OLE_DATA_SIZE_SMALL)
-    *
-    * @access private
-    * @param array &$raList Reference to array of PPS's
-    */
+     * get small data (PPS's with data smaller than OLE_DATA_SIZE_SMALL)
+     *
+     * @access private
+     * @param array &$raList Reference to array of PPS's
+     */
     function _makeSmallData(&$raList)
     {
         $sRes = '';
@@ -374,11 +374,11 @@ 
     }
 
     /**
-    * Saves all the PPS's WKs
-    *
-    * @access private
-    * @param array $raList Reference to an array with all PPS's
-    */
+     * Saves all the PPS's WKs
+     *
+     * @access private
+     * @param array $raList Reference to an array with all PPS's
+     */
     function _savePps(&$raList)
     {
         // Save each PPS WK
@@ -396,13 +396,13 @@ 
     }
 
     /**
-    * Saving Big Block Depot
-    *
-    * @access private
-    * @param integer $iSbdSize
-    * @param integer $iBsize
-    * @param integer $iPpsCnt
-    */
+     * Saving Big Block Depot
+     *
+     * @access private
+     * @param integer $iSbdSize
+     * @param integer $iBsize
+     * @param integer $iPpsCnt
+     */
     function _saveBbd($iSbdSize, $iBsize, $iPpsCnt)
     {
         $FILE = $this->_FILEH_;

Spacing +43 added lines, -43 removed lines

@@ -89,14 +89,14 @@ 
     {
         // Initial Setting for saving
         $this->_BIG_BLOCK_SIZE  = pow(2,
-                      ((isset($this->_BIG_BLOCK_SIZE))? $this->_adjust2($this->_BIG_BLOCK_SIZE)  : 9));
-        $this->_SMALL_BLOCK_SIZE= pow(2,
-                      ((isset($this->_SMALL_BLOCK_SIZE))?  $this->_adjust2($this->_SMALL_BLOCK_SIZE): 6));
+                      ((isset($this->_BIG_BLOCK_SIZE)) ? $this->_adjust2($this->_BIG_BLOCK_SIZE) : 9));
+        $this->_SMALL_BLOCK_SIZE = pow(2,
+                      ((isset($this->_SMALL_BLOCK_SIZE)) ? $this->_adjust2($this->_SMALL_BLOCK_SIZE) : 6));
 
         // Open temp file if we are sending output to stdout
         if (($filename == '-') || ($filename == '')) {
             $this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
-            $this->_FILEH_ = @fopen($this->_tmp_filename,"w+b");
+            $this->_FILEH_ = @fopen($this->_tmp_filename, "w+b");
             if ($this->_FILEH_ == false) {
                 return $this->raiseError("Can't create temporary file.");
             }
@@ -147,7 +147,7 @@ 
     function _calcSize(&$raList)
     {
         // Calculate Basic Setting
-        list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0,0,0);
+        list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0, 0, 0);
         $iSmallLen = 0;
         $iSBcnt = 0;
         for ($i = 0; $i < count($raList); $i++) {
@@ -155,21 +155,21 @@ 
                 $raList[$i]->Size = $raList[$i]->_DataLen();
                 if ($raList[$i]->Size < OLE_DATA_SIZE_SMALL) {
                     $iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
                 } else {
                     $iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-                        (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                        (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
                 }
             }
         }
         $iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
         $iSlCnt = floor($this->_BIG_BLOCK_SIZE / OLE_LONG_INT_SIZE);
-        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0);
-        $iBBcnt +=  (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
-                      (( $iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0));
+        $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt) ? 1 : 0);
+        $iBBcnt += (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
+                      (($iSmallLen % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
         $iCnt = count($raList);
         $iBdCnt = $this->_BIG_BLOCK_SIZE / OLE_PPS_SIZE;
-        $iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
+        $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt) ? 1 : 0));
 
         return array($iSBDcnt, $iBBcnt, $iPPScnt);
     }
@@ -184,8 +184,8 @@ 
     */
     function _adjust2($i2)
     {
-        $iWk = log($i2)/log(2);
-        return ($iWk > floor($iWk))? floor($iWk)+1:$iWk;
+        $iWk = log($i2) / log(2);
+        return ($iWk > floor($iWk)) ? floor($iWk) + 1 : $iWk;
     }
 
     /**
@@ -207,17 +207,17 @@ 
         $iBdExL = 0;
         $iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
         $iAllW = $iAll;
-        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
+        $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
 
         // Calculate BD count
         if ($iBdCnt > $i1stBdL) {
             while (1) {
                 $iBdExL++;
                 $iAllW++;
-                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
-                if ($iBdCnt <= ($iBdExL*$iBlCnt+ $i1stBdL)) {
+                $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
+                if ($iBdCnt <= ($iBdExL * $iBlCnt + $i1stBdL)) {
                     break;
                 }
             }
@@ -239,7 +239,7 @@ 
                   . "\x00\x00\x00\x00"
                   . "\x00\x00\x00\x00"
                   . pack("V", $iBdCnt)
-                  . pack("V", $iBBcnt+$iSBDcnt) //ROOT START
+                  . pack("V", $iBBcnt + $iSBDcnt) //ROOT START
                   . pack("V", 0)
                   . pack("V", 0x1000)
                   . pack("V", 0)                  //Small Block Depot
@@ -248,19 +248,19 @@ 
         // Extra BDList Start, Count
         if ($iBdCnt < $i1stBdL) {
             fwrite($FILE,
-                      pack("V", -2).      // Extra BDList Start
+                      pack("V", -2).// Extra BDList Start
                       pack("V", 0)        // Extra BDList Count
                   );
         } else {
-            fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL));
+            fwrite($FILE, pack("V", $iAll + $iBdCnt).pack("V", $iBdExL));
         }
 
         // BDList
         for ($i = 0; $i < $i1stBdL && $i < $iBdCnt; $i++) {
-            fwrite($FILE, pack("V", $iAll+$i));
+            fwrite($FILE, pack("V", $iAll + $i));
         }
         if ($i < $i1stBdL) {
-            for ($j = 0; $j < ($i1stBdL-$i); $j++) {
+            for ($j = 0; $j < ($i1stBdL - $i); $j++) {
                 fwrite($FILE, (pack("V", -1)));
             }
         }
@@ -288,7 +288,7 @@ 
                     if (isset($raList[$i]->_PPS_FILE)) {
                         $iLen = 0;
                         fseek($raList[$i]->_PPS_FILE, 0); // To The Top
-                        while($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
+                        while ($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
                             $iLen += strlen($sBuff);
                             fwrite($FILE, $sBuff);
                         }
@@ -305,7 +305,7 @@ 
                     $raList[$i]->_StartBlock = $iStBlk;
                     $iStBlk +=
                             (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-                                (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
+                                (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
                 }
                 // Close file for each PPS, and unlink it
                 if (isset($raList[$i]->_PPS_FILE)) {
@@ -337,10 +337,10 @@ 
                 }
                 if ($raList[$i]->Size < OLE_DATA_SIZE_SMALL) {
                     $iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
+                                  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
                     // Add to SBD
-                    for ($j = 0; $j < ($iSmbCnt-1); $j++) {
-                        fwrite($FILE, pack("V", $j+$iSmBlk+1));
+                    for ($j = 0; $j < ($iSmbCnt - 1); $j++) {
+                        fwrite($FILE, pack("V", $j + $iSmBlk + 1));
                     }
                     fwrite($FILE, pack("V", -2));
 
@@ -413,16 +413,16 @@ 
         $iBdExL = 0;
         $iAll = $iBsize + $iPpsCnt + $iSbdSize;
         $iAllW = $iAll;
-        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
+        $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+        $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
         // Calculate BD count
-        if ($iBdCnt >$i1stBdL) {
+        if ($iBdCnt > $i1stBdL) {
             while (1) {
                 $iBdExL++;
                 $iAllW++;
-                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
-                if ($iBdCnt <= ($iBdExL*$iBbCnt+ $i1stBdL)) {
+                $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
+                $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
+                if ($iBdCnt <= ($iBdExL * $iBbCnt + $i1stBdL)) {
                     break;
                 }
             }
@@ -432,19 +432,19 @@ 
         // Set for SBD
         if ($iSbdSize > 0) {
             for ($i = 0; $i < ($iSbdSize - 1); $i++) {
-                fwrite($FILE, pack("V", $i+1));
+                fwrite($FILE, pack("V", $i + 1));
             }
             fwrite($FILE, pack("V", -2));
         }
         // Set for B
         for ($i = 0; $i < ($iBsize - 1); $i++) {
-            fwrite($FILE, pack("V", $i+$iSbdSize+1));
+            fwrite($FILE, pack("V", $i + $iSbdSize + 1));
         }
         fwrite($FILE, pack("V", -2));
 
         // Set for PPS
         for ($i = 0; $i < ($iPpsCnt - 1); $i++) {
-            fwrite($FILE, pack("V", $i+$iSbdSize+$iBsize+1));
+            fwrite($FILE, pack("V", $i + $iSbdSize + $iBsize + 1));
         }
         fwrite($FILE, pack("V", -2));
         // Set for BBD itself ( 0xFFFFFFFD : BBD)
@@ -463,17 +463,17 @@ 
         }
         // Extra BDList
         if ($iBdCnt > $i1stBdL) {
-            $iN=0;
-            $iNb=0;
-            for ($i = $i1stBdL;$i < $iBdCnt; $i++, $iN++) {
+            $iN = 0;
+            $iNb = 0;
+            for ($i = $i1stBdL; $i < $iBdCnt; $i++, $iN++) {
                 if ($iN >= ($iBbCnt - 1)) {
                     $iN = 0;
                     $iNb++;
-                    fwrite($FILE, pack("V", $iAll+$iBdCnt+$iNb));
+                    fwrite($FILE, pack("V", $iAll + $iBdCnt + $iNb));
                 }
-                fwrite($FILE, pack("V", $iBsize+$iSbdSize+$iPpsCnt+$i));
+                fwrite($FILE, pack("V", $iBsize + $iSbdSize + $iPpsCnt + $i));
             }
-            if (($iBdCnt-$i1stBdL) % ($iBbCnt-1)) {
+            if (($iBdCnt - $i1stBdL) % ($iBbCnt - 1)) {
                 for ($i = 0; $i < (($iBbCnt - 1) - (($iBdCnt - $i1stBdL) % ($iBbCnt - 1))); $i++) {
                     fwrite($FILE, pack("V", -1));
                 }

main/inc/lib/pear/Pager/Common.php

Doc Comments +8 added lines, -8 removed lines

@@ -592,7 +592,7 @@ 
      *
      * @param integer $index Offset to get pageID for
      *
-     * @return integer PageID for given offset
+     * @return PEAR_Error PageID for given offset
      * @access public
      */
     function getPageIdByOffset($index)
@@ -612,7 +612,7 @@ 
      *
      * @param integer $pageID PageID to get offsets for
      *
-     * @return array  First and last offsets
+     * @return integer[]  First and last offsets
      * @access public
      */
     function getOffsetByPageId($pageID = null)
@@ -639,7 +639,7 @@ 
      *
      * @param integer $pageID PageID to get offsets for
      *
-     * @return array First and last offsets
+     * @return PEAR_Error First and last offsets
      * @access public
      */
     function getPageRangeByPageId($pageID = null)
@@ -668,7 +668,7 @@ 
      * @param string  $next_html HTML to put inside the next link
      *                           [deprecated: use the factory instead]
      *
-     * @return array back/next/first/last and page links
+     * @return PEAR_Error back/next/first/last and page links
      * @access public
      */
     function getLinks($pageID=null, $next_html='')
@@ -698,7 +698,7 @@ 
      * Returns next page ID. If current page is last page
      * this function returns FALSE
      *
-     * @return mixed Next page ID or false
+     * @return integer Next page ID or false
      * @access public
      */
     function getNextPageID()
@@ -713,7 +713,7 @@ 
      * Returns previous page ID. If current page is first page
      * this function returns FALSE
      *
-     * @return mixed Previous page ID or false
+     * @return integer Previous page ID or false
      * @access public
      */
     function getPreviousPageID()
@@ -994,7 +994,7 @@ 
      *
      * @param string $string the pattern to check
      *
-     * @return boolean
+     * @return integer
      * @access private
      */
     function _isRegexp($string) {
@@ -1136,7 +1136,7 @@ 
      *
      * @param string $url URL to use in the link [deprecated: use the factory instead]
      *
-     * @return string Links
+     * @return PEAR_Error Links
      * @access private
      */
     function _getPageLinks($url='')

Spacing +81 added lines, -81 removed lines

@@ -61,12 +61,12 @@ 
 /**
  * Error codes
  */
-define('PAGER_OK',                         0);
-define('ERROR_PAGER',                     -1);
-define('ERROR_PAGER_INVALID',             -2);
+define('PAGER_OK', 0);
+define('ERROR_PAGER', -1);
+define('ERROR_PAGER_INVALID', -2);
 define('ERROR_PAGER_INVALID_PLACEHOLDER', -3);
-define('ERROR_PAGER_INVALID_USAGE',       -4);
-define('ERROR_PAGER_NOT_IMPLEMENTED',     -5);
+define('ERROR_PAGER_INVALID_USAGE', -4);
+define('ERROR_PAGER_NOT_IMPLEMENTED', -5);
 
 /**
  * Pager_Common - Common base class for [Sliding|Jumping] Window Pager
@@ -94,13 +94,13 @@ 
      * @var integer number of items per page
      * @access private
      */
-    var $_perPage     = 10;
+    var $_perPage = 10;
 
     /**
      * @var integer number of page links for each window
      * @access private
      */
-    var $_delta       = 10;
+    var $_delta = 10;
 
     /**
      * @var integer current page number
@@ -112,13 +112,13 @@ 
      * @var integer total pages number
      * @access private
      */
-    var $_totalPages  = 1;
+    var $_totalPages = 1;
 
     /**
      * @var string CSS class for links
      * @access private
      */
-    var $_linkClass   = '';
+    var $_linkClass = '';
 
     /**
      * @var string wrapper for CSS class name
@@ -130,13 +130,13 @@ 
      * @var string path name
      * @access private
      */
-    var $_path        = PAGER_CURRENT_PATHNAME;
+    var $_path = PAGER_CURRENT_PATHNAME;
 
     /**
      * @var string file name
      * @access private
      */
-    var $_fileName    = PAGER_CURRENT_FILENAME;
+    var $_fileName = PAGER_CURRENT_FILENAME;
 
     /**
      * @var boolean If false, don't override the fileName option. Use at your own risk.
@@ -148,19 +148,19 @@ 
      * @var boolean you have to use FALSE with mod_rewrite
      * @access private
      */
-    var $_append      = true;
+    var $_append = true;
 
     /**
      * @var string specifies which HTTP method to use
      * @access private
      */
-    var $_httpMethod  = 'GET';
+    var $_httpMethod = 'GET';
 
     /**
      * @var string specifies which HTML form to use
      * @access private
      */
-    var $_formID      = '';
+    var $_formID = '';
 
     /**
      * @var boolean whether or not to import submitted data
@@ -172,19 +172,19 @@ 
      * @var string name of the querystring var for pageID
      * @access private
      */
-    var $_urlVar      = 'pageID';
+    var $_urlVar = 'pageID';
 
     /**
      * @var array data to pass through the link
      * @access private
      */
-    var $_linkData    = array();
+    var $_linkData = array();
 
     /**
      * @var array additional URL vars
      * @access private
      */
-    var $_extraVars   = array();
+    var $_extraVars = array();
 
     /**
      * @var array URL vars to ignore
@@ -196,19 +196,19 @@ 
      * @var boolean TRUE => expanded mode (for Pager_Sliding)
      * @access private
      */
-    var $_expanded    = true;
+    var $_expanded = true;
 
     /**
      * @var boolean TRUE => show accesskey attribute on <a> tags
      * @access private
      */
-    var $_accesskey   = false;
+    var $_accesskey = false;
 
     /**
      * @var string extra attributes for the <a> tag
      * @access private
      */
-    var $_attributes  = '';
+    var $_attributes = '';
 
     /**
      * @var string onclick
@@ -220,37 +220,37 @@ 
      * @var string alt text for "first page" (use "%d" placeholder for page number)
      * @access private
      */
-    var $_altFirst     = 'first page';
+    var $_altFirst = 'first page';
 
     /**
      * @var string alt text for "previous page"
      * @access private
      */
-    var $_altPrev     = 'previous page';
+    var $_altPrev = 'previous page';
 
     /**
      * @var string alt text for "next page"
      * @access private
      */
-    var $_altNext     = 'next page';
+    var $_altNext = 'next page';
 
     /**
      * @var string alt text for "last page" (use "%d" placeholder for page number)
      * @access private
      */
-    var $_altLast     = 'last page';
+    var $_altLast = 'last page';
 
     /**
      * @var string alt text for "page" (use optional "%d" placeholder for page number)
      * @access private
      */
-    var $_altPage     = 'page';
+    var $_altPage = 'page';
 
     /**
      * @var string image/text to use as "prev" link
      * @access private
      */
-    var $_prevImg     = '&lt;&lt; Back';
+    var $_prevImg = '&lt;&lt; Back';
 
     /**
      * image/text to use as "prev" link when no prev link is needed  (e.g. on the first page)
@@ -265,7 +265,7 @@ 
      * @var string image/text to use as "next" link
      * @access private
      */
-    var $_nextImg     = 'Next &gt;&gt;';
+    var $_nextImg = 'Next &gt;&gt;';
 
     /**
      * image/text to use as "next" link when
@@ -281,7 +281,7 @@ 
      * @var string link separator
      * @access private
      */
-    var $_separator   = '';
+    var $_separator = '';
 
     /**
      * @var integer number of spaces before separator
@@ -293,31 +293,31 @@ 
      * @var integer number of spaces after separator
      * @access private
      */
-    var $_spacesAfterSeparator  = 1;
+    var $_spacesAfterSeparator = 1;
 
     /**
      * @var string CSS class name for current page link
      * @access private
      */
-    var $_curPageLinkClassName  = '';
+    var $_curPageLinkClassName = '';
 
     /**
      * @var string Text before current page link
      * @access private
      */
-    var $_curPageSpanPre        = '';
+    var $_curPageSpanPre = '';
 
     /**
      * @var string Text after current page link
      * @access private
      */
-    var $_curPageSpanPost       = '';
+    var $_curPageSpanPost = '';
 
     /**
      * @var string Text before first page link
      * @access private
      */
-    var $_firstPagePre  = '[';
+    var $_firstPagePre = '[';
 
     /**
      * @var string Text to be used for first page link
@@ -335,31 +335,31 @@ 
      * @var string Text before last page link
      * @access private
      */
-    var $_lastPagePre   = '[';
+    var $_lastPagePre = '[';
 
     /**
      * @var string Text to be used for last page link
      * @access private
      */
-    var $_lastPageText  = '';
+    var $_lastPageText = '';
 
     /**
      * @var string Text after last page link
      * @access private
      */
-    var $_lastPagePost  = ']';
+    var $_lastPagePost = ']';
 
     /**
      * @var string Will contain the HTML code for the spaces
      * @access private
      */
-    var $_spacesBefore  = '';
+    var $_spacesBefore = '';
 
     /**
      * @var string Will contain the HTML code for the spaces
      * @access private
      */
-    var $_spacesAfter   = '';
+    var $_spacesAfter = '';
 
     /**
      * @var string String used as title in <link rel="first"> tag
@@ -389,37 +389,37 @@ 
      * @var string Text to be used for the 'show all' option in the select box
      * @access private
      */
-    var $_showAllText   = '';
+    var $_showAllText = '';
 
     /**
      * @var array data to be paged
      * @access private
      */
-    var $_itemData      = null;
+    var $_itemData = null;
 
     /**
      * @var boolean If TRUE and there's only one page, links aren't shown
      * @access private
      */
-    var $_clearIfVoid   = true;
+    var $_clearIfVoid = true;
 
     /**
      * @var boolean Use session for storing the number of items per page
      * @access private
      */
-    var $_useSessions   = false;
+    var $_useSessions = false;
 
     /**
      * @var boolean Close the session when finished reading/writing data
      * @access private
      */
-    var $_closeSession  = false;
+    var $_closeSession = false;
 
     /**
      * @var string name of the session var for number of items per page
      * @access private
      */
-    var $_sessionVar    = 'setPerPage';
+    var $_sessionVar = 'setPerPage';
 
     /**
      * Pear error mode (when raiseError is called)
@@ -671,7 +671,7 @@ 
      * @return array back/next/first/last and page links
      * @access public
      */
-    function getLinks($pageID=null, $next_html='')
+    function getLinks($pageID = null, $next_html = '')
     {
         $msg = 'function "getLinks()" not implemented.';
         return $this->raiseError($msg, ERROR_PAGER_NOT_IMPLEMENTED);
@@ -746,7 +746,7 @@ 
      */
     function numPages()
     {
-        return (int)$this->_totalPages;
+        return (int) $this->_totalPages;
     }
 
     // }}}
@@ -806,7 +806,7 @@ 
         if (!is_null($this->_itemData)) {
             $this->_totalItems = count($this->_itemData);
         }
-        $this->_totalPages = ceil((float)$this->_totalItems / (float)$this->_perPage);
+        $this->_totalPages = ceil((float) $this->_totalItems / (float) $this->_perPage);
         $i = 1;
         if (!empty($this->_itemData)) {
             foreach ($this->_itemData as $key => $value) {
@@ -839,7 +839,7 @@ 
     {
         if ($this->_httpMethod == 'GET') {
             if ($this->_append) {
-                $href = '?' . $this->_http_build_query_wrapper($this->_linkData);
+                $href = '?'.$this->_http_build_query_wrapper($this->_linkData);
             } else {
                 $href = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_fileName);
             }
@@ -850,25 +850,25 @@ 
             return sprintf('<a href="%s"%s%s%s%s title="%s">%s</a>',
                            // Modified by Ivan Tcholakov, 17-OCT-2008.
                            //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'),
-                           api_htmlentities($this->_url . $href),
+                           api_htmlentities($this->_url.$href),
                            //
                            empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
-                           empty($onclick)            ? '' : ' onclick="'.$onclick.'"',
+                           empty($this->_attributes) ? '' : ' '.$this->_attributes,
+                           empty($this->_accesskey) ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
+                           empty($onclick) ? '' : ' onclick="'.$onclick.'"',
                            $altText,
                            $linkText
             );
         } elseif ($this->_httpMethod == 'POST') {
             $href = $this->_url;
             if (!empty($_GET)) {
-                $href .= '?' . $this->_http_build_query_wrapper($_GET);
+                $href .= '?'.$this->_http_build_query_wrapper($_GET);
             }
             return sprintf("<a href='javascript:void(0)' onclick='%s'%s%s%s title='%s'>%s</a>",
                            $this->_generateFormOnClick($href, $this->_linkData),
                            empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
+                           empty($this->_attributes) ? '' : ' '.$this->_attributes,
+                           empty($this->_accesskey) ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
                            $altText,
                            $linkText
             );
@@ -956,7 +956,7 @@ 
         $str = '';
         if (is_array($data) || is_object($data)) {
             // foreach key/visible member
-            foreach ((array)$data as $key => $val) {
+            foreach ((array) $data as $key => $val) {
                 // append [$key] to prev
                 $tempKey = sprintf('%s[%s]', $prev, $key);
                 $str .= $this->_generateFormOnClickHelper($val, $tempKey);
@@ -1106,7 +1106,7 @@ 
      * @return string The link
      * @access private
      */
-    function _getBackLink($url='', $link='')
+    function _getBackLink($url = '', $link = '')
     {
         //legacy settings... the preferred way to set an option
         //now is passing it to the factory
@@ -1120,10 +1120,10 @@ 
         if ($this->_currentPage > 1) {
             $this->_linkData[$this->_urlVar] = $this->getPreviousPageID();
             $back = $this->_renderLink($this->_altPrev, $this->_prevImg)
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                  . $this->_spacesBefore.$this->_spacesAfter;
         } else if ($this->_prevImgEmpty !== null && $this->_totalPages > 1) {
             $back = $this->_prevImgEmpty
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                  . $this->_spacesBefore.$this->_spacesAfter;
         }
         return $back;
     }
@@ -1139,7 +1139,7 @@ 
      * @return string Links
      * @access private
      */
-    function _getPageLinks($url='')
+    function _getPageLinks($url = '')
     {
         $msg = 'function "_getPageLinks()" not implemented.';
         return $this->raiseError($msg, ERROR_PAGER_NOT_IMPLEMENTED);
@@ -1157,7 +1157,7 @@ 
      * @return string The link
      * @access private
      */
-    function _getNextLink($url='', $link='')
+    function _getNextLink($url = '', $link = '')
     {
         //legacy settings... the preferred way to set an option
         //now is passing it to the factory
@@ -1172,11 +1172,11 @@ 
             $this->_linkData[$this->_urlVar] = $this->getNextPageID();
             $next = $this->_spacesAfter
                   . $this->_renderLink($this->_altNext, $this->_nextImg)
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                  . $this->_spacesBefore.$this->_spacesAfter;
         } else if ($this->_nextImgEmpty !== null && $this->_totalPages > 1) {
             $next = $this->_spacesAfter
                   . $this->_nextImgEmpty
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                  . $this->_spacesBefore.$this->_spacesAfter;
         }
         return $next;
     }
@@ -1308,13 +1308,13 @@ 
     {
         $this->_linkData[$this->_urlVar] = $pageID;
         if ($this->_append) {
-            $href = '?' . $this->_http_build_query_wrapper($this->_linkData);
+            $href = '?'.$this->_http_build_query_wrapper($this->_linkData);
         } else {
             $href = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_fileName);
         }
         // Modified by Ivan Tcholakov, 17-OCT-2008.
         //return htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8');
-        return api_htmlentities($this->_url . $href);
+        return api_htmlentities($this->_url.$href);
         //
     }
 
@@ -1342,7 +1342,7 @@ 
      * @return string xhtml select box
      * @access public
      */
-    function getPerPageSelectBox($start=5, $end=30, $step=5, $showAllData=false, $extraParams=array())
+    function getPerPageSelectBox($start = 5, $end = 30, $step = 5, $showAllData = false, $extraParams = array())
     {
         include_once 'Pager/HtmlWidgets.php';
         $widget = new Pager_HtmlWidgets($this);
@@ -1393,8 +1393,8 @@ 
         $this->_linkData[$this->_urlVar] = 1;
         return $this->_renderLink(
                 str_replace('%d', 1, $this->_altFirst),
-                $this->_firstPagePre . $this->_firstPageText . $this->_firstPagePost
-        ) . $this->_spacesBefore . $this->_spacesAfter;
+                $this->_firstPagePre.$this->_firstPageText.$this->_firstPagePost
+        ).$this->_spacesBefore.$this->_spacesAfter;
     }
 
     // }}}
@@ -1415,7 +1415,7 @@ 
         $this->_linkData[$this->_urlVar] = $this->_totalPages;
         return $this->_renderLink(
                 str_replace('%d', $this->_totalPages, $this->_altLast),
-                $this->_lastPagePre . $this->_lastPageText . $this->_lastPagePost
+                $this->_lastPagePre.$this->_lastPageText.$this->_lastPagePost
         );
     }
 
@@ -1455,7 +1455,7 @@ 
      */
     function _http_build_query_wrapper($data)
     {
-        $data = (array)$data;
+        $data = (array) $data;
         if (empty($data)) {
             return '';
         }
@@ -1463,12 +1463,12 @@ 
         if ($separator == '&amp;') {
             $separator = '&'; //the string is escaped by htmlentities anyway...
         }
-        $tmp = array ();
+        $tmp = array();
         foreach ($data as $key => $val) {
             if (is_scalar($val)) {
                 //array_push($tmp, $key.'='.$val);
                 $val = urlencode($val);
-                array_push($tmp, $key .'='. str_replace('%2F', '/', $val));
+                array_push($tmp, $key.'='.str_replace('%2F', '/', $val));
                 continue;
             }
             // If the value is an array, recursively parse it
@@ -1494,7 +1494,7 @@ 
      */
     function __http_build_query($array, $name)
     {
-        $tmp = array ();
+        $tmp = array();
         $separator = ini_get('arg_separator.output');
         if ($separator == '&amp;') {
             $separator = '&'; //the string is escaped by htmlentities anyway...
@@ -1569,7 +1569,7 @@ 
     {
         foreach ($options as $key => $value) {
             if (in_array($key, $this->_allowed_options) && (!is_null($value))) {
-                $this->{'_' . $key} = $value;
+                $this->{'_'.$key} = $value;
             }
         }
 
@@ -1584,7 +1584,7 @@ 
         }
 
         if (substr($this->_path, -1, 1) == '/') {
-            $this->_fileName = ltrim($this->_fileName, '/');  //strip leading slash
+            $this->_fileName = ltrim($this->_fileName, '/'); //strip leading slash
         }
 
         if ($this->_append) {
@@ -1615,8 +1615,8 @@ 
         }
 
         if (strlen($this->_curPageLinkClassName)) {
-            $this->_curPageSpanPre  .= '<span class="'.$this->_curPageLinkClassName.'">';
-            $this->_curPageSpanPost = '</span>' . $this->_curPageSpanPost;
+            $this->_curPageSpanPre .= '<span class="'.$this->_curPageLinkClassName.'">';
+            $this->_curPageSpanPost = '</span>'.$this->_curPageSpanPost;
         }
 
         $this->_perPage = max($this->_perPage, 1); //avoid possible user errors
@@ -1625,7 +1625,7 @@ 
             session_start();
         }
         if (!empty($_REQUEST[$this->_sessionVar])) {
-            $this->_perPage = max(1, (int)$_REQUEST[$this->_sessionVar]);
+            $this->_perPage = max(1, (int) $_REQUEST[$this->_sessionVar]);
             if ($this->_useSessions) {
                 $_SESSION[$this->_sessionVar] = $this->_perPage;
             }
@@ -1647,7 +1647,7 @@ 
         //
 
         if (isset($_REQUEST[$this->_urlVar]) && empty($options['currentPage'])) {
-            $this->_currentPage = (int)$_REQUEST[$this->_urlVar];
+            $this->_currentPage = (int) $_REQUEST[$this->_urlVar];
         }
         $this->_currentPage = max($this->_currentPage, 1);
         $this->_linkData = $this->_getLinksData();
@@ -1672,7 +1672,7 @@ 
             $msg = 'invalid option: '.$name;
             return $this->raiseError($msg, ERROR_PAGER_INVALID);
         }
-        return $this->{'_' . $name};
+        return $this->{'_'.$name};
     }
 
     // }}}
@@ -1688,7 +1688,7 @@ 
     {
         $options = array();
         foreach ($this->_allowed_options as $option) {
-            $options[$option] = $this->{'_' . $option};
+            $options[$option] = $this->{'_'.$option};
         }
         return $options;
     }

Indentation +25 added lines, -25 removed lines

@@ -626,7 +626,7 @@ 
             return array(
                         max(($this->_perPage * ($pageID - 1)) + 1, 1),
                         min($this->_totalItems, $this->_perPage * $pageID)
-                   );
+                    );
         }
         return array(0, 0);
     }
@@ -848,16 +848,16 @@ 
                 $onclick = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_onclick);
             }
             return sprintf('<a href="%s"%s%s%s%s title="%s">%s</a>',
-                           // Modified by Ivan Tcholakov, 17-OCT-2008.
-                           //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'),
-                           api_htmlentities($this->_url . $href),
-                           //
-                           empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
-                           empty($onclick)            ? '' : ' onclick="'.$onclick.'"',
-                           $altText,
-                           $linkText
+                            // Modified by Ivan Tcholakov, 17-OCT-2008.
+                            //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'),
+                            api_htmlentities($this->_url . $href),
+                            //
+                            empty($this->_classString) ? '' : ' '.$this->_classString,
+                            empty($this->_attributes)  ? '' : ' '.$this->_attributes,
+                            empty($this->_accesskey)   ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
+                            empty($onclick)            ? '' : ' onclick="'.$onclick.'"',
+                            $altText,
+                            $linkText
             );
         } elseif ($this->_httpMethod == 'POST') {
             $href = $this->_url;
@@ -865,12 +865,12 @@ 
                 $href .= '?' . $this->_http_build_query_wrapper($_GET);
             }
             return sprintf("<a href='javascript:void(0)' onclick='%s'%s%s%s title='%s'>%s</a>",
-                           $this->_generateFormOnClick($href, $this->_linkData),
-                           empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
-                           $altText,
-                           $linkText
+                            $this->_generateFormOnClick($href, $this->_linkData),
+                            empty($this->_classString) ? '' : ' '.$this->_classString,
+                            empty($this->_attributes)  ? '' : ' '.$this->_attributes,
+                            empty($this->_accesskey)   ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
+                            $altText,
+                            $linkText
             );
         }
         return '';
@@ -1120,10 +1120,10 @@ 
         if ($this->_currentPage > 1) {
             $this->_linkData[$this->_urlVar] = $this->getPreviousPageID();
             $back = $this->_renderLink($this->_altPrev, $this->_prevImg)
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_spacesBefore . $this->_spacesAfter;
         } else if ($this->_prevImgEmpty !== null && $this->_totalPages > 1) {
             $back = $this->_prevImgEmpty
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_spacesBefore . $this->_spacesAfter;
         }
         return $back;
     }
@@ -1171,12 +1171,12 @@ 
         if ($this->_currentPage < $this->_totalPages) {
             $this->_linkData[$this->_urlVar] = $this->getNextPageID();
             $next = $this->_spacesAfter
-                  . $this->_renderLink($this->_altNext, $this->_nextImg)
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_renderLink($this->_altNext, $this->_nextImg)
+                    . $this->_spacesBefore . $this->_spacesAfter;
         } else if ($this->_nextImgEmpty !== null && $this->_totalPages > 1) {
             $next = $this->_spacesAfter
-                  . $this->_nextImgEmpty
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_nextImgEmpty
+                    . $this->_spacesBefore . $this->_spacesAfter;
         }
         return $next;
     }
@@ -1632,7 +1632,7 @@ 
         }
 
         if (!empty($_SESSION[$this->_sessionVar]) && $this->_useSessions) {
-             $this->_perPage = $_SESSION[$this->_sessionVar];
+                $this->_perPage = $_SESSION[$this->_sessionVar];
         }
 
         if ($this->_closeSession) {
@@ -1713,7 +1713,7 @@ 
                 ERROR_PAGER_INVALID             => 'invalid',
                 ERROR_PAGER_INVALID_PLACEHOLDER => 'invalid format - use "%d" as placeholder.',
                 ERROR_PAGER_INVALID_USAGE       => 'if $options[\'append\'] is set to false, '
-                                                  .' $options[\'fileName\'] MUST contain the "%d" placeholder.',
+                                                    .' $options[\'fileName\'] MUST contain the "%d" placeholder.',
                 ERROR_PAGER_NOT_IMPLEMENTED     => 'not implemented'
             );
         }