intraface / intraface.dk

src/Intraface/User.php

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
         $this->error       = $this->getError();
 
         if (PEAR::isError($this->db)) {
-            throw new Exception($this->db->getMessage() . $this->db->getUserInfo());
+            throw new Exception($this->db->getMessage().$this->db->getUserInfo());
         }
 
         if ($this->id > 0) {
@@ -108,7 +108,7 @@ 
      */
     protected function load()
     {
-        $result = $this->db->query("SELECT id, email, disabled FROM user WHERE id = " . $this->db->quote($this->id, 'integer'));
+        $result = $this->db->query("SELECT id, email, disabled FROM user WHERE id = ".$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
@@ -200,7 +200,7 @@ 
         if (!empty($this->modules[$module])) {
             return $module_id = $this->modules[$module];
         } else {
-            throw new Exception('user says unknown module ' . $module);
+            throw new Exception('user says unknown module '.$module);
         }
     }
 
@@ -260,7 +260,7 @@ 
      */
     public function hasModuleAccess($module, $intranet_id = 0)
     {
-        $filename = PATH_INCLUDE_MODULE . $module . '/Main' . ucfirst($module) . '.php';
+        $filename = PATH_INCLUDE_MODULE.$module.'/Main'.ucfirst($module).'.php';
         if (file_exists($filename)) {
             require_once $filename;
             $module_class = 'Main'.ucfirst($module);
@@ -465,7 +465,7 @@ 
     {
         $id = intval($id);
         if ($this->hasIntranetAccess($id)) {
-            $this->db->exec("UPDATE user SET active_intranet_id = ". $this->db->quote($id, 'integer')." WHERE id = ". $this->db->quote($this->get('id'), 'integer'));
+            $this->db->exec("UPDATE user SET active_intranet_id = ".$this->db->quote($id, 'integer')." WHERE id = ".$this->db->quote($this->get('id'), 'integer'));
             return $id;
         }
         return false;
@@ -568,7 +568,7 @@ 
         $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
         $new_password = Intraface_Kernel::randomKey(8);
 
-        $db->exec("UPDATE user SET password = '".md5($new_password)."' WHERE id =" . $row['id']);
+        $db->exec("UPDATE user SET password = '".md5($new_password)."' WHERE id =".$row['id']);
 
         return $new_password;
     }
@@ -579,7 +579,7 @@ 
             return false;
         }
 
-        $result = $this->db->query("SELECT * FROM user WHERE password = '".safeToDb(md5($old_password))."' AND id = " . $this->get('id'));
+        $result = $this->db->query("SELECT * FROM user WHERE password = '".safeToDb(md5($old_password))."' AND id = ".$this->get('id'));
         if ($result->numRows() < 1) {
             $this->error->set('error in old password');
         }
@@ -595,7 +595,7 @@ 
             return false;
         }
 
-        $this->db->query("UPDATE user SET password = '".safeToDb(md5($new_password))."' WHERE id = " . $this->get('id'));
+        $this->db->query("UPDATE user SET password = '".safeToDb(md5($new_password))."' WHERE id = ".$this->get('id'));
 
         return true;
     }

src/Intraface/modules/cms/Site.php

Spacing +7 added lines, -7 removed lines

@@ -71,14 +71,14 @@ 
 
         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 = " , date_created = NOW()";
         }
 
         $db = new DB_Sql;
-        $db->query($sql_type . " cms_site
+        $db->query($sql_type." cms_site
             SET intranet_id = ".$this->kernel->intranet->get('id').",
             name = '".$var['name']."',
             url = '".$var['url']."',
@@ -88,7 +88,7 @@ 
             $this->id = $db->insertedId();
         }
 
-        $this->kernel->setting->set('intranet', 'cc_license', intval($var['cc_license']), 'site_id_' . $this->id);
+        $this->kernel->setting->set('intranet', 'cc_license', intval($var['cc_license']), 'site_id_'.$this->id);
 
         $this->load();
 
@@ -98,14 +98,14 @@ 
     function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name, url FROM cms_site WHERE id = " . $this->id . " AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
+        $db->query("SELECT id, name, url FROM cms_site WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
         if (!$db->nextRecord()) {
             return 0;
         }
         $this->value['id'] = $db->f('id');
         $this->value['name'] = $db->f('name');
         $this->value['url'] = $db->f('url');
-        $this->value['cc_license'] = $this->kernel->setting->get('intranet', 'cc_license', 'site_id_' . $this->get('id'));
+        $this->value['cc_license'] = $this->kernel->setting->get('intranet', 'cc_license', 'site_id_'.$this->get('id'));
     }
 
     function delete()
@@ -115,14 +115,14 @@ 
             return 0;
         }
         $db = new Db_Sql;
