Inspection of "Composer.lock updated" - intraface/intraface.dk - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#26)

by Lars

created 2017-03-19 08:19 UTC

Status

Doc Comments +59 added lines, -8 removed lines patch added patch discarded remove patch

@@ -346,7 +346,7 @@  discard block
 block discarded – undo
     /**
      * Constructor - starts a new document
      *
-     * @param array $pageSize Array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
+     * @param integer[] $pageSize Array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
      *
      * @return void
      */
@@ -384,6 +384,8 @@  discard block
 block discarded – undo
     /**
      * destination object, used to specify the location for the user to jump to, presently on opening
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_destination($id, $action, $options = '')
     {
@@ -421,6 +423,7 @@  discard block
 block discarded – undo
     /**
      * sets the viewer preferences
      * @access private
+     * @param string $action
      */
     private function o_viewerPreferences($id, $action, $options = '')
     {
@@ -461,6 +464,8 @@  discard block
 block discarded – undo
     /**
      * define the document catalog, the overall controller for the document
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_catalog($id, $action, $options = '')
     {
@@ -513,6 +518,8 @@  discard block
 block discarded – undo
     /**
      * object which is a parent to the pages in the document
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_pages($id, $action, $options = '')
     {
@@ -633,6 +640,8 @@  discard block
 block discarded – undo
     /**
      * defines the outlines in the doc, empty for now
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_outlines($id, $action, $options = '')
     {
@@ -665,6 +674,8 @@  discard block
 block discarded – undo
     /**
      * an object to hold the font description
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_font($id, $action, $options = '')
     {
@@ -851,6 +862,8 @@  discard block
 block discarded – undo
     /**
      * a font descriptor, needed for including additional fonts
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_fontDescriptor($id, $action, $options = '')
     {
@@ -904,6 +917,8 @@  discard block
 block discarded – undo
     /**
      * the font encoding
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_fontEncoding($id, $action, $options = '')
     {
@@ -943,6 +958,7 @@  discard block
 block discarded – undo
     /**
      * a descendent cid font, needed for unicode fonts
      * @access private
+     * @param string $action
      */
     private function o_fontDescendentCID($id, $action, $options = '')
     {
@@ -1018,6 +1034,7 @@  discard block
 block discarded – undo
     /**
       * a font glyph to character map, needed for unicode fonts
       * @access private
+      * @param string $action
       */
     private function o_fontGIDtoCIDMap($id, $action, $options = '')
     {
@@ -1056,6 +1073,7 @@  discard block
 block discarded – undo
     /**
      * define the document information
      * @access private
+     * @param integer $id
      */
     private function o_info($id, $action, $options = '')
     {
@@ -1102,6 +1120,8 @@  discard block
 block discarded – undo
     /**
      * an action object, used to link to URLS initially
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_action($id, $action, $options = '')
     {
@@ -1147,6 +1167,8 @@  discard block
 block discarded – undo
      * an annotation object, this will add an annotation to the current page.
      * initially will support just link annotations
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_annotation($id, $action, $options = '')
     {
@@ -1201,6 +1223,7 @@  discard block
 block discarded – undo
     /**
      * a page object, it also creates a contents object to hold its contents
      * @access private
+     * @param string $action
      */
     private function o_page($id, $action, $options = '')
     {
@@ -1272,6 +1295,7 @@  discard block
 block discarded – undo
     /**
      * the contents objects hold all of the content which appears on pages
      * @access private
+     * @param string $action
      */
     private function o_contents($id, $action, $options = '')
     {
@@ -1324,6 +1348,8 @@  discard block
 block discarded – undo
     /**
      * an image object, will be an XObject in the document, includes description and data
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_image($id, $action, $options = '')
     {
@@ -1402,6 +1428,8 @@  discard block
 block discarded – undo
     /**
      * encryption object.
      * @access private
+     * @param integer $id
+     * @param string $action
      */
     private function o_encryption($id, $action, $options = '')
     {
@@ -1458,8 +1486,8 @@  discard block
 block discarded – undo
     
     /**
      * owner part of the encryption
-     * @param $owner - owner password plus padding
-     * @param $user - user password plus padding
+     * @param string $owner - owner password plus padding
+     * @param string $user - user password plus padding
      * @access private
      */
     private function encryptOwner($owner, $user)
@@ -1498,9 +1526,9 @@  discard block
 block discarded – undo
     /**
      *
      * user part of the encryption
-     * @param $user - user password plus padding
-     * @param $ownerDict - encrypted owner entry
-     * @param $permissions - permission set (print, copy, modify, ...)
+     * @param string $user - user password plus padding
+     * @param string $ownerDict - encrypted owner entry
+     * @param string $permissions - permission set (print, copy, modify, ...)
      */
     function encryptUser($user, $ownerDict, $permissions)
     {
@@ -1563,6 +1591,9 @@  discard block
 block discarded – undo
         return $hex;
     }
     
+    /**
+     * @param string $hex
+     */
     protected function hexToStr($hex)
     {
         $str = '';
@@ -2005,7 +2036,7 @@  discard block
 block discarded – undo
      * @param string  $encoding Which encoding to use
      * @param integer $set      What is this
      *
-     * @return void
+     * @return integer
      * @access public
      */
     public function selectFont($fontName, $encoding = '', $set = 1, $subsetFont = false)
@@ -2331,6 +2362,11 @@  discard block
 block discarded – undo
     /**
      * draw a part of an ellipse
      * @access public
+     * @param integer $x0
+     * @param integer $y0
+     * @param integer $astart
+     * @param integer $afinish
+     * @param integer $r1
      */
     public function partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 = 0, $angle = 0, $nSeg = 8)
     {
@@ -2494,6 +2530,7 @@  discard block
 block discarded – undo
      * draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
      * the coordinates of the upper-right corner
      * @access public
+     * @param integer $height
      */
     public function rectangle($x1, $y1, $width, $height)
     {
@@ -2593,6 +2630,7 @@  discard block
 block discarded – undo
     /**
      * return the height in units of the current font in the given size
      * @access public
+     * @param integer $size
      */
     public function getFontHeight($size)
     {
@@ -2611,6 +2649,7 @@  discard block
 block discarded – undo
      * if you add this number to the baseline, you get the level of the bottom of the font
      * it is in the pdf user units
      * @access public
+     * @param integer $size
      */
     public function getFontDecender($size)
     {
@@ -2775,6 +2814,8 @@  discard block
 block discarded – undo
      * on the page the text will end
      *
      * @access protected
+     * @param integer $angle
+     * @param integer $wa
      */
     protected function getTextPosition($x, $y, $angle, $size, $wa, $text)
     {
@@ -2792,6 +2833,7 @@  discard block
 block discarded – undo
      * wrapper function for checkTextDirective1
      *
      * @access private
+     * @param integer $f
      */
     private function checkTextDirective(&$text, $i, &$f)
     {
@@ -2808,6 +2850,7 @@  discard block
 block discarded – undo
      * if the directive does not require a font change, then $f should be set to 0
      *
      * @access private
+     * @param integer $final
      */
     private function checkTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size = 0, $angle = 0, $wordSpaceAdjust = 0)
     {
@@ -3132,6 +3175,8 @@  discard block
 block discarded – undo
      * do a part of the calculation for sorting out the justification of the text
      *
      * @access private
+     * @param integer $adjust
+     * @param string $justification
      */
     private function adjustWrapText($text, $actual, $width, &$x, &$adjust, $justification)
     {
@@ -3393,6 +3438,7 @@  discard block
 block discarded – undo
     /**
      * after an object has been created, it wil only show if it has been added, using this function.
      * @access public
+     * @param integer $id
      */
     public function addObject($id, $options = 'add')
     {
@@ -3477,6 +3523,8 @@  discard block
 block discarded – undo
      * extract an integer from a position in a byte stream
      *
      * @access private
+     * @param integer $pos
+     * @param integer $num
      */
     private function getBytes(&$data, $pos, $num)
     {
@@ -3491,7 +3539,7 @@  discard block
 block discarded – undo
 
     /**
      * reads the PNG chunk
-     * @param $data - binary part of the png image
+     * @param string $data - binary part of the png image
      * @access private
      */
     private function readPngChunks(&$data)
@@ -3738,6 +3786,7 @@  discard block
 block discarded – undo
     /**
      * add a JPEG image into the document, from a file
      * @access public
+     * @param string $img
      */
     public function addJpegFromFile($img, $x, $y, $w = 0, $h = 0)
     {
@@ -3870,6 +3919,7 @@  discard block
 block discarded – undo
     /**
      * common code used by the two JPEG adding functions
      * @access private
+     * @param string $data
      */
     private function addJpegImage_common(&$data, $x, $y, $w = 0, $h = 0, $imageWidth, $imageHeight, $channels = 3)
     {
@@ -3955,6 +4005,7 @@  discard block
 block discarded – undo
     /**
      * used to add messages for use in debugging
      * @access protected
+     * @param integer $error_type
      */
     protected function debug($message, $error_type = E_USER_NOTICE)
     {

Please login to merge, or discard this patch.

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

@@ -60,10 +60,10 @@  discard block
 block discarded – undo
     private $numObj=0;
 
     /**
-      * this array contains all of the pdf objects, ready for final assembly
-      *
-      * @var array
-      */
+     * this array contains all of the pdf objects, ready for final assembly
+     *
+     * @var array
+     */
     private $objects = array();
 
     /**
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
     private $objectHashes = array();
     
     /**
-      * the objectId (number within the objects array) of the document catalog
-      *
-      * @var integer
-      */
+     * the objectId (number within the objects array) of the document catalog
+     *
+     * @var integer
+     */
     private $catalogId;
 
 
@@ -139,10 +139,10 @@  discard block
 block discarded – undo
     private $fonts = array();
 
     /**
-      * a record of the current font
-      *
-      * @var string
-      */
+     * a record of the current font
+     *
+     * @var string
+     */
     private $currentFont='';
 
     /**
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
     private $currentBaseFont='';
 
     /**
-      * the number of the current font within the font array
-      *
-      * @var integer
-      */
+     * the number of the current font within the font array
+     *
+     * @var integer
+     */
     private $currentFontNum=0;
 
     /**
@@ -165,20 +165,20 @@  discard block
 block discarded – undo
     private $currentNode;
 
     /**
-      * object number of the current page
-      *
-      * @var integer
-      */
+     * object number of the current page
+     *
+     * @var integer
+     */
     private $currentPage;
 
     /**
-      * object number of the currently active contents block
-      */
+     * object number of the currently active contents block
+     */
     private $currentContents;
 
     /**
-      * number of fonts within the system
-      */
+     * number of fonts within the system
+     */
     private $numFonts = 0;
 
     /**
@@ -192,14 +192,14 @@  discard block
 block discarded – undo
     private $currentStrokeColour = array('r' => -1, 'g' => -1, 'b' => -1);
 
     /**
-      * current style that lines are drawn in
-      */
+     * current style that lines are drawn in
+     */
     private $currentLineStyle='';
 
     /**
-      * an array which is used to save the state of the document, mainly the colours and styles
-      * it is used to temporarily change to another state, the change back to what it was before
-      */
+     * an array which is used to save the state of the document, mainly the colours and styles
+     * it is used to temporarily change to another state, the change back to what it was before
+     */
     private $stateStack = array();
 
     /**
@@ -234,37 +234,37 @@  discard block
 block discarded – undo
     private $addLooseObjects=array();
 
     /**
-      * the objectId of the information object for the document
-      * this contains authorship, title etc.
-      */
+     * the objectId of the information object for the document
+     * this contains authorship, title etc.
+     */
     private $infoObject=0;
 
     /**
-      * number of images being tracked within the document
-      */
+     * number of images being tracked within the document
+     */
     private $numImages=0;
 
     /**
-      * some additional options while generation
-      * currently used for compression only
-      * Default: 'compression' => -1 which will set gzcompress to the default level of 6
-      */
+     * some additional options while generation
+     * currently used for compression only
+     * Default: 'compression' => -1 which will set gzcompress to the default level of 6
+     */
     public $options=array('compression'=>-1);
 
     /**
-      * the objectId of the first page of the document
-      */
+     * the objectId of the first page of the document
+     */
     private $firstPageId;
 
     /**
-      * used to track the last used value of the inter-word spacing, this is so that it is known
-      * when the spacing is changed.
-      */
+     * used to track the last used value of the inter-word spacing, this is so that it is known
+     * when the spacing is changed.
+     */
     private $wordSpaceAdjust=0;
 
     /**
-      * track if the current font is bolded or italicised
-      */
+     * track if the current font is bolded or italicised
+     */
     private $currentTextState = '';
 
     /**
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
         $this->newDocument($pageSize);
 
         if (in_array('Windows-1252', mb_list_encodings())) {
-              $this->targetEncoding = 'Windows-1252';
+                $this->targetEncoding = 'Windows-1252';
         }
     
         // font familys are already known in $this->fontFamilies
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
         switch ($action) {
             case 'new':
                  $this->objects[$id]=array('t'=>'destination','info'=>array());
-                 $tmp = '';
+                    $tmp = '';
                 switch ($options['type']) {
                     case 'XYZ':
                     case 'FitR':
@@ -816,7 +816,7 @@  discard block
 block discarded – undo
                     $res = "\n$id 0 obj\n<</Type /Font /Subtype /Type0 /BaseFont /".$o['info']['name']."";
                     // The horizontal identity mapping for 2-byte CIDs; may be used
                     // with CIDFonts using any Registry, Ordering, and Supplement values.
-                       $res.= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n";
+                        $res.= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n";
                     $res.= "endobj";
                 } else {
                     $res="\n".$id." 0 obj\n<< /Type /Font /Subtype /".$o['info']['SubType']." ";
@@ -953,7 +953,7 @@  discard block
 block discarded – undo
         switch ($action) {
             case 'new':
                   $this->objects[$id] = array('t' => 'fontDescendentCID', 'info' => $options);
-                  // and a CID to GID map
+                    // and a CID to GID map
                 if ($this->embedFont) {
                     $cidToGidMapId = ++$this->numObj;
                     $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
@@ -974,20 +974,20 @@  discard block
 block discarded – undo
                         case 'FontDescriptor':
                         case 'SubType':
                               $this->debug("o_fontDescendentCID $k : $v", E_USER_NOTICE);
-                              $o['info'][$k] = $v;
+                                $o['info'][$k] = $v;
                             break;
                     }
                 }
 
-                  // pass values down to cid to gid map
+                    // pass values down to cid to gid map
                 if ($this->embedFont) {
-                      $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
+                        $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
                 }
                 break;
 
             case 'out':
                   $res = "\n$id 0 obj\n";
-                  $res.= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>";
+                    $res.= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>";
                 if (isset($o['info']['FontDescriptor'])) {
                     $res.= " /FontDescriptor ".$o['info']['FontDescriptor']." 0 R";
                 }
@@ -1006,19 +1006,19 @@  discard block
 block discarded – undo
                 }
           
                 if ($this->embedFont) {
-                      $res.= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R";
+                        $res.= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R";
                 }
-                  $res.= "  >>\n";
-                  $res.= "endobj";
+                    $res.= "  >>\n";
+                    $res.= "endobj";
 
                 return $res;
         }
     }
 
     /**
-      * a font glyph to character map, needed for unicode fonts
-      * @access private
-      */
+     * a font glyph to character map, needed for unicode fonts
+     * @access private
+     */
     private function o_fontGIDtoCIDMap($id, $action, $options = '')
     {
         if ($action !== 'new') {
@@ -1032,8 +1032,8 @@  discard block
 block discarded – undo
 
             case 'out':
                   $res = "\n$id 0 obj\n";
-                  $fontFileName = $o['info']['fontFileName'];
-                  $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']);
+                    $fontFileName = $o['info']['fontFileName'];
+                    $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']);
           
                 if (isset($o['raw'])) {
                     $res.= $tmp;
@@ -1048,7 +1048,7 @@  discard block
 block discarded – undo
                     $res.= " /Length ".mb_strlen($tmp, '8bit') .">>\nstream\n$tmp\nendstream";
                 }
 
-                  $res.= "\nendobj";
+                    $res.= "\nendobj";
                 return $res;
         }
     }
@@ -1936,7 +1936,7 @@  discard block
 block discarded – undo
                                 }
                             
                                 if (!isset($data['MissingWidth']) && $c == -1 && $n === '.notdef') {
-                                      $data['MissingWidth'] = $width;
+                                        $data['MissingWidth'] = $width;
                                 }
                             }
                             break;
@@ -1957,7 +1957,7 @@  discard block
 block discarded – undo
                             
                                 if ($c >= 0) {
                                     if ($c >= 0 && $c < 0xFFFF && $glyph) {
-                                           $cidtogid[$c*2] = chr($glyph >> 8);
+                                            $cidtogid[$c*2] = chr($glyph >> 8);
                                         $cidtogid[$c*2 + 1] = chr($glyph & 0xFF);
                                     }
                                     if ($c != hexdec($n)) {
@@ -1969,7 +1969,7 @@  discard block
 block discarded – undo
                                 }
                             
                                 if (!isset($data['MissingWidth']) && $c == -1 && $n === '.notdef') {
-                                      $data['MissingWidth'] = $width;
+                                        $data['MissingWidth'] = $width;
                                 }
                             }
                             break;
@@ -2167,8 +2167,8 @@  discard block
 block discarded – undo
                     
                     // setup the basic properties for o_font output
                     $tmp = array('BaseFont'=>$adobeFontName,'Widths'=>$widthid
-                                      ,'FirstChar'=>$firstChar,'LastChar'=>$lastChar
-                                      ,'FontDescriptor'=>$fontDescriptorId);
+                                        ,'FirstChar'=>$firstChar,'LastChar'=>$lastChar
+                                        ,'FontDescriptor'=>$fontDescriptorId);
                     
                     // binary content of pfb or ttf file
                     $pfbid = ++$this->numObj;
@@ -2662,18 +2662,18 @@  discard block
 block discarded – undo
     }
 
     /**
-       * return array containing codepoints (UTF-8 character values) for the
-       * string passed in.
-       *
-       * based on the excellent TCPDF code by Nicola Asuni and the
-       * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
-       *
-       * @access private
-       * @author Orion Richardson
-       * @since January 5, 2008
-       * @param string $text UTF-8 string to process
-       * @return array UTF-8 codepoints array for the string
-       */
+     * return array containing codepoints (UTF-8 character values) for the
+     * string passed in.
+     *
+     * based on the excellent TCPDF code by Nicola Asuni and the
+     * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
+     *
+     * @access private
+     * @author Orion Richardson
+     * @since January 5, 2008
+     * @param string $text UTF-8 string to process
+     * @return array UTF-8 codepoints array for the string
+     */
     private function utf8toCodePointsArray(&$text)
     {
         $length = mb_strlen($text, '8bit'); // http://www.php.net/manual/en/function.mb-strlen.php#77040
@@ -2733,20 +2733,20 @@  discard block
 block discarded – undo
         return $unicode;
     }
 
-      /**
-       * convert UTF-8 to UTF-16 with an additional byte order marker
-       * at the front if required.
-       *
-       * based on the excellent TCPDF code by Nicola Asuni and the
-       * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
-       *
-       * @access private
-       * @author Orion Richardson
-       * @since January 5, 2008
-       * @param string $text UTF-8 string to process
-       * @param boolean $bom whether to add the byte order marker
-       * @return string UTF-16 result string
-       */
+        /**
+         * convert UTF-8 to UTF-16 with an additional byte order marker
+         * at the front if required.
+         *
+         * based on the excellent TCPDF code by Nicola Asuni and the
+         * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
+         *
+         * @access private
+         * @author Orion Richardson
+         * @since January 5, 2008
+         * @param string $text UTF-8 string to process
+         * @param boolean $bom whether to add the byte order marker
+         * @return string UTF-16 result string
+         */
     private function utf8toUtf16BE(&$text, $bom = true)
     {
         $cf = $this->currentFont;
@@ -3031,7 +3031,7 @@  discard block
 block discarded – undo
         if ($start < $len) {
             $part = substr($text, $start);
             $place_text = $this->filterText($part, false);
-          // modify unicode text so that extra word spacing is manually implemented (bug #)
+            // modify unicode text so that extra word spacing is manually implemented (bug #)
             $cf = $this->currentFont;
             if ($this->fonts[$cf]['isUnicode'] && $wordSpaceAdjust != 0) {
                 $space_scale = 1000 / $size;
@@ -3346,15 +3346,15 @@  discard block
 block discarded – undo
     }
 
     /**
-    * open an existing object for editing
-    * @access public
-    */
+     * open an existing object for editing
+     * @access public
+     */
     public function reopenObject($id)
     {
         $this->nStack++;
         $this->stack[$this->nStack]=array('c'=>$this->currentContents,'p'=>$this->currentPage);
         $this->currentContents=$id;
-       // also if this object is the primary contents for a page, then set the current page to its parent
+        // also if this object is the primary contents for a page, then set the current page to its parent
         if (isset($this->objects[$id]['onPage'])) {
             $this->currentPage = $this->objects[$id]['onPage'];
         }
@@ -3723,7 +3723,7 @@  discard block
 block discarded – undo
             }
             
             $options = array('label'=>$label,'data'=>$iChunk['idata'],'bitsPerComponent'=>$iChunk['info']['bitDepth'],'pdata'=>$iChunk['pdata']
-                                      ,'iw'=>$iChunk['info']['width'],'ih'=>$iChunk['info']['height'],'type'=>'png','color'=>$color,'ncolor'=>$ncolor);
+                                        ,'iw'=>$iChunk['info']['width'],'ih'=>$iChunk['info']['height'],'type'=>'png','color'=>$color,'ncolor'=>$ncolor);
             if (isset($iChunk['transparency'])) {
                 $options['transparency']=$iChunk['transparency'];
             }
@@ -3815,18 +3815,18 @@  discard block
 block discarded – undo
         $this->addJpegFromFile($tmpName, $x, $y, $w, $h);
     }
     
-     /**
-     * add an image into the document, from a GD object
-     * this function is not all that reliable, and I would probably encourage people to use
-     * the file based functions
-     * @param $img - gd image resource
-     * @param $x coord x
-     * @param $y coord y
-     * @param $w width
-     * @param $h height
-     * @param $quality image quality
-     * @access protected
-     */
+        /**
+         * add an image into the document, from a GD object
+         * this function is not all that reliable, and I would probably encourage people to use
+         * the file based functions
+         * @param $img - gd image resource
+         * @param $x coord x
+         * @param $y coord y
+         * @param $w width
+         * @param $h height
+         * @param $quality image quality
+         * @access protected
+         */
     protected function addImage(&$img, $x, $y, $w = 0, $h = 0, $quality = 75)
     {
         // add a new image into the current location, as an external object

Please login to merge, or discard this patch.

Spacing +665 added lines, -665 removed lines patch added patch discarded remove patch

@@ -57,7 +57,7 @@  discard block
 block discarded – undo
      *
      * @var integer
      */
-    private $numObj=0;
+    private $numObj = 0;
 
     /**
       * this array contains all of the pdf objects, ready for final assembly
@@ -143,21 +143,21 @@  discard block
 block discarded – undo
       *
       * @var string
       */
-    private $currentFont='';
+    private $currentFont = '';
 
     /**
      * the current base font
      *
      * @var string
      */
-    private $currentBaseFont='';
+    private $currentBaseFont = '';
 
     /**
       * the number of the current font within the font array
       *
       * @var integer
       */
-    private $currentFontNum=0;
+    private $currentFontNum = 0;
 
     /**
      * @var integer
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
     /**
       * current style that lines are drawn in
       */
-    private $currentLineStyle='';
+    private $currentLineStyle = '';
 
     /**
       * an array which is used to save the state of the document, mainly the colours and styles
@@ -210,46 +210,46 @@  discard block
 block discarded – undo
     /**
      * number of page objects within the document
      */
-    private $numPages=0;
+    private $numPages = 0;
 
     /**
      * object Id storage stack
      */
-    private $stack=array();
+    private $stack = array();
 
     /**
      * number of elements within the object Id storage stack
      */
-    private $nStack=0;
+    private $nStack = 0;
 
     /**
      * an array which contains information about the objects which are not firmly attached to pages
      * these have been added with the addObject function
      */
-    private $looseObjects=array();
+    private $looseObjects = array();
 
     /**
      * array contains infomation about how the loose objects are to be added to the document
      */
-    private $addLooseObjects=array();
+    private $addLooseObjects = array();
 
     /**
       * the objectId of the information object for the document
       * this contains authorship, title etc.
       */
-    private $infoObject=0;
+    private $infoObject = 0;
 
     /**
       * number of images being tracked within the document
       */
-    private $numImages=0;
+    private $numImages = 0;
 
     /**
       * some additional options while generation
       * currently used for compression only
       * Default: 'compression' => -1 which will set gzcompress to the default level of 6
       */
-    public $options=array('compression'=>-1);
+    public $options = array('compression'=>-1);
 
     /**
       * the objectId of the first page of the document
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
       * used to track the last used value of the inter-word spacing, this is so that it is known
       * when the spacing is changed.
       */
-    private $wordSpaceAdjust=0;
+    private $wordSpaceAdjust = 0;
 
     /**
       * track if the current font is bolded or italicised
@@ -270,29 +270,29 @@  discard block
 block discarded – undo
     /**
      * messages are stored here during processing, these can be selected afterwards to give some useful debug information
      */
-    public $messages='';
+    public $messages = '';
 
     /**
      * the ancryption array for the document encryption is stored here
      */
-    private $arc4='';
+    private $arc4 = '';
 
     /**
      * the object Id of the encryption information
      */
-    private $arc4_objnum=0;
+    private $arc4_objnum = 0;
 
     /**
      * the file identifier, used to uniquely identify a pdf document
      */
-    public $fileIdentifier='';
+    public $fileIdentifier = '';
 
     /**
      * a flag to say if a document is to be encrypted or not
      *
      * @var boolean
      */
-    private $encrypted=0;
+    private $encrypted = 0;
 
     /**
      * Set the encryption mode
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
      *
      * @var string
      */
-    private $encryptionKey='';
+    private $encryptionKey = '';
     
     /*
      * encryption padding fetched from the Adobe PDF reference
@@ -387,32 +387,32 @@  discard block
 block discarded – undo
      */
     private function o_destination($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                 $this->objects[$id]=array('t'=>'destination','info'=>array());
+                 $this->objects[$id] = array('t'=>'destination', 'info'=>array());
                  $tmp = '';
                 switch ($options['type']) {
                     case 'XYZ':
                     case 'FitR':
-                        $tmp =  ' '.$options['p3'].$tmp;
+                        $tmp = ' '.$options['p3'].$tmp;
                     case 'FitH':
                     case 'FitV':
                     case 'FitBH':
                     case 'FitBV':
-                        $tmp =  ' '.$options['p1'].' '.$options['p2'].$tmp;
+                        $tmp = ' '.$options['p1'].' '.$options['p2'].$tmp;
                     case 'Fit':
                     case 'FitB':
-                        $tmp =  $options['type'].$tmp;
-                        $this->objects[$id]['info']['string']=$tmp;
-                        $this->objects[$id]['info']['page']=$options['page'];
+                        $tmp = $options['type'].$tmp;
+                        $this->objects[$id]['info']['string'] = $tmp;
+                        $this->objects[$id]['info']['page'] = $options['page'];
                 }
                 break;
             case 'out':
                 $tmp = $o['info'];
-                $res="\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
+                $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
                 return $res;
                 break;
         }
@@ -424,12 +424,12 @@  discard block
 block discarded – undo
      */
     private function o_viewerPreferences($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'viewerPreferences','info'=>array());
+                $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
                 break;
             case 'add':
                 foreach ($options as $k => $v) {
@@ -442,17 +442,17 @@  discard block
 block discarded – undo
                         case 'DisplayDocTitle':
                         case 'NonFullScreenPageMode':
                         case 'Direction':
-                            $o['info'][$k]=$v;
+                            $o['info'][$k] = $v;
                             break;
                     }
                 }
                 break;
             case 'out':
-                $res="\n".$id." 0 obj\n".'<< ';
+                $res = "\n".$id." 0 obj\n".'<< ';
                 foreach ($o['info'] as $k => $v) {
-                    $res.="\n/".$k.' '.$v;
+                    $res .= "\n/".$k.' '.$v;
                 }
-                $res.="\n>>\n";
+                $res .= "\n>>\n";
                 return $res;
                 break;
         }
@@ -464,47 +464,47 @@  discard block
 block discarded – undo
      */
     private function o_catalog($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'catalog','info'=>array());
-                $this->catalogId=$id;
+                $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
+                $this->catalogId = $id;
                 break;
             case 'outlines':
             case 'pages':
             case 'openHere':
-                $o['info'][$action]=$options;
+                $o['info'][$action] = $options;
                 break;
             case 'viewerPreferences':
                 if (!isset($o['info']['viewerPreferences'])) {
                     $this->numObj++;
                     $this->o_viewerPreferences($this->numObj, 'new');
-                    $o['info']['viewerPreferences']=$this->numObj;
+                    $o['info']['viewerPreferences'] = $this->numObj;
                 }
                 $vp = $o['info']['viewerPreferences'];
                 $this->o_viewerPreferences($vp, 'add', $options);
                 break;
             case 'out':
-                $res="\n".$id." 0 obj\n".'<< /Type /Catalog';
+                $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
                 foreach ($o['info'] as $k => $v) {
                     switch ($k) {
                         case 'outlines':
-                            $res.=' /Outlines '.$v.' 0 R';
+                            $res .= ' /Outlines '.$v.' 0 R';
                             break;
                         case 'pages':
-                            $res.=' /Pages '.$v.' 0 R';
+                            $res .= ' /Pages '.$v.' 0 R';
                             break;
                         case 'viewerPreferences':
-                            $res.=' /ViewerPreferences '.$o['info']['viewerPreferences'].' 0 R';
+                            $res .= ' /ViewerPreferences '.$o['info']['viewerPreferences'].' 0 R';
                             break;
                         case 'openHere':
-                            $res.=' /OpenAction '.$o['info']['openHere'].' 0 R';
+                            $res .= ' /OpenAction '.$o['info']['openHere'].' 0 R';
                             break;
                     }
                 }
-                $res.=" >>\nendobj";
+                $res .= " >>\nendobj";
                 return $res;
                 break;
         }
@@ -516,93 +516,93 @@  discard block
 block discarded – undo
      */
     private function o_pages($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'pages','info'=>array());
+                $this->objects[$id] = array('t'=>'pages', 'info'=>array());
                 $this->o_catalog($this->catalogId, 'pages', $id);
                 break;
             case 'page':
                 if (!is_array($options)) {
                     // then it will just be the id of the new page
-                    $o['info']['pages'][]=$options;
+                    $o['info']['pages'][] = $options;
                 } else {
                     // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
                     // and pos is either 'before' or 'after', saying where this page will fit.
                     if (isset($options['id']) && isset($options['rid']) && isset($options['pos'])) {
                         $i = array_search($options['rid'], $o['info']['pages']);
-                        if (isset($o['info']['pages'][$i]) && $o['info']['pages'][$i]==$options['rid']) {
+                        if (isset($o['info']['pages'][$i]) && $o['info']['pages'][$i] == $options['rid']) {
                             // then there is a match make a space
                             switch ($options['pos']) {
                                 case 'before':
                                     $k = $i;
                                     break;
                                 case 'after':
-                                    $k=$i+1;
+                                    $k = $i + 1;
                                     break;
                                 default:
-                                    $k=-1;
+                                    $k = -1;
                                     break;
                             }
-                            if ($k>=0) {
-                                for ($j=count($o['info']['pages'])-1; $j>=$k; $j--) {
-                                    $o['info']['pages'][$j+1]=$o['info']['pages'][$j];
+                            if ($k >= 0) {
+                                for ($j = count($o['info']['pages']) - 1; $j >= $k; $j--) {
+                                    $o['info']['pages'][$j + 1] = $o['info']['pages'][$j];
                                 }
-                                $o['info']['pages'][$k]=$options['id'];
+                                $o['info']['pages'][$k] = $options['id'];
                             }
                         }
                     }
                 }
                 break;
             case 'procset':
-                $o['info']['procset']=$options;
+                $o['info']['procset'] = $options;
                 break;
             case 'mediaBox':
-                $o['info']['mediaBox']=$options; // which should be an array of 4 numbers
+                $o['info']['mediaBox'] = $options; // which should be an array of 4 numbers
                 break;
             case 'font':
-                $o['info']['fonts'][]=array('objNum'=>$options['objNum'],'fontNum'=>$options['fontNum']);
+                $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
                 break;
             case 'xObject':
-                $o['info']['xObjects'][]=array('objNum'=>$options['objNum'],'label'=>$options['label']);
+                $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
                 break;
             case 'out':
                 if (count($o['info']['pages'])) {
-                    $res="\n".$id." 0 obj\n<< /Type /Pages /Kids [";
+                    $res = "\n".$id." 0 obj\n<< /Type /Pages /Kids [";
                     foreach ($o['info']['pages'] as $k => $v) {
-                        $res.=$v." 0 R ";
+                        $res .= $v." 0 R ";
                     }
-                    $res.="] /Count ".count($this->objects[$id]['info']['pages']);
+                    $res .= "] /Count ".count($this->objects[$id]['info']['pages']);
                     if ((isset($o['info']['fonts']) && count($o['info']['fonts'])) || isset($o['info']['procset'])) {
-                        $res.=" /Resources <<";
+                        $res .= " /Resources <<";
                         if (isset($o['info']['procset'])) {
-                            $res.=" /ProcSet ".$o['info']['procset'];
+                            $res .= " /ProcSet ".$o['info']['procset'];
                         }
                         if (isset($o['info']['fonts']) && count($o['info']['fonts'])) {
-                            $res.=" /Font << ";
+                            $res .= " /Font << ";
                             foreach ($o['info']['fonts'] as $finfo) {
-                                $res.=" /F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+                                $res .= " /F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
                             }
-                            $res.=" >>";
+                            $res .= " >>";
                         }
                         if (isset($o['info']['xObjects']) && count($o['info']['xObjects'])) {
-                            $res.=" /XObject << ";
+                            $res .= " /XObject << ";
                             foreach ($o['info']['xObjects'] as $finfo) {
-                                $res.=" /".$finfo['label']." ".$finfo['objNum']." 0 R";
+                                $res .= " /".$finfo['label']." ".$finfo['objNum']." 0 R";
                             }
-                            $res.=" >>";
+                            $res .= " >>";
                         }
-                        $res.=" >>";
+                        $res .= " >>";
                         if (isset($o['info']['mediaBox'])) {
-                            $tmp=$o['info']['mediaBox'];
-                            $res.=" /MediaBox [".sprintf('%.3F', $tmp[0]).' '.sprintf('%.3F', $tmp[1]).' '.sprintf('%.3F', $tmp[2]).' '.sprintf('%.3F', $tmp[3]).']';
+                            $tmp = $o['info']['mediaBox'];
+                            $res .= " /MediaBox [".sprintf('%.3F', $tmp[0]).' '.sprintf('%.3F', $tmp[1]).' '.sprintf('%.3F', $tmp[2]).' '.sprintf('%.3F', $tmp[3]).']';
                         }
                     }
-                    $res.=" >>\nendobj";
+                    $res .= " >>\nendobj";
                 } else {
-                    $res="\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
+                    $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
                 }
                 return $res;
                 break;
@@ -617,14 +617,14 @@  discard block
 block discarded – undo
     {
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'redirect','data'=>$options['data'],'info'=>array());
-                $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'],'objNum'=>$id));
+                $this->objects[$id] = array('t'=>'redirect', 'data'=>$options['data'], 'info'=>array());
+                $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'], 'objNum'=>$id));
                 break;
             case 'out':
-                $o =& $this->objects[$id];
-                $tmp=$o['data'];
-                $res= "\n".$id." 0 obj\n<<";
-                $res.="/R".$o['data']." ".$o['data']." 0 R>>\nendobj";
+                $o = & $this->objects[$id];
+                $tmp = $o['data'];
+                $res = "\n".$id." 0 obj\n<<";
+                $res .= "/R".$o['data']." ".$o['data']." 0 R>>\nendobj";
                 return $res;
                 break;
         }
@@ -636,26 +636,26 @@  discard block
 block discarded – undo
      */
     private function o_outlines($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'outlines','info'=>array('outlines'=>array()));
+                $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
                 $this->o_catalog($this->catalogId, 'outlines', $id);
                 break;
             case 'outline':
-                $o['info']['outlines'][]=$options;
+                $o['info']['outlines'][] = $options;
                 break;
             case 'out':
                 if (count($o['info']['outlines'])) {
-                    $res="\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
+                    $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
                     foreach ($o['info']['outlines'] as $k => $v) {
-                        $res.=$v." 0 R ";
+                        $res .= $v." 0 R ";
                     }
-                    $res.="] /Count ".count($o['info']['outlines'])." >>\nendobj";
+                    $res .= "] /Count ".count($o['info']['outlines'])." >>\nendobj";
                 } else {
-                    $res="\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
+                    $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
                 }
                 return $res;
                 break;
@@ -668,36 +668,36 @@  discard block
 block discarded – undo
      */
     private function o_font($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'font','info'=>array('name'=>$options['name'], 'fontFileName' => $options['fontFileName'],'SubType'=>'Type1'));
-                $fontNum=$this->numFonts;
-                $this->objects[$id]['info']['fontNum']=$fontNum;
+                $this->objects[$id] = array('t'=>'font', 'info'=>array('name'=>$options['name'], 'fontFileName' => $options['fontFileName'], 'SubType'=>'Type1'));
+                $fontNum = $this->numFonts;
+                $this->objects[$id]['info']['fontNum'] = $fontNum;
                 // deal with the encoding and the differences
                 if (isset($options['differences'])) {
                     // then we'll need an encoding dictionary
                     $this->numObj++;
                     $this->o_fontEncoding($this->numObj, 'new', $options);
-                    $this->objects[$id]['info']['encodingDictionary']=$this->numObj;
+                    $this->objects[$id]['info']['encodingDictionary'] = $this->numObj;
                 } elseif (isset($options['encoding'])) {
                     // we can specify encoding here
                     switch ($options['encoding']) {
                         case 'WinAnsiEncoding':
                         case 'MacRomanEncoding':
                         case 'MacExpertEncoding':
-                            $this->objects[$id]['info']['encoding']=$options['encoding'];
+                            $this->objects[$id]['info']['encoding'] = $options['encoding'];
                             break;
                         case 'none':
                             break;
                         default:
-                            $this->objects[$id]['info']['encoding']='WinAnsiEncoding';
+                            $this->objects[$id]['info']['encoding'] = 'WinAnsiEncoding';
                             break;
                     }
                 } else {
-                    $this->objects[$id]['info']['encoding']='WinAnsiEncoding';
+                    $this->objects[$id]['info']['encoding'] = 'WinAnsiEncoding';
                 }
                 
                 if ($this->fonts[$options['fontFileName']]['isUnicode']) {
@@ -714,8 +714,8 @@  discard block
 block discarded – undo
 
                     $stream = "/CIDInit /ProcSet findresource begin\n12 dict begin\nbegincmap\n/CIDSystemInfo <</Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def\n/CMapName /Adobe-Identity-UCS def\n/CMapType 2 def\n1 begincodespacerange\n<0000> <FFFF>\nendcodespacerange\n1 beginbfrange\n<0000> <FFFF> <0000>\nendbfrange\nendcmap\nCMapName currentdict /CMap defineresource pop\nend\nend\n";
 
-                    $res = "<</Length " . mb_strlen($stream, '8bit') . " >>\n";
-                    $res .= "stream\n" . $stream . "\nendstream";
+                    $res = "<</Length ".mb_strlen($stream, '8bit')." >>\n";
+                    $res .= "stream\n".$stream."\nendstream";
 
                     $this->objects[$toUnicodeId]['c'] = $res;
 
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
                     $this->objects[$id]['info']['cidFont'] = $cidFontId;
                 }
                 // also tell the pages node about the new font
-                $this->o_pages($this->currentNode, 'font', array('fontNum'=>$fontNum,'objNum'=>$id));
+                $this->o_pages($this->currentNode, 'font', array('fontNum'=>$fontNum, 'objNum'=>$id));
                 break;
             case 'add':
                 foreach ($options as $k => $v) {
@@ -757,8 +757,8 @@  discard block
 block discarded – undo
                         $pfbid = $this->objects[$o['info']['FontDescriptor']]['info']['FontFile2'];
                         // if subsetting is set
                         if ($this->fonts[$o['info']['fontFileName']]['isSubset'] && !empty($this->fonts[$o['info']['fontFileName']]['subset'])) {
-                            $this->debug('subset font for ' . $o['info']['fontFileName'], E_USER_NOTICE);
-                            $subsetFontName = "AAAAAD+" . $o['info']['name'];
+                            $this->debug('subset font for '.$o['info']['fontFileName'], E_USER_NOTICE);
+                            $subsetFontName = "AAAAAD+".$o['info']['name'];
                             $o['info']['name'] = $subsetFontName;
                             // find descendant font
                             $this->objects[$o['info']['cidFont']]['info']['name'] = $subsetFontName;
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
                             // combine all used characters as string
                             $s = implode('', array_keys($this->fonts[$o['info']['fontFileName']]['subset']));
                             // submit the string to TTFsubset class to return the subset (as binary)
-                            $data = $t->doSubset($o['info']['fontFileName'] . '.ttf', $s, null);
+                            $data = $t->doSubset($o['info']['fontFileName'].'.ttf', $s, null);
                             // $data is the new (subset) of the font font
                             //file_put_contents($o['info']['name'] . '.ttf', $data);
                             
@@ -783,22 +783,22 @@  discard block
 block discarded – undo
                             }
                             $cidwidth = $newcidwidth;
                         } else {
-                            $data = file_get_contents($o['info']['fontFileName']. '.ttf');
+                            $data = file_get_contents($o['info']['fontFileName'].'.ttf');
                         }
                     
                         // TODO: cache the subset
                         
                         $l1 = strlen($data);
-                        $this->objects[$pfbid]['c'].= $data;
+                        $this->objects[$pfbid]['c'] .= $data;
                         $this->o_contents($pfbid, 'add', array('Length1'=>$l1));
                     } elseif (isset($this->objects[$o['info']['FontDescriptor']]['info']['FontFile'])) {
                         // find FontFile id - used for PFB fonts
                         $pfbid = $this->objects[$o['info']['FontDescriptor']]['info']['FontFile'];
-                        $data = file_get_contents($o['info']['fontFileName']. '.pfb');
-                        $l1 = strpos($data, 'eexec')+6;
-                        $l2 = strpos($data, '00000000')-$l1;
-                        $l3 = strlen($data)-$l2-$l1;
-                        $this->o_contents($pfbid, 'add', array('Length1'=>$l1,'Length2'=>$l2,'Length3'=>$l3));
+                        $data = file_get_contents($o['info']['fontFileName'].'.pfb');
+                        $l1 = strpos($data, 'eexec') + 6;
+                        $l2 = strpos($data, '00000000') - $l1;
+                        $l3 = strlen($data) - $l2 - $l1;
+                        $this->o_contents($pfbid, 'add', array('Length1'=>$l1, 'Length2'=>$l2, 'Length3'=>$l3));
                     } else {
                         $this->debug("Failed to select the correct font program", E_USER_WARNING);
                     }
@@ -816,32 +816,32 @@  discard block
 block discarded – undo
                     $res = "\n$id 0 obj\n<</Type /Font /Subtype /Type0 /BaseFont /".$o['info']['name']."";
                     // The horizontal identity mapping for 2-byte CIDs; may be used
                     // with CIDFonts using any Registry, Ordering, and Supplement values.
-                       $res.= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n";
-                    $res.= "endobj";
+                       $res .= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n";
+                    $res .= "endobj";
                 } else {
-                    $res="\n".$id." 0 obj\n<< /Type /Font /Subtype /".$o['info']['SubType']." ";
-                    $res.="/Name /F".$o['info']['fontNum']." ";
-                    $res.="/BaseFont /".$o['info']['name']." ";
+                    $res = "\n".$id." 0 obj\n<< /Type /Font /Subtype /".$o['info']['SubType']." ";
+                    $res .= "/Name /F".$o['info']['fontNum']." ";
+                    $res .= "/BaseFont /".$o['info']['name']." ";
                     if (isset($o['info']['encodingDictionary'])) {
                         // then place a reference to the dictionary
-                        $res.="/Encoding ".$o['info']['encodingDictionary']." 0 R ";
+                        $res .= "/Encoding ".$o['info']['encodingDictionary']." 0 R ";
                     } elseif (isset($o['info']['encoding'])) {
                         // use the specified encoding
-                        $res.="/Encoding /".$o['info']['encoding']." ";
+                        $res .= "/Encoding /".$o['info']['encoding']." ";
                     }
                     if (isset($o['info']['FirstChar'])) {
-                        $res.="/FirstChar ".$o['info']['FirstChar']." ";
+                        $res .= "/FirstChar ".$o['info']['FirstChar']." ";
                     }
                     if (isset($o['info']['LastChar'])) {
-                        $res.="/LastChar ".$o['info']['LastChar']." ";
+                        $res .= "/LastChar ".$o['info']['LastChar']." ";
                     }
                     if (isset($o['info']['Widths'])) {
-                        $res.="/Widths ".$o['info']['Widths']." 0 R ";
+                        $res .= "/Widths ".$o['info']['Widths']." 0 R ";
                     }
                     if (isset($o['info']['FontDescriptor'])) {
-                        $res.="/FontDescriptor ".$o['info']['FontDescriptor']." 0 R ";
+                        $res .= "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R ";
                     }
-                    $res.=">>\nendobj";
+                    $res .= ">>\nendobj";
                 }
                 return $res;
                 break;
@@ -854,15 +854,15 @@  discard block
 block discarded – undo
      */
     private function o_fontDescriptor($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'fontDescriptor','info'=>$options);
+                $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
                 break;
             case 'out':
-                $res="\n".$id." 0 obj\n<< /Type /FontDescriptor ";
+                $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor ";
                 foreach ($o['info'] as $label => $value) {
                     switch ($label) {
                         case 'Ascent':
@@ -879,23 +879,23 @@  discard block
 block discarded – undo
                         case 'XHeight':
                         case 'CharSet':
                             if (strlen($value)) {
-                                $res.='/'.$label.' '.$value." ";
+                                $res .= '/'.$label.' '.$value." ";
                             }
                             break;
                         case 'FontFile':
                         case 'FontFile2':
                         case 'FontFile3':
-                            $res.='/'.$label.' '.$value." 0 R ";
+                            $res .= '/'.$label.' '.$value." 0 R ";
                             break;
                         case 'FontBBox':
-                            $res.='/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."] ";
+                            $res .= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."] ";
                             break;
                         case 'FontName':
-                            $res.='/'.$label.' /'.$value." ";
+                            $res .= '/'.$label.' /'.$value." ";
                             break;
                     }
                 }
-                $res.=">>\nendobj";
+                $res .= ">>\nendobj";
                 return $res;
                 break;
         }
@@ -907,34 +907,34 @@  discard block
 block discarded – undo
      */
     private function o_fontEncoding($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
                 // the options array should contain 'differences' and maybe 'encoding'
-                $this->objects[$id]=array('t'=>'fontEncoding','info'=>$options);
+                $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
                 break;
             case 'out':
-                $res="\n".$id." 0 obj\n<< /Type /Encoding ";
+                $res = "\n".$id." 0 obj\n<< /Type /Encoding ";
                 if (!isset($o['info']['encoding'])) {
-                    $o['info']['encoding']='WinAnsiEncoding';
+                    $o['info']['encoding'] = 'WinAnsiEncoding';
                 }
-                if ($o['info']['encoding']!='none') {
-                    $res.="/BaseEncoding /".$o['info']['encoding']." ";
+                if ($o['info']['encoding'] != 'none') {
+                    $res .= "/BaseEncoding /".$o['info']['encoding']." ";
                 }
-                $res.="/Differences [";
-                $onum=-100;
+                $res .= "/Differences [";
+                $onum = -100;
                 foreach ($o['info']['differences'] as $num => $label) {
-                    if ($num!=$onum+1) {
+                    if ($num != $onum + 1) {
                         // we cannot make use of consecutive numbering
-                        $res.= " ".$num." /".$label;
+                        $res .= " ".$num." /".$label;
                     } else {
-                        $res.= " /".$label;
+                        $res .= " /".$label;
                     }
-                    $onum=$num;
+                    $onum = $num;
                 }
-                $res.="] >>\nendobj";
+                $res .= "] >>\nendobj";
                 return $res;
                 break;
         }
@@ -987,13 +987,13 @@  discard block
 block discarded – undo
 
             case 'out':
                   $res = "\n$id 0 obj\n";
-                  $res.= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>";
+                  $res .= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>";
                 if (isset($o['info']['FontDescriptor'])) {
-                    $res.= " /FontDescriptor ".$o['info']['FontDescriptor']." 0 R";
+                    $res .= " /FontDescriptor ".$o['info']['FontDescriptor']." 0 R";
                 }
 
                 if (isset($o['info']['MissingWidth'])) {
-                    $res.= " /DW ".$o['info']['MissingWidth']."";
+                    $res .= " /DW ".$o['info']['MissingWidth']."";
                 }
 
                 if (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
@@ -1002,14 +1002,14 @@  discard block
 block discarded – undo
                     foreach ($cid_widths as $cid => $width) {
                         $w .= "$cid [$width] ";
                     }
-                    $res.= " /W [$w]";
+                    $res .= " /W [$w]";
                 }
           
                 if ($this->embedFont) {
-                      $res.= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R";
+                      $res .= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R";
                 }
-                  $res.= "  >>\n";
-                  $res.= "endobj";
+                  $res .= "  >>\n";
+                  $res .= "endobj";
 
                 return $res;
         }
@@ -1036,19 +1036,19 @@  discard block
 block discarded – undo
                   $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']);
           
                 if (isset($o['raw'])) {
-                    $res.= $tmp;
+                    $res .= $tmp;
                 } else {
-                    $res.= "<<";
+                    $res .= "<<";
                     if (function_exists('gzcompress') && $this->options['compression']) {
                         // then implement ZLIB based compression on this content stream
                         $tmp = gzcompress($tmp, $this->options['compression']);
-                        $res.= " /Filter /FlateDecode";
+                        $res .= " /Filter /FlateDecode";
                     }
             
-                    $res.= " /Length ".mb_strlen($tmp, '8bit') .">>\nstream\n$tmp\nendstream";
+                    $res .= " /Length ".mb_strlen($tmp, '8bit').">>\nstream\n$tmp\nendstream";
                 }
 
-                  $res.= "\nendobj";
+                  $res .= "\nendobj";
                 return $res;
         }
     }
@@ -1059,14 +1059,14 @@  discard block
 block discarded – undo
      */
     private function o_info($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->infoObject=$id;
-                $date='D:'.date('Ymd');
-                $this->objects[$id]=array('t'=>'info','info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz','CreationDate'=>$date));
+                $this->infoObject = $id;
+                $date = 'D:'.date('Ymd');
+                $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
                 break;
             case 'Title':
             case 'Author':
@@ -1077,23 +1077,23 @@  discard block
 block discarded – undo
             case 'CreationDate':
             case 'ModDate':
             case 'Trapped':
-                $o['info'][$action]=$options;
+                $o['info'][$action] = $options;
                 break;
             case 'out':
                 if ($this->encrypted) {
                     $this->encryptInit($id);
                 }
-                $res="\n".$id." 0 obj\n<< ";
+                $res = "\n".$id." 0 obj\n<< ";
                 foreach ($o['info'] as $k => $v) {
-                    $res.='/'.$k.' (';
+                    $res .= '/'.$k.' (';
                     if ($this->encrypted) {
-                        $res.=$this->filterText($this->ARC4($v), true, false);
+                        $res .= $this->filterText($this->ARC4($v), true, false);
                     } else {
-                        $res.=$this->filterText($v, true, false);
+                        $res .= $this->filterText($v, true, false);
                     }
-                    $res.=") ";
+                    $res .= ") ";
                 }
-                $res.=">>\nendobj";
+                $res .= ">>\nendobj";
                 return $res;
             break;
         }
@@ -1105,39 +1105,39 @@  discard block
 block discarded – undo
      */
     private function o_action($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
                 if (is_array($options)) {
-                    $this->objects[$id]=array('t'=>'action','info'=>$options,'type'=>$options['type']);
+                    $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
                 } else {
                     // then assume a URI action
-                    $this->objects[$id]=array('t'=>'action','info'=>$options,'type'=>'URI');
+                    $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>'URI');
                 }
                 break;
             case 'out':
                 if ($this->encrypted) {
                     $this->encryptInit($id);
                 }
-                $res="\n".$id." 0 obj\n<< /Type /Action";
+                $res = "\n".$id." 0 obj\n<< /Type /Action";
                 switch ($o['type']) {
                     case 'ilink':
                         // there will be an 'label' setting, this is the name of the destination
-                        $res.=" /S /GoTo /D ".$this->destinations[(string)$o['info']['label']]." 0 R";
+                        $res .= " /S /GoTo /D ".$this->destinations[(string)$o['info']['label']]." 0 R";
                         break;
                     case 'URI':
-                        $res.=" /S /URI /URI (";
+                        $res .= " /S /URI /URI (";
                         if ($this->encrypted) {
-                            $res.=$this->filterText($this->ARC4($o['info']), true, false);
+                            $res .= $this->filterText($this->ARC4($o['info']), true, false);
                         } else {
-                            $res.=$this->filterText($o['info'], true, false);
+                            $res .= $this->filterText($o['info'], true, false);
                         }
-                            $res.=")";
+                            $res .= ")";
                         break;
                 }
-                $res.=" >>\nendobj";
+                $res .= " >>\nendobj";
                 return $res;
             break;
         }
@@ -1150,8 +1150,8 @@  discard block
 block discarded – undo
      */
     private function o_annotation($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
@@ -1161,38 +1161,38 @@  discard block
 block discarded – undo
                 // and add the action object which is going to be required
                 switch ($options['type']) {
                     case 'link':
-                        $this->objects[$id]=array('t'=>'annotation','info'=>$options);
+                        $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
                         $this->numObj++;
                         $this->o_action($this->numObj, 'new', $options['url']);
-                        $this->objects[$id]['info']['actionId']=$this->numObj;
+                        $this->objects[$id]['info']['actionId'] = $this->numObj;
                         break;
                     case 'ilink':
                         // this is to a named internal link
                         $label = $options['label'];
-                        $this->objects[$id]=array('t'=>'annotation','info'=>$options);
+                        $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
                         $this->numObj++;
-                        $this->o_action($this->numObj, 'new', array('type'=>'ilink','label'=>$label));
-                        $this->objects[$id]['info']['actionId']=$this->numObj;
+                        $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
+                        $this->objects[$id]['info']['actionId'] = $this->numObj;
                         break;
                 }
                 break;
             case 'out':
-                $res="\n".$id." 0 obj << /Type /Annot";
+                $res = "\n".$id." 0 obj << /Type /Annot";
                 switch ($o['info']['type']) {
                     case 'link':
                     case 'ilink':
-                        $res.= " /Subtype /Link";
+                        $res .= " /Subtype /Link";
                         break;
                 }
-                $res.=" /A ".$o['info']['actionId']." 0 R";
-                $res.=" /Border [0 0 0]";
-                $res.=" /H /I";
-                $res.=" /Rect [ ";
+                $res .= " /A ".$o['info']['actionId']." 0 R";
+                $res .= " /Border [0 0 0]";
+                $res .= " /H /I";
+                $res .= " /Rect [ ";
                 foreach ($o['info']['rect'] as $v) {
-                    $res.= sprintf("%.4f ", $v);
+                    $res .= sprintf("%.4f ", $v);
                 }
-                $res.="]";
-                $res.=" >>\nendobj";
+                $res .= "]";
+                $res .= " >>\nendobj";
                 return $res;
             break;
         }
@@ -1204,66 +1204,66 @@  discard block
 block discarded – undo
      */
     private function o_page($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
                 $this->numPages++;
-                $this->objects[$id]=array('t'=>'page','info'=>array('parent'=>$this->currentNode,'pageNum'=>$this->numPages));
+                $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
                 if (is_array($options)) {
                     // then this must be a page insertion, array shoudl contain 'rid','pos'=[before|after]
-                    $options['id']=$id;
+                    $options['id'] = $id;
                     $this->o_pages($this->currentNode, 'page', $options);
                 } else {
                     $this->o_pages($this->currentNode, 'page', $id);
                 }
-                    $this->currentPage=$id;
+                    $this->currentPage = $id;
                     // make a contents object to go with this page
                     $this->numObj++;
                     $this->o_contents($this->numObj, 'new', $id);
-                    $this->currentContents=$this->numObj;
-                    $this->objects[$id]['info']['contents']=array();
-                    $this->objects[$id]['info']['contents'][]=$this->numObj;
+                    $this->currentContents = $this->numObj;
+                    $this->objects[$id]['info']['contents'] = array();
+                    $this->objects[$id]['info']['contents'][] = $this->numObj;
                     $match = ($this->numPages%2 ? 'odd' : 'even');
                 foreach ($this->addLooseObjects as $oId => $target) {
-                    if ($target=='all' || $match==$target) {
-                        $this->objects[$id]['info']['contents'][]=$oId;
+                    if ($target == 'all' || $match == $target) {
+                        $this->objects[$id]['info']['contents'][] = $oId;
                     }
                 }
                 break;
             case 'content':
-                $o['info']['contents'][]=$options;
+                $o['info']['contents'][] = $options;
                 break;
             case 'annot':
                 // add an annotation to this page
                 if (!isset($o['info']['annot'])) {
-                    $o['info']['annot']=array();
+                    $o['info']['annot'] = array();
                 }
                 // $options should contain the id of the annotation dictionary
-                $o['info']['annot'][]=$options;
+                $o['info']['annot'][] = $options;
                 break;
             case 'out':
-                $res="\n".$id." 0 obj\n<< /Type /Page";
-                $res.=" /Parent ".$o['info']['parent']." 0 R";
+                $res = "\n".$id." 0 obj\n<< /Type /Page";
+                $res .= " /Parent ".$o['info']['parent']." 0 R";
                 if (isset($o['info']['annot'])) {
-                    $res.=" /Annots [";
+                    $res .= " /Annots [";
                     foreach ($o['info']['annot'] as $aId) {
-                        $res.=" ".$aId." 0 R";
+                        $res .= " ".$aId." 0 R";
                     }
-                    $res.=" ]";
+                    $res .= " ]";
                 }
                 $count = count($o['info']['contents']);
-                if ($count==1) {
-                    $res.=" /Contents ".$o['info']['contents'][0]." 0 R";
-                } elseif ($count>1) {
-                    $res.=" /Contents [ ";
+                if ($count == 1) {
+                    $res .= " /Contents ".$o['info']['contents'][0]." 0 R";
+                } elseif ($count > 1) {
+                    $res .= " /Contents [ ";
                     foreach ($o['info']['contents'] as $cId) {
-                        $res.=$cId." 0 R ";
+                        $res .= $cId." 0 R ";
                     }
-                    $res.="]";
+                    $res .= "]";
                 }
-                    $res.=" >>\nendobj";
+                    $res .= " >>\nendobj";
                 return $res;
             break;
         }
@@ -1275,35 +1275,35 @@  discard block
 block discarded – undo
      */
     private function o_contents($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
-                $this->objects[$id]=array('t'=>'contents','c'=>'','info'=>array());
+                $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
                 if (strlen($options) && intval($options)) {
                     // then this contents is the primary for a page
-                    $this->objects[$id]['onPage']=$options;
-                } elseif ($options=='raw') {
+                    $this->objects[$id]['onPage'] = $options;
+                } elseif ($options == 'raw') {
                     // then this page contains some other type of system object
-                    $this->objects[$id]['raw']=1;
+                    $this->objects[$id]['raw'] = 1;
                 }
                 break;
             case 'add':
                 // add more options to the decleration
                 foreach ($options as $k => $v) {
-                    $o['info'][$k]=$v;
+                    $o['info'][$k] = $v;
                 }
             case 'out':
-                $tmp=$o['c'];
-                $res= "\n".$id." 0 obj\n";
+                $tmp = $o['c'];
+                $res = "\n".$id." 0 obj\n";
                 if (isset($this->objects[$id]['raw'])) {
-                    $res.=$tmp;
+                    $res .= $tmp;
                 } else {
-                    $res.= "<<";
+                    $res .= "<<";
                     if (function_exists('gzcompress') && $this->options['compression']) {
                         // then implement ZLIB based compression on this content stream
-                        $res.=" /Filter /FlateDecode";
+                        $res .= " /Filter /FlateDecode";
                         $tmp = gzcompress($tmp, $this->options['compression']);
                     }
                     if ($this->encrypted) {
@@ -1313,9 +1313,9 @@  discard block
 block discarded – undo
                     foreach ($o['info'] as $k => $v) {
                         $res .= " /".$k.' '.$v;
                     }
-                    $res.=" /Length ".strlen($tmp)." >> stream\n".$tmp."\nendstream";
+                    $res .= " /Length ".strlen($tmp)." >> stream\n".$tmp."\nendstream";
                 }
-                    $res.="\nendobj";
+                    $res .= "\nendobj";
                 return $res;
             break;
         }
@@ -1327,43 +1327,43 @@  discard block
 block discarded – undo
      */
     private function o_image($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
                 // make the new object
-                $this->objects[$id]=array('t'=>'image','data'=>$options['data'],'info'=>array());
-                $this->objects[$id]['info']['Type']='/XObject';
-                $this->objects[$id]['info']['Subtype']='/Image';
-                $this->objects[$id]['info']['Width']=$options['iw'];
-                $this->objects[$id]['info']['Height']=$options['ih'];
-                if (!isset($options['type']) || $options['type']=='jpg') {
+                $this->objects[$id] = array('t'=>'image', 'data'=>$options['data'], 'info'=>array());
+                $this->objects[$id]['info']['Type'] = '/XObject';
+                $this->objects[$id]['info']['Subtype'] = '/Image';
+                $this->objects[$id]['info']['Width'] = $options['iw'];
+                $this->objects[$id]['info']['Height'] = $options['ih'];
+                if (!isset($options['type']) || $options['type'] == 'jpg') {
                     if (!isset($options['channels'])) {
-                        $options['channels']=3;
+                        $options['channels'] = 3;
                     }
                     switch ($options['channels']) {
                         case 1:
-                            $this->objects[$id]['info']['ColorSpace']='/DeviceGray';
+                            $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
                             break;
                         default:
-                            $this->objects[$id]['info']['ColorSpace']='/DeviceRGB';
+                            $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
                             break;
                     }
-                    $this->objects[$id]['info']['Filter']='/DCTDecode';
-                    $this->objects[$id]['info']['BitsPerComponent']=8;
-                } elseif ($options['type']=='png') {
+                    $this->objects[$id]['info']['Filter'] = '/DCTDecode';
+                    $this->objects[$id]['info']['BitsPerComponent'] = 8;
+                } elseif ($options['type'] == 'png') {
                     if (strlen($options['pdata'])) {
                         $this->numObj++;
-                        $this->objects[$this->numObj]=array('t'=>'image','c'=>'','info'=>array());
+                        $this->objects[$this->numObj] = array('t'=>'image', 'c'=>'', 'info'=>array());
                         $this->objects[$this->numObj]['info'] = array('Type'=>'/XObject', 'Subtype'=>'/Image', 'Width'=> $options['iw'], 'Height'=> $options['ih'], 'Filter'=>'/FlateDecode', 'ColorSpace'=>'/DeviceGray', 'BitsPerComponent'=>'8', 'DecodeParms'=>'<< /Predictor 15 /Colors 1 /BitsPerComponent 8 /Columns '.$options['iw'].' >>');
-                        $this->objects[$this->numObj]['data']=$options['pdata'];
+                        $this->objects[$this->numObj]['data'] = $options['pdata'];
                         if (isset($options['transparency'])) {
                             switch ($options['transparency']['type']) {
                                 case 'indexed':
-                                    $tmp=' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
+                                    $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
                                     $this->objects[$id]['info']['Mask'] = $tmp;
-                                    $this->objects[$id]['info']['ColorSpace'] = ' [ /Indexed /DeviceRGB '.(strlen($options['pdata'])/3-1).' '.$this->numObj.' 0 R ]';
+                                    $this->objects[$id]['info']['ColorSpace'] = ' [ /Indexed /DeviceRGB '.(strlen($options['pdata'])/3 - 1).' '.$this->numObj.' 0 R ]';
                                     break;
                                 case 'alpha':
                                     $this->objects[$id]['info']['SMask'] = $this->numObj.' 0 R';
@@ -1372,28 +1372,28 @@  discard block
 block discarded – undo
                             }
                         }
                     } else {
-                        $this->objects[$id]['info']['ColorSpace']='/'.$options['color'];
+                        $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
                     }
-                    $this->objects[$id]['info']['BitsPerComponent']=$options['bitsPerComponent'];
-                    $this->objects[$id]['info']['Filter']='/FlateDecode';
+                    $this->objects[$id]['info']['BitsPerComponent'] = $options['bitsPerComponent'];
+                    $this->objects[$id]['info']['Filter'] = '/FlateDecode';
                     $this->objects[$id]['data'] = $options['data'];
-                    $this->objects[$id]['info']['DecodeParms']='<< /Predictor 15 /Colors '.$options['ncolor'].' /Columns '.$options['iw'].' /BitsPerComponent '.$options['bitsPerComponent'].'>>';
+                    $this->objects[$id]['info']['DecodeParms'] = '<< /Predictor 15 /Colors '.$options['ncolor'].' /Columns '.$options['iw'].' /BitsPerComponent '.$options['bitsPerComponent'].'>>';
                 }
                     // assign it a place in the named resource dictionary as an external object, according to
                     // the label passed in with it.
-                    $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'],'objNum'=>$id));
+                    $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'], 'objNum'=>$id));
                 break;
             case 'out':
-                $tmp=$o['data'];
-                $res= "\n".$id." 0 obj\n<<";
+                $tmp = $o['data'];
+                $res = "\n".$id." 0 obj\n<<";
                 foreach ($o['info'] as $k => $v) {
-                    $res.=" /".$k.' '.$v;
+                    $res .= " /".$k.' '.$v;
                 }
                 if ($this->encrypted) {
                     $this->encryptInit($id);
                     $tmp = $this->ARC4($tmp);
                 }
-                $res.=" /Length ".strlen($tmp)." >> stream\n".$tmp."\nendstream\nendobj";
+                $res .= " /Length ".strlen($tmp)." >> stream\n".$tmp."\nendstream\nendobj";
                 return $res;
             break;
         }
@@ -1405,14 +1405,14 @@  discard block
 block discarded – undo
      */
     private function o_encryption($id, $action, $options = '')
     {
-        if ($action!='new') {
-            $o =& $this->objects[$id];
+        if ($action != 'new') {
+            $o = & $this->objects[$id];
         }
         switch ($action) {
             case 'new':
                 // make the new object
-                $this->objects[$id]=array('t'=>'encryption','info'=>$options);
-                $this->arc4_objnum=$id;
+                $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
+                $this->arc4_objnum = $id;
             
                 // Pad or truncate the owner password
                 $owner = substr($options['owner'].$this->encryptionPad, 0, 32);
@@ -1431,26 +1431,26 @@  discard block
 block discarded – undo
                 // encryption key is set in encryptUser function
                 //$this->encryptionKey = $encryptionKey;
             
-                $this->encrypted=1;
+                $this->encrypted = 1;
                 break;
             case 'out':
-                $res= "\n".$id." 0 obj\n<<";
-                $res.=' /Filter /Standard';
+                $res = "\n".$id." 0 obj\n<<";
+                $res .= ' /Filter /Standard';
                 if ($this->encryptionMode > 1) { // RC4 128bit encryption
-                    $res.=' /V 2';
-                    $res.=' /R 3';
-                    $res.=' /Length 128';
+                    $res .= ' /V 2';
+                    $res .= ' /R 3';
+                    $res .= ' /Length 128';
                 } else { // RC4 40bit encryption
-                    $res.=' /V 1';
-                    $res.=' /R 2';
+                    $res .= ' /V 1';
+                    $res .= ' /R 2';
                 }
                     // use hex string instead of char code - char codes can make troubles (E.g. CR or LF)
-                    $res.=' /O <'.$this->strToHex($o['info']['O']).'>';
-                    $res.=' /U <'.$this->strToHex($o['info']['U']).'>';
+                    $res .= ' /O <'.$this->strToHex($o['info']['O']).'>';
+                    $res .= ' /U <'.$this->strToHex($o['info']['U']).'>';
                     // and the p-value needs to be converted to account for the twos-complement approach
                     //$o['info']['p'] = (($o['info']['p'] ^ 0xFFFFFFFF)+1)*-1;
-                    $res.=' /P '.($o['info']['p']);
-                    $res.=" >>\nendobj";
+                    $res .= ' /P '.($o['info']['p']);
+                    $res .= " >>\nendobj";
                 return $res;
             break;
         }
@@ -1479,13 +1479,13 @@  discard block
 block discarded – undo
         $ownerKey = substr($ownerHash, 0, $keylength); // PDF 1.4 - Create the encryption key (IMPORTANT: need to check Length)
         
         $this->ARC4_init($ownerKey); // 5 bytes of the encryption key (hashed 50 times)
-        $ovalue=$this->ARC4($user); // PDF 1.4 - Encrypt the padded user password using RC4
+        $ovalue = $this->ARC4($user); // PDF 1.4 - Encrypt the padded user password using RC4
         
         if ($this->encryptionMode > 1) {
             $len = strlen($ownerKey);
-            for ($i = 1; $i<=19; ++$i) {
+            for ($i = 1; $i <= 19; ++$i) {
                 $ek = '';
-                for ($j=0; $j < $len; $j++) {
+                for ($j = 0; $j < $len; $j++) {
                     $ek .= chr(ord($ownerKey[$j]) ^ $i);
                 }
                 $this->ARC4_init($ek);
@@ -1526,12 +1526,12 @@  discard block
 block discarded – undo
             
             // encrypt the hash from the previous method by using the encryptionKey
             $this->ARC4_init($this->encryptionKey);
-            $uvalue=$this->ARC4($userHash);
+            $uvalue = $this->ARC4($userHash);
             
             $len = strlen($this->encryptionKey);
-            for ($i = 1; $i<=19; ++$i) {
+            for ($i = 1; $i <= 19; ++$i) {
                 $ek = '';
-                for ($j=0; $j< $len; $j++) {
+                for ($j = 0; $j < $len; $j++) {
                     $ek .= chr(ord($this->encryptionKey[$j]) ^ $i);
                 }
                 $this->ARC4_init($ek);
@@ -1544,7 +1544,7 @@  discard block
 block discarded – undo
             $this->ARC4_init($this->encryptionKey);
             //$this->encryptionKey = $encryptionKey;
             //$this->encrypted=1;
-            $uvalue=$this->ARC4($this->encryptionPad);
+            $uvalue = $this->ARC4($this->encryptionPad);
         }
         return $uvalue;
     }
@@ -1557,7 +1557,7 @@  discard block
 block discarded – undo
     protected function strToHex($string)
     {
         $hex = '';
-        for ($i=0; $i < strlen($string); $i++) {
+        for ($i = 0; $i < strlen($string); $i++) {
             $hex .= sprintf("%02x", ord($string[$i]));
         }
         return $hex;
@@ -1566,7 +1566,7 @@  discard block
 block discarded – undo
     protected function hexToStr($hex)
     {
         $str = '';
-        for ($i=0; $i<strlen($hex); $i+=2) {
+        for ($i = 0; $i < strlen($hex); $i += 2) {
             $str .= chr(hexdec(substr($hex, $i, 2)));
         }
         return $str;
@@ -1591,10 +1591,10 @@  discard block
 block discarded – undo
     {
         $tmp = $this->encryptionKey;
         $hex = dechex($id);
-        if (strlen($hex)<6) {
-            $hex = substr('000000', 0, 6-strlen($hex)).$hex;
+        if (strlen($hex) < 6) {
+            $hex = substr('000000', 0, 6 - strlen($hex)).$hex;
         }
-        $tmp.= chr(hexdec(substr($hex, 4, 2))).chr(hexdec(substr($hex, 2, 2))).chr(hexdec(substr($hex, 0, 2))).chr(0).chr(0);
+        $tmp .= chr(hexdec(substr($hex, 4, 2))).chr(hexdec(substr($hex, 2, 2))).chr(hexdec(substr($hex, 0, 2))).chr(0).chr(0);
         $key = $this->md5_16($tmp);
         if ($this->encryptionMode > 1) {
             $this->ARC4_init(substr($key, 0, 16)); // use max 16 bytes for RC4 128bit encryption key
@@ -1611,23 +1611,23 @@  discard block
 block discarded – undo
     {
         $this->arc4 = '';
         // setup the control array
-        if (strlen($key)==0) {
+        if (strlen($key) == 0) {
             return;
         }
         $k = '';
-        while (strlen($k)<256) {
-            $k.=$key;
+        while (strlen($k) < 256) {
+            $k .= $key;
         }
-        $k=substr($k, 0, 256);
-        for ($i=0; $i<256; $i++) {
+        $k = substr($k, 0, 256);
+        for ($i = 0; $i < 256; $i++) {
             $this->arc4 .= chr($i);
         }
-        $j=0;
-        for ($i=0; $i<256; $i++) {
+        $j = 0;
+        for ($i = 0; $i < 256; $i++) {
             $t = $this->arc4[$i];
             $j = ($j + ord($t) + ord($k[$i]))%256;
-            $this->arc4[$i]=$this->arc4[$j];
-            $this->arc4[$j]=$t;
+            $this->arc4[$i] = $this->arc4[$j];
+            $this->arc4[$j] = $t;
         }
     }
 
@@ -1637,19 +1637,19 @@  discard block
 block discarded – undo
      */
     private function ARC4($text)
     {
-        $len=strlen($text);
-        $a=0;
-        $b=0;
+        $len = strlen($text);
+        $a = 0;
+        $b = 0;
         $c = $this->arc4;
-        $out='';
-        for ($i=0; $i<$len; $i++) {
-            $a = ($a+1)%256;
-            $t= $c[$a];
-            $b = ($b+ord($t))%256;
-            $c[$a]=$c[$b];
-            $c[$b]=$t;
-            $k = ord($c[(ord($c[$a])+ord($c[$b]))%256]);
-            $out.=chr(ord($text[$i]) ^ $k);
+        $out = '';
+        for ($i = 0; $i < $len; $i++) {
+            $a = ($a + 1)%256;
+            $t = $c[$a];
+            $b = ($b + ord($t))%256;
+            $c[$a] = $c[$b];
+            $c[$b] = $t;
+            $k = ord($c[(ord($c[$a]) + ord($c[$b]))%256]);
+            $out .= chr(ord($text[$i]) ^ $k);
         }
         return $out;
     }
@@ -1661,7 +1661,7 @@  discard block
 block discarded – undo
     public function addLink($url, $x0, $y0, $x1, $y1)
     {
         $this->numObj++;
-        $info = array('type'=>'link','url'=>$url,'rect'=>array($x0,$y0,$x1,$y1));
+        $info = array('type'=>'link', 'url'=>$url, 'rect'=>array($x0, $y0, $x1, $y1));
         $this->o_annotation($this->numObj, 'new', $info);
     }
 
@@ -1672,7 +1672,7 @@  discard block
 block discarded – undo
     public function addInternalLink($label, $x0, $y0, $x1, $y1)
     {
         $this->numObj++;
-        $info = array('type'=>'ilink','label'=>$label,'rect'=>array($x0,$y0,$x1,$y1));
+        $info = array('type'=>'ilink', 'label'=>$label, 'rect'=>array($x0, $y0, $x1, $y1));
         $this->o_annotation($this->numObj, 'new', $info);
     }
 
@@ -1685,9 +1685,9 @@  discard block
 block discarded – undo
     public function setEncryption($userPass = '', $ownerPass = '', $pc = array(), $mode = 1)
     {
         if ($mode > 1) {
-            $p=bindec('01111111111111111111000011000000'); // revision 3 is using bit 3 - 6 AND 9 - 12
+            $p = bindec('01111111111111111111000011000000'); // revision 3 is using bit 3 - 6 AND 9 - 12
         } else {
-            $p=bindec('01111111111111111111111111000000'); // while revision 2 is using bit 3 - 6 only
+            $p = bindec('01111111111111111111111111000000'); // while revision 2 is using bit 3 - 6 only
         }
         
         $options = array(
@@ -1702,9 +1702,9 @@  discard block
 block discarded – undo
         );
         foreach ($pc as $k => $v) {
             if ($v && isset($options[$k])) {
-                $p+=$options[$k];
+                $p += $options[$k];
             } elseif (isset($options[$v])) {
-                $p+=$options[$v];
+                $p += $options[$v];
             }
         }
         
@@ -1715,10 +1715,10 @@  discard block
 block discarded – undo
         if ($this->arc4_objnum == 0) {
             // then the block does not exist already, add it.
             $this->numObj++;
-            if (strlen($ownerPass)==0) {
-                $ownerPass=$userPass;
+            if (strlen($ownerPass) == 0) {
+                $ownerPass = $userPass;
             }
-            $this->o_encryption($this->numObj, 'new', array('user'=>$userPass,'owner'=>$ownerPass,'p'=>$p));
+            $this->o_encryption($this->numObj, 'new', array('user'=>$userPass, 'owner'=>$ownerPass, 'p'=>$p));
         }
     }
 
@@ -1743,7 +1743,7 @@  discard block
 block discarded – undo
 
         if ($debug) {
             // turn compression off
-            $this->options['compression']=0;
+            $this->options['compression'] = 0;
         }
 
         if ($this->arc4_objnum) {
@@ -1756,23 +1756,23 @@  discard block
 block discarded – undo
 
         $this->checkAllHere();
 
-        $xref=array();
-        $content="%PDF-1.4\n%����";
+        $xref = array();
+        $content = "%PDF-1.4\n%����";
         //  $content="%PDF-1.3\n";
-        $pos=strlen($content);
+        $pos = strlen($content);
         foreach ($this->objects as $k => $v) {
-            $tmp='o_'.$v['t'];
-            $cont=$this->$tmp($k,'out');
-            $content.=$cont;
-            $xref[]=$pos;
-            $pos+=strlen($cont);
+            $tmp = 'o_'.$v['t'];
+            $cont = $this->$tmp($k, 'out');
+            $content .= $cont;
+            $xref[] = $pos;
+            $pos += strlen($cont);
         }
         ++$pos;
-        $content.="\nxref\n0 ".(count($xref)+1)."\n0000000000 65535 f \n";
+        $content .= "\nxref\n0 ".(count($xref) + 1)."\n0000000000 65535 f \n";
         foreach ($xref as $p) {
-            $content.=substr('0000000000', 0, 10-strlen($p+1)).($p+1)." 00000 n \n";
+            $content .= substr('0000000000', 0, 10 - strlen($p + 1)).($p + 1)." 00000 n \n";
         }
-        $content.="trailer\n<< /Size ".(count($xref)+1)." /Root 1 0 R /Info ".$this->infoObject." 0 R";
+        $content .= "trailer\n<< /Size ".(count($xref) + 1)." /Root 1 0 R /Info ".$this->infoObject." 0 R";
         // if encryption has been applied to this document then add the marker for this dictionary
         if ($this->arc4_objnum > 0) {
             $content .= " /Encrypt ".$this->arc4_objnum." 0 R";
@@ -1791,9 +1791,9 @@  discard block
 block discarded – undo
      *
      * @access protected
      */
-    protected function newDocument($pageSize = array(0,0,612,792))
+    protected function newDocument($pageSize = array(0, 0, 612, 792))
     {
-        $this->numObj=0;
+        $this->numObj = 0;
         $this->objects = array();
 
         $this->numObj++;
@@ -1838,7 +1838,7 @@  discard block
 block discarded – undo
         $pos = strrpos($font, '/');
         if ($pos === false) {
             // $dir  = './';
-            $dir  = dirname(__FILE__) . '/fonts/';
+            $dir  = dirname(__FILE__).'/fonts/';
             $name = $font;
         } else {
             $dir  = substr($font, 0, $pos + 1);
@@ -1864,7 +1864,7 @@  discard block
 block discarded – undo
             } else {
                 $this->debug('openFont: cached file found in '.$this->tempPath.'/'.$cachedFile);
                 $this->fonts[$font] = require($this->tempPath.'/'.$cachedFile);
-                if (!isset($this->fonts[$font]['_version_']) || $this->fonts[$font]['_version_']<2) {
+                if (!isset($this->fonts[$font]['_version_']) || $this->fonts[$font]['_version_'] < 2) {
                     // if the font file is old, then clear it out and prepare for re-creation
                     $this->debug('openFont: version conflict with cached font file. Force recreation');
                     unset($this->fonts[$font]);
@@ -1885,8 +1885,8 @@  discard block
 block discarded – undo
             
             $file = file($dir.$metrics_name);
             foreach ($file as $row) {
-                $row=trim($row);
-                $pos=strpos($row, ' ');
+                $row = trim($row);
+                $pos = strpos($row, ' ');
                 if ($pos) {
                     // then there must be some keyword
                     $key = substr($row, 0, $pos);
@@ -1909,10 +1909,10 @@  discard block
 block discarded – undo
                         case 'StdHW':
                         case 'StdVW':
                         case 'StartCharMetrics':
-                            $data[$key]=trim(substr($row, $pos));
+                            $data[$key] = trim(substr($row, $pos));
                             break;
                         case 'FontBBox':
-                            $data[$key]=explode(' ', trim(substr($row, $pos)));
+                            $data[$key] = explode(' ', trim(substr($row, $pos)));
                             break;
                         case 'C':
                             // C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
@@ -1976,16 +1976,16 @@  discard block
 block discarded – undo
                         case 'KPX':
                             break;
                         // KPX Adieresis yacute -40
-                        $bits=explode(' ', $row);
-                        $data['KPX'][$bits[1]][$bits[2]]=$bits[3];
+                        $bits = explode(' ', $row);
+                        $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
                         break;
                     }
                 }
             }
             $data['CIDtoGID'] = base64_encode($cidtogid);
-            $data['_version_']=2;
+            $data['_version_'] = 2;
             
-            $this->fonts[$font]=$data;
+            $this->fonts[$font] = $data;
             $fp = fopen($this->tempPath.'/'.$cachedFile, 'w'); // use the temp folder to write cached font data
             fwrite($fp, '<?php /* R&OS php pdf class font cache file */ return '.var_export($data, true).'; ?>');
             fclose($fp);
@@ -2017,7 +2017,7 @@  discard block
 block discarded – undo
     
         $ext = substr($fontName, -4);
         if ($ext === '.afm' || $ext === '.ufm') {
-            $fontName = substr($fontName, 0, strlen($fontName)-4);
+            $fontName = substr($fontName, 0, strlen($fontName) - 4);
         }
         
         $pos = strrpos($fontName, '/');
@@ -2098,14 +2098,14 @@  discard block
 block discarded – undo
                     // also need to adjust the widths for the differences array
                     if (isset($options['differences'])) {
                         foreach ($options['differences'] as $charNum => $charName) {
-                            if ($charNum>$lastChar) {
+                            if ($charNum > $lastChar) {
                                 for ($i = $lastChar + 1; $i <= $charNum; $i++) {
-                                    $widths[]=0;
+                                    $widths[] = 0;
                                 }
                                 $lastChar = $charNum;
                             }
                             if (isset($font['C'][$charName])) {
-                                $widths[$charNum-$firstChar]=$font['C'][$charName];
+                                $widths[$charNum - $firstChar] = $font['C'][$charName];
                                 if ($font['isUnicode']) {
                                     $cid_widths[$charName] = $font['C'][$charName];
                                 }
@@ -2124,7 +2124,7 @@  discard block
 block discarded – undo
                     if (!$font['isUnicode']) {
                         $this->numObj++;
                         $this->o_contents($this->numObj, 'new', 'raw');
-                        $this->objects[$this->numObj]['c'].='['.implode(' ', $widths).']';
+                        $this->objects[$this->numObj]['c'] .= '['.implode(' ', $widths).']';
                         $widthid = $this->numObj;
                     }
                     
@@ -2144,16 +2144,16 @@  discard block
 block discarded – undo
                     $fontDescriptorId = ++$this->numObj;
                     
                     // determine flags (more than a little flakey, hopefully will not matter much)
-                    $flags=0;
-                    if ($font['ItalicAngle']!=0) {
-                        $flags+=pow(2, 6);
+                    $flags = 0;
+                    if ($font['ItalicAngle'] != 0) {
+                        $flags += pow(2, 6);
                     }
-                    if ($font['IsFixedPitch']=='true') {
-                        $flags+=1;
+                    if ($font['IsFixedPitch'] == 'true') {
+                        $flags += 1;
                     }
-                    $flags+=pow(2, 5); // assume non-sybolic
+                    $flags += pow(2, 5); // assume non-sybolic
 
-                    $list = array('Ascent'=>'Ascender','CapHeight'=>'CapHeight','Descent'=>'Descender','FontBBox'=>'FontBBox','ItalicAngle'=>'ItalicAngle');
+                    $list = array('Ascent'=>'Ascender', 'CapHeight'=>'CapHeight', 'Descent'=>'Descender', 'FontBBox'=>'FontBBox', 'ItalicAngle'=>'ItalicAngle');
                     $fdopt = array(
                         'Flags' => $flags,
                         'FontName' => $adobeFontName,
@@ -2161,13 +2161,13 @@  discard block
 block discarded – undo
                     );
                     foreach ($list as $k => $v) {
                         if (isset($font[$v])) {
-                            $fdopt[$k]=$font[$v];
+                            $fdopt[$k] = $font[$v];
                         }
                     }
                     
                     // setup the basic properties for o_font output
-                    $tmp = array('BaseFont'=>$adobeFontName,'Widths'=>$widthid
-                                      ,'FirstChar'=>$firstChar,'LastChar'=>$lastChar
+                    $tmp = array('BaseFont'=>$adobeFontName, 'Widths'=>$widthid
+                                      ,'FirstChar'=>$firstChar, 'LastChar'=>$lastChar
                                       ,'FontDescriptor'=>$fontDescriptorId);
                     
                     // binary content of pfb or ttf file
@@ -2176,11 +2176,11 @@  discard block
 block discarded – undo
                     // embed the font program
                     // to allow font subsets embedding fonts is proceed in o_font 'output'
                     if ($this->embedFont) {
-                        if ($fbtype=='pfb') {
-                            $fdopt['FontFile']=$pfbid;
-                        } elseif ($fbtype=='ttf') {
-                            $fdopt['FontFile2']=$pfbid;
-                            $tmp['SubType']='TrueType'; // Declare basic font as TrueType
+                        if ($fbtype == 'pfb') {
+                            $fdopt['FontFile'] = $pfbid;
+                        } elseif ($fbtype == 'ttf') {
+                            $fdopt['FontFile2'] = $pfbid;
+                            $tmp['SubType'] = 'TrueType'; // Declare basic font as TrueType
                         }
                         $this->o_fontDescriptor($fontDescriptorId, 'new', $fdopt);
                         $this->o_contents($pfbid, 'new');
@@ -2198,7 +2198,7 @@  discard block
 block discarded – undo
                 // also set the differences here, note that this means that these will take effect only the
                 // first time that a font is selected, else they are ignored
                 if (isset($options['differences'])) {
-                    $font['differences']=$options['differences'];
+                    $font['differences'] = $options['differences'];
                 }
             }
         }
@@ -2210,7 +2210,7 @@  discard block
 block discarded – undo
         
         if ($set && isset($this->fonts[$fontName])) {
             // so if for some reason the font was not set in the last one then it will not be selected
-            $this->currentBaseFont=$fontName;
+            $this->currentBaseFont = $fontName;
             // the next line means that if a new font is selected, then the current text state will be
             // applied to it as well.
             $this->setCurrentFont();
@@ -2232,9 +2232,9 @@  discard block
 block discarded – undo
      */
     protected function setCurrentFont()
     {
-        if (strlen($this->currentBaseFont)==0) {
+        if (strlen($this->currentBaseFont) == 0) {
             // then assume an initial font
-            $this->selectFont(dirname(__FILE__) . '/fonts/Helvetica');
+            $this->selectFont(dirname(__FILE__).'/fonts/Helvetica');
         }
         $pos = strrpos($this->currentBaseFont, '/');
         if ($pos !== false) {
@@ -2280,7 +2280,7 @@  discard block
 block discarded – undo
      */
     protected function addContent($content)
     {
-        $this->objects[$this->currentContents]['c'].=$content;
+        $this->objects[$this->currentContents]['c'] .= $content;
     }
 
     /**
@@ -2289,9 +2289,9 @@  discard block
 block discarded – undo
      */
     public function setColor($r, $g, $b, $force = 0)
     {
-        if ($r>=0 && ($force || $r!=$this->currentColour['r'] || $g!=$this->currentColour['g'] || $b!=$this->currentColour['b'])) {
-            $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' rg';
-            $this->currentColour=array('r'=>$r,'g'=>$g,'b'=>$b);
+        if ($r >= 0 && ($force || $r != $this->currentColour['r'] || $g != $this->currentColour['g'] || $b != $this->currentColour['b'])) {
+            $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' rg';
+            $this->currentColour = array('r'=>$r, 'g'=>$g, 'b'=>$b);
         }
     }
 
@@ -2301,9 +2301,9 @@  discard block
 block discarded – undo
      */
     public function setStrokeColor($r, $g, $b, $force = 0)
     {
-        if ($r>=0 && ($force || $r!=$this->currentStrokeColour['r'] || $g!=$this->currentStrokeColour['g'] || $b!=$this->currentStrokeColour['b'])) {
-            $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' RG';
-            $this->currentStrokeColour=array('r'=>$r,'g'=>$g,'b'=>$b);
+        if ($r >= 0 && ($force || $r != $this->currentStrokeColour['r'] || $g != $this->currentStrokeColour['g'] || $b != $this->currentStrokeColour['b'])) {
+            $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' RG';
+            $this->currentStrokeColour = array('r'=>$r, 'g'=>$g, 'b'=>$b);
         }
     }
 
@@ -2313,7 +2313,7 @@  discard block
 block discarded – undo
      */
     public function line($x1, $y1, $x2, $y2)
     {
-        $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' m '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' l S';
+        $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' m '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' l S';
     }
 
     /**
@@ -2324,8 +2324,8 @@  discard block
 block discarded – undo
     {
         // in the current line style, draw a bezier curve from (x0,y0) to (x3,y3) using the other two points
         // as the control points for the curve.
-        $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', $x0).' '.sprintf('%.3F', $y0).' m '.sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1);
-        $this->objects[$this->currentContents]['c'].= ' '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' '.sprintf('%.3F', $x3).' '.sprintf('%.3F', $y3).' c S';
+        $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x0).' '.sprintf('%.3F', $y0).' m '.sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1);
+        $this->objects[$this->currentContents]['c'] .= ' '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' '.sprintf('%.3F', $x3).' '.sprintf('%.3F', $y3).' c S';
     }
 
     /**
@@ -2359,19 +2359,19 @@  discard block
 block discarded – undo
      */
     public function ellipse($x0, $y0, $r1, $r2 = 0, $angle = 0, $nSeg = 8, $astart = 0, $afinish = 360, $close = 1, $fill = 0)
     {
-        if ($r1==0) {
+        if ($r1 == 0) {
             return;
         }
-        if ($r2==0) {
-            $r2=$r1;
+        if ($r2 == 0) {
+            $r2 = $r1;
         }
-        if ($nSeg<2) {
-            $nSeg=2;
+        if ($nSeg < 2) {
+            $nSeg = 2;
         }
 
         $astart = deg2rad((float)$astart);
         $afinish = deg2rad((float)$afinish);
-        $totalAngle =$afinish-$astart;
+        $totalAngle = $afinish - $astart;
 
         $dt = $totalAngle/$nSeg;
         $dtm = $dt/3;
@@ -2381,43 +2381,43 @@  discard block
 block discarded – undo
             $tmp = "\n q ";
             $tmp .= sprintf('%.3F', cos($a)).' '.sprintf('%.3F', (-1.0*sin($a))).' '.sprintf('%.3F', sin($a)).' '.sprintf('%.3F', cos($a)).' ';
             $tmp .= sprintf('%.3F', $x0).' '.sprintf('%.3F', $y0).' cm';
-            $this->objects[$this->currentContents]['c'].= $tmp;
-            $x0=0;
-            $y0=0;
+            $this->objects[$this->currentContents]['c'] .= $tmp;
+            $x0 = 0;
+            $y0 = 0;
         }
 
         $t1 = $astart;
-        $a0 = $x0+$r1*cos($t1);
-        $b0 = $y0+$r2*sin($t1);
+        $a0 = $x0 + $r1*cos($t1);
+        $b0 = $y0 + $r2*sin($t1);
         $c0 = -$r1*sin($t1);
         $d0 = $r2*cos($t1);
 
-        $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', $a0).' '.sprintf('%.3F', $b0).' m ';
-        for ($i=1; $i<=$nSeg; $i++) {
+        $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $a0).' '.sprintf('%.3F', $b0).' m ';
+        for ($i = 1; $i <= $nSeg; $i++) {
             // draw this bit of the total curve
-            $t1 = $i*$dt+$astart;
-            $a1 = $x0+$r1*cos($t1);
-            $b1 = $y0+$r2*sin($t1);
+            $t1 = $i*$dt + $astart;
+            $a1 = $x0 + $r1*cos($t1);
+            $b1 = $y0 + $r2*sin($t1);
             $c1 = -$r1*sin($t1);
             $d1 = $r2*cos($t1);
-            $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', ($a0+$c0*$dtm)).' '.sprintf('%.3F', ($b0+$d0*$dtm));
-            $this->objects[$this->currentContents]['c'].= ' '.sprintf('%.3F', ($a1-$c1*$dtm)).' '.sprintf('%.3F', ($b1-$d1*$dtm)).' '.sprintf('%.3F', $a1).' '.sprintf('%.3F', $b1).' c';
-            $a0=$a1;
-            $b0=$b1;
-            $c0=$c1;
-            $d0=$d1;
+            $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', ($a0 + $c0*$dtm)).' '.sprintf('%.3F', ($b0 + $d0*$dtm));
+            $this->objects[$this->currentContents]['c'] .= ' '.sprintf('%.3F', ($a1 - $c1*$dtm)).' '.sprintf('%.3F', ($b1 - $d1*$dtm)).' '.sprintf('%.3F', $a1).' '.sprintf('%.3F', $b1).' c';
+            $a0 = $a1;
+            $b0 = $b1;
+            $c0 = $c1;
+            $d0 = $d1;
         }
         if ($fill) {
-            $this->objects[$this->currentContents]['c'].=' f';
+            $this->objects[$this->currentContents]['c'] .= ' f';
         } else {
             if ($close) {
-                $this->objects[$this->currentContents]['c'].=' s'; // small 's' signifies closing the path as well
+                $this->objects[$this->currentContents]['c'] .= ' s'; // small 's' signifies closing the path as well
             } else {
-                $this->objects[$this->currentContents]['c'].=' S';
+                $this->objects[$this->currentContents]['c'] .= ' S';
             }
         }
-        if ($angle !=0) {
-            $this->objects[$this->currentContents]['c'].=' Q';
+        if ($angle != 0) {
+            $this->objects[$this->currentContents]['c'] .= ' Q';
         }
     }
 
@@ -2440,26 +2440,26 @@  discard block
 block discarded – undo
 
         // this is quite inefficient in that it sets all the parameters whenever 1 is changed, but will fix another day
         $string = '';
-        if ($width>0) {
-            $string.= $width.' w';
+        if ($width > 0) {
+            $string .= $width.' w';
         }
-        $ca = array('butt'=>0,'round'=>1,'square'=>2);
+        $ca = array('butt'=>0, 'round'=>1, 'square'=>2);
         if (isset($ca[$cap])) {
-            $string.= ' '.$ca[$cap].' J';
+            $string .= ' '.$ca[$cap].' J';
         }
-        $ja = array('miter'=>0,'round'=>1,'bevel'=>2);
+        $ja = array('miter'=>0, 'round'=>1, 'bevel'=>2);
         if (isset($ja[$join])) {
-            $string.= ' '.$ja[$join].' j';
+            $string .= ' '.$ja[$join].' j';
         }
         if (is_array($dash)) {
-            $string.= ' [';
+            $string .= ' [';
             foreach ($dash as $len) {
-                $string.=' '.$len;
+                $string .= ' '.$len;
             }
-            $string.= ' ] '.$phase.' d';
+            $string .= ' ] '.$phase.' d';
         }
         $this->currentLineStyle = $string;
-        $this->objects[$this->currentContents]['c'].="\n".$string;
+        $this->objects[$this->currentContents]['c'] .= "\n".$string;
     }
 
     /**
@@ -2468,15 +2468,15 @@  discard block
 block discarded – undo
      */
     public function polygon($p, $np, $f = 0)
     {
-        $this->objects[$this->currentContents]['c'].="\n";
-        $this->objects[$this->currentContents]['c'].=sprintf('%.3F', $p[0]).' '.sprintf('%.3F', $p[1]).' m ';
-        for ($i=2; $i<$np*2; $i=$i+2) {
-            $this->objects[$this->currentContents]['c'].= sprintf('%.3F', $p[$i]).' '.sprintf('%.3F', $p[$i+1]).' l ';
+        $this->objects[$this->currentContents]['c'] .= "\n";
+        $this->objects[$this->currentContents]['c'] .= sprintf('%.3F', $p[0]).' '.sprintf('%.3F', $p[1]).' m ';
+        for ($i = 2; $i < $np*2; $i = $i + 2) {
+            $this->objects[$this->currentContents]['c'] .= sprintf('%.3F', $p[$i]).' '.sprintf('%.3F', $p[$i + 1]).' l ';
         }
-        if ($f==1) {
-            $this->objects[$this->currentContents]['c'].=' f';
+        if ($f == 1) {
+            $this->objects[$this->currentContents]['c'] .= ' f';
         } else {
-            $this->objects[$this->currentContents]['c'].=' S';
+            $this->objects[$this->currentContents]['c'] .= ' S';
         }
     }
 
@@ -2487,7 +2487,7 @@  discard block
 block discarded – undo
      */
     public function filledRectangle($x1, $y1, $width, $height)
     {
-        $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re f';
+        $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re f';
     }
 
     /**
@@ -2497,7 +2497,7 @@  discard block
 block discarded – undo
      */
     public function rectangle($x1, $y1, $width, $height)
     {
-        $this->objects[$this->currentContents]['c'].="\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re S';
+        $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re S';
     }
 
     /**
@@ -2512,7 +2512,7 @@  discard block
 block discarded – undo
         // then on the new page, re-open them with the right setings
 
         if ($this->nStateStack) {
-            for ($i=$this->nStateStack; $i>=1; $i--) {
+            for ($i = $this->nStateStack; $i >= 1; $i--) {
                 $this->restoreState($i);
             }
         }
@@ -2522,28 +2522,28 @@  discard block
 block discarded – undo
             // the id from the ezPdf class is the od of the contents of the page, not the page object itself
             // query that object to find the parent
             $rid = $this->objects[$id]['onPage'];
-            $opt= array('rid'=>$rid,'pos'=>$pos);
+            $opt = array('rid'=>$rid, 'pos'=>$pos);
             $this->o_page($this->numObj, 'new', $opt);
         } else {
             $this->o_page($this->numObj, 'new');
         }
         // if there is a stack saved, then put that onto the page
         if ($this->nStateStack) {
-            for ($i=1; $i<=$this->nStateStack; $i++) {
+            for ($i = 1; $i <= $this->nStateStack; $i++) {
                 $this->saveState($i);
             }
         }
         // and if there has been a stroke or fill colour set, then transfer them
-        if ($this->currentColour['r']>=0) {
+        if ($this->currentColour['r'] >= 0) {
             $this->setColor($this->currentColour['r'], $this->currentColour['g'], $this->currentColour['b'], 1);
         }
-        if ($this->currentStrokeColour['r']>=0) {
+        if ($this->currentStrokeColour['r'] >= 0) {
             $this->setStrokeColor($this->currentStrokeColour['r'], $this->currentStrokeColour['g'], $this->currentStrokeColour['b'], 1);
         }
 
         // if there is a line style set, then put this in too
         if (strlen($this->currentLineStyle)) {
-            $this->objects[$this->currentContents]['c'].="\n".$this->currentLineStyle;
+            $this->objects[$this->currentContents]['c'] .= "\n".$this->currentLineStyle;
         }
 
         // the call to the o_page object set currentContents to the present page, so this can be returned as the page id
@@ -2568,23 +2568,23 @@  discard block
 block discarded – undo
         // 'compress'=> 1 or 0 - apply content stream compression, this is on (1) by default
         // 'download'=> 1 or 0 - provide download dialog
         if (!is_array($options)) {
-            $options=array();
+            $options = array();
         }
-        if (isset($options['compress']) && $options['compress']==0) {
+        if (isset($options['compress']) && $options['compress'] == 0) {
             $tmp = $this->output(1);
         } else {
             $tmp = $this->output();
         }
         header("Content-Type: application/pdf");
         header("Content-Length: ".strlen(ltrim($tmp)));
-        $fileName = (isset($options['Content-Disposition'])?$options['Content-Disposition']:'file.pdf');
+        $fileName = (isset($options['Content-Disposition']) ? $options['Content-Disposition'] : 'file.pdf');
         if (isset($options['download']) && $options['download'] == 1) {
             $attached = 'attachment';
         } else {
             $attached = 'inline';
         }
         header("Content-Disposition: $attached; filename=".$fileName);
-        if (isset($options['Accept-Ranges']) && $options['Accept-Ranges']==1) {
+        if (isset($options['Accept-Ranges']) && $options['Accept-Ranges'] == 1) {
             header("Accept-Ranges: ".strlen(ltrim($tmp)));
         }
         echo ltrim($tmp);
@@ -2646,13 +2646,13 @@  discard block
 block discarded – undo
                 $hexStr = $this->strToHex($text);
                 // store all used characters if subset font is set to true
                 if ($this->fonts[$cf]['isSubset']) {
-                    for ($i = 0; $i < (strlen($hexStr) / 2); $i++) {
-                        array_push($this->fonts[$cf]['subset'], substr($hexStr, ($i * 2), 2));
+                    for ($i = 0; $i < (strlen($hexStr)/2); $i++) {
+                        array_push($this->fonts[$cf]['subset'], substr($hexStr, ($i*2), 2));
                     }
                 }
             }
         }
-        $text = strtr($text, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(8) => '\\b', chr(9) => '\\t', chr(10) => '\\n', chr(12) => '\\f' ,chr(13) => '\\r'));
+        $text = strtr($text, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(8) => '\\b', chr(9) => '\\t', chr(10) => '\\n', chr(12) => '\\f', chr(13) => '\\r'));
 
         if ($this->rtl) {
             $text = strrev($text);
@@ -2708,7 +2708,7 @@  discard block
 block discarded – undo
                     // compose UTF-8 bytes to a single unicode value
                     $c = $bytes[0];
                     for ($j = 1; $j < $numbytes; $j++) {
-                        $c += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
+                        $c += ($bytes[$j] << (($numbytes - $j - 1)*0x06));
                     }
                     if ((($c >= 0xD800) and ($c <= 0xDFFF)) or ($c >= 0x10FFFF)) {
                         // The definition of UTF-8 prohibits encoding character numbers between
@@ -2759,12 +2759,12 @@  discard block
 block discarded – undo
             if ($c === 0xFFFD) {
                 $out .= "\xFF\xFD"; // replacement character
             } elseif ($c < 0x10000) {
-                $out .= chr($c >> 0x08) . chr($c & 0xFF);
+                $out .= chr($c >> 0x08).chr($c & 0xFF);
             } else {
                 $c -= 0x10000;
                 $w1 = 0xD800 | ($c >> 0x10);
                 $w2 = 0xDC00 | ($c & 0x3FF);
-                $out .= chr($w1 >> 0x08) . chr($w1 & 0xFF) . chr($w2 >> 0x08) . chr($w2 & 0xFF);
+                $out .= chr($w1 >> 0x08).chr($w1 & 0xFF).chr($w2 >> 0x08).chr($w2 & 0xFF);
             }
         }
         return $out;
@@ -2782,10 +2782,10 @@  discard block
 block discarded – undo
         $w = $this->getTextWidth($size, $text);
         // need to adjust for the number of spaces in this text
         $words = explode(' ', $text);
-        $nspaces=count($words)-1;
+        $nspaces = count($words) - 1;
         $w += $wa*$nspaces;
         $a = deg2rad((float)$angle);
-        return array(cos($a)*$w+$x,-sin($a)*$w+$y);
+        return array(cos($a)*$w + $x, -sin($a)*$w + $y);
     }
 
     /**
@@ -2795,8 +2795,8 @@  discard block
 block discarded – undo
      */
     private function checkTextDirective(&$text, $i, &$f)
     {
-        $x=0;
-        $y=0;
+        $x = 0;
+        $y = 0;
         return $this->checkTextDirective1($text, $i, $f, 0, $x, $y);
     }
 
@@ -2812,8 +2812,8 @@  discard block
 block discarded – undo
     private function checkTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size = 0, $angle = 0, $wordSpaceAdjust = 0)
     {
         $directive = 0;
-        $j=$i;
-        if ($text[$j]=='<') {
+        $j = $i;
+        if ($text[$j] == '<') {
             $j++;
             switch ($text[$j]) {
                 case '/':
@@ -2825,44 +2825,44 @@  discard block
 block discarded – undo
                         case 'b':
                         case 'i':
                             $j++;
-                            if ($text[$j]=='>') {
-                                $p = strrpos($this->currentTextState, $text[$j-1]);
+                            if ($text[$j] == '>') {
+                                $p = strrpos($this->currentTextState, $text[$j - 1]);
                                 if ($p !== false) {
                                     // then there is one to remove
-                                    $this->currentTextState = substr($this->currentTextState, 0, $p).substr($this->currentTextState, $p+1);
+                                    $this->currentTextState = substr($this->currentTextState, 0, $p).substr($this->currentTextState, $p + 1);
                                 }
-                                $directive=$j-$i+1;
+                                $directive = $j - $i + 1;
                             }
                             break;
                         case 'c':
                             // this this might be a callback function
                             $j++;
                             $k = strpos($text, '>', $j);
-                            if ($k!==false && $text[$j]==':') {
+                            if ($k !== false && $text[$j] == ':') {
                                 // then this will be treated as a callback directive
-                                $directive = $k-$i+1;
-                                $f=0;
+                                $directive = $k - $i + 1;
+                                $f = 0;
                                 // split the remainder on colons to get the function name and the paramater
-                                $tmp = substr($text, $j+1, $k-$j-1);
+                                $tmp = substr($text, $j + 1, $k - $j - 1);
                                 $b1 = strpos($tmp, ':');
-                                if ($b1!==false) {
+                                if ($b1 !== false) {
                                     $func = substr($tmp, 0, $b1);
-                                    $parm = substr($tmp, $b1+1);
+                                    $parm = substr($tmp, $b1 + 1);
                                 } else {
-                                    $func=$tmp;
-                                    $parm='';
+                                    $func = $tmp;
+                                    $parm = '';
                                 }
                                 if (!isset($func) || !strlen(trim($func))) {
-                                    $directive=0;
+                                    $directive = 0;
                                 } else {
                                     // only call the function if this is the final call
                                     if ($final) {
                                         // need to assess the text position, calculate the text width to this point
                                         // can use getTextWidth to find the text width I think
                                         $tmp = $this->getTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, substr($text, 0, $i));
-                                        $info = array('x'=>$tmp[0],'y'=>$tmp[1],'angle'=>$angle,'status'=>'end','p'=>$parm,'nCallback'=>$this->nCallback);
-                                        $x=$tmp[0];
-                                        $y=$tmp[1];
+                                        $info = array('x'=>$tmp[0], 'y'=>$tmp[1], 'angle'=>$angle, 'status'=>'end', 'p'=>$parm, 'nCallback'=>$this->nCallback);
+                                        $x = $tmp[0];
+                                        $y = $tmp[1];
                                         $ret = $this->$func($info);
                                         if (is_array($ret)) {
                                             // then the return from the callback function could set the position, to start with, later will do font colour, and font
@@ -2870,7 +2870,7 @@  discard block
 block discarded – undo
                                                 switch ($rk) {
                                                     case 'x':
                                                     case 'y':
-                                                        $$rk=$rv;
+                                                        $$rk = $rv;
                                                         break;
                                                 }
                                             }
@@ -2878,8 +2878,8 @@  discard block
 block discarded – undo
                                         // also remove from to the stack
                                         // for simplicity, just take from the end, fix this another day
                                         $this->nCallback--;
-                                        if ($this->nCallback<0) {
-                                            $this->nCallBack=0;
+                                        if ($this->nCallback < 0) {
+                                            $this->nCallBack = 0;
                                         }
                                     }
                                 }
@@ -2890,34 +2890,34 @@  discard block
 block discarded – undo
                 case 'b':
                 case 'i':
                     $j++;
-                    if ($text[$j]=='>') {
-                        $this->currentTextState.=$text[$j-1];
-                        $directive=$j-$i+1;
+                    if ($text[$j] == '>') {
+                        $this->currentTextState .= $text[$j - 1];
+                        $directive = $j - $i + 1;
                     }
                     break;
                 case 'C':
-                    $noClose=1;
+                    $noClose = 1;
                 case 'c':
                     // this this might be a callback function
                     $j++;
                     $k = strpos($text, '>', $j);
-                    if ($k!==false && $text[$j]==':') {
+                    if ($k !== false && $text[$j] == ':') {
                         // then this will be treated as a callback directive
-                        $directive = $k-$i+1;
-                        $f=0;
+                        $directive = $k - $i + 1;
+                        $f = 0;
                         // split the remainder on colons to get the function name and the paramater
                         // $bits = explode(':',substr($text,$j+1,$k-$j-1));
-                        $tmp = substr($text, $j+1, $k-$j-1);
+                        $tmp = substr($text, $j + 1, $k - $j - 1);
                         $b1 = strpos($tmp, ':');
-                        if ($b1!==false) {
+                        if ($b1 !== false) {
                             $func = substr($tmp, 0, $b1);
-                            $parm = substr($tmp, $b1+1);
+                            $parm = substr($tmp, $b1 + 1);
                         } else {
-                            $func=$tmp;
-                            $parm='';
+                            $func = $tmp;
+                            $parm = '';
                         }
                         if (!isset($func) || !strlen(trim($func))) {
-                            $directive=0;
+                            $directive = 0;
                         } else {
                         // only call the function if this is the final call, ie, the one actually doing printing, not measurement
                             if ($final) {
@@ -2925,14 +2925,14 @@  discard block
 block discarded – undo
                                 // can use getTextWidth to find the text width I think
                                 // also add the text height and decender
                                 $tmp = $this->getTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, substr($text, 0, $i));
-                                $info = array('x'=>$tmp[0],'y'=>$tmp[1],'angle'=>$angle,'status'=>'start','p'=>$parm,'f'=>$func,'height'=>$this->getFontHeight($size),'decender'=>$this->getFontDecender($size));
-                                $x=$tmp[0];
-                                $y=$tmp[1];
+                                $info = array('x'=>$tmp[0], 'y'=>$tmp[1], 'angle'=>$angle, 'status'=>'start', 'p'=>$parm, 'f'=>$func, 'height'=>$this->getFontHeight($size), 'decender'=>$this->getFontDecender($size));
+                                $x = $tmp[0];
+                                $y = $tmp[1];
                                 if (!isset($noClose) || !$noClose) {
                                     // only add to the stack if this is a small 'c', therefore is a start-stop pair
                                     $this->nCallback++;
-                                    $info['nCallback']=$this->nCallback;
-                                    $this->callback[$this->nCallback]=$info;
+                                    $info['nCallback'] = $this->nCallback;
+                                    $this->callback[$this->nCallback] = $info;
                                 }
                                 $ret = $this->$func($info);
                                 if (is_array($ret)) {
@@ -2941,7 +2941,7 @@  discard block
 block discarded – undo
                                         switch ($rk) {
                                             case 'x':
                                             case 'y':
-                                                $$rk=$rv;
+                                                $$rk = $rv;
                                                 break;
                                         }
                                     }
@@ -2962,13 +2962,13 @@  discard block
 block discarded – undo
     public function addText($x, $y, $size, $text, $angle = 0, $wordSpaceAdjust = 0)
     {
         if (!$this->numFonts) {
-            $this->selectFont(dirname(__FILE__) . '/fonts/Helvetica');
+            $this->selectFont(dirname(__FILE__).'/fonts/Helvetica');
         }
         // if there are any open callbacks, then they should be called, to show the start of the line
         if ($this->nCallback > 0) {
             for ($i = $this->nCallback; $i > 0; $i--) {
                 // call each function
-                $info = array('x'=>$x,'y'=>$y,'angle'=>$angle,'status'=>'sol','p'=>$this->callback[$i]['p'],'nCallback'=>$this->callback[$i]['nCallback'],'height'=>$this->callback[$i]['height'],'decender'=>$this->callback[$i]['decender']);
+                $info = array('x'=>$x, 'y'=>$y, 'angle'=>$angle, 'status'=>'sol', 'p'=>$this->callback[$i]['p'], 'nCallback'=>$this->callback[$i]['nCallback'], 'height'=>$this->callback[$i]['height'], 'decender'=>$this->callback[$i]['decender']);
                 $func = $this->callback[$i]['f'];
                 $this->$func($info);
             }
@@ -2986,14 +2986,14 @@  discard block
 block discarded – undo
         }
         
         $len = strlen($text);
-        $start=0;
-        for ($i=0; $i<$len; $i++) {
-            $f=1;
+        $start = 0;
+        for ($i = 0; $i < $len; $i++) {
+            $f = 1;
             $directive = $this->checkTextDirective($text, $i, $f);
             if ($directive) {
                 // then we should write what we need to
-                if ($i>$start) {
-                    $part = substr($text, $start, $i-$start);
+                if ($i > $start) {
+                    $part = substr($text, $start, $i - $start);
                     $this->addContent(' /F'.$this->currentFontNum.' '.sprintf('%.1f', $size).' Tf ');
                     $this->addContent(' ('.$this->filterText($part, false).') Tj');
                 }
@@ -3002,13 +3002,13 @@  discard block
 block discarded – undo
                     $this->setCurrentFont();
                 } else {
                     $this->addContent(' ET');
-                    $f=1;
-                    $xp=$x;
-                    $yp=$y;
+                    $f = 1;
+                    $xp = $x;
+                    $yp = $y;
                     $directive = $this->checkTextDirective1($text, $i, $f, 1, $xp, $yp, $size, $angle, $wordSpaceAdjust);
 
                     // restart the text object
-                    if ($angle==0) {
+                    if ($angle == 0) {
                         $this->addContent("\n".'BT '.sprintf('%.3F', $xp).' '.sprintf('%.3F', $yp).' Td');
                     } else {
                         $a = deg2rad((float)$angle);
@@ -3017,14 +3017,14 @@  discard block
 block discarded – undo
                         $tmp .= sprintf('%.3F', $xp).' '.sprintf('%.3F', $yp).' Tm';
                         $this->addContent($tmp);
                     }
-                    if ($wordSpaceAdjust!=0 || $wordSpaceAdjust != $this->wordSpaceAdjust) {
-                        $this->wordSpaceAdjust=$wordSpaceAdjust;
+                    if ($wordSpaceAdjust != 0 || $wordSpaceAdjust != $this->wordSpaceAdjust) {
+                        $this->wordSpaceAdjust = $wordSpaceAdjust;
                         $this->addContent(' '.sprintf('%.3F', $wordSpaceAdjust).' Tw');
                     }
                 }
                 // and move the writing point to the next piece of text
-                $i=$i+$directive-1;
-                $start=$i+1;
+                $i = $i + $directive - 1;
+                $start = $i + 1;
             }
         }
 
@@ -3034,7 +3034,7 @@  discard block
 block discarded – undo
           // modify unicode text so that extra word spacing is manually implemented (bug #)
             $cf = $this->currentFont;
             if ($this->fonts[$cf]['isUnicode'] && $wordSpaceAdjust != 0) {
-                $space_scale = 1000 / $size;
+                $space_scale = 1000/$size;
                 $place_text = str_replace(' ', ' ) '.(-round($space_scale*$wordSpaceAdjust)).' (', $place_text);
             }
             $this->addContent(" /F$this->currentFontNum ".sprintf('%.1F Tf ', $size));
@@ -3085,7 +3085,7 @@  discard block
 block discarded – undo
 
         // hmm, this is where it all starts to get tricky - use the font information to
         // calculate the width of each character, add them up and convert to user units
-        $w=0;
+        $w = 0;
         $len = strlen($text);
         $cf = $this->currentFont;
         // font is set to unicode mode
@@ -3095,15 +3095,15 @@  discard block
 block discarded – undo
             $out = $this->utf8toUtf16BE($text);
         }
         
-        for ($i=0; $i< strlen($text); $i++) {
-            $f=1;
+        for ($i = 0; $i < strlen($text); $i++) {
+            $f = 1;
             $directive = $this->checkTextDirective($text, $i, $f);
             if ($directive) {
                 if ($f) {
                     $this->setCurrentFont();
                     $cf = $this->currentFont;
                 }
-                $i=$i+$directive-1;
+                $i = $i + $directive - 1;
             } else {
                 if ($unicode) {
                     // use the previous converted text (utf8toUtf16BE) and get the correct character index by using below workaround
@@ -3116,10 +3116,10 @@  discard block
 block discarded – undo
                     // then this character is being replaced by another
                     $name = $this->fonts[$cf]['differences'][$char];
                     if (isset($this->fonts[$cf]['C'][$name])) {
-                        $w+=$this->fonts[$cf]['C'][$name];
+                        $w += $this->fonts[$cf]['C'][$name];
                     }
                 } elseif (isset($this->fonts[$cf]['C'][$char])) {
-                    $w+=$this->fonts[$cf]['C'][$char];
+                    $w += $this->fonts[$cf]['C'][$char];
                 }
             }
         }
@@ -3140,20 +3140,20 @@  discard block
 block discarded – undo
                 return;
                 break;
             case 'right':
-                $x+=$width-$actual;
+                $x += $width - $actual;
                 break;
             case 'center':
             case 'centre':
-                $x+=($width-$actual)/2;
+                $x += ($width - $actual)/2;
                 break;
             case 'full':
                 // count the number of words
                 $words = explode(' ', $text);
-                $nspaces=count($words)-1;
-                if ($nspaces>0) {
-                    $adjust = ($width-$actual)/$nspaces;
+                $nspaces = count($words) - 1;
+                if ($nspaces > 0) {
+                    $adjust = ($width - $actual)/$nspaces;
                 } else {
-                    $adjust=0;
+                    $adjust = 0;
                 }
                 break;
         }
@@ -3178,27 +3178,27 @@  discard block
 block discarded – undo
         $store_currentTextState = $this->currentTextState;
 
         if (!$this->numFonts) {
-            $this->selectFont(dirname(__FILE__) . '/fonts/Helvetica');
+            $this->selectFont(dirname(__FILE__).'/fonts/Helvetica');
         }
-        if ($width<=0) {
+        if ($width <= 0) {
             // error, pretend it printed ok, otherwise risking a loop
             return '';
         }
-        $w=0;
-        $break=0;
-        $breakWidth=0;
-        $len=strlen($text);
+        $w = 0;
+        $break = 0;
+        $breakWidth = 0;
+        $len = strlen($text);
         $cf = $this->currentFont;
         $tw = $width/$size*1000;
-        for ($i=0; $i<$len; $i++) {
-            $f=1;
+        for ($i = 0; $i < $len; $i++) {
+            $f = 1;
             $directive = $this->checkTextDirective($text, $i, $f);
             if ($directive) {
                 if ($f) {
                     $this->setCurrentFont();
                     $cf = $this->currentFont;
                 }
-                $i=$i+$directive-1;
+                $i = $i + $directive - 1;
             } else {
                 $cOrd = ord($text[$i]);
                 if (isset($this->fonts[$cf]['differences'][$cOrd])) {
@@ -3209,18 +3209,18 @@  discard block
 block discarded – undo
                 }
 
                 if (isset($this->fonts[$cf]['C'][$cOrd2])) {
-                    $w+=$this->fonts[$cf]['C'][$cOrd2];
+                    $w += $this->fonts[$cf]['C'][$cOrd2];
                 }
-                if ($w>$tw) {
+                if ($w > $tw) {
                     // then we need to truncate this line
-                    if ($break>0) {
+                    if ($break > 0) {
                         // then we have somewhere that we can split :)
-                        if ($text[$break]==' ') {
+                        if ($text[$break] == ' ') {
                             $tmp = substr($text, 0, $break);
                         } else {
-                            $tmp = substr($text, 0, $break+1);
+                            $tmp = substr($text, 0, $break + 1);
                         }
-                        $adjust=0;
+                        $adjust = 0;
                         $this->adjustWrapText($tmp, $breakWidth, $width, $x, $adjust, $justification);
 
                         // reset the text state
@@ -3229,16 +3229,16 @@  discard block
 block discarded – undo
                         if (!$test) {
                             $this->addText($x, $y, $size, $tmp, $angle, $adjust);
                         }
-                        return substr($text, $break+1);
+                        return substr($text, $break + 1);
                     } else {
                         // just split before the current character
                         $tmp = substr($text, 0, $i);
-                        $adjust=0;
-                        $ctmp=ord($text[$i]);
+                        $adjust = 0;
+                        $ctmp = ord($text[$i]);
                         if (isset($this->fonts[$cf]['differences'][$ctmp])) {
-                            $ctmp=$this->fonts[$cf]['differences'][$ctmp];
+                            $ctmp = $this->fonts[$cf]['differences'][$ctmp];
                         }
-                        $tmpw=($w-$this->fonts[$cf]['C'][$ctmp])*$size/1000;
+                        $tmpw = ($w - $this->fonts[$cf]['C'][$ctmp])*$size/1000;
                         $this->adjustWrapText($tmp, $tmpw, $width, $x, $adjust, $justification);
                         // reset the text state
                         $this->currentTextState = $store_currentTextState;
@@ -3249,26 +3249,26 @@  discard block
 block discarded – undo
                         return substr($text, $i);
                     }
                 }
-                if ($text[$i]=='-') {
-                    $break=$i;
+                if ($text[$i] == '-') {
+                    $break = $i;
                     $breakWidth = $w*$size/1000;
                 }
-                if ($text[$i]==' ') {
-                    $break=$i;
-                    $ctmp=ord($text[$i]);
+                if ($text[$i] == ' ') {
+                    $break = $i;
+                    $ctmp = ord($text[$i]);
                     if (isset($this->fonts[$cf]['differences'][$ctmp])) {
-                        $ctmp=$this->fonts[$cf]['differences'][$ctmp];
+                        $ctmp = $this->fonts[$cf]['differences'][$ctmp];
                     }
-                    $breakWidth = ($w-$this->fonts[$cf]['C'][$ctmp])*$size/1000;
+                    $breakWidth = ($w - $this->fonts[$cf]['C'][$ctmp])*$size/1000;
                 }
             }
         }
         // then there was no need to break this line
-        if ($justification=='full') {
-            $justification='left';
+        if ($justification == 'full') {
+            $justification = 'left';
         }
-        $adjust=0;
-        $tmpw=$w*$size/1000;
+        $adjust = 0;
+        $tmpw = $w*$size/1000;
         $this->adjustWrapText($text, $tmpw, $width, $x, $adjust, $justification);
         // reset the text state
         $this->currentTextState = $store_currentTextState;
@@ -3294,17 +3294,17 @@  discard block
 block discarded – undo
             $opt = $this->stateStack[$pageEnd]; // ok to use this as stack starts numbering at 1
             $this->setColor($opt['col']['r'], $opt['col']['g'], $opt['col']['b'], 1);
             $this->setStrokeColor($opt['str']['r'], $opt['str']['g'], $opt['str']['b'], 1);
-            $this->objects[$this->currentContents]['c'].="\n".$opt['lin'];
+            $this->objects[$this->currentContents]['c'] .= "\n".$opt['lin'];
             // $this->currentLineStyle = $opt['lin'];
         } else {
             $this->nStateStack++;
-            $this->stateStack[$this->nStateStack]=array(
+            $this->stateStack[$this->nStateStack] = array(
                 'col'=>$this->currentColour
                 ,'str'=>$this->currentStrokeColour
                 ,'lin'=>$this->currentLineStyle
             );
         }
-        $this->objects[$this->currentContents]['c'].="\nq";
+        $this->objects[$this->currentContents]['c'] .= "\nq";
     }
 
     /**
@@ -3317,12 +3317,12 @@  discard block
 block discarded – undo
             $n = $this->nStateStack;
             $this->currentColour = $this->stateStack[$n]['col'];
             $this->currentStrokeColour = $this->stateStack[$n]['str'];
-            $this->objects[$this->currentContents]['c'].="\n".$this->stateStack[$n]['lin'];
+            $this->objects[$this->currentContents]['c'] .= "\n".$this->stateStack[$n]['lin'];
             $this->currentLineStyle = $this->stateStack[$n]['lin'];
             unset($this->stateStack[$n]);
             $this->nStateStack--;
         }
-        $this->objects[$this->currentContents]['c'].="\nQ";
+        $this->objects[$this->currentContents]['c'] .= "\nQ";
     }
 
     /**
@@ -3335,12 +3335,12 @@  discard block
 block discarded – undo
     public function openObject()
     {
         $this->nStack++;
-        $this->stack[$this->nStack]=array('c'=>$this->currentContents,'p'=>$this->currentPage);
+        $this->stack[$this->nStack] = array('c'=>$this->currentContents, 'p'=>$this->currentPage);
         // add a new object of the content type, to hold the data flow
         $this->numObj++;
         $this->o_contents($this->numObj, 'new');
-        $this->currentContents=$this->numObj;
-        $this->looseObjects[$this->numObj]=1;
+        $this->currentContents = $this->numObj;
+        $this->looseObjects[$this->numObj] = 1;
 
         return $this->numObj;
     }
@@ -3352,8 +3352,8 @@  discard block
 block discarded – undo
     public function reopenObject($id)
     {
         $this->nStack++;
-        $this->stack[$this->nStack]=array('c'=>$this->currentContents,'p'=>$this->currentPage);
-        $this->currentContents=$id;
+        $this->stack[$this->nStack] = array('c'=>$this->currentContents, 'p'=>$this->currentPage);
+        $this->currentContents = $id;
        // also if this object is the primary contents for a page, then set the current page to its parent
         if (isset($this->objects[$id]['onPage'])) {
             $this->currentPage = $this->objects[$id]['onPage'];
@@ -3368,9 +3368,9 @@  discard block
 block discarded – undo
     {
         // close the object, as long as there was one open in the first place, which will be indicated by
         // an objectId on the stack.
-        if ($this->nStack>0) {
-            $this->currentContents=$this->stack[$this->nStack]['c'];
-            $this->currentPage=$this->stack[$this->nStack]['p'];
+        if ($this->nStack > 0) {
+            $this->currentContents = $this->stack[$this->nStack]['c'];
+            $this->currentPage = $this->stack[$this->nStack]['p'];
             $this->nStack--;
             // easier to probably not worry about removing the old entries, they will be overwritten
             // if there are new ones.
@@ -3386,7 +3386,7 @@  discard block
 block discarded – undo
         // if an object has been appearing on pages up to now, then stop it, this page will
         // be the last one that could contian it.
         if (isset($this->addLooseObjects[$id])) {
-            $this->addLooseObjects[$id]='';
+            $this->addLooseObjects[$id] = '';
         }
     }
 
@@ -3397,13 +3397,13 @@  discard block
 block discarded – undo
     public function addObject($id, $options = 'add')
     {
         // add the specified object to the page
-        if (isset($this->looseObjects[$id]) && $this->currentContents!=$id) {
+        if (isset($this->looseObjects[$id]) && $this->currentContents != $id) {
             // then it is a valid object, and it is not being added to itself
             switch ($options) {
                 case 'all':
                     // then this object is to be added to this page (done in the next block) and
                     // all future new pages.
-                    $this->addLooseObjects[$id]='all';
+                    $this->addLooseObjects[$id] = 'all';
                 case 'add':
                     if (isset($this->objects[$this->currentContents]['onPage'])) {
                         // then the destination contents is the primary for the page
@@ -3412,27 +3412,27 @@  discard block
 block discarded – undo
                     }
                     break;
                 case 'even':
-                    $this->addLooseObjects[$id]='even';
-                    $pageObjectId=$this->objects[$this->currentContents]['onPage'];
-                    if ($this->objects[$pageObjectId]['info']['pageNum']%2==0) {
+                    $this->addLooseObjects[$id] = 'even';
+                    $pageObjectId = $this->objects[$this->currentContents]['onPage'];
+                    if ($this->objects[$pageObjectId]['info']['pageNum']%2 == 0) {
                         $this->addObject($id); // hacky huh :)
                     }
                     break;
                 case 'odd':
-                    $this->addLooseObjects[$id]='odd';
-                    $pageObjectId=$this->objects[$this->currentContents]['onPage'];
-                    if ($this->objects[$pageObjectId]['info']['pageNum']%2==1) {
+                    $this->addLooseObjects[$id] = 'odd';
+                    $pageObjectId = $this->objects[$this->currentContents]['onPage'];
+                    if ($this->objects[$pageObjectId]['info']['pageNum']%2 == 1) {
                         $this->addObject($id); // hacky huh :)
                     }
                     break;
                 case 'next':
-                    $this->addLooseObjects[$id]='all';
+                    $this->addLooseObjects[$id] = 'all';
                     break;
                 case 'nexteven':
-                    $this->addLooseObjects[$id]='even';
+                    $this->addLooseObjects[$id] = 'even';
                     break;
                 case 'nextodd':
-                    $this->addLooseObjects[$id]='odd';
+                    $this->addLooseObjects[$id] = 'odd';
                     break;
             }
         }
@@ -3481,10 +3481,10 @@  discard block
 block discarded – undo
     private function getBytes(&$data, $pos, $num)
     {
         // return the integer represented by $num bytes from $pos within $data
-        $ret=0;
-        for ($i=0; $i<$num; $i++) {
-            $ret=$ret*256;
-            $ret+=ord($data[$pos+$i]);
+        $ret = 0;
+        for ($i = 0; $i < $num; $i++) {
+            $ret = $ret*256;
+            $ret += ord($data[$pos + $i]);
         }
         return $ret;
     }
@@ -3501,30 +3501,30 @@  discard block
 block discarded – undo
         $p = 8;
         $len = strlen($data);
         // cycle through the file, identifying chunks
-        while ($p<$len) {
+        while ($p < $len) {
             $chunkLen = $this->getBytes($data, $p, 4);
-            $chunkType = substr($data, $p+4, 4);
+            $chunkType = substr($data, $p + 4, 4);
             //error_log($chunkType. ' - '.$chunkLen);
             switch ($chunkType) {
                 case 'IHDR':
                 //this is where all the file information comes from
-                    $default['info']['width']=$this->getBytes($data, $p+8, 4);
-                    $default['info']['height']=$this->getBytes($data, $p+12, 4);
-                    $default['info']['bitDepth']=ord($data[$p+16]);
-                    $default['info']['colorType']=ord($data[$p+17]);
-                    $default['info']['compressionMethod']=ord($data[$p+18]);
-                    $default['info']['filterMethod']=ord($data[$p+19]);
-                    $default['info']['interlaceMethod']=ord($data[$p+20]);
+                    $default['info']['width'] = $this->getBytes($data, $p + 8, 4);
+                    $default['info']['height'] = $this->getBytes($data, $p + 12, 4);
+                    $default['info']['bitDepth'] = ord($data[$p + 16]);
+                    $default['info']['colorType'] = ord($data[$p + 17]);
+                    $default['info']['compressionMethod'] = ord($data[$p + 18]);
+                    $default['info']['filterMethod'] = ord($data[$p + 19]);
+                    $default['info']['interlaceMethod'] = ord($data[$p + 20]);
                 
-                    $this->debug('readPngChunks: ColorType is' . $default['info']['colorType'], E_USER_NOTICE);
+                    $this->debug('readPngChunks: ColorType is'.$default['info']['colorType'], E_USER_NOTICE);
                 
                     $default['haveHeader'] = true;
                 
-                    if ($default['info']['compressionMethod']!=0) {
+                    if ($default['info']['compressionMethod'] != 0) {
                         $error = true;
                         $errormsg = "unsupported compression method";
                     }
-                    if ($default['info']['filterMethod']!=0) {
+                    if ($default['info']['filterMethod'] != 0) {
                         $error = true;
                         $errormsg = "unsupported filter method";
                     }
@@ -3539,12 +3539,12 @@  discard block
 block discarded – undo
         
                         // there will be one entry for each palette entry. up until the last non-opaque entry.
                         // set up an array, stretching over all palette entries which will be o (opaque) or 1 (transparent)
-                        $default['transparency']['type']='indexed';
+                        $default['transparency']['type'] = 'indexed';
                         //$numPalette = strlen($default['pdata'])/3;
-                        $trans=0;
-                        for ($i=$chunkLen; $i>=0; $i--) {
-                            if (ord($data[$p+8+$i])==0) {
-                                $trans=$i;
+                        $trans = 0;
+                        for ($i = $chunkLen; $i >= 0; $i--) {
+                            if (ord($data[$p + 8 + $i]) == 0) {
+                                $trans = $i;
                             }
                         }
                         $default['transparency']['data'] = $trans;
@@ -3553,16 +3553,16 @@  discard block
 block discarded – undo
                         // Gray: 2 bytes, range 0 .. (2^bitdepth)-1
         
                         // $transparency['grayscale']=$this->getBytes($data,$p+8,2); // g = grayscale
-                        $default['transparency']['type']='indexed';
-                        $default['transparency']['data'] = ord($data[$p+8+1]);
+                        $default['transparency']['type'] = 'indexed';
+                        $default['transparency']['data'] = ord($data[$p + 8 + 1]);
                     } elseif ($default['info']['colorType'] == 2) { // truecolor
                         // corresponding to entries in the plte chunk
                         // Red: 2 bytes, range 0 .. (2^bitdepth)-1
                         // Green: 2 bytes, range 0 .. (2^bitdepth)-1
                         // Blue: 2 bytes, range 0 .. (2^bitdepth)-1
-                        $default['transparency']['r']=$this->getBytes($data, $p+8, 2); // r from truecolor
-                        $default['transparency']['g']=$this->getBytes($data, $p+10, 2); // g from truecolor
-                        $default['transparency']['b']=$this->getBytes($data, $p+12, 2); // b from truecolor
+                        $default['transparency']['r'] = $this->getBytes($data, $p + 8, 2); // r from truecolor
+                        $default['transparency']['g'] = $this->getBytes($data, $p + 10, 2); // g from truecolor
+                        $default['transparency']['b'] = $this->getBytes($data, $p + 12, 2); // b from truecolor
                     } elseif ($default['info']['colorType'] == 6 || $default['info']['colorType'] == 4) {
                         // set transparency type to "alpha" and proceed with it in $this->o_image later
                         $default['transparency']['type'] = 'alpha';
@@ -3579,11 +3579,11 @@  discard block
 block discarded – undo
                             for ($ypx = 0; $ypx < $default['info']['height']; ++$ypx) {
                                 $colorBits = imagecolorat($img, $xpx, $ypx);
                                 $color = imagecolorsforindex($img, $colorBits);
-                                $color['alpha'] = (((127 - $color['alpha']) / 127) * 255);
+                                $color['alpha'] = (((127 - $color['alpha'])/127)*255);
                                 imagesetpixel($imgalpha, $xpx, $ypx, $color['alpha']);
                             }
                         }
-                        $tmpfile_alpha=tempnam($this->tempPath, 'ezImg');
+                        $tmpfile_alpha = tempnam($this->tempPath, 'ezImg');
                     
                         imagepng($imgalpha, $tmpfile_alpha);
                         imagedestroy($imgalpha);
@@ -3595,7 +3595,7 @@  discard block
 block discarded – undo
                         $default['pdata'] = $alphaImg['idata'];
                     
                         // generate true color image with no alpha channel
-                        $tmpfile_tt=tempnam($this->tempPath, 'ezImg');
+                        $tmpfile_tt = tempnam($this->tempPath, 'ezImg');
                     
                         $imgplain = imagecreatetruecolor($default['info']['width'], $default['info']['height']);
                         imagecopy($imgplain, $img, 0, 0, 0, 0, $default['info']['width'], $default['info']['height']);
@@ -3615,10 +3615,10 @@  discard block
 block discarded – undo
                     }
                     break;
                 case 'PLTE':
-                    $default['pdata'] = substr($data, $p+8, $chunkLen);
+                    $default['pdata'] = substr($data, $p + 8, $chunkLen);
                     break;
                 case 'IDAT':
-                    $default['idata'] .= substr($data, $p+8, $chunkLen);
+                    $default['idata'] .= substr($data, $p + 8, $chunkLen);
                     break;
                 case 'tRNS': // this HEADER info is optional. More info: rfc2083 (http://tools.ietf.org/html/rfc2083)
                     // error_log('OPTIONAL HEADER -tRNS- exist:');
@@ -3628,7 +3628,7 @@  discard block
 block discarded – undo
                 default:
                     break;
             }
-            $p += $chunkLen+12;
+            $p += $chunkLen + 12;
         }
         return $default;
     }
@@ -3644,18 +3644,18 @@  discard block
 block discarded – undo
         $error = false;
         $errormsg = "";
         
-        $this->debug('addPngFromFile: opening image ' . $file);
+        $this->debug('addPngFromFile: opening image '.$file);
         
         $data = file_get_contents($file);
         
         if ($data === false) {
-            $this->debug('addPngFromFile: trouble opening file ' . $file, E_USER_WARNING);
+            $this->debug('addPngFromFile: trouble opening file '.$file, E_USER_WARNING);
             return;
         }
         
         $header = chr(137).chr(80).chr(78).chr(71).chr(13).chr(10).chr(26).chr(10);
-        if (substr($data, 0, 8)!=$header) {
-            $this->debug('addPngFromFile: Invalid PNG header for file: ' . $file, E_USER_WARNING);
+        if (substr($data, 0, 8) != $header) {
+            $this->debug('addPngFromFile: Invalid PNG header for file: '.$file, E_USER_WARNING);
             return;
         }
         
@@ -3675,24 +3675,24 @@  discard block
 block discarded – undo
             $errormsg = "only bit depth of 8 or less is supported.";
         }
 
-        if ($iChunk['info']['colorType'] == 1 || $iChunk['info']['colorType'] == 5 || $iChunk['info']['colorType']== 7) {
+        if ($iChunk['info']['colorType'] == 1 || $iChunk['info']['colorType'] == 5 || $iChunk['info']['colorType'] == 7) {
             $error = true;
             $errormsg = 'Unsupported PNG color type: '.$iChunk['info']['colorType'];
         } elseif (isset($iChunk['info'])) {
             switch ($iChunk['info']['colorType']) {
                 case 3:
                     $color = 'DeviceRGB';
-                    $ncolor=1;
+                    $ncolor = 1;
                     break;
                 case 6:
                 case 2:
                     $color = 'DeviceRGB';
-                    $ncolor=3;
+                    $ncolor = 3;
                     break;
                 case 4:
                 case 0:
                     $color = 'DeviceGray';
-                    $ncolor=1;
+                    $ncolor = 1;
                     break;
             }
         }
@@ -3701,11 +3701,11 @@  discard block
 block discarded – undo
             $this->debug('addPngFromFile: '.$errormsg, E_USER_WARNING);
             return;
         }
-        if ($w==0) {
-            $w=$h/$iChunk['info']['height']*$iChunk['info']['width'];
+        if ($w == 0) {
+            $w = $h/$iChunk['info']['height']*$iChunk['info']['width'];
         }
-        if ($h==0) {
-            $h=$w*$iChunk['info']['height']/$iChunk['info']['width'];
+        if ($h == 0) {
+            $h = $w*$iChunk['info']['height']/$iChunk['info']['width'];
         }
         
         if ($this->hashed) {
@@ -3715,24 +3715,24 @@  discard block
 block discarded – undo
             $label = $this->objectHash[$oHash];
         } else {
             $this->numImages++;
-            $label='I'.$this->numImages;
+            $label = 'I'.$this->numImages;
             $this->numObj++;
             
             if (isset($oHash)) {
                 $this->objectHash[$oHash] = $label;
             }
             
-            $options = array('label'=>$label,'data'=>$iChunk['idata'],'bitsPerComponent'=>$iChunk['info']['bitDepth'],'pdata'=>$iChunk['pdata']
-                                      ,'iw'=>$iChunk['info']['width'],'ih'=>$iChunk['info']['height'],'type'=>'png','color'=>$color,'ncolor'=>$ncolor);
+            $options = array('label'=>$label, 'data'=>$iChunk['idata'], 'bitsPerComponent'=>$iChunk['info']['bitDepth'], 'pdata'=>$iChunk['pdata']
+                                      ,'iw'=>$iChunk['info']['width'], 'ih'=>$iChunk['info']['height'], 'type'=>'png', 'color'=>$color, 'ncolor'=>$ncolor);
             if (isset($iChunk['transparency'])) {
-                $options['transparency']=$iChunk['transparency'];
+                $options['transparency'] = $iChunk['transparency'];
             }
             $this->o_image($this->numObj, 'new', $options);
         }
         
-        $this->objects[$this->currentContents]['c'].="\nq ".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
-        $this->objects[$this->currentContents]['c'].=" /".$label.' Do';
-        $this->objects[$this->currentContents]['c'].=" Q";
+        $this->objects[$this->currentContents]['c'] .= "\nq ".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
+        $this->objects[$this->currentContents]['c'] .= " /".$label.' Do';
+        $this->objects[$this->currentContents]['c'] .= " Q";
     }
     
     /**
@@ -3748,9 +3748,9 @@  discard block
 block discarded – undo
             return;
         }
 
-        $tmp=getimagesize($img);
-        $imageWidth=$tmp[0];
-        $imageHeight=$tmp[1];
+        $tmp = getimagesize($img);
+        $imageWidth = $tmp[0];
+        $imageHeight = $tmp[1];
 
         if (isset($tmp['channels'])) {
             $channels = $tmp['channels'];
@@ -3758,14 +3758,14 @@  discard block
 block discarded – undo
             $channels = 3;
         }
 
-        if ($w<=0 && $h<=0) {
-            $w=$imageWidth;
+        if ($w <= 0 && $h <= 0) {
+            $w = $imageWidth;
         }
-        if ($w==0) {
-            $w=$h/$imageHeight*$imageWidth;
+        if ($w == 0) {
+            $w = $h/$imageHeight*$imageWidth;
         }
-        if ($h==0) {
-            $h=$w*$imageHeight/$imageWidth;
+        if ($h == 0) {
+            $h = $w*$imageHeight/$imageWidth;
         }
 
         $data = file_get_contents($img);
@@ -3793,23 +3793,23 @@  discard block
 block discarded – undo
             return;
         }
         
-        $tmp=getimagesize($img);
-        $imageWidth=$tmp[0];
-        $imageHeight=$tmp[1];
+        $tmp = getimagesize($img);
+        $imageWidth = $tmp[0];
+        $imageHeight = $tmp[1];
         
         
-        if ($w<=0 && $h<=0) {
-            $w=$imageWidth;
+        if ($w <= 0 && $h <= 0) {
+            $w = $imageWidth;
         }
-        if ($w==0) {
-            $w=$h/$imageHeight*$imageWidth;
+        if ($w == 0) {
+            $w = $h/$imageHeight*$imageWidth;
         }
-        if ($h==0) {
-            $h=$w*$imageHeight/$imageWidth;
+        if ($h == 0) {
+            $h = $w*$imageHeight/$imageWidth;
         }
         
         $imgres = imagecreatefromgif($img);
-        $tmpName=tempnam($this->tempPath, 'img');
+        $tmpName = tempnam($this->tempPath, 'img');
         imagejpeg($imgres, $tmpName, 90);
         
         $this->addJpegFromFile($tmpName, $x, $y, $w, $h);
@@ -3837,26 +3837,26 @@  discard block
 block discarded – undo
 
         // there seems to be some problem here in that images that have quality set above 75 do not appear
         // not too sure why this is, but in the meantime I have restricted this to 75.
-        if ($quality>75) {
-            $quality=75;
+        if ($quality > 75) {
+            $quality = 75;
         }
 
         // if the width or height are set to zero, then set the other one based on keeping the image
         // height/width ratio the same, if they are both zero, then give up :)
-        $imageWidth=imagesx($img);
-        $imageHeight=imagesy($img);
+        $imageWidth = imagesx($img);
+        $imageHeight = imagesy($img);
 
-        if ($w<=0 && $h<=0) {
+        if ($w <= 0 && $h <= 0) {
             return;
         }
-        if ($w==0) {
-            $w=$h/$imageHeight*$imageWidth;
+        if ($w == 0) {
+            $w = $h/$imageHeight*$imageWidth;
         }
-        if ($h==0) {
-            $h=$w*$imageHeight/$imageWidth;
+        if ($h == 0) {
+            $h = $w*$imageHeight/$imageWidth;
         }
 
-        $tmpName=tempnam($this->tempPath, 'img');
+        $tmpName = tempnam($this->tempPath, 'img');
         imagejpeg($img, $tmpName, $quality);
         
         $data = file_get_contents($tmpName);
@@ -3882,19 +3882,19 @@  discard block
 block discarded – undo
             $label = $this->objectHash[$oHash];
         } else {
             $this->numImages++;
-            $label='I'.$this->numImages;
+            $label = 'I'.$this->numImages;
             $this->numObj++;
             
             if (isset($oHash)) {
                 $this->objectHash[$oHash] = $label;
             }
             
-            $this->o_image($this->numObj, 'new', array('label'=>$label,'data'=>$data,'iw'=>$imageWidth,'ih'=>$imageHeight,'channels'=>$channels));
+            $this->o_image($this->numObj, 'new', array('label'=>$label, 'data'=>$data, 'iw'=>$imageWidth, 'ih'=>$imageHeight, 'channels'=>$channels));
         }
 
-        $this->objects[$this->currentContents]['c'].="\nq ".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
-        $this->objects[$this->currentContents]['c'].=" /".$label.' Do';
-        $this->objects[$this->currentContents]['c'].=" Q";
+        $this->objects[$this->currentContents]['c'] .= "\nq ".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
+        $this->objects[$this->currentContents]['c'] .= " /".$label.' Do';
+        $this->objects[$this->currentContents]['c'] .= " Q";
     }
 
     /**
@@ -3914,7 +3914,7 @@  discard block
 block discarded – undo
         // 'FitBH' top
         // 'FitBV' left
         $this->numObj++;
-        $this->o_destination($this->numObj, 'new', array('page'=>$this->currentPage,'type'=>$style,'p1'=>$a,'p2'=>$b,'p3'=>$c));
+        $this->o_destination($this->numObj, 'new', array('page'=>$this->currentPage, 'type'=>$style, 'p1'=>$a, 'p2'=>$b, 'p3'=>$c));
         $id = $this->catalogId;
         $this->o_catalog($id, 'openHere', $this->numObj);
     }
@@ -3929,10 +3929,10 @@  discard block
 block discarded – undo
         // it has been linked to
         // styles are the same as the 'openHere' function
         $this->numObj++;
-        $this->o_destination($this->numObj, 'new', array('page'=>$this->currentPage,'type'=>$style,'p1'=>$a,'p2'=>$b,'p3'=>$c));
+        $this->o_destination($this->numObj, 'new', array('page'=>$this->currentPage, 'type'=>$style, 'p1'=>$a, 'p2'=>$b, 'p3'=>$c));
         $id = $this->numObj;
         // store the label->idf relationship, note that this means that labels can be used only once
-        $this->destinations["$label"]=$id;
+        $this->destinations["$label"] = $id;
     }
 
     /**
@@ -3967,7 +3967,7 @@  discard block
 block discarded – undo
                     trigger_error($message, $error_type);
                     break;
                 case 'variable':
-                    $this->messages.=$message."\n";
+                    $this->messages .= $message."\n";
                     break;
             }
         }
@@ -3995,7 +3995,7 @@  discard block
 block discarded – undo
                     $this->checkpoint = $tmp;
                     unset($tmp);
                 } else {
-                    $this->checkpoint='';
+                    $this->checkpoint = '';
                 }
                 break;
             case 'rewind':
@@ -4005,7 +4005,7 @@  discard block
 block discarded – undo
                     $tmp = $this->checkpoint;
                     foreach ($tmp as $k => $v) {
                         if ($k != 'checkpoint') {
-                            $this->$k=$v;
+                            $this->$k = $v;
                         }
                     }
                     unset($tmp);
@@ -4016,7 +4016,7 @@  discard block
 block discarded – undo
                     // can only abort if were inside a checkpoint
                     $tmp = $this->checkpoint;
                     foreach ($tmp as $k => $v) {
-                        $this->$k=$v;
+                        $this->$k = $v;
                     }
                     unset($tmp);
                 }

Please login to merge, or discard this patch.

src/Intraface/ModuleHandler.php 2 patches

Doc Comments +7 added lines, -1 removed lines patch added patch discarded remove patch

@@ -39,6 +39,9 @@  discard block
 block discarded – undo
         }
     }
 
+    /**
+     * @param string $module_name
+     */
     function setPrimaryModule($module_name)
     {
         if (!empty($this->primary_module_object) and is_object($this->primary_module_object)) {
@@ -169,8 +172,8 @@  discard block
 block discarded – undo
     /**
      * getModule()
      *
-     * @param string $module_name
      *
+     * @param string $name
      * @return object
      */
     function getModule($name)
@@ -250,6 +253,9 @@  discard block
 block discarded – undo
         return false;
     }
 
+    /**
+     * @param string $name
+     */
     private static function isValidModuleName($name)
     {
         return preg_match("/^[a-z0-9]+$/", $name);

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -78,7 +78,7 @@  discard block
 block discarded – undo
     public function useModule($module_name, $ignore_user_access = false)
     {
         if (!self::isValidModuleName($module_name)) {
-            throw new Exception($module_name . ' is not a valid module name');
+            throw new Exception($module_name.' is not a valid module name');
         }
 
         if (!empty($this->modules[$module_name]) and is_object($this->modules[$module_name])) {
@@ -116,11 +116,11 @@  discard block
 block discarded – undo
         }
 
         if ($access !== true) {
-            throw new Exception('You need access to a required module to see this page, maybe it is ' . $module_name);
+            throw new Exception('You need access to a required module to see this page, maybe it is '.$module_name);
         }
 
-        $main_class_name = "Main" . ucfirst($module_name);
-        $main_class_path = PATH_INCLUDE_MODULE . $module_name . "/" . $main_class_name . ".php";
+        $main_class_name = "Main".ucfirst($module_name);
+        $main_class_path = PATH_INCLUDE_MODULE.$module_name."/".$main_class_name.".php";
 
         if (file_exists($main_class_path)) {
             require_once($main_class_path);
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
             return $object;
         } else {
             // @TODO this should not fail as hard - but what should happen then?
-            throw new Exception('ModuleHandler: ' . $main_class_path . ' does not exist');
+            throw new Exception('ModuleHandler: '.$main_class_path.' does not exist');
         }
     }
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
     public function useShared($shared_name)
     {
         if (!self::isValidModuleName($shared_name)) {
-            throw new Exception($shared_name. ' is not a valid shared module name');
+            throw new Exception($shared_name.' is not a valid shared module name');
         }
 
         // Tjekker om shared allerede er loaded
@@ -152,8 +152,8 @@  discard block
 block discarded – undo
             return $this->shared[$shared_name];
         }
 
-        $main_shared_name = 'Shared' . ucfirst($shared_name);
-        $main_shared_path = PATH_INCLUDE_SHARED . $shared_name . '/' . $main_shared_name . '.php';
+        $main_shared_name = 'Shared'.ucfirst($shared_name);
+        $main_shared_path = PATH_INCLUDE_SHARED.$shared_name.'/'.$main_shared_name.'.php';
 
         if (file_exists($main_shared_path)) {
             require_once $main_shared_path;
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
             $this->shared[$shared_name] = $object;
             return $object;
         } else {
-            throw new Exception($shared_name . ' cannot be found on ' . $main_shared_path . ' with PATH_INCLUDE_SHARED: ' . PATH_INCLUDE_SHARED);
+            throw new Exception($shared_name.' cannot be found on '.$main_shared_path.' with PATH_INCLUDE_SHARED: '.PATH_INCLUDE_SHARED);
         }
     }
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
         if (is_object($this->modules[$name])) {
             return($this->modules[$name]);
         } else {
-            throw new Exception('getModule() module ' . $name . ' not loaded');
+            throw new Exception('getModule() module '.$name.' not loaded');
         }
     }
 

Please login to merge, or discard this patch.

src/Intraface/modules/accounting/Account.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -450,7 +450,7 @@
 block discarded – undo
      * @param $date_from (date) yyyy-mm-dd Der s�ges jo kun i indev�rende �r
      * @param $date_to (date) yyyy-mm-dd   Der s�ges kun i indev�rende �r
      *
-     * @return (array) med debet, credit og total saldo
+     * @return boolean med debet, credit og total saldo
      *
      *
      *

Please login to merge, or discard this patch.

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -235,7 +235,7 @@
 block discarded – undo
             $this->error->set('Ikke en tilladt type');
         }
 
-         $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');
+            $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');
 
         if (!array_key_exists($var['use_key'], $this->use)) {
             $this->error->set('Ikke en tilladt brug af kontoen');

Please login to merge, or discard this patch.

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -94,7 +94,7 @@  discard block
 block discarded – undo
         $this->db = new DB_Sql;
         $this->mdb2 = MDB2::singleton(DB_DSN);
         if (PEAR::isError($this->mdb2)) {
-            throw new Exception($this->mdb2->getMessage() . $this->mdb2->getUserInfo());
+            throw new Exception($this->mdb2->getMessage().$this->mdb2->getUserInfo());
         }
 
         $this->error = new Intraface_Error;
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
                 account.active
             FROM
                 accounting_account account
-            WHERE account.id = " . $this->id . "
-                AND account.intranet_id = ".$this->year->kernel->intranet->get('id'). "
+            WHERE account.id = " . $this->id."
+                AND account.intranet_id = ".$this->year->kernel->intranet->get('id')."
                 AND year_id = ".$this->year->get('id')."
             LIMIT 1";
 
@@ -256,26 +256,26 @@  discard block
 block discarded – undo
 
         if ($this->id > 0) {
             $sql_type = "UPDATE accounting_account ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         } else {
             $sql_type = "INSERT INTO accounting_account ";
             $sql_end = ", date_created=NOW()";
         }
 
-        $sql = $sql_type . "SET
+        $sql = $sql_type."SET
             number = '".(int)$var['number']."',
-            intranet_id = " . $this->year->kernel->intranet->get('id') . ",
-            user_id = " . $this->year->kernel->user->get("id") . ",
+            intranet_id = " . $this->year->kernel->intranet->get('id').",
+            user_id = " . $this->year->kernel->user->get("id").",
             type_key='" . $var['type_key']."',
             year_id = " . $this->year->get('id').",
             use_key = '" . $var['use_key']."',
             name = '" . $var['name']."',
             comment = '" . $var['comment']."',
-            vat_percent = '" . $var['vat_percent'] . "',
-            sum_to_account_number = " . (int)$var['sum_to'] . ",
-            sum_from_account_number = " . (int)$var['sum_from'] . ",
+            vat_percent = '" . $var['vat_percent']."',
+            sum_to_account_number = " . (int)$var['sum_to'].",
+            sum_from_account_number = " . (int)$var['sum_from'].",
             date_changed = NOW(),
-            vat_key=" . (int)$var['vat_key'] . " " . $sql_end;
+            vat_key=" . (int)$var['vat_key']." ".$sql_end;
 
         $this->db->query($sql);
 
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
         }
 
         if (!empty($var['created_from_id']) and is_numeric($var['created_from_id'])) {
-            $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = " . $this->id);
+            $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = ".$this->id);
         }
 
         $this->load();
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
             return false;
         }
 
-        $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = " . $this->year->kernel->intranet->get('id') . " AND year_id = ".$this->year->get('id')." AND id = " . $this->id);
+        $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = ".$this->year->get('id')." AND id = ".$this->id);
         $this->value['active'] = 0;
         return true;
     }
@@ -390,10 +390,10 @@  discard block
 block discarded – undo
         $sql = "SELECT
                 id
             FROM accounting_account
-            WHERE number = " . $account_number . "
-                AND intranet_id = " . $this->year->kernel->intranet->get('id') . "
-                AND year_id = " .$this->year->get('id'). "
-                AND id <> " . $this->id . " AND active = 1";
+            WHERE number = " . $account_number."
+                AND intranet_id = " . $this->year->kernel->intranet->get('id')."
+                AND year_id = " .$this->year->get('id')."
+                AND id <> " . $this->id." AND active = 1";
         $result = $this->mdb2->query($sql);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query: '.$result->getUserInfo());
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
     {
         $sql = "SELECT primosaldo_debet, primosaldo_credit
             FROM accounting_account
-            WHERE year_id = " . $this->year->get('id') . "
-                AND id = ".$this->id . "
+            WHERE year_id = " . $this->year->get('id')."
+                AND id = ".$this->id."
                 AND active = 1
                 AND intranet_id = ".$this->year->kernel->intranet->get('id');
 
@@ -499,9 +499,9 @@  discard block
 block discarded – undo
         if ($this->get('type_key') == array_search('sum', $this->types)) {
             $db2 = new DB_Sql;
             $sql = "SELECT id FROM accounting_account
-                    WHERE number >= " . $this->get('sum_from') . "
+                    WHERE number >= " . $this->get('sum_from')."
                         AND type_key != ".array_search('sum', $this->types)."
-                        AND number <= " . $this->get('sum_to') . "
+                        AND number <= " . $this->get('sum_to')."
                         AND year_id = ".$this->year->get('id')."
                         AND intranet_id = " . $this->year->kernel->intranet->get('id');
             $db2->query($sql);
@@ -567,9 +567,9 @@  discard block
 block discarded – undo
         $this->db->query("SELECT
                 id
             FROM accounting_post post
-            WHERE (post.account_id = ". $this->id . ")
+            WHERE (post.account_id = ". $this->id.")
                 AND intranet_id = ".$this->year->kernel->intranet->get('id')."
-                AND year_id = " . $this->year->get('id') . "
+                AND year_id = " . $this->year->get('id')."
                 LIMIT 1");
         return $this->db->numRows();
     }
@@ -590,9 +590,9 @@  discard block
 block discarded – undo
                     debet,
                     credit
                 FROM accounting_post post
-                WHERE (post.account_id = ". $this->get('id') . ")
+                WHERE (post.account_id = ". $this->get('id').")
                     AND intranet_id = ".$this->year->kernel->intranet->get('id')."
-                    AND year_id = " . $this->year->get('id') . "
+                    AND year_id = " . $this->year->get('id')."
                     AND stated = 1
                     ORDER BY date ASC, id ASC");
         $i = 1;
@@ -626,9 +626,9 @@  discard block
 block discarded – undo
     public function calculateVat($amount, $vat_percent)
     {
         $amount = (float)$amount;
-        $vat_percent = (float)$vat_percent / 100;
+        $vat_percent = (float)$vat_percent/100;
 
-        return $amount * ($vat_percent / (1 + $vat_percent));
+        return $amount*($vat_percent/(1 + $vat_percent));
     }
 
     public function getId()

Please login to merge, or discard this patch.

src/Intraface/modules/accounting/Post.php 2 patches

Doc Comments +10 added lines, -2 removed lines patch added patch discarded remove patch

		@@ -36,6 +36,9 @@ discard block
		block discarded – undo
36	36	}
37	37	}
38	38
	39	+ /**
	40	+ * @param integer $post_id
	41	+ */
39	42	public function factory($year, $post_id)
40	43	{
41	44	return Intraface_modules_accounting_PostGateway::getFromYearAndPostId($year, $post_id);
		@@ -76,6 +79,13 @@ discard block
		block discarded – undo
76	79	return 1;
77	80	}
78	81
	82	+ /**
	83	+ * @param string $date
	84	+ * @param integer $account_id
	85	+ * @param string $text
	86	+ * @param double $debet
	87	+ * @param double $credit
	88	+ */
79	89	private function validate($date, $account_id, $text, $debet, $credit)
80	90	{
81	91	$validator = new Intraface_Validator($this->error);
		@@ -99,9 +109,7 @@ discard block
		block discarded – undo
99	109	/**
100	110	* States the posts
101	111	*
102		- * @param integer $year_id
103	112	* @param string $date
104		- * @param string $voucher_number
105	113	* @param string $text
106	114	* @param integer $account_id
107	115	* @param float $debet

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -44,7 +44,7 @@  discard block
 block discarded – undo
     private function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = " . $this->id . " AND intranet_id=" .$this->voucher->year->kernel->intranet->get('id'));
+        $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = ".$this->id." AND intranet_id=".$this->voucher->year->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -125,14 +125,14 @@  discard block
 block discarded – undo
 
         if ($this->id > 0) {
             $sql_type = "UPDATE";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         } else {
             $sql_type = "INSERT INTO";
             $sql_end = "";
         }
 
         $db = new DB_Sql;
-        $sql = $sql_type . " accounting_post
+        $sql = $sql_type." accounting_post
                  SET
                     voucher_id = '".$this->voucher->get('id')."',
                     intranet_id = ".$this->
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
                     account_id = '".(int)$account_id."',
                     text = '".(string)$text."',
                     debet = '".$debet."',
-                    credit = '".$credit."'"  . $sql_end;
+                    credit = '".$credit."'".$sql_end;
         $db->query($sql);
 
         $this->id = $db->insertedId();
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
         }
 
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_post SET stated = 1 WHERE id = " . $this->id . " AND intranet_id =" .$this->voucher->year->kernel->intranet->get('id'));
+        $db->query("UPDATE accounting_post SET stated = 1 WHERE id = ".$this->id." AND intranet_id =".$this->voucher->year->kernel->intranet->get('id'));
 
         return true;
     }
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
         }
 
         $db = new DB_Sql;
-        $db->query("DELETE FROM accounting_post WHERE id = " . $this->id);
+        $db->query("DELETE FROM accounting_post WHERE id = ".$this->id);
         return true;
 
     }

Please login to merge, or discard this patch.

src/Intraface/modules/accounting/Voucher.php 2 patches

Doc Comments +1 added lines, -4 removed lines patch added patch discarded remove patch

@@ -22,7 +22,6 @@  discard block
 block discarded – undo
      * Constructor
      *
      * @param object  $year_object
-     * @param integer $post_id (optional)
      *
      * @return void
      */
@@ -45,7 +44,7 @@  discard block
 block discarded – undo
      * @param object $year
      * @param string $voucher_number
      *
-     * @return void
+     * @return Voucher
      */
     function factory($year, $voucher_number)
     {
@@ -339,9 +338,7 @@  discard block
 block discarded – undo
     /**
      * Prepares amounts for stating, e.g. whether the accounts needs vat calculations
      *
-     * @param integer $year_id
      * @param string  $date
-     * @param string  $voucher_number
      * @param string  $text
      * @param integer $account_id
      * @param float   $debet

Please login to merge, or discard this patch.

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -68,7 +68,7 @@  discard block
 block discarded – undo
                     voucher.date,
                     voucher.reference
             FROM accounting_voucher voucher
-            WHERE voucher.id = " . $this->id. " AND intranet_id = ". $this->year->kernel->intranet->getId();
+            WHERE voucher.id = " . $this->id." AND intranet_id = ".$this->year->kernel->intranet->getId();
 
         $db = new DB_Sql;
         $db->query($sql);
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
             $sql_end = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE";
-            $sql_end = " WHERE id = " . (int)$this->id;
+            $sql_end = " WHERE id = ".(int)$this->id;
         }
 
         $db = new DB_Sql;
-        $sql = $sql_type . " accounting_voucher
+        $sql = $sql_type." accounting_voucher
             SET intranet_id = ".$this->year->kernel->intranet->get('id').",
                 year_id = ".$this->year->get('id').",
                 user_id = ".$this->year->kernel->user->get('id').",
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
                 number = '".$var['voucher_number']."',
                 date = '".$post_date->get()."',
                 reference = '".$var['reference']."',
-                text = '".$var['text']."'" . $sql_end;
+                text = '".$var['text']."'".$sql_end;
 
         $db->query($sql);
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
             $buy_all_abroad = $buy_abroad;
         }
 
-        $amount = $this->get('amount') * ($this->vatpercent / 100);
+        $amount = $this->get('amount')*($this->vatpercent/100);
 
         // I det omfang du har fradragsret for momsen, kan du medregne det beregnede
         // momsbeløb til konto for indgående moms. Det beregnede momsbeløb af EU-varekøb
@@ -374,13 +374,13 @@  discard block
 block discarded – undo
                         $debet = $debet - $vat_amount;
                         // bogfør momsen
                         $post = new Post($this);
-                        $post->save($date, $vat_account_id, $text . " - købsmoms", $vat_amount, 0, $skip_draft);
+                        $post->save($date, $vat_account_id, $text." - købsmoms", $vat_amount, 0, $skip_draft);
                     } else {
                         $vat_amount = $this->calculateVat($credit, $vat_percent);
                         $credit = $credit - $vat_amount;
                         // bogføre udgående moms
                         $post = new Post($this);
-                        $post->save($date, $vat_account_id, $text . " - tilbageført moms", 0, $vat_amount, $skip_draft);
+                        $post->save($date, $vat_account_id, $text." - tilbageført moms", 0, $vat_amount, $skip_draft);
                     }
 
                         // bogføre selve posten
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
                         $credit = $credit - $vat_amount;
                         // bogføre udgående moms
                         $post = new Post($this);
-                        $post->save($date, $vat_account_id, $text . " - salgsmoms", 0, $vat_amount, $skip_draft);
+                        $post->save($date, $vat_account_id, $text." - salgsmoms", 0, $vat_amount, $skip_draft);
                     } else {
                         // tilbagefører momsen hvis det er et debet beløb
                         $vat_amount = $this->calculateVat($debet, $vat_percent);
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
             $post = new Post($this, $p['id']);
 
             if (!$post->setStated()) {
-                $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');
+                $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');
             }
 
             // tjekker om der har været nogle fejl i bogføringen
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
         }
 
         if ($this->get('saldo') <> 0) {
-            $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er ' . $this->get('saldo') . '.');
+            $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er '.$this->get('saldo').'.');
         }
 
         if ($this->error->isError()) {
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
             }
 
             if (!$post->setStated()) {
-                $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');
+                $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');
             }
         }
         // tjekker om der har været nogle fejl i bogføringen
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
     function getPosts()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = " . $this->id . " AND intranet_id=".$this->year->kernel->intranet->get('id'));
+        $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = ".$this->id." AND intranet_id=".$this->year->kernel->intranet->get('id'));
         $list = array();
         $i = 0;
         $this->value['saldo'] = 0;

Please login to merge, or discard this patch.

src/Intraface/modules/accounting/Year.php 2 patches

Doc Comments +13 added lines, -3 removed lines patch added patch discarded remove patch

@@ -43,7 +43,7 @@  discard block
 block discarded – undo
     /**
      * Funktion til at sætte et regnskabsår, som brugeren redigerer i.
      *
-     * @return true
+     * @return boolean
      */
     function setYear()
     {
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
      *
      * @param boolean $redirect Set to true if a redirect should occur if no year isset
      *
-     * @return boolean
+     * @return null|boolean
      */
     function checkYear($redirect = true)
     {
@@ -439,11 +439,17 @@  discard block
 block discarded – undo
         return $this->kernel->getSetting()->set('intranet', 'accounting.'.$setting, $value, $this->get('id'));
     }
 
+    /**
+     * @param string $setting
+     */
     function getSetting($setting)
     {
         return $this->kernel->getSetting()->get('intranet', 'accounting.' . $setting, $this->get('id'));
     }
 
+    /**
+     * @param string $type
+     */
     function createAccounts($type, $last_year_id = 0)
     {
         if ($this->getId() == 0) {
@@ -742,7 +748,8 @@  discard block
 block discarded – undo
 
     /**
      * @param $from->year (object)
-     * @param $setting (string)
+     * @param string $setting (string)
+     * @param Year $from_year
      */
     function transferAccountSetting($from_year, $setting)
     {
@@ -874,6 +881,9 @@  discard block
 block discarded – undo
         return true;
     }
 
+    /**
+     * @return string
+     */
     public function getId()
     {
         return $this->get('id');

Please login to merge, or discard this patch.

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -144,7 +144,7 @@  discard block
 block discarded – undo
                 DATE_FORMAT(to_date, '%d-%m-%Y') AS to_date_dk,
                 last_year_id, from_date, to_date, locked, label, vat
             FROM accounting_year
-            WHERE id = '" . $this->id . "'
+            WHERE id = '" . $this->id."'
                 AND intranet_id = ".$this->kernel->intranet->get('id')."
             LIMIT 1";
 
@@ -212,13 +212,13 @@  discard block
 block discarded – undo
         }
 
         if ($this->id > 0) {
-            $sql="UPDATE accounting_year ";
-            $sql_after=" WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
+            $sql = "UPDATE accounting_year ";
+            $sql_after = " WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
         } else {
-            $sql="INSERT INTO accounting_year ";
+            $sql = "INSERT INTO accounting_year ";
             $sql_after = ', date_created = NOW()';
         }
-        $sql.=" SET
+        $sql .= " SET
             intranet_id='".$this->kernel->intranet->get('id')."',
             user_id='".$this->kernel->user->get('id')."',
             last_year_id='".$var['last_year_id']."',
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
     {
         $sql = "SELECT id FROM accounting_year
             WHERE id = ".$this->id."
-                AND intranet_id = ". $this->kernel->intranet->get('id') . " AND active = 1";
+                AND intranet_id = ". $this->kernel->intranet->get('id')." AND active = 1";
 
         $db = new DB_Sql;
         $db->query($sql);
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
     public function isYearOpen()
     {
         $db = new Db_Sql;
-        $db->query("SELECT locked FROM accounting_year WHERE id = " . $this->id . " AND intranet_id = ".$this->kernel->intranet->get('id'));
+        $db->query("SELECT locked FROM accounting_year WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if ($db->nextRecord()) {
             if ($db->f('locked') == 1) {
                 return false;
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
         $date = safeToDb($date);
 
         $db = new Db_Sql;
-        $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id') . " LIMIT 1");
+        $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
         if ($db->nextRecord()) {
             if ($db->f('from_date') <= $date and $date <= $db->f('to_date')) {
                 return true;
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
 
         if (!empty($balance_accounts) and count($balance_accounts) > 0) {
             foreach ($balance_accounts as $account) {
-                $sql_where .= "id = " . $account . " OR ";
+                $sql_where .= "id = ".$account." OR ";
             }
         }
         // hvis der ikke er nogen balance_accounts skal den ikke v�lge nogen poster
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
         $db = new DB_Sql;
         $db->query("SELECT id FROM accounting_account
             WHERE (".$sql_where.")
-            	AND intranet_id = " . $this->kernel->intranet->get('id') . "
+            	AND intranet_id = " . $this->kernel->intranet->get('id')."
             	AND year_id = " . $this->get('id'));
 
         $accounts = array(); // afstemningskonti
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
 
     function getSetting($setting)
     {
-        return $this->kernel->getSetting()->get('intranet', 'accounting.' . $setting, $this->get('id'));
+        return $this->kernel->getSetting()->get('intranet', 'accounting.'.$setting, $this->get('id'));
     }
 
     function createAccounts($type, $last_year_id = 0)
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
 
                     // settings
                     if (!empty($input['setting'])) {
-                        $this->setSetting($input['setting'] . '_account_id', $id);
+                        $this->setSetting($input['setting'].'_account_id', $id);
                     }
                     if (!empty($input['balance_account']) and $input['balance_account'] == 1) {
                         $balance_accounts[] = $id;
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
 
                 if (is_array($balance_accounts)) {
                     foreach ($balance_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_balance_accounts[] = $db->f('id');
                         }
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
 
                 if (is_array($buy_eu_accounts)) {
                     foreach ($buy_eu_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_buy_eu_accounts[] = $db->f('id');
                         }
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
 
                 if (is_array($buy_abroad_accounts)) {
                     foreach ($buy_abroad_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_buy_abroad_accounts[] = $db->f('id');
                         }
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
     {
         $account_id = $from_year->getSetting($setting);
         $db = new DB_Sql;
-        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . $account_id);
+        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".$account_id);
         if ($db->nextRecord()) {
             $this->setSetting($setting, $db->f('id'));
         }
@@ -826,9 +826,9 @@  discard block
 block discarded – undo
         }
         $db = new DB_Sql;
         $sql = "SELECT id FROM debtor
-            WHERE type= " . $type_key . "
-                AND intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (this_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE type= " . $type_key."
+                AND intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (this_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0
                 AND active = 1";
         $db->query($sql);
@@ -842,8 +842,8 @@  discard block
 block discarded – undo
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM invoice_payment
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (payment_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (payment_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0";
         $db->query($sql);
         if ($db->numRows() == 0) {
@@ -856,8 +856,8 @@  discard block
 block discarded – undo
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM procurement
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (invoice_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (invoice_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0
                 AND active = 1";
         $db->query($sql);
@@ -870,7 +870,7 @@  discard block
 block discarded – undo
     function lock()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_year SET locked = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE accounting_year SET locked = 1 WHERE id = ".$this->id);
         return true;
     }
 

Please login to merge, or discard this patch.

src/Intraface/modules/accounting/YearGateway.php 2 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -58,6 +58,9 @@
 block discarded – undo
         return $account_years;
     }
 
+    /**
+     * @param string $voucher_id
+     */
     function findByVoucherId($voucher_id)
     {
         $sql = "SELECT id FROM accounting_voucher

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 
     function findById($id, $load_active = true)
     {
-        require_once dirname(__FILE__) . '/Year.php';
+        require_once dirname(__FILE__).'/Year.php';
         return new Year($this->kernel, $id, $load_active);
     }
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
     {
         $sql = "SELECT id FROM accounting_voucher
             WHERE intranet_id = ".$this->kernel->intranet->get('id')."
-            AND id = " . (int)$voucher_id . "
+            AND id = " . (int)$voucher_id."
             LIMIT 1";
 
         $db = new DB_Sql;

Please login to merge, or discard this patch.

src/Intraface/modules/cms/CKEditor.php 2 patches

Doc Comments +1 added lines patch added patch discarded remove patch

@@ -468,6 +468,7 @@
 block discarded – undo
 
     /**
      * Return path to ckeditor.js.
+     * @return string
      */
     private function ckeditorPath()
     {

Please login to merge, or discard this patch.

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -73,7 +73,7 @@  discard block
 block discarded – undo
      * When %CKEditor is created with the editor() method, a HTML &lt;textarea&gt; element is created,
      * it will be displayed to anyone with JavaScript disabled or with incompatible browser.
      */
-    public $textareaAttributes = array( "rows" => 8, "cols" => 60 );
+    public $textareaAttributes = array("rows" => 8, "cols" => 60);
     /**
      * A string indicating the creation date of %CKEditor.
      * Do not change it unless you want to force browsers to not use previously cached version of %CKEditor.
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
     {
         $attr = "";
         foreach ($this->textareaAttributes as $key => $val) {
-            $attr.= " " . $key . '="' . str_replace('"', '&quot;', $val) . '"';
+            $attr .= " ".$key.'="'.str_replace('"', '&quot;', $val).'"';
         }
-        $out = "<textarea name=\"" . $name . "\"" . $attr . ">" . htmlspecialchars($value) . "</textarea>\n";
+        $out = "<textarea name=\"".$name."\"".$attr.">".htmlspecialchars($value)."</textarea>\n";
         if (!$this->initialized) {
             $out .= $this->init();
         }
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
             $classDetection = "";
             $js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
             if (!empty($className)) {
-                $js .= "    var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
+                $js .= "    var classRegex = new RegExp('(?:^| )' + '".$className."' + '(?:$| )');\n";
                 $js .= "    if (!classRegex.test(textarea.className))\n";
                 $js .= "        return false;\n";
             }
-            $js .= "    CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
+            $js .= "    CKEDITOR.tools.extend(config, ".$this->jsEncode($_config).", true);";
             $js .= "} );";
         }
 
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
                     }
                     // Return only new events
                     if (!in_array($code, $returnedEvents[$eventName])) {
-                        $out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);";
+                        $out .= ($code ? "\n" : "")."CKEDITOR.on('".$eventName."', $code);";
                         $returnedEvents[$eventName][] = $code;
                     }
                 }
@@ -443,19 +443,19 @@  discard block
 block discarded – undo
         $ckeditorPath = $this->ckeditorPath();
 
         if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
-            $args = '?t=' . $this->timestamp;
+            $args = '?t='.$this->timestamp;
         }
 
         // Skip relative paths...
         if (strpos($ckeditorPath, '..') !== 0) {
-            $out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';");
+            $out .= $this->script("window.CKEDITOR_BASEPATH='".$ckeditorPath."';");
         }
 
-        $out .= "<script type=\"text/javascript\" src=\"" . $ckeditorPath . 'ckeditor.js' . $args . "\"></script>\n";
+        $out .= "<script type=\"text/javascript\" src=\"".$ckeditorPath.'ckeditor.js'.$args."\"></script>\n";
 
         $extraCode = "";
         if ($this->timestamp != self::timestamp) {
-            $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
+            $extraCode .= ($extraCode ? "\n" : "")."CKEDITOR.timestamp = '".$this->timestamp."';";
         }
         if ($extraCode) {
             $out .= $this->script($extraCode);
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
             /**
              * realpath — Returns canonicalized absolute pathname
              */
-            $realPath = realpath('./') ;
+            $realPath = realpath('./');
         }
 
         /**
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
 
                 $val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val);
 
-                return '"' . $val . '"';
+                return '"'.$val.'"';
             }
         }
         $isList = true;
@@ -561,12 +561,12 @@  discard block
 block discarded – undo
             foreach ($val as $v) {
                 $result[] = $this->jsEncode($v);
             }
-            return '[ ' . join(', ', $result) . ' ]';
+            return '[ '.join(', ', $result).' ]';
         } else {
             foreach ($val as $k => $v) {
                 $result[] = $this->jsEncode($k).': '.$this->jsEncode($v);
             }
-            return '{ ' . join(', ', $result) . ' }';
+            return '{ '.join(', ', $result).' }';
         }
     }
 }

Please login to merge, or discard this patch.

src/Intraface/modules/cms/Element.php 2 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@
 block discarded – undo
     /**
      * Creates a parameter
      *
-     * @return object
+     * @return CMS_Parameter
      */
     function createParameter()
     {

Please login to merge, or discard this patch.

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -41,9 +41,9 @@  discard block
 block discarded – undo
      */
     function __construct($section, $id = 0)
     {
-        $this->value['identify_as'] = 'cms_element';  // bruges af parameter
+        $this->value['identify_as'] = 'cms_element'; // bruges af parameter
 
-        $this->id        = (int) $id;
+        $this->id        = (int)$id;
         $this->kernel    = $section->kernel;
         $this->section   = $section;
         $this->error     = new Intraface_Error;
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 
     function getPosition(DB_Sql $db)
     {
-        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = " . $this->kernel->intranet->get('id'), "position", "id");
+        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = ".$this->kernel->intranet->get('id'), "position", "id");
     }
 
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
         }
 
         $db = new DB_Sql;
-        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = ".$this->id);
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
         $this->value['extra_class'] = '';
 
         if ($this->get('elm_width')) {
-            $this->value['extra_style'] .= 'width: ' . $this->get('elm_width') . ';';
+            $this->value['extra_style'] .= 'width: '.$this->get('elm_width').';';
         }
 
         if ($this->get('elm_properties') == 'float') {
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
             $this->value['extra_style'] .= ' clear: both;';
         }
         if ($this->get('elm_adjust')) {
-            $this->value['extra_class'] .= ' cms-align-' . $this->get('elm_adjust');
+            $this->value['extra_class'] .= ' cms-align-'.$this->get('elm_adjust');
         }
 
         if ($this->get('elm_box') == 'box') {
@@ -237,11 +237,11 @@  discard block
 block discarded – undo
             $sql_end = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
-        $sql = $sql_type . " cms_element SET
+        $sql = $sql_type." cms_element SET
                 intranet_id = ".$this->section->kernel->intranet->get('id').",
-                section_id=". (int)$this->section->get('id') . ",
+                section_id=". (int)$this->section->get('id').",
                 type_key = ".safeToDb($this->value['type_key']).",
                 date_changed = NOW(),
                 date_publish = ".$date_publish.",
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
             $this->id = $db->insertedId();
 
             $next_pos = $this->getPosition($db)->getMaxPosition() + 1;
-            $db->query("UPDATE cms_element SET position = " . $next_pos . " WHERE id = " . $this->id);
+            $db->query("UPDATE cms_element SET position = ".$next_pos." WHERE id = ".$this->id);
         }
 
         $this->load();
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 0 WHERE id = ".$this->id);
         return true;
     }
 
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
     public function undelete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 1 WHERE id = ".$this->id);
         return true;
     }
 

Please login to merge, or discard this patch.

		@@ -468,6 +468,7 @@
		block discarded – undo
468	468
469	469	/**
470	470	* Return path to ckeditor.js.
	471	+ * @return string
471	472	*/
472	473	private function ckeditorPath()
473	474	{

		@@ -346,7 +346,7 @@ discard block
		block discarded – undo
346	346	/**
347	347	* Constructor - starts a new document
348	348	*
349		- * @param array $pageSize Array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
	349	+ * @param integer[] $pageSize Array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
350	350	*
351	351	* @return void
352	352	*/
		@@ -384,6 +384,8 @@ discard block
		block discarded – undo
384	384	/**
385	385	* destination object, used to specify the location for the user to jump to, presently on opening
386	386	* @access private
	387	+ * @param integer $id
	388	+ * @param string $action
387	389	*/
388	390	private function o_destination($id, $action, $options = '')
389	391	{
		@@ -421,6 +423,7 @@ discard block
		block discarded – undo
421	423	/**
422	424	* sets the viewer preferences
423	425	* @access private
	426	+ * @param string $action
424	427	*/
425	428	private function o_viewerPreferences($id, $action, $options = '')
426	429	{
		@@ -461,6 +464,8 @@ discard block
		block discarded – undo
461	464	/**
462	465	* define the document catalog, the overall controller for the document
463	466	* @access private
	467	+ * @param integer $id
	468	+ * @param string $action
464	469	*/
465	470	private function o_catalog($id, $action, $options = '')
466	471	{
		@@ -513,6 +518,8 @@ discard block
		block discarded – undo
513	518	/**
514	519	* object which is a parent to the pages in the document
515	520	* @access private
	521	+ * @param integer $id
	522	+ * @param string $action
516	523	*/
517	524	private function o_pages($id, $action, $options = '')
518	525	{
		@@ -633,6 +640,8 @@ discard block
		block discarded – undo
633	640	/**
634	641	* defines the outlines in the doc, empty for now
635	642	* @access private
	643	+ * @param integer $id
	644	+ * @param string $action
636	645	*/
637	646	private function o_outlines($id, $action, $options = '')
638	647	{
		@@ -665,6 +674,8 @@ discard block
		block discarded – undo
665	674	/**
666	675	* an object to hold the font description
667	676	* @access private
	677	+ * @param integer $id
	678	+ * @param string $action
668	679	*/
669	680	private function o_font($id, $action, $options = '')
670	681	{
		@@ -851,6 +862,8 @@ discard block
		block discarded – undo
851	862	/**
852	863	* a font descriptor, needed for including additional fonts
853	864	* @access private
	865	+ * @param integer $id
	866	+ * @param string $action
854	867	*/
855	868	private function o_fontDescriptor($id, $action, $options = '')
856	869	{
		@@ -904,6 +917,8 @@ discard block
		block discarded – undo
904	917	/**
905	918	* the font encoding
906	919	* @access private
	920	+ * @param integer $id
	921	+ * @param string $action
907	922	*/
908	923	private function o_fontEncoding($id, $action, $options = '')
909	924	{
		@@ -943,6 +958,7 @@ discard block
		block discarded – undo
943	958	/**
944	959	* a descendent cid font, needed for unicode fonts
945	960	* @access private
	961	+ * @param string $action
946	962	*/
947	963	private function o_fontDescendentCID($id, $action, $options = '')
948	964	{
		@@ -1018,6 +1034,7 @@ discard block
		block discarded – undo
1018	1034	/**
1019	1035	* a font glyph to character map, needed for unicode fonts
1020	1036	* @access private
	1037	+ * @param string $action
1021	1038	*/
1022	1039	private function o_fontGIDtoCIDMap($id, $action, $options = '')
1023	1040	{
		@@ -1056,6 +1073,7 @@ discard block
		block discarded – undo
1056	1073	/**
1057	1074	* define the document information
1058	1075	* @access private
	1076	+ * @param integer $id
1059	1077	*/
1060	1078	private function o_info($id, $action, $options = '')
1061	1079	{
		@@ -1102,6 +1120,8 @@ discard block
		block discarded – undo
1102	1120	/**
1103	1121	* an action object, used to link to URLS initially
1104	1122	* @access private
	1123	+ * @param integer $id
	1124	+ * @param string $action
1105	1125	*/
1106	1126	private function o_action($id, $action, $options = '')
1107	1127	{
		@@ -1147,6 +1167,8 @@ discard block
		block discarded – undo
1147	1167	* an annotation object, this will add an annotation to the current page.
1148	1168	* initially will support just link annotations
1149	1169	* @access private
	1170	+ * @param integer $id
	1171	+ * @param string $action
1150	1172	*/
1151	1173	private function o_annotation($id, $action, $options = '')
1152	1174	{
		@@ -1201,6 +1223,7 @@ discard block
		block discarded – undo
1201	1223	/**
1202	1224	* a page object, it also creates a contents object to hold its contents
1203	1225	* @access private
	1226	+ * @param string $action
1204	1227	*/
1205	1228	private function o_page($id, $action, $options = '')
1206	1229	{
		@@ -1272,6 +1295,7 @@ discard block
		block discarded – undo
1272	1295	/**
1273	1296	* the contents objects hold all of the content which appears on pages
1274	1297	* @access private
	1298	+ * @param string $action
1275	1299	*/
1276	1300	private function o_contents($id, $action, $options = '')
1277	1301	{
		@@ -1324,6 +1348,8 @@ discard block
		block discarded – undo
1324	1348	/**
1325	1349	* an image object, will be an XObject in the document, includes description and data
1326	1350	* @access private
	1351	+ * @param integer $id
	1352	+ * @param string $action
1327	1353	*/
1328	1354	private function o_image($id, $action, $options = '')
1329	1355	{
		@@ -1402,6 +1428,8 @@ discard block
		block discarded – undo
1402	1428	/**
1403	1429	* encryption object.
1404	1430	* @access private
	1431	+ * @param integer $id
	1432	+ * @param string $action
1405	1433	*/
1406	1434	private function o_encryption($id, $action, $options = '')
1407	1435	{
		@@ -1458,8 +1486,8 @@ discard block
		block discarded – undo
1458	1486
1459	1487	/**
1460	1488	* owner part of the encryption
1461		- * @param $owner - owner password plus padding
1462		- * @param $user - user password plus padding
	1489	+ * @param string $owner - owner password plus padding
	1490	+ * @param string $user - user password plus padding
1463	1491	* @access private
1464	1492	*/
1465	1493	private function encryptOwner($owner, $user)
		@@ -1498,9 +1526,9 @@ discard block
		block discarded – undo
1498	1526	/**
1499	1527	*
1500	1528	* user part of the encryption
1501		- * @param $user - user password plus padding
1502		- * @param $ownerDict - encrypted owner entry
1503		- * @param $permissions - permission set (print, copy, modify, ...)
	1529	+ * @param string $user - user password plus padding
	1530	+ * @param string $ownerDict - encrypted owner entry
	1531	+ * @param string $permissions - permission set (print, copy, modify, ...)
1504	1532	*/
1505	1533	function encryptUser($user, $ownerDict, $permissions)
1506	1534	{
		@@ -1563,6 +1591,9 @@ discard block
		block discarded – undo
1563	1591	return $hex;
1564	1592	}
1565	1593
	1594	+ /**
	1595	+ * @param string $hex
	1596	+ */
1566	1597	protected function hexToStr($hex)
1567	1598	{
1568	1599	$str = '';
		@@ -2005,7 +2036,7 @@ discard block
		block discarded – undo
2005	2036	* @param string $encoding Which encoding to use
2006	2037	* @param integer $set What is this
2007	2038	*
2008		- * @return void
	2039	+ * @return integer
2009	2040	* @access public
2010	2041	*/
2011	2042	public function selectFont($fontName, $encoding = '', $set = 1, $subsetFont = false)
		@@ -2331,6 +2362,11 @@ discard block
		block discarded – undo
2331	2362	/**
2332	2363	* draw a part of an ellipse
2333	2364	* @access public
	2365	+ * @param integer $x0
	2366	+ * @param integer $y0
	2367	+ * @param integer $astart
	2368	+ * @param integer $afinish
	2369	+ * @param integer $r1
2334	2370	*/
2335	2371	public function partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 = 0, $angle = 0, $nSeg = 8)
2336	2372	{
		@@ -2494,6 +2530,7 @@ discard block
		block discarded – undo
2494	2530	* draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
2495	2531	* the coordinates of the upper-right corner
2496	2532	* @access public
	2533	+ * @param integer $height
2497	2534	*/
2498	2535	public function rectangle($x1, $y1, $width, $height)
2499	2536	{
		@@ -2593,6 +2630,7 @@ discard block
		block discarded – undo
2593	2630	/**
2594	2631	* return the height in units of the current font in the given size
2595	2632	* @access public
	2633	+ * @param integer $size
2596	2634	*/
2597	2635	public function getFontHeight($size)
2598	2636	{
		@@ -2611,6 +2649,7 @@ discard block
		block discarded – undo
2611	2649	* if you add this number to the baseline, you get the level of the bottom of the font
2612	2650	* it is in the pdf user units
2613	2651	* @access public
	2652	+ * @param integer $size
2614	2653	*/
2615	2654	public function getFontDecender($size)
2616	2655	{
		@@ -2775,6 +2814,8 @@ discard block
		block discarded – undo
2775	2814	* on the page the text will end
2776	2815	*
2777	2816	* @access protected
	2817	+ * @param integer $angle
	2818	+ * @param integer $wa
2778	2819	*/
2779	2820	protected function getTextPosition($x, $y, $angle, $size, $wa, $text)
2780	2821	{
		@@ -2792,6 +2833,7 @@ discard block
		block discarded – undo
2792	2833	* wrapper function for checkTextDirective1
2793	2834	*
2794	2835	* @access private
	2836	+ * @param integer $f
2795	2837	*/
2796	2838	private function checkTextDirective(&$text, $i, &$f)
2797	2839	{
		@@ -2808,6 +2850,7 @@ discard block
		block discarded – undo
2808	2850	* if the directive does not require a font change, then $f should be set to 0
2809	2851	*
2810	2852	* @access private
	2853	+ * @param integer $final
2811	2854	*/
2812	2855	private function checkTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size = 0, $angle = 0, $wordSpaceAdjust = 0)
2813	2856	{
		@@ -3132,6 +3175,8 @@ discard block
		block discarded – undo
3132	3175	* do a part of the calculation for sorting out the justification of the text
3133	3176	*
3134	3177	* @access private
	3178	+ * @param integer $adjust
	3179	+ * @param string $justification
3135	3180	*/
3136	3181	private function adjustWrapText($text, $actual, $width, &$x, &$adjust, $justification)
3137	3182	{
		@@ -3393,6 +3438,7 @@ discard block
		block discarded – undo
3393	3438	/**
3394	3439	* after an object has been created, it wil only show if it has been added, using this function.
3395	3440	* @access public
	3441	+ * @param integer $id
3396	3442	*/
3397	3443	public function addObject($id, $options = 'add')
3398	3444	{
		@@ -3477,6 +3523,8 @@ discard block
		block discarded – undo
3477	3523	* extract an integer from a position in a byte stream
3478	3524	*
3479	3525	* @access private
	3526	+ * @param integer $pos
	3527	+ * @param integer $num
3480	3528	*/
3481	3529	private function getBytes(&$data, $pos, $num)
3482	3530	{
		@@ -3491,7 +3539,7 @@ discard block
		block discarded – undo
3491	3539
3492	3540	/**
3493	3541	* reads the PNG chunk
3494		- * @param $data - binary part of the png image
	3542	+ * @param string $data - binary part of the png image
3495	3543	* @access private
3496	3544	*/
3497	3545	private function readPngChunks(&$data)
		@@ -3738,6 +3786,7 @@ discard block
		block discarded – undo
3738	3786	/**
3739	3787	* add a JPEG image into the document, from a file
3740	3788	* @access public
	3789	+ * @param string $img
3741	3790	*/
3742	3791	public function addJpegFromFile($img, $x, $y, $w = 0, $h = 0)
3743	3792	{
		@@ -3870,6 +3919,7 @@ discard block
		block discarded – undo
3870	3919	/**
3871	3920	* common code used by the two JPEG adding functions
3872	3921	* @access private
	3922	+ * @param string $data
3873	3923	*/
3874	3924	private function addJpegImage_common(&$data, $x, $y, $w = 0, $h = 0, $imageWidth, $imageHeight, $channels = 3)
3875	3925	{
		@@ -3955,6 +4005,7 @@ discard block
		block discarded – undo
3955	4005	/**
3956	4006	* used to add messages for use in debugging
3957	4007	* @access protected
	4008	+ * @param integer $error_type
3958	4009	*/
3959	4010	protected function debug($message, $error_type = E_USER_NOTICE)
3960	4011	{

		@@ -60,10 +60,10 @@ discard block
		block discarded – undo
60	60	private $numObj=0;
61	61
62	62	/**
63		- * this array contains all of the pdf objects, ready for final assembly
64		- *
65		- * @var array
66		- */
	63	+ * this array contains all of the pdf objects, ready for final assembly
	64	+ *
	65	+ * @var array
	66	+ */
67	67	private $objects = array();
68	68
69	69	/**
		@@ -76,10 +76,10 @@ discard block
		block discarded – undo
76	76	private $objectHashes = array();
77	77
78	78	/**
79		- * the objectId (number within the objects array) of the document catalog
80		- *
81		- * @var integer
82		- */
	79	+ * the objectId (number within the objects array) of the document catalog
	80	+ *
	81	+ * @var integer
	82	+ */
83	83	private $catalogId;
84	84
85	85
		@@ -139,10 +139,10 @@ discard block
		block discarded – undo
139	139	private $fonts = array();
140	140
141	141	/**
142		- * a record of the current font
143		- *
144		- * @var string
145		- */
	142	+ * a record of the current font
	143	+ *
	144	+ * @var string
	145	+ */
146	146	private $currentFont='';
147	147
148	148	/**
		@@ -153,10 +153,10 @@ discard block
		block discarded – undo
153	153	private $currentBaseFont='';
154	154
155	155	/**
156		- * the number of the current font within the font array
157		- *
158		- * @var integer
159		- */
	156	+ * the number of the current font within the font array
	157	+ *
	158	+ * @var integer
	159	+ */
160	160	private $currentFontNum=0;
161	161
162	162	/**
		@@ -165,20 +165,20 @@ discard block
		block discarded – undo
165	165	private $currentNode;
166	166
167	167	/**
168		- * object number of the current page
169		- *
170		- * @var integer
171		- */
	168	+ * object number of the current page
	169	+ *
	170	+ * @var integer
	171	+ */
172	172	private $currentPage;
173	173
174	174	/**
175		- * object number of the currently active contents block
176		- */
	175	+ * object number of the currently active contents block
	176	+ */
177	177	private $currentContents;
178	178
179	179	/**
180		- * number of fonts within the system
181		- */
	180	+ * number of fonts within the system
	181	+ */
182	182	private $numFonts = 0;
183	183
184	184	/**
		@@ -192,14 +192,14 @@ discard block
		block discarded – undo
192	192	private $currentStrokeColour = array('r' => -1, 'g' => -1, 'b' => -1);
193	193
194	194	/**
195		- * current style that lines are drawn in
196		- */
	195	+ * current style that lines are drawn in
	196	+ */
197	197	private $currentLineStyle='';
198	198
199	199	/**
200		- * an array which is used to save the state of the document, mainly the colours and styles
201		- * it is used to temporarily change to another state, the change back to what it was before
202		- */
	200	+ * an array which is used to save the state of the document, mainly the colours and styles
	201	+ * it is used to temporarily change to another state, the change back to what it was before
	202	+ */
203	203	private $stateStack = array();
204	204
205	205	/**
		@@ -234,37 +234,37 @@ discard block
		block discarded – undo
234	234	private $addLooseObjects=array();
235	235
236	236	/**
237		- * the objectId of the information object for the document
238		- * this contains authorship, title etc.
239		- */
	237	+ * the objectId of the information object for the document
	238	+ * this contains authorship, title etc.
	239	+ */
240	240	private $infoObject=0;
241	241
242	242	/**
243		- * number of images being tracked within the document
244		- */
	243	+ * number of images being tracked within the document
	244	+ */
245	245	private $numImages=0;
246	246
247	247	/**
248		- * some additional options while generation
249		- * currently used for compression only
250		- * Default: 'compression' => -1 which will set gzcompress to the default level of 6
251		- */
	248	+ * some additional options while generation
	249	+ * currently used for compression only
	250	+ * Default: 'compression' => -1 which will set gzcompress to the default level of 6
	251	+ */
252	252	public $options=array('compression'=>-1);
253	253
254	254	/**
255		- * the objectId of the first page of the document
256		- */
	255	+ * the objectId of the first page of the document
	256	+ */
257	257	private $firstPageId;
258	258
259	259	/**
260		- * used to track the last used value of the inter-word spacing, this is so that it is known
261		- * when the spacing is changed.
262		- */
	260	+ * used to track the last used value of the inter-word spacing, this is so that it is known
	261	+ * when the spacing is changed.
	262	+ */
263	263	private $wordSpaceAdjust=0;
264	264
265	265	/**
266		- * track if the current font is bolded or italicised
267		- */
	266	+ * track if the current font is bolded or italicised
	267	+ */
268	268	private $currentTextState = '';
269	269
270	270	/**
		@@ -359,7 +359,7 @@ discard block
		block discarded – undo
359	359	$this->newDocument($pageSize);
360	360
361	361	if (in_array('Windows-1252', mb_list_encodings())) {
362		- $this->targetEncoding = 'Windows-1252';
	362	+ $this->targetEncoding = 'Windows-1252';
363	363	}
364	364
365	365	// font familys are already known in $this->fontFamilies
		@@ -393,7 +393,7 @@ discard block
		block discarded – undo
393	393	switch ($action) {
394	394	case 'new':
395	395	$this->objects[$id]=array('t'=>'destination','info'=>array());
396		- $tmp = '';
	396	+ $tmp = '';
397	397	switch ($options['type']) {
398	398	case 'XYZ':
399	399	case 'FitR':
		@@ -816,7 +816,7 @@ discard block
		block discarded – undo
816	816	$res = "\n$id 0 obj\n<</Type /Font /Subtype /Type0 /BaseFont /".$o['info']['name']."";
817	817	// The horizontal identity mapping for 2-byte CIDs; may be used
818	818	// with CIDFonts using any Registry, Ordering, and Supplement values.
819		- $res.= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n";
	819	+ $res.= " /Encoding /Identity-H /DescendantFonts [".$o['info']['cidFont']." 0 R] /ToUnicode ".$o['info']['toUnicode']." 0 R >>\n";
820	820	$res.= "endobj";
821	821	} else {
822	822	$res="\n".$id." 0 obj\n<< /Type /Font /Subtype /".$o['info']['SubType']." ";
		@@ -953,7 +953,7 @@ discard block
		block discarded – undo
953	953	switch ($action) {
954	954	case 'new':
955	955	$this->objects[$id] = array('t' => 'fontDescendentCID', 'info' => $options);
956		- // and a CID to GID map
	956	+ // and a CID to GID map
957	957	if ($this->embedFont) {
958	958	$cidToGidMapId = ++$this->numObj;
959	959	$this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
		@@ -974,20 +974,20 @@ discard block
		block discarded – undo
974	974	case 'FontDescriptor':
975	975	case 'SubType':
976	976	$this->debug("o_fontDescendentCID $k : $v", E_USER_NOTICE);
977		- $o['info'][$k] = $v;
	977	+ $o['info'][$k] = $v;
978	978	break;
979	979	}
980	980	}
981	981
982		- // pass values down to cid to gid map
	982	+ // pass values down to cid to gid map
983	983	if ($this->embedFont) {
984		- $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
	984	+ $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
985	985	}
986	986	break;
987	987
988	988	case 'out':
989	989	$res = "\n$id 0 obj\n";
990		- $res.= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>";
	990	+ $res.= "<</Type /Font /Subtype /CIDFontType2 /BaseFont /".$o['info']['name']." /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >>";
991	991	if (isset($o['info']['FontDescriptor'])) {
992	992	$res.= " /FontDescriptor ".$o['info']['FontDescriptor']." 0 R";
993	993	}
		@@ -1006,19 +1006,19 @@ discard block
		block discarded – undo
1006	1006	}
1007	1007
1008	1008	if ($this->embedFont) {
1009		- $res.= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R";
	1009	+ $res.= " /CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R";
1010	1010	}
1011		- $res.= " >>\n";
1012		- $res.= "endobj";
	1011	+ $res.= " >>\n";
	1012	+ $res.= "endobj";
1013	1013
1014	1014	return $res;
1015	1015	}
1016	1016	}
1017	1017
1018	1018	/**
1019		- * a font glyph to character map, needed for unicode fonts
1020		- * @access private
1021		- */
	1019	+ * a font glyph to character map, needed for unicode fonts
	1020	+ * @access private
	1021	+ */
1022	1022	private function o_fontGIDtoCIDMap($id, $action, $options = '')
1023	1023	{
1024	1024	if ($action !== 'new') {
		@@ -1032,8 +1032,8 @@ discard block
		block discarded – undo
1032	1032
1033	1033	case 'out':
1034	1034	$res = "\n$id 0 obj\n";
1035		- $fontFileName = $o['info']['fontFileName'];
1036		- $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']);
	1035	+ $fontFileName = $o['info']['fontFileName'];
	1036	+ $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']);
1037	1037
1038	1038	if (isset($o['raw'])) {
1039	1039	$res.= $tmp;
		@@ -1048,7 +1048,7 @@ discard block
		block discarded – undo
1048	1048	$res.= " /Length ".mb_strlen($tmp, '8bit') .">>\nstream\n$tmp\nendstream";
1049	1049	}
1050	1050
1051		- $res.= "\nendobj";
	1051	+ $res.= "\nendobj";
1052	1052	return $res;
1053	1053	}
1054	1054	}
		@@ -1936,7 +1936,7 @@ discard block
		block discarded – undo
1936	1936	}
1937	1937
1938	1938	if (!isset($data['MissingWidth']) && $c == -1 && $n === '.notdef') {
1939		- $data['MissingWidth'] = $width;
	1939	+ $data['MissingWidth'] = $width;
1940	1940	}
1941	1941	}
1942	1942	break;
		@@ -1957,7 +1957,7 @@ discard block
		block discarded – undo
1957	1957
1958	1958	if ($c >= 0) {
1959	1959	if ($c >= 0 && $c < 0xFFFF && $glyph) {
1960		- $cidtogid[$c*2] = chr($glyph >> 8);
	1960	+ $cidtogid[$c*2] = chr($glyph >> 8);
1961	1961	$cidtogid[$c*2 + 1] = chr($glyph & 0xFF);
1962	1962	}
1963	1963	if ($c != hexdec($n)) {
		@@ -1969,7 +1969,7 @@ discard block
		block discarded – undo
1969	1969	}
1970	1970
1971	1971	if (!isset($data['MissingWidth']) && $c == -1 && $n === '.notdef') {
1972		- $data['MissingWidth'] = $width;
	1972	+ $data['MissingWidth'] = $width;
1973	1973	}
1974	1974	}
1975	1975	break;
		@@ -2167,8 +2167,8 @@ discard block
		block discarded – undo
2167	2167
2168	2168	// setup the basic properties for o_font output
2169	2169	$tmp = array('BaseFont'=>$adobeFontName,'Widths'=>$widthid
2170		- ,'FirstChar'=>$firstChar,'LastChar'=>$lastChar
2171		- ,'FontDescriptor'=>$fontDescriptorId);
	2170	+ ,'FirstChar'=>$firstChar,'LastChar'=>$lastChar
	2171	+ ,'FontDescriptor'=>$fontDescriptorId);
2172	2172
2173	2173	// binary content of pfb or ttf file
2174	2174	$pfbid = ++$this->numObj;
		@@ -2662,18 +2662,18 @@ discard block
		block discarded – undo
2662	2662	}
2663	2663
2664	2664	/**
2665		- * return array containing codepoints (UTF-8 character values) for the
2666		- * string passed in.
2667		- *
2668		- * based on the excellent TCPDF code by Nicola Asuni and the
2669		- * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
2670		- *
2671		- * @access private
2672		- * @author Orion Richardson
2673		- * @since January 5, 2008
2674		- * @param string $text UTF-8 string to process
2675		- * @return array UTF-8 codepoints array for the string
2676		- */
	2665	+ * return array containing codepoints (UTF-8 character values) for the
	2666	+ * string passed in.
	2667	+ *
	2668	+ * based on the excellent TCPDF code by Nicola Asuni and the
	2669	+ * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
	2670	+ *
	2671	+ * @access private
	2672	+ * @author Orion Richardson
	2673	+ * @since January 5, 2008
	2674	+ * @param string $text UTF-8 string to process
	2675	+ * @return array UTF-8 codepoints array for the string
	2676	+ */
2677	2677	private function utf8toCodePointsArray(&$text)
2678	2678	{
2679	2679	$length = mb_strlen($text, '8bit'); // http://www.php.net/manual/en/function.mb-strlen.php#77040
		@@ -2733,20 +2733,20 @@ discard block
		block discarded – undo
2733	2733	return $unicode;
2734	2734	}
2735	2735
2736		- /**
2737		- * convert UTF-8 to UTF-16 with an additional byte order marker
2738		- * at the front if required.
2739		- *
2740		- * based on the excellent TCPDF code by Nicola Asuni and the
2741		- * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
2742		- *
2743		- * @access private
2744		- * @author Orion Richardson
2745		- * @since January 5, 2008
2746		- * @param string $text UTF-8 string to process
2747		- * @param boolean $bom whether to add the byte order marker
2748		- * @return string UTF-16 result string
2749		- */
	2736	+ /**
	2737	+ * convert UTF-8 to UTF-16 with an additional byte order marker
	2738	+ * at the front if required.
	2739	+ *
	2740	+ * based on the excellent TCPDF code by Nicola Asuni and the
	2741	+ * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
	2742	+ *
	2743	+ * @access private
	2744	+ * @author Orion Richardson
	2745	+ * @since January 5, 2008
	2746	+ * @param string $text UTF-8 string to process
	2747	+ * @param boolean $bom whether to add the byte order marker
	2748	+ * @return string UTF-16 result string
	2749	+ */
2750	2750	private function utf8toUtf16BE(&$text, $bom = true)
2751	2751	{
2752	2752	$cf = $this->currentFont;
		@@ -3031,7 +3031,7 @@ discard block
		block discarded – undo
3031	3031	if ($start < $len) {
3032	3032	$part = substr($text, $start);
3033	3033	$place_text = $this->filterText($part, false);
3034		- // modify unicode text so that extra word spacing is manually implemented (bug #)
	3034	+ // modify unicode text so that extra word spacing is manually implemented (bug #)
3035	3035	$cf = $this->currentFont;
3036	3036	if ($this->fonts[$cf]['isUnicode'] && $wordSpaceAdjust != 0) {
3037	3037	$space_scale = 1000 / $size;
		@@ -3346,15 +3346,15 @@ discard block
		block discarded – undo
3346	3346	}
3347	3347
3348	3348	/**
3349		- * open an existing object for editing
3350		- * @access public
3351		- */
	3349	+ * open an existing object for editing
	3350	+ * @access public
	3351	+ */
3352	3352	public function reopenObject($id)
3353	3353	{
3354	3354	$this->nStack++;
3355	3355	$this->stack[$this->nStack]=array('c'=>$this->currentContents,'p'=>$this->currentPage);
3356	3356	$this->currentContents=$id;
3357		- // also if this object is the primary contents for a page, then set the current page to its parent
	3357	+ // also if this object is the primary contents for a page, then set the current page to its parent
3358	3358	if (isset($this->objects[$id]['onPage'])) {
3359	3359	$this->currentPage = $this->objects[$id]['onPage'];
3360	3360	}
		@@ -3723,7 +3723,7 @@ discard block
		block discarded – undo
3723	3723	}
3724	3724
3725	3725	$options = array('label'=>$label,'data'=>$iChunk['idata'],'bitsPerComponent'=>$iChunk['info']['bitDepth'],'pdata'=>$iChunk['pdata']
3726		- ,'iw'=>$iChunk['info']['width'],'ih'=>$iChunk['info']['height'],'type'=>'png','color'=>$color,'ncolor'=>$ncolor);
	3726	+ ,'iw'=>$iChunk['info']['width'],'ih'=>$iChunk['info']['height'],'type'=>'png','color'=>$color,'ncolor'=>$ncolor);
3727	3727	if (isset($iChunk['transparency'])) {
3728	3728	$options['transparency']=$iChunk['transparency'];
3729	3729	}
		@@ -3815,18 +3815,18 @@ discard block
		block discarded – undo
3815	3815	$this->addJpegFromFile($tmpName, $x, $y, $w, $h);
3816	3816	}
3817	3817
3818		- /**
3819		- * add an image into the document, from a GD object
3820		- * this function is not all that reliable, and I would probably encourage people to use
3821		- * the file based functions
3822		- * @param $img - gd image resource
3823		- * @param $x coord x
3824		- * @param $y coord y
3825		- * @param $w width
3826		- * @param $h height
3827		- * @param $quality image quality
3828		- * @access protected
3829		- */
	3818	+ /**
	3819	+ * add an image into the document, from a GD object
	3820	+ * this function is not all that reliable, and I would probably encourage people to use
	3821	+ * the file based functions
	3822	+ * @param $img - gd image resource
	3823	+ * @param $x coord x
	3824	+ * @param $y coord y
	3825	+ * @param $w width
	3826	+ * @param $h height
	3827	+ * @param $quality image quality
	3828	+ * @access protected
	3829	+ */
3830	3830	protected function addImage(&$img, $x, $y, $w = 0, $h = 0, $quality = 75)
3831	3831	{
3832	3832	// add a new image into the current location, as an external object

		@@ -39,6 +39,9 @@ discard block
		block discarded – undo
39	39	}
40	40	}
41	41
	42	+ /**
	43	+ * @param string $module_name
	44	+ */
42	45	function setPrimaryModule($module_name)
43	46	{
44	47	if (!empty($this->primary_module_object) and is_object($this->primary_module_object)) {
		@@ -169,8 +172,8 @@ discard block
		block discarded – undo
169	172	/**
170	173	* getModule()
171	174	*
172		- * @param string $module_name
173	175	*
	176	+ * @param string $name
174	177	* @return object
175	178	*/
176	179	function getModule($name)
		@@ -250,6 +253,9 @@ discard block
		block discarded – undo
250	253	return false;
251	254	}
252	255
	256	+ /**
	257	+ * @param string $name
	258	+ */
253	259	private static function isValidModuleName($name)
254	260	{
255	261	return preg_match("/^[a-z0-9]+$/", $name);

		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	public function useModule($module_name, $ignore_user_access = false)
79	79	{
80	80	if (!self::isValidModuleName($module_name)) {
81		- throw new Exception($module_name . ' is not a valid module name');
	81	+ throw new Exception($module_name.' is not a valid module name');
82	82	}
83	83
84	84	if (!empty($this->modules[$module_name]) and is_object($this->modules[$module_name])) {
		@@ -116,11 +116,11 @@ discard block
		block discarded – undo
116	116	}
117	117
118	118	if ($access !== true) {
119		- throw new Exception('You need access to a required module to see this page, maybe it is ' . $module_name);
	119	+ throw new Exception('You need access to a required module to see this page, maybe it is '.$module_name);
120	120	}
121	121
122		- $main_class_name = "Main" . ucfirst($module_name);
123		- $main_class_path = PATH_INCLUDE_MODULE . $module_name . "/" . $main_class_name . ".php";
	122	+ $main_class_name = "Main".ucfirst($module_name);
	123	+ $main_class_path = PATH_INCLUDE_MODULE.$module_name."/".$main_class_name.".php";
124	124
125	125	if (file_exists($main_class_path)) {
126	126	require_once($main_class_path);
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	return $object;
131	131	} else {
132	132	// @TODO this should not fail as hard - but what should happen then?
133		- throw new Exception('ModuleHandler: ' . $main_class_path . ' does not exist');
	133	+ throw new Exception('ModuleHandler: '.$main_class_path.' does not exist');
134	134	}
135	135	}
136	136
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	public function useShared($shared_name)
145	145	{
146	146	if (!self::isValidModuleName($shared_name)) {
147		- throw new Exception($shared_name. ' is not a valid shared module name');
	147	+ throw new Exception($shared_name.' is not a valid shared module name');
148	148	}
149	149
150	150	// Tjekker om shared allerede er loaded
		@@ -152,8 +152,8 @@ discard block
		block discarded – undo
152	152	return $this->shared[$shared_name];
153	153	}
154	154
155		- $main_shared_name = 'Shared' . ucfirst($shared_name);
156		- $main_shared_path = PATH_INCLUDE_SHARED . $shared_name . '/' . $main_shared_name . '.php';
	155	+ $main_shared_name = 'Shared'.ucfirst($shared_name);
	156	+ $main_shared_path = PATH_INCLUDE_SHARED.$shared_name.'/'.$main_shared_name.'.php';
157	157
158	158	if (file_exists($main_shared_path)) {
159	159	require_once $main_shared_path;
		@@ -162,7 +162,7 @@ discard block
		block discarded – undo
162	162	$this->shared[$shared_name] = $object;
163	163	return $object;
164	164	} else {
165		- throw new Exception($shared_name . ' cannot be found on ' . $main_shared_path . ' with PATH_INCLUDE_SHARED: ' . PATH_INCLUDE_SHARED);
	165	+ throw new Exception($shared_name.' cannot be found on '.$main_shared_path.' with PATH_INCLUDE_SHARED: '.PATH_INCLUDE_SHARED);
166	166	}
167	167	}
168	168
		@@ -178,7 +178,7 @@ discard block
		block discarded – undo
178	178	if (is_object($this->modules[$name])) {
179	179	return($this->modules[$name]);
180	180	} else {
181		- throw new Exception('getModule() module ' . $name . ' not loaded');
	181	+ throw new Exception('getModule() module '.$name.' not loaded');
182	182	}
183	183	}
184	184

		@@ -450,7 +450,7 @@
		block discarded – undo
450	450	* @param $date_from (date) yyyy-mm-dd Der s�ges jo kun i indev�rende �r
451	451	* @param $date_to (date) yyyy-mm-dd Der s�ges kun i indev�rende �r
452	452	*
453		- * @return (array) med debet, credit og total saldo
	453	+ * @return boolean med debet, credit og total saldo
454	454	*
455	455	*
456	456	*

		@@ -235,7 +235,7 @@
		block discarded – undo
235	235	$this->error->set('Ikke en tilladt type');
236	236	}
237	237
238		- $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');
	238	+ $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');
239	239
240	240	if (!array_key_exists($var['use_key'], $this->use)) {
241	241	$this->error->set('Ikke en tilladt brug af kontoen');

		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	$this->db = new DB_Sql;
95	95	$this->mdb2 = MDB2::singleton(DB_DSN);
96	96	if (PEAR::isError($this->mdb2)) {
97		- throw new Exception($this->mdb2->getMessage() . $this->mdb2->getUserInfo());
	97	+ throw new Exception($this->mdb2->getMessage().$this->mdb2->getUserInfo());
98	98	}
99	99
100	100	$this->error = new Intraface_Error;
		@@ -150,8 +150,8 @@ discard block
		block discarded – undo
150	150	account.active
151	151	FROM
152	152	accounting_account account
153		- WHERE account.id = " . $this->id . "
154		- AND account.intranet_id = ".$this->year->kernel->intranet->get('id'). "
	153	+ WHERE account.id = " . $this->id."
	154	+ AND account.intranet_id = ".$this->year->kernel->intranet->get('id')."
155	155	AND year_id = ".$this->year->get('id')."
156	156	LIMIT 1";
157	157
		@@ -256,26 +256,26 @@ discard block
		block discarded – undo
256	256
257	257	if ($this->id > 0) {
258	258	$sql_type = "UPDATE accounting_account ";
259		- $sql_end = " WHERE id = " . $this->id;
	259	+ $sql_end = " WHERE id = ".$this->id;
260	260	} else {
261	261	$sql_type = "INSERT INTO accounting_account ";
262	262	$sql_end = ", date_created=NOW()";
263	263	}
264	264
265		- $sql = $sql_type . "SET
	265	+ $sql = $sql_type."SET
266	266	number = '".(int)$var['number']."',
267		- intranet_id = " . $this->year->kernel->intranet->get('id') . ",
268		- user_id = " . $this->year->kernel->user->get("id") . ",
	267	+ intranet_id = " . $this->year->kernel->intranet->get('id').",
	268	+ user_id = " . $this->year->kernel->user->get("id").",
269	269	type_key='" . $var['type_key']."',
270	270	year_id = " . $this->year->get('id').",
271	271	use_key = '" . $var['use_key']."',
272	272	name = '" . $var['name']."',
273	273	comment = '" . $var['comment']."',
274		- vat_percent = '" . $var['vat_percent'] . "',
275		- sum_to_account_number = " . (int)$var['sum_to'] . ",
276		- sum_from_account_number = " . (int)$var['sum_from'] . ",
	274	+ vat_percent = '" . $var['vat_percent']."',
	275	+ sum_to_account_number = " . (int)$var['sum_to'].",
	276	+ sum_from_account_number = " . (int)$var['sum_from'].",
277	277	date_changed = NOW(),
278		- vat_key=" . (int)$var['vat_key'] . " " . $sql_end;
	278	+ vat_key=" . (int)$var['vat_key']." ".$sql_end;
279	279
280	280	$this->db->query($sql);
281	281
		@@ -284,7 +284,7 @@ discard block
		block discarded – undo
284	284	}
285	285
286	286	if (!empty($var['created_from_id']) and is_numeric($var['created_from_id'])) {
287		- $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = " . $this->id);
	287	+ $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = ".$this->id);
288	288	}
289	289
290	290	$this->load();
		@@ -349,7 +349,7 @@ discard block
		block discarded – undo
349	349	return false;
350	350	}
351	351
352		- $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = " . $this->year->kernel->intranet->get('id') . " AND year_id = ".$this->year->get('id')." AND id = " . $this->id);
	352	+ $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = ".$this->year->get('id')." AND id = ".$this->id);
353	353	$this->value['active'] = 0;
354	354	return true;
355	355	}
		@@ -390,10 +390,10 @@ discard block
		block discarded – undo
390	390	$sql = "SELECT
391	391	id
392	392	FROM accounting_account
393		- WHERE number = " . $account_number . "
394		- AND intranet_id = " . $this->year->kernel->intranet->get('id') . "
395		- AND year_id = " .$this->year->get('id'). "
396		- AND id <> " . $this->id . " AND active = 1";
	393	+ WHERE number = " . $account_number."
	394	+ AND intranet_id = " . $this->year->kernel->intranet->get('id')."
	395	+ AND year_id = " .$this->year->get('id')."
	396	+ AND id <> " . $this->id." AND active = 1";
397	397	$result = $this->mdb2->query($sql);
398	398	if (PEAR::isError($result)) {
399	399	throw new Exception('Error in query: '.$result->getUserInfo());
		@@ -418,8 +418,8 @@ discard block
		block discarded – undo
418	418	{
419	419	$sql = "SELECT primosaldo_debet, primosaldo_credit
420	420	FROM accounting_account
421		- WHERE year_id = " . $this->year->get('id') . "
422		- AND id = ".$this->id . "
	421	+ WHERE year_id = " . $this->year->get('id')."
	422	+ AND id = ".$this->id."
423	423	AND active = 1
424	424	AND intranet_id = ".$this->year->kernel->intranet->get('id');
425	425
		@@ -499,9 +499,9 @@ discard block
		block discarded – undo
499	499	if ($this->get('type_key') == array_search('sum', $this->types)) {
500	500	$db2 = new DB_Sql;
501	501	$sql = "SELECT id FROM accounting_account
502		- WHERE number >= " . $this->get('sum_from') . "
	502	+ WHERE number >= " . $this->get('sum_from')."
503	503	AND type_key != ".array_search('sum', $this->types)."
504		- AND number <= " . $this->get('sum_to') . "
	504	+ AND number <= " . $this->get('sum_to')."
505	505	AND year_id = ".$this->year->get('id')."
506	506	AND intranet_id = " . $this->year->kernel->intranet->get('id');
507	507	$db2->query($sql);
		@@ -567,9 +567,9 @@ discard block
		block discarded – undo
567	567	$this->db->query("SELECT
568	568	id
569	569	FROM accounting_post post
570		- WHERE (post.account_id = ". $this->id . ")
	570	+ WHERE (post.account_id = ". $this->id.")
571	571	AND intranet_id = ".$this->year->kernel->intranet->get('id')."
572		- AND year_id = " . $this->year->get('id') . "
	572	+ AND year_id = " . $this->year->get('id')."
573	573	LIMIT 1");
574	574	return $this->db->numRows();
575	575	}
		@@ -590,9 +590,9 @@ discard block
		block discarded – undo
590	590	debet,
591	591	credit
592	592	FROM accounting_post post
593		- WHERE (post.account_id = ". $this->get('id') . ")
	593	+ WHERE (post.account_id = ". $this->get('id').")
594	594	AND intranet_id = ".$this->year->kernel->intranet->get('id')."
595		- AND year_id = " . $this->year->get('id') . "
	595	+ AND year_id = " . $this->year->get('id')."
596	596	AND stated = 1
597	597	ORDER BY date ASC, id ASC");
598	598	$i = 1;
		@@ -626,9 +626,9 @@ discard block
		block discarded – undo
626	626	public function calculateVat($amount, $vat_percent)
627	627	{
628	628	$amount = (float)$amount;
629		- $vat_percent = (float)$vat_percent / 100;
	629	+ $vat_percent = (float)$vat_percent/100;
630	630
631		- return $amount * ($vat_percent / (1 + $vat_percent));
	631	+ return $amount*($vat_percent/(1 + $vat_percent));
632	632	}
633	633
634	634	public function getId()

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	private function load()
45	45	{
46	46	$db = new DB_Sql;
47		- $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = " . $this->id . " AND intranet_id=" .$this->voucher->year->kernel->intranet->get('id'));
	47	+ $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = ".$this->id." AND intranet_id=".$this->voucher->year->kernel->intranet->get('id'));
48	48	if (!$db->nextRecord()) {
49	49	return 0;
50	50	}
		@@ -125,14 +125,14 @@ discard block
		block discarded – undo
125	125
126	126	if ($this->id > 0) {
127	127	$sql_type = "UPDATE";
128		- $sql_end = " WHERE id = " . $this->id;
	128	+ $sql_end = " WHERE id = ".$this->id;
129	129	} else {
130	130	$sql_type = "INSERT INTO";
131	131	$sql_end = "";
132	132	}
133	133
134	134	$db = new DB_Sql;
135		- $sql = $sql_type . " accounting_post
	135	+ $sql = $sql_type." accounting_post
136	136	SET
137	137	voucher_id = '".$this->voucher->get('id')."',
138	138	intranet_id = ".$this->
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	account_id = '".(int)$account_id."',
148	148	text = '".(string)$text."',
149	149	debet = '".$debet."',
150		- credit = '".$credit."'" . $sql_end;
	150	+ credit = '".$credit."'".$sql_end;
151	151	$db->query($sql);
152	152
153	153	$this->id = $db->insertedId();
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	}
175	175
176	176	$db = new DB_Sql;
177		- $db->query("UPDATE accounting_post SET stated = 1 WHERE id = " . $this->id . " AND intranet_id =" .$this->voucher->year->kernel->intranet->get('id'));
	177	+ $db->query("UPDATE accounting_post SET stated = 1 WHERE id = ".$this->id." AND intranet_id =".$this->voucher->year->kernel->intranet->get('id'));
178	178
179	179	return true;
180	180	}
		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	}
187	187
188	188	$db = new DB_Sql;
189		- $db->query("DELETE FROM accounting_post WHERE id = " . $this->id);
	189	+ $db->query("DELETE FROM accounting_post WHERE id = ".$this->id);
190	190	return true;
191	191
192	192	}

		@@ -22,7 +22,6 @@ discard block
		block discarded – undo
22	22	* Constructor
23	23	*
24	24	* @param object $year_object
25		- * @param integer $post_id (optional)
26	25	*
27	26	* @return void
28	27	*/
		@@ -45,7 +44,7 @@ discard block
		block discarded – undo
45	44	* @param object $year
46	45	* @param string $voucher_number
47	46	*
48		- * @return void
	47	+ * @return Voucher
49	48	*/
50	49	function factory($year, $voucher_number)
51	50	{
		@@ -339,9 +338,7 @@ discard block
		block discarded – undo
339	338	/**
340	339	* Prepares amounts for stating, e.g. whether the accounts needs vat calculations
341	340	*
342		- * @param integer $year_id
343	341	* @param string $date
344		- * @param string $voucher_number
345	342	* @param string $text
346	343	* @param integer $account_id
347	344	* @param float $debet

		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	voucher.date,
69	69	voucher.reference
70	70	FROM accounting_voucher voucher
71		- WHERE voucher.id = " . $this->id. " AND intranet_id = ". $this->year->kernel->intranet->getId();
	71	+ WHERE voucher.id = " . $this->id." AND intranet_id = ".$this->year->kernel->intranet->getId();
72	72
73	73	$db = new DB_Sql;
74	74	$db->query($sql);
		@@ -143,11 +143,11 @@ discard block
		block discarded – undo
143	143	$sql_end = ", date_created = NOW()";
144	144	} else {
145	145	$sql_type = "UPDATE";
146		- $sql_end = " WHERE id = " . (int)$this->id;
	146	+ $sql_end = " WHERE id = ".(int)$this->id;
147	147	}
148	148
149	149	$db = new DB_Sql;
150		- $sql = $sql_type . " accounting_voucher
	150	+ $sql = $sql_type." accounting_voucher
151	151	SET intranet_id = ".$this->year->kernel->intranet->get('id').",
152	152	year_id = ".$this->year->get('id').",
153	153	user_id = ".$this->year->kernel->user->get('id').",
		@@ -155,7 +155,7 @@ discard block
		block discarded – undo
155	155	number = '".$var['voucher_number']."',
156	156	date = '".$post_date->get()."',
157	157	reference = '".$var['reference']."',
158		- text = '".$var['text']."'" . $sql_end;
	158	+ text = '".$var['text']."'".$sql_end;
159	159
160	160	$db->query($sql);
161	161
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309	$buy_all_abroad = $buy_abroad;
310	310	}
311	311
312		- $amount = $this->get('amount') * ($this->vatpercent / 100);
	312	+ $amount = $this->get('amount')*($this->vatpercent/100);
313	313
314	314	// I det omfang du har fradragsret for momsen, kan du medregne det beregnede
315	315	// momsbeløb til konto for indgående moms. Det beregnede momsbeløb af EU-varekøb
		@@ -374,13 +374,13 @@ discard block
		block discarded – undo
374	374	$debet = $debet - $vat_amount;
375	375	// bogfør momsen
376	376	$post = new Post($this);
377		- $post->save($date, $vat_account_id, $text . " - købsmoms", $vat_amount, 0, $skip_draft);
	377	+ $post->save($date, $vat_account_id, $text." - købsmoms", $vat_amount, 0, $skip_draft);
378	378	} else {
379	379	$vat_amount = $this->calculateVat($credit, $vat_percent);
380	380	$credit = $credit - $vat_amount;
381	381	// bogføre udgående moms
382	382	$post = new Post($this);
383		- $post->save($date, $vat_account_id, $text . " - tilbageført moms", 0, $vat_amount, $skip_draft);
	383	+ $post->save($date, $vat_account_id, $text." - tilbageført moms", 0, $vat_amount, $skip_draft);
384	384	}
385	385
386	386	// bogføre selve posten
		@@ -396,7 +396,7 @@ discard block
		block discarded – undo
396	396	$credit = $credit - $vat_amount;
397	397	// bogføre udgående moms
398	398	$post = new Post($this);
399		- $post->save($date, $vat_account_id, $text . " - salgsmoms", 0, $vat_amount, $skip_draft);
	399	+ $post->save($date, $vat_account_id, $text." - salgsmoms", 0, $vat_amount, $skip_draft);
400	400	} else {
401	401	// tilbagefører momsen hvis det er et debet beløb
402	402	$vat_amount = $this->calculateVat($debet, $vat_percent);
		@@ -455,7 +455,7 @@ discard block
		block discarded – undo
455	455	$post = new Post($this, $p['id']);
456	456
457	457	if (!$post->setStated()) {
458		- $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');
	458	+ $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');
459	459	}
460	460
461	461	// tjekker om der har været nogle fejl i bogføringen
		@@ -479,7 +479,7 @@ discard block
		block discarded – undo
479	479	}
480	480
481	481	if ($this->get('saldo') <> 0) {
482		- $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er ' . $this->get('saldo') . '.');
	482	+ $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er '.$this->get('saldo').'.');
483	483	}
484	484
485	485	if ($this->error->isError()) {
		@@ -495,7 +495,7 @@ discard block
		block discarded – undo
495	495	}
496	496
497	497	if (!$post->setStated()) {
498		- $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');
	498	+ $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');
499	499	}
500	500	}
501	501	// tjekker om der har været nogle fejl i bogføringen
		@@ -509,7 +509,7 @@ discard block
		block discarded – undo
509	509	function getPosts()
510	510	{
511	511	$db = new DB_Sql;
512		- $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = " . $this->id . " AND intranet_id=".$this->year->kernel->intranet->get('id'));
	512	+ $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = ".$this->id." AND intranet_id=".$this->year->kernel->intranet->get('id'));
513	513	$list = array();
514	514	$i = 0;
515	515	$this->value['saldo'] = 0;

		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	/**
44	44	* Funktion til at sætte et regnskabsår, som brugeren redigerer i.
45	45	*
46		- * @return true
	46	+ * @return boolean
47	47	*/
48	48	function setYear()
49	49	{
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	*
86	86	* @param boolean $redirect Set to true if a redirect should occur if no year isset
87	87	*
88		- * @return boolean
	88	+ * @return null\|boolean
89	89	*/
90	90	function checkYear($redirect = true)
91	91	{
		@@ -439,11 +439,17 @@ discard block
		block discarded – undo
439	439	return $this->kernel->getSetting()->set('intranet', 'accounting.'.$setting, $value, $this->get('id'));
440	440	}
441	441
	442	+ /**
	443	+ * @param string $setting
	444	+ */
442	445	function getSetting($setting)
443	446	{
444	447	return $this->kernel->getSetting()->get('intranet', 'accounting.' . $setting, $this->get('id'));
445	448	}
446	449
	450	+ /**
	451	+ * @param string $type
	452	+ */
447	453	function createAccounts($type, $last_year_id = 0)
448	454	{
449	455	if ($this->getId() == 0) {
		@@ -742,7 +748,8 @@ discard block
		block discarded – undo
742	748
743	749	/**
744	750	* @param $from->year (object)
745		- * @param $setting (string)
	751	+ * @param string $setting (string)
	752	+ * @param Year $from_year
746	753	*/
747	754	function transferAccountSetting($from_year, $setting)
748	755	{
		@@ -874,6 +881,9 @@ discard block
		block discarded – undo
874	881	return true;
875	882	}
876	883
	884	+ /**
	885	+ * @return string
	886	+ */
877	887	public function getId()
878	888	{
879	889	return $this->get('id');

		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	DATE_FORMAT(to_date, '%d-%m-%Y') AS to_date_dk,
145	145	last_year_id, from_date, to_date, locked, label, vat
146	146	FROM accounting_year
147		- WHERE id = '" . $this->id . "'
	147	+ WHERE id = '" . $this->id."'
148	148	AND intranet_id = ".$this->kernel->intranet->get('id')."
149	149	LIMIT 1";
150	150
		@@ -212,13 +212,13 @@ discard block
		block discarded – undo
212	212	}
213	213
214	214	if ($this->id > 0) {
215		- $sql="UPDATE accounting_year ";
216		- $sql_after=" WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
	215	+ $sql = "UPDATE accounting_year ";
	216	+ $sql_after = " WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
217	217	} else {
218		- $sql="INSERT INTO accounting_year ";
	218	+ $sql = "INSERT INTO accounting_year ";
219	219	$sql_after = ', date_created = NOW()';
220	220	}
221		- $sql.=" SET
	221	+ $sql .= " SET
222	222	intranet_id='".$this->kernel->intranet->get('id')."',
223	223	user_id='".$this->kernel->user->get('id')."',
224	224	last_year_id='".$var['last_year_id']."',
		@@ -259,7 +259,7 @@ discard block
		block discarded – undo
259	259	{
260	260	$sql = "SELECT id FROM accounting_year
261	261	WHERE id = ".$this->id."
262		- AND intranet_id = ". $this->kernel->intranet->get('id') . " AND active = 1";
	262	+ AND intranet_id = ". $this->kernel->intranet->get('id')." AND active = 1";
263	263
264	264	$db = new DB_Sql;
265	265	$db->query($sql);
		@@ -291,7 +291,7 @@ discard block
		block discarded – undo
291	291	public function isYearOpen()
292	292	{
293	293	$db = new Db_Sql;
294		- $db->query("SELECT locked FROM accounting_year WHERE id = " . $this->id . " AND intranet_id = ".$this->kernel->intranet->get('id'));
	294	+ $db->query("SELECT locked FROM accounting_year WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
295	295	if ($db->nextRecord()) {
296	296	if ($db->f('locked') == 1) {
297	297	return false;
		@@ -316,7 +316,7 @@ discard block
		block discarded – undo
316	316	$date = safeToDb($date);
317	317
318	318	$db = new Db_Sql;
319		- $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id') . " LIMIT 1");
	319	+ $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
320	320	if ($db->nextRecord()) {
321	321	if ($db->f('from_date') <= $date and $date <= $db->f('to_date')) {
322	322	return true;
		@@ -403,7 +403,7 @@ discard block
		block discarded – undo
403	403
404	404	if (!empty($balance_accounts) and count($balance_accounts) > 0) {
405	405	foreach ($balance_accounts as $account) {
406		- $sql_where .= "id = " . $account . " OR ";
	406	+ $sql_where .= "id = ".$account." OR ";
407	407	}
408	408	}
409	409	// hvis der ikke er nogen balance_accounts skal den ikke v�lge nogen poster
		@@ -412,7 +412,7 @@ discard block
		block discarded – undo
412	412	$db = new DB_Sql;
413	413	$db->query("SELECT id FROM accounting_account
414	414	WHERE (".$sql_where.")
415		- AND intranet_id = " . $this->kernel->intranet->get('id') . "
	415	+ AND intranet_id = " . $this->kernel->intranet->get('id')."
416	416	AND year_id = " . $this->get('id'));
417	417
418	418	$accounts = array(); // afstemningskonti
		@@ -441,7 +441,7 @@ discard block
		block discarded – undo
441	441
442	442	function getSetting($setting)
443	443	{
444		- return $this->kernel->getSetting()->get('intranet', 'accounting.' . $setting, $this->get('id'));
	444	+ return $this->kernel->getSetting()->get('intranet', 'accounting.'.$setting, $this->get('id'));
445	445	}
446	446
447	447	function createAccounts($type, $last_year_id = 0)
		@@ -488,7 +488,7 @@ discard block
		block discarded – undo
488	488
489	489	// settings
490	490	if (!empty($input['setting'])) {
491		- $this->setSetting($input['setting'] . '_account_id', $id);
	491	+ $this->setSetting($input['setting'].'_account_id', $id);
492	492	}
493	493	if (!empty($input['balance_account']) and $input['balance_account'] == 1) {
494	494	$balance_accounts[] = $id;
		@@ -569,7 +569,7 @@ discard block
		block discarded – undo
569	569
570	570	if (is_array($balance_accounts)) {
571	571	foreach ($balance_accounts as $key => $id) {
572		- $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
	572	+ $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
573	573	while ($db->nextRecord()) {
574	574	$new_balance_accounts[] = $db->f('id');
575	575	}
		@@ -584,7 +584,7 @@ discard block
		block discarded – undo
584	584
585	585	if (is_array($buy_eu_accounts)) {
586	586	foreach ($buy_eu_accounts as $key => $id) {
587		- $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
	587	+ $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
588	588	while ($db->nextRecord()) {
589	589	$new_buy_eu_accounts[] = $db->f('id');
590	590	}
		@@ -599,7 +599,7 @@ discard block
		block discarded – undo
599	599
600	600	if (is_array($buy_abroad_accounts)) {
601	601	foreach ($buy_abroad_accounts as $key => $id) {
602		- $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
	602	+ $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
603	603	while ($db->nextRecord()) {
604	604	$new_buy_abroad_accounts[] = $db->f('id');
605	605	}
		@@ -748,7 +748,7 @@ discard block
		block discarded – undo
748	748	{
749	749	$account_id = $from_year->getSetting($setting);
750	750	$db = new DB_Sql;
751		- $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . $account_id);
	751	+ $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".$account_id);
752	752	if ($db->nextRecord()) {
753	753	$this->setSetting($setting, $db->f('id'));
754	754	}
		@@ -826,9 +826,9 @@ discard block
		block discarded – undo
826	826	}
827	827	$db = new DB_Sql;
828	828	$sql = "SELECT id FROM debtor
829		- WHERE type= " . $type_key . "
830		- AND intranet_id = " .$this->kernel->intranet->get('id') . "
831		- AND (this_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
	829	+ WHERE type= " . $type_key."
	830	+ AND intranet_id = " .$this->kernel->intranet->get('id')."
	831	+ AND (this_date BETWEEN '" . $date_start."' AND '".$date_end."')
832	832	AND voucher_id = 0
833	833	AND active = 1";
834	834	$db->query($sql);
		@@ -842,8 +842,8 @@ discard block
		block discarded – undo
842	842	{
843	843	$db = new DB_Sql;
844	844	$sql = "SELECT id FROM invoice_payment
845		- WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
846		- AND (payment_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
	845	+ WHERE intranet_id = " .$this->kernel->intranet->get('id')."
	846	+ AND (payment_date BETWEEN '" . $date_start."' AND '".$date_end."')
847	847	AND voucher_id = 0";
848	848	$db->query($sql);
849	849	if ($db->numRows() == 0) {
		@@ -856,8 +856,8 @@ discard block
		block discarded – undo
856	856	{
857	857	$db = new DB_Sql;
858	858	$sql = "SELECT id FROM procurement
859		- WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
860		- AND (invoice_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
	859	+ WHERE intranet_id = " .$this->kernel->intranet->get('id')."
	860	+ AND (invoice_date BETWEEN '" . $date_start."' AND '".$date_end."')
861	861	AND voucher_id = 0
862	862	AND active = 1";
863	863	$db->query($sql);
		@@ -870,7 +870,7 @@ discard block
		block discarded – undo
870	870	function lock()
871	871	{
872	872	$db = new DB_Sql;
873		- $db->query("UPDATE accounting_year SET locked = 1 WHERE id = " . $this->id);
	873	+ $db->query("UPDATE accounting_year SET locked = 1 WHERE id = ".$this->id);
874	874	return true;
875	875	}
876	876

		@@ -58,6 +58,9 @@
		block discarded – undo
58	58	return $account_years;
59	59	}
60	60
	61	+ /**
	62	+ * @param string $voucher_id
	63	+ */
61	64	function findByVoucherId($voucher_id)
62	65	{
63	66	$sql = "SELECT id FROM accounting_voucher

		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28
29	29	function findById($id, $load_active = true)
30	30	{
31		- require_once dirname(__FILE__) . '/Year.php';
	31	+ require_once dirname(__FILE__).'/Year.php';
32	32	return new Year($this->kernel, $id, $load_active);
33	33	}
34	34
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	{
63	63	$sql = "SELECT id FROM accounting_voucher
64	64	WHERE intranet_id = ".$this->kernel->intranet->get('id')."
65		- AND id = " . (int)$voucher_id . "
	65	+ AND id = " . (int)$voucher_id."
66	66	LIMIT 1";
67	67
68	68	$db = new DB_Sql;

		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	* When %CKEditor is created with the editor() method, a HTML <textarea> element is created,
74	74	* it will be displayed to anyone with JavaScript disabled or with incompatible browser.
75	75	*/
76		- public $textareaAttributes = array( "rows" => 8, "cols" => 60 );
	76	+ public $textareaAttributes = array("rows" => 8, "cols" => 60);
77	77	/**
78	78	* A string indicating the creation date of %CKEditor.
79	79	* Do not change it unless you want to force browsers to not use previously cached version of %CKEditor.
		@@ -133,9 +133,9 @@ discard block
		block discarded – undo
133	133	{
134	134	$attr = "";
135	135	foreach ($this->textareaAttributes as $key => $val) {
136		- $attr.= " " . $key . '="' . str_replace('"', '"', $val) . '"';
	136	+ $attr .= " ".$key.'="'.str_replace('"', '"', $val).'"';
137	137	}
138		- $out = "<textarea name=\"" . $name . "\"" . $attr . ">" . htmlspecialchars($value) . "</textarea>\n";
	138	+ $out = "<textarea name=\"".$name."\"".$attr.">".htmlspecialchars($value)."</textarea>\n";
139	139	if (!$this->initialized) {
140	140	$out .= $this->init();
141	141	}
		@@ -234,11 +234,11 @@ discard block
		block discarded – undo
234	234	$classDetection = "";
235	235	$js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
236	236	if (!empty($className)) {
237		- $js .= " var classRegex = new RegExp('(?:^\| )' + '". $className ."' + '(?:$\| )');\n";
	237	+ $js .= " var classRegex = new RegExp('(?:^\| )' + '".$className."' + '(?:$\| )');\n";
238	238	$js .= " if (!classRegex.test(textarea.className))\n";
239	239	$js .= " return false;\n";
240	240	}
241		- $js .= " CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
	241	+ $js .= " CKEDITOR.tools.extend(config, ".$this->jsEncode($_config).", true);";
242	242	$js .= "} );";
243	243	}
244	244
		@@ -412,7 +412,7 @@ discard block
		block discarded – undo
412	412	}
413	413	// Return only new events
414	414	if (!in_array($code, $returnedEvents[$eventName])) {
415		- $out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);";
	415	+ $out .= ($code ? "\n" : "")."CKEDITOR.on('".$eventName."', $code);";
416	416	$returnedEvents[$eventName][] = $code;
417	417	}
418	418	}
		@@ -443,19 +443,19 @@ discard block
		block discarded – undo
443	443	$ckeditorPath = $this->ckeditorPath();
444	444
445	445	if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
446		- $args = '?t=' . $this->timestamp;
	446	+ $args = '?t='.$this->timestamp;
447	447	}
448	448
449	449	// Skip relative paths...
450	450	if (strpos($ckeditorPath, '..') !== 0) {
451		- $out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';");
	451	+ $out .= $this->script("window.CKEDITOR_BASEPATH='".$ckeditorPath."';");
452	452	}
453	453
454		- $out .= "<script type=\"text/javascript\" src=\"" . $ckeditorPath . 'ckeditor.js' . $args . "\"></script>\n";
	454	+ $out .= "<script type=\"text/javascript\" src=\"".$ckeditorPath.'ckeditor.js'.$args."\"></script>\n";
455	455
456	456	$extraCode = "";
457	457	if ($this->timestamp != self::timestamp) {
458		- $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
	458	+ $extraCode .= ($extraCode ? "\n" : "")."CKEDITOR.timestamp = '".$this->timestamp."';";
459	459	}
460	460	if ($extraCode) {
461	461	$out .= $this->script($extraCode);
		@@ -486,7 +486,7 @@ discard block
		block discarded – undo
486	486	/**
487	487	* realpath — Returns canonicalized absolute pathname
488	488	*/
489		- $realPath = realpath('./') ;
	489	+ $realPath = realpath('./');
490	490	}
491	491
492	492	/**
		@@ -546,7 +546,7 @@ discard block
		block discarded – undo
546	546
547	547	$val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val);
548	548
549		- return '"' . $val . '"';
	549	+ return '"'.$val.'"';
550	550	}
551	551	}
552	552	$isList = true;
		@@ -561,12 +561,12 @@ discard block
		block discarded – undo
561	561	foreach ($val as $v) {
562	562	$result[] = $this->jsEncode($v);
563	563	}
564		- return '[ ' . join(', ', $result) . ' ]';
	564	+ return '[ '.join(', ', $result).' ]';
565	565	} else {
566	566	foreach ($val as $k => $v) {
567	567	$result[] = $this->jsEncode($k).': '.$this->jsEncode($v);
568	568	}
569		- return '{ ' . join(', ', $result) . ' }';
	569	+ return '{ '.join(', ', $result).' }';
570	570	}
571	571	}
572	572	}

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	/**
70	70	* Creates a parameter
71	71	*
72		- * @return object
	72	+ * @return CMS_Parameter
73	73	*/
74	74	function createParameter()
75	75	{

		@@ -41,9 +41,9 @@ discard block
		block discarded – undo
41	41	*/
42	42	function __construct($section, $id = 0)
43	43	{
44		- $this->value['identify_as'] = 'cms_element'; // bruges af parameter
	44	+ $this->value['identify_as'] = 'cms_element'; // bruges af parameter
45	45
46		- $this->id = (int) $id;
	46	+ $this->id = (int)$id;
47	47	$this->kernel = $section->kernel;
48	48	$this->section = $section;
49	49	$this->error = new Intraface_Error;
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63
64	64	function getPosition(DB_Sql $db)
65	65	{
66		- return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = " . $this->kernel->intranet->get('id'), "position", "id");
	66	+ return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = ".$this->kernel->intranet->get('id'), "position", "id");
67	67	}
68	68
69	69	/**
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	}
126	126
127	127	$db = new DB_Sql;
128		- $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = " . $this->id);
	128	+ $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = ".$this->id);
129	129	if (!$db->nextRecord()) {
130	130	return 0;
131	131	}
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	$this->value['extra_class'] = '';
148	148
149	149	if ($this->get('elm_width')) {
150		- $this->value['extra_style'] .= 'width: ' . $this->get('elm_width') . ';';
	150	+ $this->value['extra_style'] .= 'width: '.$this->get('elm_width').';';
151	151	}
152	152
153	153	if ($this->get('elm_properties') == 'float') {
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	$this->value['extra_style'] .= ' clear: both;';
162	162	}
163	163	if ($this->get('elm_adjust')) {
164		- $this->value['extra_class'] .= ' cms-align-' . $this->get('elm_adjust');
	164	+ $this->value['extra_class'] .= ' cms-align-'.$this->get('elm_adjust');
165	165	}
166	166
167	167	if ($this->get('elm_box') == 'box') {
		@@ -237,11 +237,11 @@ discard block
		block discarded – undo
237	237	$sql_end = ", date_created = NOW()";
238	238	} else {
239	239	$sql_type = "UPDATE ";
240		- $sql_end = " WHERE id = " . $this->id;
	240	+ $sql_end = " WHERE id = ".$this->id;
241	241	}
242		- $sql = $sql_type . " cms_element SET
	242	+ $sql = $sql_type." cms_element SET
243	243	intranet_id = ".$this->section->kernel->intranet->get('id').",
244		- section_id=". (int)$this->section->get('id') . ",
	244	+ section_id=". (int)$this->section->get('id').",
245	245	type_key = ".safeToDb($this->value['type_key']).",
246	246	date_changed = NOW(),
247	247	date_publish = ".$date_publish.",
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254	$this->id = $db->insertedId();
255	255
256	256	$next_pos = $this->getPosition($db)->getMaxPosition() + 1;
257		- $db->query("UPDATE cms_element SET position = " . $next_pos . " WHERE id = " . $this->id);
	257	+ $db->query("UPDATE cms_element SET position = ".$next_pos." WHERE id = ".$this->id);
258	258	}
259	259
260	260	$this->load();
		@@ -290,7 +290,7 @@ discard block
		block discarded – undo
290	290	public function delete()
291	291	{
292	292	$db = new DB_Sql;
293		- $db->query("UPDATE cms_element SET active = 0 WHERE id = " . $this->id);
	293	+ $db->query("UPDATE cms_element SET active = 0 WHERE id = ".$this->id);
294	294	return true;
295	295	}
296	296
		@@ -302,7 +302,7 @@ discard block
		block discarded – undo
302	302	public function undelete()
303	303	{
304	304	$db = new DB_Sql;
305		- $db->query("UPDATE cms_element SET active = 1 WHERE id = " . $this->id);
	305	+ $db->query("UPDATE cms_element SET active = 1 WHERE id = ".$this->id);
306	306	return true;
307	307	}
308	308

intraface / intraface.dk

Pull Request — master (#26)

Status

Category

Doc Comments +59 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

Spacing +665 added lines, -665 removed lines patch added patch discarded remove patch

Doc Comments +7 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

Doc Comments +10 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Doc Comments +13 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch