chamilo / chamilo-lms

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'
             );
         }

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

Doc Comments +2 added lines, -1 removed lines

@@ -55,7 +55,8 @@
     /**

      * Constructor

      *

-     * @param object &$pager Pager instance

+     * @param object &$pager Pager instance
+     * @param Pager_Common $pager

      */

     function Pager_HtmlWidgets(&$pager)
     {

Indentation +8 added lines, -8 removed lines

@@ -153,12 +153,12 @@ 
                     $href = htmlentities($this->pager->_url . str_replace('%d', $selector, $this->pager->_fileName), ENT_COMPAT, 'UTF-8');

                 }

                 $tmp .= ' onchange="document.location.href=\''

-                     . $href .'\''

-                     . '"';

+                        . $href .'\''

+                        . '"';

             } elseif ($this->pager->_httpMethod == 'POST') {

                 $tmp .= " onchange='"

-                     . $this->pager->_generateFormOnClick($this->pager->_url, $this->pager->_linkData)

-                     . "'";

+                        . $this->pager->_generateFormOnClick($this->pager->_url, $this->pager->_linkData)

+                        . "'";

                 $tmp = preg_replace(

                     '/(input\.name = \"'.$this->pager->_sessionVar.'\"; input\.value =) \"(\d+)\";/',

                     '\\1 this.options[this.selectedIndex].value;',

@@ -259,12 +259,12 @@ 
                     //
                 }
                 $tmp .= ' onchange="javascript: document.location.href=\''
-                     . $href .'\''
-                     . '"';
+                        . $href .'\''
+                        . '"';
             } elseif ($this->pager->_httpMethod == 'POST') {
                 $tmp .= " onchange='"
-                     . $this->pager->_generateFormOnClick($this->pager->_url, $this->pager->_linkData)
-                     . "'";
+                        . $this->pager->_generateFormOnClick($this->pager->_url, $this->pager->_linkData)
+                        . "'";
                 $tmp = preg_replace(
                     '/(input\.name = \"'.$this->pager->_urlVar.'\"; input\.value =) \"(\d+)\";/',
                     '\\1 this.options[this.selectedIndex].value;',

Spacing +16 added lines, -16 removed lines

@@ -59,7 +59,7 @@ 
      */

     function Pager_HtmlWidgets(&$pager)
     {
-        $this->pager =& $pager;
+        $this->pager = & $pager;
     }
 
     // }}}
@@ -90,7 +90,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())
     {
         // FIXME: needs POST support
         $optionText = '%d';
@@ -117,11 +117,11 @@ 
                 ERROR_PAGER_INVALID_PLACEHOLDER
             );
         }
-        $start = (int)$start;
-        $end   = (int)$end;
-        $step  = (int)$step;
+        $start = (int) $start;
+        $end   = (int) $end;
+        $step  = (int) $step;
         if (!empty($_SESSION[$this->pager->_sessionVar])) {
-            $selected = (int)$_SESSION[$this->pager->_sessionVar];
+            $selected = (int) $_SESSION[$this->pager->_sessionVar];
         } else {
             $selected = $this->pager->_perPage;
         }
@@ -143,17 +143,17 @@ 
                         $tmpLinkData[$this->pager->_urlVar] = $this->pager->getCurrentPageID();

                     }

                     $tmpLinkData[$this->pager->_sessionVar] = '1';

-                    $href = '?' . $this->pager->_http_build_query_wrapper($tmpLinkData);

-                    $href = htmlentities($this->pager->_url, ENT_COMPAT, 'UTF-8'). preg_replace(

+                    $href = '?'.$this->pager->_http_build_query_wrapper($tmpLinkData);

+                    $href = htmlentities($this->pager->_url, ENT_COMPAT, 'UTF-8').preg_replace(

                         '/(&|&|\?)('.$this->pager->_sessionVar.'=)(\d+)/',

                         '\\1\\2'.$selector,

                         htmlentities($href, ENT_COMPAT, 'UTF-8')

                     );

                 } else {

-                    $href = htmlentities($this->pager->_url . str_replace('%d', $selector, $this->pager->_fileName), ENT_COMPAT, 'UTF-8');

+                    $href = htmlentities($this->pager->_url.str_replace('%d', $selector, $this->pager->_fileName), ENT_COMPAT, 'UTF-8');

                 }

                 $tmp .= ' onchange="document.location.href=\''

-                     . $href .'\''

+                     . $href.'\''

                      . '"';

             } elseif ($this->pager->_httpMethod == 'POST') {

                 $tmp .= " onchange='"

@@ -170,7 +170,7 @@ 
 

         $tmp .= '>';
         $last = $start;

-        for ($i=$start; $i<=$end; $i+=$step) {
+        for ($i = $start; $i <= $end; $i += $step) {
             $last = $i;

             $tmp .= '<option value="'.$i.'"';
             if ($i == $selected) {
@@ -240,13 +240,13 @@ 
             if ($this->pager->_httpMethod == 'GET') {
                 $selector = '\' + '.'this.options[this.selectedIndex].value + \'';
                 if ($this->pager->_append) {
-                    $href = '?' . $this->pager->_http_build_query_wrapper($this->pager->_linkData);
+                    $href = '?'.$this->pager->_http_build_query_wrapper($this->pager->_linkData);
                     // Modified by Ivan Tcholakov, 17-OCT-2008.
                     //$href = htmlentities($this->pager->_url, ENT_COMPAT, 'UTF-8'). preg_replace(
                     //    '/(&|&amp;|\?)('.$this->pager->_urlVar.'=)(\d+)/',
                     //    '\\1\\2'.$selector,
                     //    htmlentities($href, ENT_COMPAT, 'UTF-8')
-                    $href = api_htmlentities($this->pager->_url). preg_replace(
+                    $href = api_htmlentities($this->pager->_url).preg_replace(
                         '/(&|&amp;|\?)('.$this->pager->_urlVar.'=)(\d+)/',
                         '\\1\\2'.$selector,
                         api_htmlentities($href)
@@ -255,11 +255,11 @@ 
                 } else {
                     // Modified by Ivan Tcholakov, 17-OCT-2008.
                     //$href = htmlentities($this->pager->_url . str_replace('%d', $selector, $this->pager->_fileName), ENT_COMPAT, 'UTF-8');
-                    $href = api_htmlentities($this->pager->_url . str_replace('%d', $selector, $this->pager->_fileName));
+                    $href = api_htmlentities($this->pager->_url.str_replace('%d', $selector, $this->pager->_fileName));
                     //
                 }
                 $tmp .= ' onchange="javascript: document.location.href=\''
-                     . $href .'\''
+                     . $href.'\''
                      . '"';
             } elseif ($this->pager->_httpMethod == 'POST') {
                 $tmp .= " onchange='"
@@ -276,7 +276,7 @@ 
         $start = 1;
         $end   = $this->pager->numPages();

         $selected = $this->pager->getCurrentPageID();
-        for ($i=$start; $i<=$end; $i++) {
+        for ($i = $start; $i <= $end; $i++) {
             $tmp .= '<option value="'.$i.'"';
             if ($i == $selected) {
                 $tmp .= ' selected="selected"';

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

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
      *
      * @param integer $pageid PageID to get offsets for
      *
-     * @return array  First and last offsets
+     * @return integer[]  First and last offsets
      * @access public
      */
     function getPageRangeByPageId($pageid = null)

Indentation +5 added lines, -5 removed lines

@@ -234,8 +234,8 @@ 
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i)
-                           . $this->_spacesBefore
-                           . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
+                            . $this->_spacesBefore
+                            . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
                 }
             }
 
@@ -268,8 +268,8 @@ 
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i)
-                      . $this->_spacesBefore
-                      . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
+                        . $this->_spacesBefore
+                        . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
                 }
             }
 
@@ -285,7 +285,7 @@ 
                     $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
                 }
                 $links .= $this->_spacesBefore
-                       . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
+                        . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
             }
         }
         return $links;

Spacing +7 added lines, -7 removed lines

@@ -112,7 +112,7 @@ 
      */
     function getPageRangeByPageId($pageid = null)
     {
-        $pageid = isset($pageid) ? (int)$pageid : $this->_currentPage;
+        $pageid = isset($pageid) ? (int) $pageid : $this->_currentPage;
         if (!isset($this->_pageData)) {
             $this->_generatePageData();
         }
@@ -146,7 +146,7 @@ 
      * @return array back/pages/next/first/last/all links
      * @access public
      */
-    function getLinks($pageID = null, $dummy='')
+    function getLinks($pageID = null, $dummy = '')
     {
         if (!is_null($pageID)) {
             $_sav = $this->_currentPage;
@@ -251,7 +251,7 @@ 
 
                 if ($i == $this->_currentPage) {
                     $this->range[$i] = true;
-                    $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
+                    $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost;
                 } else {
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
@@ -262,8 +262,8 @@ 
             }
 
             if ($this->_expanded && $expansion_after) {
-                $links .= $this->_separator . $this->_spacesAfter;
-                for ($i = $this->_currentPage + $this->_delta +1; $expansion_after; $expansion_after--, $i++) {
+                $links .= $this->_separator.$this->_spacesAfter;
+                for ($i = $this->_currentPage + $this->_delta + 1; $expansion_after; $expansion_after--, $i++) {
                     $print_separator_flag = ($expansion_after != 1);
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
@@ -275,14 +275,14 @@ 
 
         } else {
             //if $this->_totalPages <= (2*Delta+1) show them all
-            for ($i=1; $i<=$this->_totalPages; $i++) {
+            for ($i = 1; $i <= $this->_totalPages; $i++) {
                 if ($i != $this->_currentPage) {
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i);
                 } else {
                     $this->range[$i] = true;
-                    $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
+                    $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost;
                 }
                 $links .= $this->_spacesBefore
                        . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');

main/inc/lib/pear/PEAR.php

Doc Comments +3 added lines, -2 removed lines

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

Spacing +13 added lines, -14 removed lines

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

Indentation +51 added lines, -51 removed lines

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

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

Doc Comments +5 added lines

@@ -147,6 +147,7 @@ 
      * the two files do not match, and likewise that the last lines do not
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
+     * @param double $nchunks
      */
     function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
@@ -267,6 +268,10 @@ 
      *
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
+     * @param integer $xoff
+     * @param integer $xlim
+     * @param integer $yoff
+     * @param integer $ylim
      */
     function _compareseq ($xoff, $xlim, $yoff, $ylim)
     {

Spacing +8 added lines, -8 removed lines

@@ -148,7 +148,7 @@ 
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
      */
-    function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+    function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
         $flip = false;
 
@@ -171,7 +171,7 @@ 
         }
 
         $this->lcs = 0;
-        $this->seq[0]= $yoff - 1;
+        $this->seq[0] = $yoff - 1;
         $this->in_seq = array();
         $ymids[0] = array();
 
@@ -184,7 +184,7 @@ 
                 }
             }
 
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $chunk) / $nchunks);
             for (; $x < $x1; $x++) {
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
                 if (empty($ymatches[$line])) {
@@ -220,7 +220,7 @@ 
         $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
         $ymid = $ymids[$this->lcs];
         for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $n) / $nchunks);
             $y1 = $ymid[$n] + 1;
             $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
         }
@@ -240,7 +240,7 @@ 
 
         $beg = 1;
         while ($beg < $end) {
-            $mid = (int)(($beg + $end) / 2);
+            $mid = (int) (($beg + $end) / 2);
             if ($ypos > $this->seq[$mid]) {
                 $beg = $mid + 1;
             } else {
@@ -268,7 +268,7 @@ 
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
      */
-    function _compareseq ($xoff, $xlim, $yoff, $ylim)
+    function _compareseq($xoff, $xlim, $yoff, $ylim)
     {
         /* Slide down the bottom initial diagonal. */
         while ($xoff < $xlim && $yoff < $ylim
@@ -309,7 +309,7 @@ 
             reset($seps);
             $pt1 = $seps[0];
             while ($pt2 = next($seps)) {
-                $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+                $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
                 $pt1 = $pt2;
             }
         }
@@ -352,7 +352,7 @@ 
                 $j++;
             }
 
-            while ($i < $len && ! $changed[$i]) {
+            while ($i < $len && !$changed[$i]) {
                 assert('$j < $other_len && ! $other_changed[$j]');
                 $i++; $j++;
                 while ($j < $other_len && $other_changed[$j]) {

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

Doc Comments +9 added lines

@@ -143,6 +143,12 @@ 
         return $output . $this->_endDiff();
     }
 
+    /**
+     * @param integer $xbeg
+     * @param integer $xlen
+     * @param integer $ybeg
+     * @param integer $ylen
+     */
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
         $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
@@ -199,6 +205,9 @@ 
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
+    /**
+     * @param string $header
+     */
     function _startBlock($header)
     {
         return $header . "\n";

Indentation +4 added lines, -4 removed lines

@@ -104,8 +104,8 @@ 
                         }
                         /* @todo */
                         $output .= $this->_block($x0, $ntrail + $xi - $x0,
-                                                 $y0, $ntrail + $yi - $y0,
-                                                 $block);
+                                                    $y0, $ntrail + $yi - $y0,
+                                                    $block);
                         $block = false;
                     }
                 }
@@ -136,8 +136,8 @@ 
 
         if (is_array($block)) {
             $output .= $this->_block($x0, $xi - $x0,
-                                     $y0, $yi - $y0,
-                                     $block);
+                                        $y0, $yi - $y0,
+                                        $block);
         }
 
         return $output . $this->_endDiff();

Switch Indentation +12 added lines, -12 removed lines

@@ -149,21 +149,21 @@
 
         foreach ($edits as $edit) {
             switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
+                case 'text_diff_op_copy':
+                    $output .= $this->_context($edit->orig);
+                    break;
 
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
+                case 'text_diff_op_add':
+                    $output .= $this->_added($edit->final);
+                    break;
 
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
+                case 'text_diff_op_delete':
+                    $output .= $this->_deleted($edit->orig);
+                    break;
 
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
+                case 'text_diff_op_change':
+                    $output .= $this->_changed($edit->orig, $edit->final);
+                    break;
             }
         }
 

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
     function Text_Diff_Renderer($params = array())
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
             if (isset($this->$v)) {
                 $this->$v = $value;
             }
@@ -140,7 +140,7 @@ 
                                      $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -167,7 +167,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     function _startDiff()
@@ -183,10 +183,10 @@ 
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
+            $xbeg .= ','.($xbeg + $xlen - 1);
         }
         if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
+            $ybeg .= ','.($ybeg + $ylen - 1);
         }
 
         // this matches the GNU Diff behaviour
@@ -196,12 +196,12 @@ 
             $xbeg--;
         }
 
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
     }
 
     function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     function _endBlock()
@@ -211,7 +211,7 @@ 
 
     function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     function _context($lines)
@@ -231,7 +231,7 @@ 
 
     function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
+        return $this->_deleted($orig)."---\n".$this->_added($final);
     }
 
 }

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

Doc Comments +6 added lines

@@ -74,6 +74,9 @@ 
         return $header;
     }
 
+    /**
+     * @param string[] $lines
+     */
     function _lines($lines, $prefix = ' ', $encode = true)
     {
         if ($encode) {
@@ -141,6 +144,9 @@ 
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
     }
 
+    /**
+     * @param string $string
+     */
     function _splitOnWords($string, $newlineEscape = "\n")
     {
         // Ignore \0; otherwise the while loop will never finish.

Indentation +2 added lines, -2 removed lines

@@ -129,13 +129,13 @@
          * preserve whitespace as well. Therefore we split on words,
          * but include all blocks of whitespace in the wordlist. */
         $diff = new Text_Diff('native',
-                              array($this->_splitOnWords($text1, $nl),
+                                array($this->_splitOnWords($text1, $nl),
                                     $this->_splitOnWords($text2, $nl)));
 
         /* Get the diff in inline format. */
         $renderer = new Text_Diff_Renderer_inline
             (array_merge($this->getParams(),
-                         array('split_level' => 'words')));
+                            array('split_level' => 'words')));
 
         /* Run the diff and get the output. */
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";

Spacing +6 added lines, -7 removed lines

@@ -83,14 +83,14 @@ 
         if ($this->_split_level == 'words') {
             return implode('', $lines);
         } else {
-            return implode("\n", $lines) . "\n";
+            return implode("\n", $lines)."\n";
         }
     }
 
     function _added($lines)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
+        $lines[0] = $this->_ins_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_ins_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -98,7 +98,7 @@ 
     function _deleted($lines, $words = false)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
+        $lines[0] = $this->_del_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_del_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -116,7 +116,7 @@ 
                 $orig[0] = substr($orig[0], 1);
                 $final[0] = substr($final[0], 1);
             }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
+            return $prefix.$this->_deleted($orig).$this->_added($final);
         }
 
         $text1 = implode("\n", $orig);
@@ -133,12 +133,11 @@ 
                                     $this->_splitOnWords($text2, $nl)));
 
         /* Get the diff in inline format. */
-        $renderer = new Text_Diff_Renderer_inline
-            (array_merge($this->getParams(),
+        $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
                          array('split_level' => 'words')));
 
         /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
     }
 
     function _splitOnWords($string, $newlineEscape = "\n")

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

Doc Comments +10 added lines

@@ -180,6 +180,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _xor($login, $key)
@@ -208,6 +209,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotx($login, $key)
@@ -241,6 +243,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotxpp($login, $key)
@@ -274,6 +277,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotxmm($login, $key)
@@ -306,6 +310,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotx($login, $key)
@@ -340,6 +345,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotxpp($login, $key)
@@ -374,6 +380,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotxmm($login, $key)
@@ -430,6 +437,7 @@ 
      *
      * @access private
      * @param  integer Length of the password