-        $db->query("UPDATE cms_site SET active = 0 WHERE intranet_id=".$this->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("UPDATE cms_site SET active = 0 WHERE intranet_id=".$this->kernel->intranet->get('id')." AND id = ".$this->id);
         return 1;
     }
 
     function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name FROM cms_site WHERE intranet_id = " . $this->kernel->intranet->get('id'). " AND active = 1");
+        $db->query("SELECT id, name FROM cms_site WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1");
         $i = 0;
         $sites = array();
         while ($db->nextRecord()) {

src/Intraface/modules/debtor/Controller/ReminderEmail.php

Spacing +19 added lines, -19 removed lines

@@ -12,14 +12,14 @@ 
 
     function visit(Reminder $reminder)
     {
-        $this->output .= "Dato: " . $reminder->get("dk_this_date") ."\n\n";
-        $this->output .= $reminder->contact->address->get("name") . "\n";
+        $this->output .= "Dato: ".$reminder->get("dk_this_date")."\n\n";
+        $this->output .= $reminder->contact->address->get("name")."\n";
         if ($reminder->get("attention_to") != "") {
             $this->output .= "Att.: ".$reminder->get("attention_to")."\n";
         }
-        $this->output .= $reminder->contact->address->get("address") . "\n";
-        $this->output .= $reminder->contact->address->get("postcode") . "  " .  $reminder->contact->address->get("city") ."\n\n";
-        $this->output .= $reminder->get("text") . "\n\n";
+        $this->output .= $reminder->contact->address->get("address")."\n";
+        $this->output .= $reminder->contact->address->get("postcode")."  ".$reminder->contact->address->get("city")."\n\n";
+        $this->output .= $reminder->get("text")."\n\n";
 
         // Overskrifter - Vareudskrivning
         $this->output .= "Beskrivelse          Dato        Forfaldsdato    Beløb\n";
@@ -33,24 +33,24 @@ 
             $j++) {
                 $this->output .= ' ';
             }
-                $this->output .= ' ' . $items[$i]["dk_this_date"];
-                $this->output .= '  ' . $items[$i]["dk_due_date"];
-                $this->output .= '      ' . number_format($items[$i]["arrears"], 2, ",", ".");
+                $this->output .= ' '.$items[$i]["dk_this_date"];
+                $this->output .= '  '.$items[$i]["dk_due_date"];
+                $this->output .= '      '.number_format($items[$i]["arrears"], 2, ",", ".");
                 $total += $items[$i]["arrears"];
         }
             $items = $reminder->item->getList("reminder");
         for ($i = 0, $max = count($items); $i < $max; $i++) {
             $this->output .= "\nTidl. rykkkergebyr  ";
-            $this->output .= ' ' . $items[$i]["dk_this_date"];
-            $this->output .= '  ' .$items[$i]["dk_due_date"];
-            $this->output .= '      ' . number_format($items[$i]["reminder_fee"], 2, ",", ".");
+            $this->output .= ' '.$items[$i]["dk_this_date"];
+            $this->output .= '  '.$items[$i]["dk_due_date"];
+            $this->output .= '      '.number_format($items[$i]["reminder_fee"], 2, ",", ".");
             $total += $items[$i]["reminder_fee"];
         }
         if ($reminder->get("reminder_fee") != 0) {
             $this->output .= "\nRykkergebyr                                      ".number_format($reminder->get("reminder_fee"), 2, ",", ".");
             $total += $reminder->get("reminder_fee");
         }
-            $this->output .= "\n\nTotal:                                           " . number_format($total, 2, ",", ".");
+            $this->output .= "\n\nTotal:                                           ".number_format($total, 2, ",", ".");
 
             $parameter = array(
                 "contact" => $reminder->contact,
@@ -58,7 +58,7 @@ 
                 "amount" => $total,
                 "due_date" => $reminder->get("dk_due_date"),
                 "girocode" => $reminder->get("girocode"));
-            $this->output .= "\n\nDet skyldige beløb betales senest: " . $parameter['due_date'];
+            $this->output .= "\n\nDet skyldige beløb betales senest: ".$parameter['due_date'];
 
             // TODO: change to payment_method
         switch ($reminder->get('payment_method_key')) {
@@ -68,16 +68,16 @@ 
                 $this->output .= "\nBank:                ".$reminder->kernel->setting->get('intranet', 'bank_name');
                 $this->output .= "\nRegnr.:              ".$reminder->kernel->setting->get('intranet', 'bank_reg_number');
                 $this->output .= "\nKontonr.:            ".$reminder->kernel->setting->get('intranet', 'bank_account_number');
-                $this->output .= "\nBesked til modtager: " . "Kunde #" . $reminder->contact->get("number");
+                $this->output .= "\nBesked til modtager: "."Kunde #".$reminder->contact->get("number");
                 break;
             case 3:
                 $this->output .= "\n\nBetaling via homebanking\n+71< ".str_repeat("0", 15 - strlen($parameter["girocode"])).$parameter["girocode"]." +".$this->context->getKernel()->setting->get('intranet', 'giro_account_number')."<";
                 break;
         }
 
-            $this->output .= "\n\nMed venlig hilsen\n\n" . $reminder->kernel->user->getAddress()->get("name") . "\n" .$reminder->kernel->intranet->get("name");
-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("address");
-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("postcode") . "  " . $reminder->kernel->intranet->address->get("city");
+            $this->output .= "\n\nMed venlig hilsen\n\n".$reminder->kernel->user->getAddress()->get("name")."\n".$reminder->kernel->intranet->get("name");
+            $this->output .= "\n".$reminder->kernel->intranet->address->get("address");
+            $this->output .= "\n".$reminder->kernel->intranet->address->get("postcode")."  ".$reminder->kernel->intranet->address->get("city");
     }
 
     public function getText()
@@ -108,7 +108,7 @@ 
             throw new Exception('Kontaktpersonen har ikke nogen email');
         }
 
-        $subject  =     "Påmindelse om betaling";
+        $subject = "Påmindelse om betaling";
 
         $reminder_text = new Reminder_Text();
         $reminder_text->visit($reminder);
@@ -146,7 +146,7 @@ 
         if ($id = $email->save($var)) {
             $redirect = new Intraface_Redirect($this->context->getKernel());
             $shared_email = $this->context->getKernel()->useModule('email');
-            $url = $redirect->setDestination($shared_email->getPath().$id . '?edit', NET_SCHME . NET_HOST . $this->context->url());
+            $url = $redirect->setDestination($shared_email->getPath().$id.'?edit', NET_SCHME.NET_HOST.$this->context->url());
             $redirect->setIdentifier('send_email');
             $redirect->askParameter('send_email_status');
             return new k_SeeOther($url);

src/Intraface/modules/debtor/Controller/Reminder.php

Spacing +21 added lines, -21 removed lines

@@ -51,7 +51,7 @@ 
             }
         }
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/reminder');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/reminder');
         return $smarty->render($this);
     }
 
@@ -82,7 +82,7 @@ 
             $checked_reminder[] = $reminders[$i]["reminder_id"];
         }
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/reminder-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/reminder-edit');
         return $smarty->render($this, array('value' => $value, 'checked_invoice' => $checked_invoice, 'checked_reminder' => $checked_reminder));
     }
 
@@ -180,7 +180,7 @@ 
             throw new Exception('Kontaktpersonen har ikke nogen email');
         }
 
-        $subject  =     "Påmindelse om betaling";
+        $subject = "Påmindelse om betaling";
 
         $reminder_text = new Reminder_Text();
         $reminder_text->visit($reminder);