+     * @param integer $length
      * @return string  Returns the password
      */
     function _createPronounceable($length)
@@ -475,6 +483,8 @@ 
      * @param  string  Character which could be use in the
      *                 unpronounceable password ex : 'ABCDEFG'
      *                 or numeric, alphabetical or alphanumeric.
+     * @param integer $length
+     * @param string $chars
      * @return string  Returns the password
      */
     function _createUnpronounceable($length, $chars)

Indentation +37 added lines, -37 removed lines

@@ -441,17 +441,17 @@ 
          * List of vowels and vowel sounds
          */
         $v = array('a', 'e', 'i', 'o', 'u', 'ae', 'ou', 'io',
-                   'ea', 'ou', 'ia', 'ai'
-                   );
+                    'ea', 'ou', 'ia', 'ai'
+                    );
 
         /**
          * List of consonants and consonant sounds
          */
         $c = array('b', 'c', 'd', 'g', 'h', 'j', 'k', 'l', 'm',
-                   'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
-                   'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
-                   'ch', 'ph', 'st', 'sl', 'cl'
-                   );
+                    'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
+                    'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
+                    'ch', 'ph', 'st', 'sl', 'cl'
+                    );
 
         $v_count = 12;
         $c_count = 29;
@@ -484,50 +484,50 @@ 
         /**
          * List of character which could be use in the password
          */
-         switch($chars) {
+            switch($chars) {
 
-         case 'alphanumeric':
+            case 'alphanumeric':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
+                break;
 
-         case 'alphabetical':
+            case 'alphabetical':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
+                break;
 
-         case 'numeric':
+            case 'numeric':
              $chars = '0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
+                break;
 
-         case '':
+            case '':
              $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
+                break;
 
-         default:
+            default:
              /**
               * Some characters shouldn't be used
               */
              $chars = trim($chars);
-             $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
-
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
-         }
-
-         /**
-          * Generate password
-          */
-         for ($i = 0; $i < $length; $i++) {
-             $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
-             $password .= $chars{$num};
-         }
-
-         /**
-          * Return password
-          */
-         return $password;
+                $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
+
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
+            }
+
+            /**
+             * Generate password
+             */
+            for ($i = 0; $i < $length; $i++) {
+                $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
+                $password .= $chars{$num};
+            }
+
+            /**
+             * Return password
+             */
+            return $password;
     }
 }
 ?>