@@ -218,7 +218,7 @@ 
         if ($id = $email->save($var)) {
             $redirect = new Intraface_Redirect($this->getKernel());
             $shared_email = $this->getKernel()->useModule('email');
-            $url = $redirect->setDestination($shared_email->getPath() . $id . '?edit', NET_SCHEME . NET_HOST . $this->url());
+            $url = $redirect->setDestination($shared_email->getPath().$id.'?edit', NET_SCHEME.NET_HOST.$this->url());
             $redirect->setIdentifier('send_email');
             $redirect->askParameter('send_email_status');
             return new k_SeeOther($url);
@@ -265,14 +265,14 @@ 
 
     function visit(Reminder $reminder)
     {
-        $this->output .= "Dato: " . $reminder->get("dk_this_date") ."\n\n";
-        $this->output .= $reminder->contact->address->get("name") . "\n";
+        $this->output .= "Dato: ".$reminder->get("dk_this_date")."\n\n";
+        $this->output .= $reminder->contact->address->get("name")."\n";
         if ($reminder->get("attention_to") != "") {
             $this->output .= "Att.: ".$reminder->get("attention_to")."\n";
         }
-        $this->output .= $reminder->contact->address->get("address") . "\n";
-        $this->output .= $reminder->contact->address->get("postcode") . "  " .  $reminder->contact->address->get("city") ."\n\n";
-        $this->output .= $reminder->get("text") . "\n\n";
+        $this->output .= $reminder->contact->address->get("address")."\n";
+        $this->output .= $reminder->contact->address->get("postcode")."  ".$reminder->contact->address->get("city")."\n\n";
+        $this->output .= $reminder->get("text")."\n\n";
 
         // Overskrifter - Vareudskrivning
         $this->output .= "Beskrivelse          Dato        Forfaldsdato    Bel�b\n";
@@ -286,24 +286,24 @@ 
             $j++) {
                 $this->output .= ' ';
             }
-                $this->output .= ' ' . $items[$i]["dk_this_date"];
-                $this->output .= '  ' . $items[$i]["dk_due_date"];
-                $this->output .= '      ' . number_format($items[$i]["arrears"], 2, ",", ".");
+                $this->output .= ' '.$items[$i]["dk_this_date"];
+                $this->output .= '  '.$items[$i]["dk_due_date"];
+                $this->output .= '      '.number_format($items[$i]["arrears"], 2, ",", ".");
                 $total += $items[$i]["arrears"];
         }
             $items = $reminder->item->getList("reminder");
         for ($i = 0, $max = count($items); $i < $max; $i++) {
             $this->output .= "\nTidl. rykkkergebyr  ";
-            $this->output .= ' ' . $items[$i]["dk_this_date"];
-            $this->output .= '  ' .$items[$i]["dk_due_date"];
-            $this->output .= '      ' . number_format($items[$i]["reminder_fee"], 2, ",", ".");
+            $this->output .= ' '.$items[$i]["dk_this_date"];
+            $this->output .= '  '.$items[$i]["dk_due_date"];
+            $this->output .= '      '.number_format($items[$i]["reminder_fee"], 2, ",", ".");
             $total += $items[$i]["reminder_fee"];
         }
         if ($reminder->get("reminder_fee") != 0) {
             $this->output .= "\nRykkergebyr                                      ".number_format($reminder->get("reminder_fee"), 2, ",", ".");
             $total += $reminder->get("reminder_fee");
         }
-            $this->output .= "\n\nTotal:                                           " . number_format($total, 2, ",", ".");
+            $this->output .= "\n\nTotal:                                           ".number_format($total, 2, ",", ".");
 
             $parameter = array(
                 "contact" => $reminder->contact,
@@ -311,7 +311,7 @@ 
                 "amount" => $total,
                 "due_date" => $reminder->get("dk_due_date"),
                 "girocode" => $reminder->get("girocode"));
-            $this->output .= "\n\nDet skyldige beløb betales senest: " . $parameter['due_date'];
+            $this->output .= "\n\nDet skyldige beløb betales senest: ".$parameter['due_date'];
 
             // TODO: change to payment_method
         switch ($reminder->get('payment_method_key')) {
@@ -321,16 +321,16 @@ 
                 $this->output .= "\nBank:                ".$reminder->kernel->setting->get('intranet', 'bank_name');
                 $this->output .= "\nRegnr.:              ".$reminder->kernel->setting->get('intranet', 'bank_reg_number');
                 $this->output .= "\nKontonr.:            ".$reminder->kernel->setting->get('intranet', 'bank_account_number');
-                $this->output .= "\nBesked til modtager: " . "Kunde #" . $reminder->contact->get("number");
+                $this->output .= "\nBesked til modtager: "."Kunde #".$reminder->contact->get("number");
                 break;
             case 3:
                 $this->output .= "\n\nBetaling via homebanking\n+71< ".str_repeat("0", 15 - strlen($parameter["girocode"])).$parameter["girocode"]." +".$kernel->setting->get('intranet', 'giro_account_number')."<";
                 break;
         }
 
-            $this->output .= "\n\nMed venlig hilsen\n\n" . $reminder->kernel->user->getAddress()->get("name") . "\n" .$reminder->kernel->intranet->get("name");
-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("address");
-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("postcode") . "  " . $reminder->kernel->intranet->address->get("city");
+            $this->output .= "\n\nMed venlig hilsen\n\n".$reminder->kernel->user->getAddress()->get("name")."\n".$reminder->kernel->intranet->get("name");
+            $this->output .= "\n".$reminder->kernel->intranet->address->get("address");
+            $this->output .= "\n".$reminder->kernel->intranet->address->get("postcode")."  ".$reminder->kernel->intranet->address->get("city");
     }
 
     public function getText()

src/Intraface/modules/contact/ContactReminder.php

Indentation +6 added lines, -6 removed lines

@@ -224,7 +224,7 @@ 
             throw new Exception('Could not save information in ContactReminder->update' . $result->getUserInfo());
             return false;
         }
-         return $this->id;
+            return $this->id;
     }
 
     /**
@@ -244,8 +244,8 @@ 
             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
             return false;
         }
-         $this->load();
-         return true;
+            $this->load();
+            return true;
     }
 
     /**
@@ -277,7 +277,7 @@ 
         if ($result->numRows() == 0) {
             return array();
         }
-         return $result->fetchAll(MDB2_FETCHMODE_ASSOC);
+            return $result->fetchAll(MDB2_FETCHMODE_ASSOC);
     }
 
     /**
@@ -295,8 +295,8 @@ 
             throw new Exception('Could not postphone reminder' . $result->getUserInfo());
             return false;
         }
-         $this->load();
-         return true;
+            $this->load();
+            return true;
     }
 
     public function getDBQuery()

src/Intraface/LegacyCpdf.php

Spacing +665 added lines, -665 removed lines

@@ -57,7 +57,7 @@ 
      *
      * @var integer
      */
-    private $numObj=0;
+    private $numObj = 0;
 
     /**
       * this array contains all of the pdf objects, ready for final assembly
@@ -143,21 +143,21 @@ 
       *
       * @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 @@ 
     /**
       * 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 @@ 
     /**
      * 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 @@ 
       * 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 @@ 
     /**
      * 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 @@ 
      *
      * @var string
      */
-    private $encryptionKey='';
+    private $encryptionKey = '';
     
     /*
      * encryption padding fetched from the Adobe PDF reference
@@ -387,32 +387,32 @@ 
      */
     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 @@ 
      */
     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 @@ 
                         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 @@ 
      */
     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 @@ 
      */
     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 @@ 
     {
         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 @@ 
      */
     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 @@ 
      */
     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 @@ 
 
                     $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 @@ 
                     $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 @@ 
                         $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 @@ 
                             // 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 @@ 
                             }
                             $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 @@ 
                     $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 @@ 
      */
     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 @@ 
                         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 @@ 
      */
     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 @@ 
 
             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 @@ 
                     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 @@ 
                   $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 @@ 
      */
     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 @@ 
             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 @@ 
      */
     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 @@ 
      */
     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 @@ 
                 // 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 @@ 
      */
     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 @@ 
      */
     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 @@ 
                     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 @@ 
      */
     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 @@ 
                             }
                         }
                     } 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 @@ 
      */
     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 @@ 
                 // 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 @@ 
         $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 @@ 
             
             // 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 @@ 
             $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 @@ 
     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 @@ 
     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 @@ 
     {
         $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 @@ 
     {
         $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 @@ 
      */
     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 @@ 
     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 @@ 
     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 @@ 
     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 @@ 
         );
         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 @@ 
         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 @@ 
 
         if ($debug) {
             // turn compression off
-            $this->options['compression']=0;
+            $this->options['compression'] = 0;
         }
 
         if ($this->arc4_objnum) {
@@ -1756,23 +1756,23 @@ 
 
         $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 @@ 
      *
      * @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 @@ 
         $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 @@ 
             } 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 @@ 
             
             $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 @@ 
                         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 @@ 
                         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 @@ 
     
         $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 @@ 
                     // 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 @@ 
                     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 @@ 
                     $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 @@ 
                     );
                     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 @@ 
                     // 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 @@ 
                 // 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 @@ 
         
         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 @@ 
      */
     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 @@ 
      */
     protected function addContent($content)
     {
-        $this->objects[$this->currentContents]['c'].=$content;
+        $this->objects[$this->currentContents]['c'] .= $content;
     }
 
     /**
@@ -2289,9 +2289,9 @@ 
      */
     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 @@ 
      */
     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 @@ 
      */
     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 @@ 
     {
         // 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 @@ 
      */
     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 @@ 
             $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 @@ 
 
         // 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 @@ 
      */
     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 @@ 
      */
     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 @@ 
      */
     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 @@ 
         // 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 @@ 
             // 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 @@ 
         // '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 @@ 
                 $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 @@ 
                     // 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 @@ 
             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 @@ 
         $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 @@ 
      */
     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 @@ 
     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 @@ 
                         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 @@ 
                                                 switch ($rk) {
                                                     case 'x':
                                                     case 'y':
-                                                        $$rk=$rv;
+                                                        $$rk = $rv;
                                                         break;
                                                 }
                                             }