Switch Indentation +61 added lines, -61 removed lines

@@ -55,12 +55,12 @@ 
     function create($length = 10, $type = 'pronounceable', $chars = '')
     {
         switch ($type) {
-        case 'unpronounceable' :
-            return Text_Password::_createUnpronounceable($length, $chars);
+            case 'unpronounceable' :
+                return Text_Password::_createUnpronounceable($length, $chars);
 
-        case 'pronounceable' :
-        default :
-            return Text_Password::_createPronounceable($length);
+            case 'pronounceable' :
+            default :
+                return Text_Password::_createPronounceable($length);
         }
     }
 
@@ -110,35 +110,35 @@ 
     function createFromLogin($login, $type, $key = 0)
     {
         switch ($type) {
-        case 'reverse':
-            return strrev($login);
+            case 'reverse':
+                return strrev($login);
 
-        case 'shuffle':
-            return Text_Password::_shuffle($login);
+            case 'shuffle':
+                return Text_Password::_shuffle($login);
 
-        case 'xor':
-            return Text_Password::_xor($login, $key);
+            case 'xor':
+                return Text_Password::_xor($login, $key);
 
-        case 'rot13':
-            return str_rot13($login);
+            case 'rot13':
+                return str_rot13($login);
 
-        case 'rotx':
-            return Text_Password::_rotx($login, $key);
+            case 'rotx':
+                return Text_Password::_rotx($login, $key);
 
-        case 'rotx++':
-            return Text_Password::_rotxpp($login, $key);
+            case 'rotx++':
+                return Text_Password::_rotxpp($login, $key);
 
-        case 'rotx--':
-            return Text_Password::_rotxmm($login, $key);
+            case 'rotx--':
+                return Text_Password::_rotxmm($login, $key);
 
-        case 'ascii_rotx':
-            return Text_Password::_asciiRotx($login, $key);
+            case 'ascii_rotx':
+                return Text_Password::_asciiRotx($login, $key);
 
-        case 'ascii_rotx++':
-            return Text_Password::_asciiRotxpp($login, $key);
+            case 'ascii_rotx++':
+                return Text_Password::_asciiRotxpp($login, $key);
 
-        case 'ascii_rotx--':
-            return Text_Password::_asciiRotxmm($login, $key);
+            case 'ascii_rotx--':
+                return Text_Password::_asciiRotxmm($login, $key);
         }
     }
 
@@ -320,11 +320,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -354,11 +354,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -388,11 +388,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -486,34 +486,34 @@ 
          */
          switch($chars) {
 
-         case 'alphanumeric':
-             $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
-             break;
+             case 'alphanumeric':
+                 $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
+                 break;
 
-         case 'alphabetical':
-             $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
-             break;
+             case 'alphabetical':
+                 $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
+                 break;
 
-         case 'numeric':
-             $chars = '0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
-             break;
+             case 'numeric':
+                 $chars = '0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
+                 break;
 
-         case '':
-             $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
-             break;
+             case '':
+                 $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
+                 break;
 
-         default:
-             /**
+             default:
+                 /**
               * Some characters shouldn't be used
               */
-             $chars = trim($chars);
-             $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
+                 $chars = trim($chars);
+                 $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
 
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
          }
 
          /**

Spacing +2 added lines, -2 removed lines

@@ -459,7 +459,7 @@ 
         $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = $v_count + $c_count;
 
         for ($i = 0; $i < $length; $i++) {
-            $retVal .= $c[mt_rand(0, $c_count-1)] . $v[mt_rand(0, $v_count-1)];
+            $retVal .= $c[mt_rand(0, $c_count - 1)].$v[mt_rand(0, $v_count - 1)];
         }
 
         return substr($retVal, 0, $length);
@@ -484,7 +484,7 @@ 
         /**
          * List of character which could be use in the password
          */
-         switch($chars) {
+         switch ($chars) {
 
          case 'alphanumeric':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';