@@ -2878,8 +2878,8 @@ 
                                         // 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 @@ 
                 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 @@ 
                                 // 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 @@ 
                                         switch ($rk) {
                                             case 'x':
                                             case 'y':
-                                                $$rk=$rv;
+                                                $$rk = $rv;
                                                 break;
                                         }
                                     }
@@ -2962,13 +2962,13 @@ 
     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 @@ 
         }
         
         $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 @@ 
                     $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 @@ 
                         $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 @@ 
           // 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 @@ 
 
         // 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 @@ 
             $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 @@ 
                     // 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 @@ 
                 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 @@ 
         $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 @@ 
                 }
 
                 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 @@ 
                         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 @@ 
                         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 @@ 
             $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 @@ 
             $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 @@ 
     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 @@ 
     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 @@ 
     {
         // 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 @@ 
         // 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 @@ 
     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 @@ 
                     }
                     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 @@ 
     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 @@ 
         $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 @@ 
         
                         // 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 @@ 
                         // 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 @@ 
                             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 @@ 
                         $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 @@ 
                     }
                     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 @@ 
                 default:
                     break;
             }
-            $p += $chunkLen+12;
+            $p += $chunkLen + 12;
         }
         return $default;
     }
@@ -3644,18 +3644,18 @@ 
         $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 @@ 
             $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 @@ 
             $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 @@ 
             $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 @@ 
             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 @@ 
             $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 @@ 
             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 @@ 
 
         // 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 @@ 
             $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 @@ 
         // '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 @@ 
         // 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 @@ 
                     trigger_error($message, $error_type);
                     break;
                 case 'variable':
-                    $this->messages.=$message."\n";
+                    $this->messages .= $message."\n";
                     break;
             }
         }
@@ -3995,7 +3995,7 @@ 
                     $this->checkpoint = $tmp;
                     unset($tmp);
                 } else {
-                    $this->checkpoint='';
+                    $this->checkpoint = '';
                 }
                 break;
             case 'rewind':
@@ -4005,7 +4005,7 @@ 
                     $tmp = $this->checkpoint;
                     foreach ($tmp as $k => $v) {
                         if ($k != 'checkpoint') {
-                            $this->$k=$v;
+                            $this->$k = $v;
                         }
                     }
                     unset($tmp);
@@ -4016,7 +4016,7 @@ 
                     // can only abort if were inside a checkpoint
                     $tmp = $this->checkpoint;
                     foreach ($tmp as $k => $v) {
-                        $this->$k=$v;
+                        $this->$k = $v;
                     }
                     unset($tmp);
                 }

src/Intraface/XMLRPC/Shop/Server0100.php

Indentation +2 added lines, -2 removed lines

@@ -590,7 +590,7 @@ 
         return $this->prepareResponseData($this->cleanUpProductList($product->getRelatedProducts($currencies, 'webshop')));
     }
 
-   /**
+    /**
      * Gets featured products
      *
      * Method is experimental and only used by discimport.dk. If you need to use it
@@ -640,7 +640,7 @@ 
         return $this->prepareResponseData($related_products);
     }
 
-   /**
+    /**
      * Gets product keywords which can be used to sort ones webshop
      *
      *

src/Intraface/XMLRPC/Shop/Server2.php

Indentation +2 added lines, -2 removed lines

@@ -233,7 +233,7 @@ 
         return $this->prepareResponseData($product->getRelatedProducts());
     }
 
-   /**
+    /**
      * Gets featured products
      *
      * Method is experimental and only used by discimport.dk. If you need to use it
@@ -277,7 +277,7 @@ 
         return $this->prepareResponseData($related_products);
     }
 
-   /**
+    /**
      * Gets product keywords which can be used to sort ones webshop
      *
      *

src/Intraface/XMLRPC/Shop/Server.php

Indentation +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
         return $product->getRelatedProducts();
     }
 
-   /**
+    /**
      * Gets featured products
      *
      * Method is experimental and only used by discimport.dk. If you need to use it
@@ -198,7 +198,7 @@ 
         return $related_products;
     }
 
-   /**
+    /**
      * Gets product keywords which can be used to sort ones webshop
      *
      * Method is experimental and only used by nylivsstil.dk. If you need to use it